Module: kamailio
Branch: master
Commit: aa685bf6deb8e0601738eda6e5e9710c250796c4
URL: https://github.com/kamailio/kamailio/commit/aa685bf6deb8e0601738eda6e5e9710…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2019-07-30T09:32:15+02:00
modules: readme files regenerated - siptrace ... [skip ci]
---
Modified: src/modules/siptrace/README
---
Diff: https://github.com/kamailio/kamailio/commit/aa685bf6deb8e0601738eda6e5e9710…
Patch: https://github.com/kamailio/kamailio/commit/aa685bf6deb8e0601738eda6e5e9710…
---
diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README
index 6849bce7f7..2be4f37a91 100644
--- a/src/modules/siptrace/README
+++ b/src/modules/siptrace/README
@@ -10,20 +10,14 @@ Alexandr Dubovikov
<alexandr.dubovikov(a)gmail.com>
-Edited by
-
Daniel-Constantin Mierla
<miconda(a)gmail.com>
-Edited by
-
Giacomo Vacca
<giacomo.vacca(a)gmail.com>
-Edited by
-
Camille Oudot
<camille.oudot(a)orange.com>
@@ -67,7 +61,7 @@ Camille Oudot
4. Functions
- 4.1. sip_trace([mode][,address][, correlation_id])
+ 4.1. sip_trace([address][,correlation_id][,mode])
4.2. hlog([correlation_id,] message)
5. RPC Commands
@@ -136,7 +130,7 @@ Chapter 1. Admin Guide
4. Functions
- 4.1. sip_trace([mode][,address][, correlation_id])
+ 4.1. sip_trace([address][,correlation_id][,mode])
4.2. hlog([correlation_id,] message)
5. RPC Commands
@@ -466,10 +460,10 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia")
4. Functions
- 4.1. sip_trace([mode][,address][, correlation_id])
+ 4.1. sip_trace([address][,correlation_id][,mode])
4.2. hlog([correlation_id,] message)
-4.1. sip_trace([mode][,address][, correlation_id])
+4.1. sip_trace([address][,correlation_id][,mode])
Store or forward the current processed SIP message/transaction/dialog
in database. It is stored in the form prior applying changes made to
@@ -477,15 +471,15 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia")
the current transaction('t') or the current dialog('d').
Meaning of the parameters is as follows:
+ * address - The address in form of SIP URI where to send a duplicate
+ of traced message. This parameter trumps duplicate_uri and allows
+ tracing to more than one server.
+ * correlation_id - A string with a correlation ID to be added to the
+ HEP header when using HEPv3. It's possible to use PVs.
* mode - SIP messages to be traced. One can trace the current message
(function can be called on either a reply or a request), the
current transaction(the route must belong to a request) or the
current dialog(the message has to be an invite).
- address - The address in form of SIP URI where to send a duplicate
- of traced message. This parameter trumps duplicate_uri and allows
- tracing to more than one server.
- correlation_id - A string with a correlation ID to be added to the
- HEP header when using HEPv3. It's possible to use PVs.
This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
ONREPLY_ROUTE, BRANCH_ROUTE.
Module: kamailio
Branch: master
Commit: 803476627da7676321251f403cc8c6ced2d09721
URL: https://github.com/kamailio/kamailio/commit/803476627da7676321251f403cc8c6c…
Author: Henning Westerholt <hw(a)skalatan.de>
Committer: Henning Westerholt <hw(a)skalatan.de>
Date: 2019-07-30T09:22:25+02:00
siptrace: fix order of parameter for sip_trace function, add listitem structure
---
Modified: src/modules/siptrace/doc/siptrace_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/803476627da7676321251f403cc8c6c…
Patch: https://github.com/kamailio/kamailio/commit/803476627da7676321251f403cc8c6c…
---
diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml
index 0ec443ce3a..a60b843831 100644
--- a/src/modules/siptrace/doc/siptrace_admin.xml
+++ b/src/modules/siptrace/doc/siptrace_admin.xml
@@ -515,7 +515,7 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia")
<title>Functions</title>
<section id="siptrace.f.sip_trace">
<title>
- <function moreinfo="none">sip_trace([mode][,address][, correlation_id])</function>
+ <function moreinfo="none">sip_trace([address][,correlation_id][,mode])</function>
</title>
<para>
Store or forward the current processed SIP message/transaction/dialog in database.
@@ -525,19 +525,23 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia")
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>mode</emphasis> - SIP messages to be traced. One can trace the current message
- (function can be called on either a reply or a request), the current transaction(the route must
- belong to a request) or the current dialog(the message has to be an invite).
- </para>
<para><emphasis>address</emphasis> - The address in form of SIP URI
where to send a duplicate of traced message. This parameter trumps
duplicate_uri and allows tracing to more than one server.
</para>
+ </listitem>
+ <listitem>
<para><emphasis>correlation_id</emphasis> - A string with a correlation ID
to be added to the HEP header when using HEPv3.
It's possible to use PVs.
</para>
</listitem>
+ <listitem>
+ <para><emphasis>mode</emphasis> - SIP messages to be traced. One can trace the current message
+ (function can be called on either a reply or a request), the current transaction(the route must
+ belong to a request) or the current dialog(the message has to be an invite).
+ </para>
+ </listitem>
</itemizedlist>
<para>
This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
### Description
When using db_redis for dialog realtime storage, I've found every dialog entry is writing to a single hash with a null value:
```
1564282556.519166 [7 127.0.0.1:33838] "HMSET" "" "hash_entry" "2461" "hash_id" "4292" "callid" "39d9ba94b0e311e9b879c08c6015a900(a)10.0.0.2" "from_uri" "sip:61400123123@10.0.0.2:5060;user=phone" "from_tag" "1991956793-3910263728-2361424312-11081056" "to_uri" "sip:61399991234@5.5.5.5;user=phone" "to_tag" "vvFKcF789FU6S" "caller_sock" "udp:10.0.0.2:5060" "callee_sock" "udp:10.0.0.2:5060" "start_time" "1564282556" "state" "3" "timeout" "1486721673" "caller_cseq" "1" "callee_cseq" "0" "caller_contact" "sip:61400123123@10.0.0.2:5060;user=phone" "callee_contact" "sip:10.0.0.3:5060" "caller_route_set" "" "callee_route_set" "" "sflags" "0" "toroute_name" "" "req_uri" "sip:61399991234@kamailio.local" "xdata" "" "iflags" "0"
1564282561.716416 [7 127.0.0.1:33836] "HMSET" "" "hash_entry" "3657" "hash_id" "8250" "callid" "100c26fd-2b86-1238-048a-0cc47a18705a" "from_uri" "sip:61400123123@10.0.0.3:5060" "from_tag" "ye24F58F417BH" "to_uri" "sip:61400123123@kamalio.local" "to_tag" "as2bd0b9fb" "caller_sock" "udp:10.0.0.2:5060" "callee_sock" "udp:10.0.0.2:5060" "start_time" "1564282561" "state" "3" "timeout" "1486721672" "caller_cseq" "7587486" "callee_cseq" "0" "caller_contact" "sip:10.0.0.3:5060" "callee_contact" "sip:5.5.5.5;did=94e.d9ab66d6" "caller_route_set" "" "callee_route_set" "" "sflags" "0" "toroute_name" "" "req_uri" "sip:61400123123@5.5.5.5" "xdata" "" "iflags" "16"
```
Note that these are two seperate dialogs, however each runs `HMSET ""`, meaning the hash known as "" has the value written.
#### Reproduction
```
modparam("dialog", "dlg_flag", 4)
modparam("dialog", "track_cseq_updates", 1)
modparam("dialog", "event_callback", "ksr_dialog_event")
modparam("dialog", "db_mode", 1) # Real time dump to DB
modparam("dialog", "db_url", "redis://127.0.0.1:6379/7")
```
### Additional Information
5.3.0-dev4
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/2017
Module: kamailio
Branch: master
Commit: b4e11cb25d848651406e0ad355d54f10db971761
URL: https://github.com/kamailio/kamailio/commit/b4e11cb25d848651406e0ad355d54f1…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-07-29T13:51:57+02:00
core: skip to-tag when computing via branch for invite, ack and cancel
- proper functionality for stateless proxy in case of negative ACK (in
this case the INVITE has no To-tag, but ACK has it and resulted in
different via branch, making downstream proxy to not match transaction)
---
Modified: src/core/char_msg_val.h
---
Diff: https://github.com/kamailio/kamailio/commit/b4e11cb25d848651406e0ad355d54f1…
Patch: https://github.com/kamailio/kamailio/commit/b4e11cb25d848651406e0ad355d54f1…
---
diff --git a/src/core/char_msg_val.h b/src/core/char_msg_val.h
index 79461cd836..436f58b401 100644
--- a/src/core/char_msg_val.h
+++ b/src/core/char_msg_val.h
@@ -38,6 +38,7 @@
inline static int char_msg_val( struct sip_msg *msg, char *cv )
{
str src[8];
+ str sempty = str_init("");
if (unlikely(!check_transaction_quadruple(msg))) {
LM_ERR("can't calculate char_value due to a parsing error\n");
@@ -55,7 +56,12 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv )
}
/* use only the from & to tags */
src[0]=get_from(msg)->tag_value;
- src[1]=get_to(msg)->tag_value;
+ if(msg->first_line.u.request.method_value
+ & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL)) {
+ src[1]=sempty;
+ } else {
+ src[1]=get_to(msg)->tag_value;
+ }
src[2]= msg->callid->body;
src[3]= msg->first_line.u.request.uri;
src[4]= get_cseq( msg )->number;