- sr-dev - kamailio.org

RFC: KEMI and array/dictionary values
by Victor Seva 08 Apr '20

08 Apr '20

Hi, We started to migrate our Lua scripts to KEMI but we use [0] sr.xavp.get_keys() and sr.xavp.get() functions that return an array and a dictionary. It seems that KEMI has no support for complex data types. So, I think we still need a way to extend the interpreters with richer functions that must be implemented on all flavours or create some c abstractions to support arrays and dictionaries in KEMI. Comments/Ideas? Victor [0] https://www.kamailio.org/wiki/embeddedapi/devel/lua#srxavp

2 2

Error in kamailio - 5.3.3
by Pavithra M 08 Apr '20

08 Apr '20

Hi, I have configured kamailio as Ims server with pcscf,icscf,scsf and hss in 4 different vms . After that I use zoiper client for testing the call flow . Registration is successful .It goes via UE -> Pcscf -> icscf -> scscf and returns back with 200 OK . Registration is happening with authentication from hss . When I make an INVITE , it goes from UE -> PCSCF -> SCSCF -> ICSCF -> SCSF and s-cscf gives *403 - Domain not served *to icscf and i-cscf returns to p-cscf with the same error . I am not seeing any errors in scscf and i-cscf . In pcscf , I am seeing an error like *Error : <core> [core/lvalue.c] :lval_pvar_assign() : setting pvar failed * *Error : <core> [core/lvalue.c] :* *lval_assign():assignment failed at pos* What should I do? Kindly advise. I am struggling with this issue for a week.kindly do the needful. Version - kamailio - 5.3.3 I need a normal call flow to be established between two clients.kindly help .

2 1

git:master:c2512ac4: siptrace: docs for trace_init_mode parameter
by Daniel-Constantin Mierla 08 Apr '20

08 Apr '20

Module: kamailio Branch: master Commit: c2512ac4b93dfc82264fc6d50d9b27a12755980f URL: https://github.com/kamailio/kamailio/commit/c2512ac4b93dfc82264fc6d50d9b27a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T17:35:25+02:00 siptrace: docs for trace_init_mode parameter --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c2512ac4b93dfc82264fc6d50d9b27a… Patch: https://github.com/kamailio/kamailio/commit/c2512ac4b93dfc82264fc6d50d9b27a… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 511dda3a98..2192b1b199 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -462,6 +462,44 @@ modparam("siptrace", "trace_delayed", 1) ... modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") ... +</programlisting> + </example> + </section> + <section id="siptrace.p.trace_init_mode"> + <title><varname>trace_init_mode</varname> (integer)</title> + <para> + Control what tracing modes are initialized. + </para> + <para> + The value of the parameter can be a combination of next values: + <itemizedlist> + <listitem> + <para> + 0 - all modes are initialized. + </para> + </listitem> + <listitem> + <para> + 1 - module initialized to do tracing only with core callback + functions (see also 'trace_mode' parameter). + </para> + </listitem> + <listitem> + <para> + 2 - module initialized to do tracing only using config script flags + and functions. + </para> + </listitem> + </itemizedlist> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>trace_init_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "trace_init_mode", 1) +... </programlisting> </example> </section>

2 2

git:master:66582c49: rr: exported record_route_advertised_address() to kemi
by Daniel-Constantin Mierla 08 Apr '20

08 Apr '20

Module: kamailio Branch: master Commit: 66582c49ee16a15a6859bfb094c2faaed7960d4d URL: https://github.com/kamailio/kamailio/commit/66582c49ee16a15a6859bfb094c2faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-08T08:49:29+02:00 rr: exported record_route_advertised_address() to kemi --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/66582c49ee16a15a6859bfb094c2faa… Patch: https://github.com/kamailio/kamailio/commit/66582c49ee16a15a6859bfb094c2faa… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index b7b979f25e..236373a288 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -453,6 +453,23 @@ static int w_record_route_advertised_address(struct sip_msg *msg, char *addr, ch return 1; } +/** + * + */ +static int ki_record_route_advertised_address(sip_msg_t *msg, str *addr) +{ + if (msg->msg_flags & FL_RR_ADDED) { + LM_ERR("Double attempt to record-route\n"); + return -1; + } + + if ( record_route_advertised_address(msg, addr) < 0) + return -1; + + msg->msg_flags |= FL_RR_ADDED; + return 1; +} + static int w_add_rr_param(struct sip_msg *msg, char *key, char *foo) { @@ -865,6 +882,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rr"), str_init("record_route_advertised_address"), + SR_KEMIP_INT, ki_record_route_advertised_address, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("rr"), str_init("next_hop_route"), SR_KEMIP_INT, ki_rr_next_hop_route, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:0edff017: siptrace: skip grepping local socket till sending function
by Daniel-Constantin Mierla 08 Apr '20

08 Apr '20

Module: kamailio Branch: master Commit: 0edff017fe4259f01ea62d5aa78d5305a6d8164e URL: https://github.com/kamailio/kamailio/commit/0edff017fe4259f01ea62d5aa78d530… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-08T08:49:29+02:00 siptrace: skip grepping local socket till sending function - have a single place where to decide what local socket should be used --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0edff017fe4259f01ea62d5aa78d530… Patch: https://github.com/kamailio/kamailio/commit/0edff017fe4259f01ea62d5aa78d530… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 284fa45ba2..c3876c9108 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -69,7 +69,7 @@ MODULE_VERSION #define SIPTRACE_ANYADDR_LEN (sizeof(SIPTRACE_ANYADDR) - 1) #define trace_is_off(_msg) \ - (((_msg)->msg_flags & FL_SIPTRACE) == 0) + (((_msg)->msg_flags & FL_SIPTRACE) == 0) #define is_null_pv(_str) \ (!str_strcmp(&_str, pv_get_null_str())) @@ -321,7 +321,7 @@ static int mod_init(void) } if(!DB_CAPABILITY(db_funcs, DB_CAP_INSERT)) { LM_ERR("database modules does not provide all functions needed" - " by module\n"); + " by module\n"); return -1; } } @@ -354,7 +354,7 @@ static int mod_init(void) } memset(trace_send_sock_uri, 0, sizeof(sip_uri_t)); if(parse_uri(trace_send_sock_str.s, trace_send_sock_str.len, - trace_send_sock_uri) + trace_send_sock_uri) < 0) { LM_ERR("bad send sock address\n"); return -1; @@ -422,7 +422,7 @@ static int mod_init(void) } if(pv_get_avp_name( - 0, &avp_spec.pvp, &traced_user_avp, &traced_user_avp_type) + 0, &avp_spec.pvp, &traced_user_avp, &traced_user_avp_type) != 0) { LM_ERR("[%.*s] - invalid AVP definition\n", traced_user_avp_str.len, traced_user_avp_str.s); @@ -441,7 +441,7 @@ static int mod_init(void) } if(pv_get_avp_name( - 0, &avp_spec.pvp, &trace_table_avp, &trace_table_avp_type) + 0, &avp_spec.pvp, &trace_table_avp, &trace_table_avp_type) != 0) { LM_ERR("[%.*s] - invalid AVP definition\n", trace_table_avp_str.len, trace_table_avp_str.s); @@ -476,7 +476,7 @@ static int child_init(int rank) db_con = db_funcs.init(&db_url); if(!db_con) { LM_ERR("unable to connect to database. Please check " - "configuration.\n"); + "configuration.\n"); return -1; } if(DB_CAPABILITY(db_funcs, DB_CAP_QUERY)) { @@ -851,9 +851,9 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, goto trace_current; } - /* if sip_trace is called over an incoming CANCEL, skip - * capturing it if the cancelled transaction is already being traced - */ + /* if sip_trace is called over an incoming CANCEL, skip + * capturing it if the cancelled transaction is already being traced + */ if (msg->REQ_METHOD==METHOD_CANCEL) { t_invite=tmb.t_lookup_original(msg); if (t_invite!=T_NULL_CELL) { @@ -865,7 +865,7 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, tmb.t_unref(msg); } } - + /* if sip_trace is called over an incoming ACK, skip * capturing it if it's an ACK for a negative reply for * an already traced transaction @@ -1112,18 +1112,6 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, return -1; } - if(dst) { - if(dst->send_sock == 0) { - dst->send_sock = get_send_socket(0, &dst->to, dst->proto); - if(dst->send_sock == 0) { - LM_ERR("can't forward to af %d, proto %d no corresponding" - " listening socket\n", - dst->to.s.sa_family, dst->proto); - return -1; - } - } - } - memset(&sto, 0, sizeof(siptrace_data_t)); if(traced_user_avp.n != 0)

1 0

Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain not served)
by Pavithra M 08 Apr '20

08 Apr '20

Hi , I am also facing the same issue . Could you please tell me the workaround if it worked . Thanks.

2 4

git:master:fbd101ee: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 08 Apr '20

08 Apr '20

Module: kamailio Branch: master Commit: fbd101eebc17b92a80cbf4867527d2ff8075f6e5 URL: https://github.com/kamailio/kamailio/commit/fbd101eebc17b92a80cbf4867527d2f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-08T04:16:09+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/fbd101eebc17b92a80cbf4867527d2f… Patch: https://github.com/kamailio/kamailio/commit/fbd101eebc17b92a80cbf4867527d2f…

1 0

[kamailio/kamailio] dialog: adding dlg.dump (#2272)
by Julien Chavanton 08 Apr '20

08 Apr '20

alternative command to output dialogs data to file, far much faster than dlg.list   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist:  - [x] Tested changes locally - [x] Related to issue #2269 #### Description This command can output 100K dialogs in less than a second. Almost the exact same format as dlg.list, except no using arrays for `variables` and `profiles` since they can have a mixture of values and key / value pairs. ``` { "h_entry": 16383, "h_id": 4428, "ref": 2, "call_id": "ehm839mk6HwtIXfCpluxkNlbDq8H9im2", "from_uri": "sip:voip_perf@147.75.65.147", "to_uri": "sip:12063722016@52.42.112.121", "state": 4, "start_ts": 1585863821, "init_ts": 1585863821, "end_ts": 0, "timeout": 1585885421, "lifetime": 21600, "dflags": 1539, "sflags": 0, "iflags": 0, "caller": { "tag": "KK4KtrhQ--OjGMBNCvpXfKX-tinxQ3EK", "contact": "sip:voip_perf@147.75.65.147:5072;transport=udp", "cseq": "25945", "route_set": "", "socket": "udp:0.0.0.0:5060" }, "callee": { "tag": "jlf1PLBMkC3utNwg-qwdkolYbaMx0no5", "contact": "sip:voip_perf@147.75.65.147:5060;transport=udp", "cseq": "0", "route_set": "", "socket": "udp:0.0.0.0:5060" }, "profiles": { "outbound_call": "" }, "variables": { "foo": "bar" } } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2272 -- Commit Summary -- * dialog: adding dlg.dump -- File Changes -- M src/modules/dialog/Makefile (15) M src/modules/dialog/dialog.c (155) M src/modules/dialog/doc/dialog_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2272.patch https://github.com/kamailio/kamailio/pull/2272.diff -- 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/pull/2272

2 12

[kamailio/kamailio] dialog: extract/dump a large amount (#2269)
by Julien Chavanton 08 Apr '20

08 Apr '20

### Description The commands available to extract dialog information `dlg.profile_list` and `dlg.list` Are not fast enough to output a large amount of dialogs. After doing some benchmark the time is spent in in `rpc->struct_add`, `rpc->add etc`, etc. it appears to be slowing down linearly. ### Possible Solutions I made a quick POC to verify what I can get if I output to file instead and I got blazing fast performance, this is good news since it means that iterating over the hash table etc. is super fast. https://github.com/jchavanton/kamailio/commit/f28c5a6b6364d79ee35acb5be439e… ``` dialog: outputing large amount of dialogs to file Test: 1) injecting 100K dialogs with voip_perf 2) confirmation that we have 100K+ dialogs kamcmd dlg.profile_get_size outbound_call 100879 3) execute the quickly hacked modifications to output to /tmp/dialogs.txt kamctl rpc dlg.profile_list outbound_call 3.1) verify how long it took 2020-03-31T22:28:18.398916476Z 12(31) : dialog [dialog.c:2174]: internal_rpc_profile_print_dlgs(): profile->lock 2020-03-31T22:28:18.554379411Z 12(31) : dialog [dialog.c:2190]: internal_rpc_profile_print_dlgs(): profile->lock release // command took less then 20ms 3.2) verify the content of the output wc /tmp/dialogs.txt 124355 117324 20547037 /tmp/dialogs.txt Note about the content // not everything is outputed in this quick hack but we can imagine that the impact will be very low. call-id[uV.YzlhIZd1inE8SYDAlzmOLG12tYqVS]from[sip:voip_perf@147.75.65.247]to[sip:12060412757@52.42.112.21]h_entry[6207]h_id[44579]ref[2]contact[sip:voip_perf@147.75.65.247:5072;transport=udp]cseq[19528] ``` ### Additional Information I am thinking about adding commands to output to file in `json` and/or `csv` -- 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/2269

1 1

git:master:776f2f65: Merge pull request #2272 from kamailio/jchavanton/dlg_dump
by GitHub 08 Apr '20

08 Apr '20

Module: kamailio Branch: master Commit: 776f2f65e28028e5a67da30a8f10d2917b806108 URL: https://github.com/kamailio/kamailio/commit/776f2f65e28028e5a67da30a8f10d29… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-07T19:06:40-07:00 Merge pull request #2272 from kamailio/jchavanton/dlg_dump dialog: adding dlg.dump --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/776f2f65e28028e5a67da30a8f10d29… Patch: https://github.com/kamailio/kamailio/commit/776f2f65e28028e5a67da30a8f10d29…

1 0

git:master:2d00e26d: dialog: adding dlg.dump
by Julien Chavanton 08 Apr '20

08 Apr '20

Module: kamailio Branch: master Commit: 2d00e26d912b79da67ce44375c5d422582041693 URL: https://github.com/kamailio/kamailio/commit/2d00e26d912b79da67ce44375c5d422… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-04-07T08:38:36-07:00 dialog: adding dlg.dump alternative command to output dialogs data to file, far much faster than dlg.list dialog: use core/srjson --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2d00e26d912b79da67ce44375c5d422… Patch: https://github.com/kamailio/kamailio/commit/2d00e26d912b79da67ce44375c5d422…

1 0

git:master:bc171047: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: bc1710478e8d099d509424b3c0eaebb0fd4556cd URL: https://github.com/kamailio/kamailio/commit/bc1710478e8d099d509424b3c0eaebb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-07T18:31:11+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/bc1710478e8d099d509424b3c0eaebb… Patch: https://github.com/kamailio/kamailio/commit/bc1710478e8d099d509424b3c0eaebb…

1 0

git:master:a21052ad: siptrace: fixed missing extern declarations of global parameters
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: a21052ad5a43dcd5f1ff5cb8b67bc7a66b95c0bb URL: https://github.com/kamailio/kamailio/commit/a21052ad5a43dcd5f1ff5cb8b67bc7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T18:28:07+02:00 siptrace: fixed missing extern declarations of global parameters --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/a21052ad5a43dcd5f1ff5cb8b67bc7a… Patch: https://github.com/kamailio/kamailio/commit/a21052ad5a43dcd5f1ff5cb8b67bc7a… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 34492df946..d0694b1d44 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -40,6 +40,8 @@ extern int trace_xheaders_write; extern int trace_xheaders_read; extern str trace_dup_uri_str; extern sip_uri_t *trace_dup_uri; +extern str trace_send_sock_str; +extern sip_uri_t *trace_send_sock_uri; /** * @@ -280,7 +282,7 @@ int sip_trace_xheaders_free(struct _siptrace_data *sto) int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) { dest_info_t dst; - dest_info_t pdst; + dest_info_t *pdst = NULL; proxy_l_t *p = NULL; if(buf == NULL || len <= 0) {

1 0

git:master:bb0d49c6: siptrace: docs - fixed missing ending para tag
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: bb0d49c6965208d7b27a0f22a79932a8db199faa URL: https://github.com/kamailio/kamailio/commit/bb0d49c6965208d7b27a0f22a79932a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T18:29:49+02:00 siptrace: docs - fixed missing ending para tag --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb0d49c6965208d7b27a0f22a79932a… Patch: https://github.com/kamailio/kamailio/commit/bb0d49c6965208d7b27a0f22a79932a… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 2192b1b199..24e305500a 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -491,6 +491,7 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") </para> </listitem> </itemizedlist> + </para> <para> Default value is <emphasis>0</emphasis>. </para>

1 0

Broken: kamailio/kamailio#8667 (master - d0f46e8)
by Travis CI 07 Apr '20

07 Apr '20

Build Update for kamailio/kamailio ------------------------------------- Build: #8667 Status: Broken Duration: 4 mins and 5 secs Commit: d0f46e8 (master) Author: Daniel-Constantin Mierla Message: siptrace: use the send socket also for duplication via sip - it was ignored, being used only for duplication via hep View the changeset: https://github.com/kamailio/kamailio/compare/2dde938c1888...d0f46e8a9b3e View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/672152402?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:ccb51b26: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: ccb51b26bd52a6b0917e71803e9ddbc82f095bc4 URL: https://github.com/kamailio/kamailio/commit/ccb51b26bd52a6b0917e71803e9ddbc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-07T18:01:17+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/ccb51b26bd52a6b0917e71803e9ddbc… Patch: https://github.com/kamailio/kamailio/commit/ccb51b26bd52a6b0917e71803e9ddbc…

1 0

git:master:8de85574: siptrace: removed storage of xheaders read/write flags in shared memory
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 8de855740e9f31c6d53cf2834d7d825df640d967 URL: https://github.com/kamailio/kamailio/commit/8de855740e9f31c6d53cf2834d7d825… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T17:46:01+02:00 siptrace: removed storage of xheaders read/write flags in shared memory - they are not changed at runtime, set at module initialization --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/8de855740e9f31c6d53cf2834d7d825… Patch: https://github.com/kamailio/kamailio/commit/8de855740e9f31c6d53cf2834d7d825…

1 0

git:master:d0f46e8a: siptrace: use the send socket also for duplication via sip
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: d0f46e8a9b3ed357057cc2b95b12fb7a58fbe73f URL: https://github.com/kamailio/kamailio/commit/d0f46e8a9b3ed357057cc2b95b12fb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T17:58:02+02:00 siptrace: use the send socket also for duplication via sip - it was ignored, being used only for duplication via hep --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/d0f46e8a9b3ed357057cc2b95b12fb7… Patch: https://github.com/kamailio/kamailio/commit/d0f46e8a9b3ed357057cc2b95b12fb7… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index fb0e9bd940..34492df946 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -277,13 +277,15 @@ int sip_trace_xheaders_free(struct _siptrace_data *sto) /** * */ -int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) +int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) { - struct dest_info dst; - struct proxy_l *p = NULL; + dest_info_t dst; + dest_info_t pdst; + proxy_l_t *p = NULL; - if(buf == NULL || len <= 0) + if(buf == NULL || len <= 0) { return -1; + } /* either modparam dup_uri or siptrace param dst2 */ if((trace_dup_uri_str.s == 0 || trace_dup_uri == NULL) && (dst2 == NULL)) { @@ -304,17 +306,39 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) } hostent2su( &dst.to, &p->host, p->addr_idx, (p->port) ? p->port : SIP_PORT); + pdst = &dst; + } else { + pdst = dst2; + } + + if(pdst->send_sock == NULL) { + if(trace_send_sock_str.s) { + LM_DBG("send sock activated, grep for the sock_info\n"); + pdst->send_sock = grep_sock_info(&trace_send_sock_uri->host, + trace_send_sock_uri->port_no, + trace_send_sock_uri->proto); + if(!pdst->send_sock) { + LM_WARN("cannot grep socket info\n"); + } else { + LM_DBG("found socket while grep: [%.*s] [%.*s]\n", + pdst->send_sock->name.len, + pdst->send_sock->name.s, pdst->send_sock->address_str.len, + pdst->send_sock->address_str.s); + } + } + } - dst.send_sock = get_send_socket(0, &dst.to, dst.proto); - if(dst.send_sock == 0) { - LM_ERR("can't forward to af %d, proto %d no corresponding" + if(pdst->send_sock == NULL) { + pdst->send_sock = get_send_socket(0, &pdst->to, pdst->proto); + if(pdst->send_sock == 0) { + LM_ERR("cannot forward to af %d, proto %d - no corresponding" " listening socket\n", - dst.to.s.sa_family, dst.proto); + pdst->to.s.sa_family, pdst->proto); goto error; } } - if(msg_send((dst2) ? dst2 : &dst, buf, len) < 0) { + if(msg_send(pdst, buf, len) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

1 0

git:master:43207442: siptrace: remove storage of trace_to_database value in shared memory
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 43207442aec71d290442c174dd2bd194370f7b00 URL: https://github.com/kamailio/kamailio/commit/43207442aec71d290442c174dd2bd19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T16:53:18+02:00 siptrace: remove storage of trace_to_database value in shared memory - not needed because it was not changed during runtime - added some clang-format off/on for structures --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/43207442aec71d290442c174dd2bd19… Patch: https://github.com/kamailio/kamailio/commit/43207442aec71d290442c174dd2bd19…

1 0

git:master:42c7c7a1: siptrace: new parameter trace_init_mode
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 42c7c7a12b1e742cf51382cbaeba7a695d8241d1 URL: https://github.com/kamailio/kamailio/commit/42c7c7a12b1e742cf51382cbaeba7a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T17:34:49+02:00 siptrace: new parameter trace_init_mode - control what kind of tracing is initialized for the module --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/42c7c7a12b1e742cf51382cbaeba7a6… Patch: https://github.com/kamailio/kamailio/commit/42c7c7a12b1e742cf51382cbaeba7a6…

1 0

git:master:2482f95e: siptrace: renamed some global symbols for coherent prefixing
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 2482f95edf9488375156b4a1116f4c9d26c41d7c URL: https://github.com/kamailio/kamailio/commit/2482f95edf9488375156b4a1116f4c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T16:37:38+02:00 siptrace: renamed some global symbols for coherent prefixing --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_hep.c Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/2482f95edf9488375156b4a1116f4c9… Patch: https://github.com/kamailio/kamailio/commit/2482f95edf9488375156b4a1116f4c9…

1 0

[kamailio/kamailio] Support for 192.0.0.0/29 as NATed source (#1488)
by dtryba 07 Apr '20

07 Apr '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  192.0.0.0/29 is a reserved subnet for NATtin IPv4 across an IPv6 netwerk. For example Dual Stack Lite carrier grade NAT. This is small change and updates the subnets used for NAT according to https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-speci… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1488 -- Commit Summary -- * Support for -- File Changes -- M src/modules/ipops/detailed_ip_type.c (1) M src/modules/ipops/detailed_ip_type.h (2) M src/modules/nat_traversal/nat_traversal.c (3) M src/modules/nathelper/nathelper.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1488.patch https://github.com/kamailio/kamailio/pull/1488.diff -- 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/pull/1488

3 4

siptrace inconsistency
by Federico Cabiddu 07 Apr '20

07 Apr '20

Hi all, I've been recently testing 5.3.x/master siptrace module, in particular the new trace mode "t" vs the legacy flag + sip_trace() mode and I've found some issues with the handling of CANCEL. Specifically, I've tested the following scenarios: 1) sip_trace_mode("t") on the initial INVITE only: received ACK for negative replies not captured 2) sip_trace_mode("t") on the initial INVITE and on neg ACK: received ACK captured twice 3) setflag and sip_trace() on the initial INVITE only: received CANCEL and ACK not captured (outgoing yes) 4) setflag and sip_trace() on the initial INVITE and ACK: received CANCEL not captured, received ACK captured twice 5) setflag and sip_trace() for each message (legacy): received CANCEL and 200 captured twice, received ACK captured twice Digging into the module's code the "culprit" looks to be trace_is_off function ( https://github.com/kamailio/kamailio/blob/2768f8ce1cf6da242674e7e40c8e76eb6…) and the places where it is called. E.g.: for the case 1), when a negative reply is received, trace_tm_neg_ack_in is called, which calls inside trace_is_off ( https://github.com/kamailio/kamailio/blob/2768f8ce1cf6da242674e7e40c8e76eb6…), which cannot be true unless the ACK has been marked for capture in the script, in which case it will be capture twice (case 2). The same applies to the CANCEL for case 3), in trace_onreq_out (callback for TMCB_E2ECANCEL_IN) trace_is_off because the incoming message is not flagged. Case 3) should theoretically behave like case 1) according to commit https://github.com/kamailio/kamailio/commit/40e09d8625184f19ff5666a2848cbb8… . I'm not really sure if (and how) modify the trace_is_off function or not calling it in specific cases. E.g.: why calling it in trace_tm_neg_ack_in? This callback is set when we explicity want to trace a transaction, so why checking inside if tracing is on? Maybe I'm missing something, but I think that probably the different behaviors of the modes should be better specified/decided. Best regards, Federico

3 15

git:master:2dde938c: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 2dde938c188839c71a1551866de20e39d73d28f6 URL: https://github.com/kamailio/kamailio/commit/2dde938c188839c71a1551866de20e3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-07T12:46:16+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/2dde938c188839c71a1551866de20e3… Patch: https://github.com/kamailio/kamailio/commit/2dde938c188839c71a1551866de20e3… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index f7fcd2eded..ea4eae3b19 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -156,7 +156,7 @@ Chapter 1. Admin Guide configuration file. In this case the original message is processed along with it's corresponding transaction/dialog if certain flags are used. - * by setting “trace_mode” to mirror all traffic. + * by setting “trace_mode” to mirror or store to db all traffic. The tracing can be turned on/off using Kamailio RPC commands. @@ -435,13 +435,19 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") 3.18. trace_mode (integer) - If set to 1, the module uses core events triggered when receiving or - sending SIP traffic to mirror traffic to a SIP capture server using - HEP. It will automatically do the mirroring of all SIP traffic. It is - no longer needed to set the siptrace flag per request or execute - sip_trace(), if it is done, then there mirroring is duplicated. + If not set to 0, the module uses core events triggered when receiving + or sending SIP traffic to store it to database or mirror it to a SIP + capture server using HEP or UDP forwarding. It will automatically do + the handling of all SIP traffic. It is no longer needed to set the + siptrace flag per request or execute sip_trace(), if it is done, then + the storing and mirroring is duplicated. - If set to 0, no automatic mirroring of SIP traffic via HEP. + The value of the parameter can be a combination of next values: + * 0 - no automatic mirroring or storing of SIP traffic. + * 1 (1st bit set) - mirror the traffic to HEP server. + * 2 (2nd bit set) - store the traffic to database server. + * 4 (3rd bit set) - mirro the traffic to the SIP URI specified by + duplicate_uri. The trace_on parameter still has to be set, allowing also to control this mode of mirroring via RPC commands. @@ -453,6 +459,8 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 1) ... +modparam("siptrace", "trace_mode", 3) +... 3.19. auth_key (integer)

1 0

git:master:87b8c506: siptrace: docs updates for trace_mode parameter
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 87b8c506f0dc77f0d39eb662df24fbe500bef9bb URL: https://github.com/kamailio/kamailio/commit/87b8c506f0dc77f0d39eb662df24fbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T12:33:47+02:00 siptrace: docs updates for trace_mode parameter --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/87b8c506f0dc77f0d39eb662df24fbe… Patch: https://github.com/kamailio/kamailio/commit/87b8c506f0dc77f0d39eb662df24fbe… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 9a33b36456..511dda3a98 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -33,7 +33,7 @@ </listitem> <listitem> <para> - by setting <quote>trace_mode</quote> to mirror all traffic. + by setting <quote>trace_mode</quote> to mirror or store to db all traffic. </para> </listitem> </itemizedlist> @@ -468,16 +468,40 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") <section id="siptrace.p.trace_mode"> <title><varname>trace_mode</varname> (integer)</title> <para> - If set to 1, the module uses core events triggered when receiving - or sending SIP traffic to mirror traffic to a SIP capture server - using HEP. It will automatically do the mirroring of all SIP traffic. + If not set to 0, the module uses core events triggered when receiving + or sending SIP traffic to store it to database or mirror it to a SIP + capture server using HEP or UDP forwarding. + It will automatically do the handling of all SIP traffic. It is no longer needed to set the siptrace flag per request or - execute sip_trace(), if it is done, then there mirroring is + execute sip_trace(), if it is done, then the storing and mirroring is duplicated. </para> + <para> + The value of the parameter can be a combination of next values: + <itemizedlist> + <listitem> <para> - If set to 0, no automatic mirroring of SIP traffic via HEP. + 0 - no automatic mirroring or storing of SIP traffic. </para> + </listitem> + <listitem> + <para> + 1 (1st bit set) - mirror the traffic to HEP server. + </para> + </listitem> + <listitem> + <para> + 2 (2nd bit set) - store the traffic to database server. + </para> + </listitem> + <listitem> + <para> + 4 (3rd bit set) - mirro the traffic to the SIP URI specified by + duplicate_uri. + </para> + </listitem> + </itemizedlist> + </para> <para> The trace_on parameter still has to be set, allowing also to control this mode of mirroring via RPC commands. @@ -493,6 +517,8 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 1) ... +modparam("siptrace", "trace_mode", 3) +... </programlisting> </example> </section>

1 0

git:master:1109fcfb: siptrace: trace_mode can be used to automatically store traffic to db or mirror via SIP URI
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 1109fcfbdf2b01c46a437cf5b762df9aea85ce9b URL: https://github.com/kamailio/kamailio/commit/1109fcfbdf2b01c46a437cf5b762df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T12:33:47+02:00 siptrace: trace_mode can be used to automatically store traffic to db or mirror via SIP URI - used to be only for HEP (trace_mode = 1) - trace_mode = 2 - store to database - trace_mode = 4 - mirror via SIP to duplicate_uri - the value can be a combination of these modes by summing up the corresponding values --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/1109fcfbdf2b01c46a437cf5b762df9… Patch: https://github.com/kamailio/kamailio/commit/1109fcfbdf2b01c46a437cf5b762df9…

1 0

git:master:34396801: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 3439680143422a3fd3e1bdbbe46b9c3770256631 URL: https://github.com/kamailio/kamailio/commit/3439680143422a3fd3e1bdbbe46b9c3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-07T10:16:24+02:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/3439680143422a3fd3e1bdbbe46b9c3… Patch: https://github.com/kamailio/kamailio/commit/3439680143422a3fd3e1bdbbe46b9c3…

1 0

git:master:4cdd0b40: rr: convenience furnction loose_route_preloaded()
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: 4cdd0b40ac2b150f93f38a091e650e2d648d379f URL: https://github.com/kamailio/kamailio/commit/4cdd0b40ac2b150f93f38a091e650e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T09:57:33+02:00 rr: convenience furnction loose_route_preloaded() - return 1 when Route header handling is ok for an initial request (no-totag) - return -1 in case of error or processing was for a request within dialog --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/loose.h Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4cdd0b40ac2b150f93f38a091e650e2… Patch: https://github.com/kamailio/kamailio/commit/4cdd0b40ac2b150f93f38a091e650e2…

1 0

git:master:fd5a0b89: rr: docs for loose_route_preloaded()
by Daniel-Constantin Mierla 07 Apr '20

07 Apr '20

Module: kamailio Branch: master Commit: fd5a0b890028887b4cb1cd7ac2be2cf37d27956f URL: https://github.com/kamailio/kamailio/commit/fd5a0b890028887b4cb1cd7ac2be2cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-07T10:04:54+02:00 rr: docs for loose_route_preloaded() --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fd5a0b890028887b4cb1cd7ac2be2cf… Patch: https://github.com/kamailio/kamailio/commit/fd5a0b890028887b4cb1cd7ac2be2cf… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index bdb78291b6..bce2042d05 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -416,6 +416,33 @@ loose_route(); </example> </section> + <section id="rr.f.loose_route_preloaded"> + <title><function moreinfo="none">loose_route_preloaded()</function></title> + + <para>The function is similar to `loose_route()`, but it returns 1 (true) + when the Route header is preloaded (is in an initial request) and -1 + (false) if processing of the Route header failed or it is for requests + within dialog.</para> + <para>It is a convenient function to use for routing initial requests on + an edge proxy that adds Path header to REGISTER requests. + </para> + <para>This function can be used from REQUEST_ROUTE.</para> + + <example> + <title><function>loose_route_preloaded</function> usage</title> + + <programlisting format="linespecific"> +... +if(!loose_route_preloaded()) { + sl_send_reply("404" "Preloaded route expected"); + exit; +} +... +</programlisting> + </example> + </section> + + <section id="rr.f.record_route"> <title><function moreinfo="none">record_route([sparams])</function></title>

1 0

Re: [sr-dev] [kamailio/kamailio] README: fix simple typo (0e771d9)
by Fred Posner 06 Apr '20

06 Apr '20

README: simple typo fix params.xml: simple typo fix -- 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/commit/0e771d9706e9989991640c684fe40d3…

1 0

git:master:119bce3e: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: 119bce3e20367cb0fad0700f744cdcc47dba6841 URL: https://github.com/kamailio/kamailio/commit/119bce3e20367cb0fad0700f744cdcc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-06T21:31:11+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/119bce3e20367cb0fad0700f744cdcc… Patch: https://github.com/kamailio/kamailio/commit/119bce3e20367cb0fad0700f744cdcc… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index ca0d73ca26..f7fcd2eded 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -160,9 +160,9 @@ Chapter 1. Admin Guide The tracing can be turned on/off using Kamailio RPC commands. - kamctl fifo sip_trace on + kamctl rpc siptrace.status on - kamctl fifo sip_trace off + kamctl rpc siptrace.status off 2. Dependencies @@ -260,8 +260,7 @@ modparam("siptrace", "trace_on", 1) Example 1.5. Set traced_user_avp parameter ... -modparam("siptrace", "traced_user_avp", "$avp(i:123)") -modparam("siptrace", "traced_user_avp", "$avp(s:user)") +modparam("siptrace", "traced_user_avp", "$avp(user)") ... 3.6. trace_table_avp (str) @@ -444,10 +443,14 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") If set to 0, no automatic mirroring of SIP traffic via HEP. + The trace_on parameter still has to be set, allowing also to control + this mode of mirroring via RPC commands. + Default value is 0. Example 1.18. Set trace_mode parameter ... +modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 1) ...

1 0

git:master:6704c511: siptrace: check trace_on value for core recv/send callbacks
by Daniel-Constantin Mierla 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: 6704c5117fa949ee610173ea5ac39a309c4dfe19 URL: https://github.com/kamailio/kamailio/commit/6704c5117fa949ee610173ea5ac39a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-06T20:45:06+02:00 siptrace: check trace_on value for core recv/send callbacks - value was not tested, not considering the enable/disable control via rpc --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/6704c5117fa949ee610173ea5ac39a3… Patch: https://github.com/kamailio/kamailio/commit/6704c5117fa949ee610173ea5ac39a3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index f95df0e069..5238adbc4a 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2014,6 +2014,10 @@ int siptrace_net_data_recv(sr_event_param_t *evp) if(evp->data == 0) return -1; + if(trace_on_flag != NULL && *trace_on_flag==0) { + return 0; + } + nd = (sr_net_info_t *)evp->data; if(nd->rcv == NULL || nd->data.s == NULL || nd->data.len <= 0) return -1; @@ -2063,6 +2067,10 @@ int siptrace_net_data_send(sr_event_param_t *evp) if(evp->data == 0) return -1; + if(trace_on_flag != NULL && *trace_on_flag==0) { + return 0; + } + nd = (sr_net_info_t *)evp->data; if(nd->dst == NULL || nd->data.s == NULL || nd->data.len <= 0) return -1;

1 0

git:master:ab6f384d: siptrace: docs updates for trace_mode and whitespacing
by Daniel-Constantin Mierla 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: ab6f384d4fd35c1f351c16838148164813c70a72 URL: https://github.com/kamailio/kamailio/commit/ab6f384d4fd35c1f351c16838148164… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-06T20:54:46+02:00 siptrace: docs updates for trace_mode and whitespacing --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ab6f384d4fd35c1f351c16838148164… Patch: https://github.com/kamailio/kamailio/commit/ab6f384d4fd35c1f351c16838148164… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 95bd13edbb..9a33b36456 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -183,8 +183,7 @@ modparam("siptrace", "trace_on", 1) <title>Set <varname>traced_user_avp</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("siptrace", "traced_user_avp", "$avp(i:123)") -modparam("siptrace", "traced_user_avp", "$avp(s:user)") +modparam("siptrace", "traced_user_avp", "$avp(user)") ... </programlisting> </example> @@ -238,12 +237,12 @@ modparam("siptrace", "duplicate_uri", "sip:10.1.1.1:5888") <title><varname>trace_to_database</varname> (integer)</title> <para> Parameter to enable/disable inserts to the database from this - &kamailio;. + &kamailio;. </para> <para> - In case we only want to send the SIP messages to the - <quote>duplicate_uri</quote> and not store the information to the local - database we can set this to "0". + In case we only want to send the SIP messages to the + <quote>duplicate_uri</quote> and not store the information to the local + database we can set this to "0". </para> <para> <emphasis> @@ -325,7 +324,7 @@ modparam("siptrace", "trace_sl_acks", 0) side. </para> <para> - <emphasis>Note:</emphasis> The headers are first read, then written. This allows + <emphasis>Note:</emphasis> The headers are first read, then written. This allows relaying the information over more than two &kamailio; servers by setting both <varname>xheaders_write</varname> and <varname>xheaders_read</varname> to "1" on the servers in the middle. @@ -387,7 +386,7 @@ modparam("siptrace", "hep_mode_on", 1) </programlisting> </example> </section> - + <section id="siptrace.p.hep_version"> <title><varname>hep_version</varname> (integer)</title> <para> @@ -480,6 +479,10 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") If set to 0, no automatic mirroring of SIP traffic via HEP. </para> <para> + The trace_on parameter still has to be set, allowing also to control + this mode of mirroring via RPC commands. + </para> + <para> Default value is <emphasis>0</emphasis>. </para> <example> @@ -487,6 +490,7 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") parameter</title> <programlisting format="linespecific"> ... +modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 1) ... </programlisting> @@ -674,7 +678,7 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID"); <section> <title>Database setup</title> <para> - Before running &kamailio; with siptrace, you have to setup the database + Before running &kamailio; with siptrace, you have to setup the database tables where the module will store the data. For that, if the table were not created by the installation script or you choose to install everything by yourself you can use the siptrace-create.sql @@ -714,6 +718,6 @@ onsend_route { </programlisting> </example> </section> - + </chapter>

1 0

git:master:768b0b2c: siptrace: docs - fix siptrace control command example in the overview
by Daniel-Constantin Mierla 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: 768b0b2c1559211dbc3c5b2e01a25bac8fd2540a URL: https://github.com/kamailio/kamailio/commit/768b0b2c1559211dbc3c5b2e01a25ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-06T20:43:57+02:00 siptrace: docs - fix siptrace control command example in the overview --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/768b0b2c1559211dbc3c5b2e01a25ba… Patch: https://github.com/kamailio/kamailio/commit/768b0b2c1559211dbc3c5b2e01a25ba… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index f9174dbc04..95bd13edbb 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -43,10 +43,10 @@ The tracing can be turned on/off using Kamailio <acronym>RPC</acronym> commands. </para> <para> - &ctltool; fifo sip_trace on + &ctltool; rpc siptrace.status on </para> <para> - &ctltool; fifo sip_trace off + &ctltool; rpc siptrace.status off </para> </section> <section>

1 0

[kamailio/kamailio] tls: add support for escaped cert PVs and select (#2268)
by Armen Babikyan 06 Apr '20

06 Apr '20

- new PVs: $tls_peer_escaped_cert, $tls_my_escaped_cert - new selects: @tls.peer.escaped_cert, @tls.my.escaped_cert You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2268 -- Commit Summary -- * tls: add support for escaped cert PVs and select -- File Changes -- M src/modules/tls/tls_select.c (106) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2268.patch https://github.com/kamailio/kamailio/pull/2268.diff -- 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/pull/2268

3 10

git:master:e2be8fe7: tls: init local variables to avoid compile warnings
by Daniel-Constantin Mierla 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: e2be8fe723ab98318816c18b59ffd086f7305040 URL: https://github.com/kamailio/kamailio/commit/e2be8fe723ab98318816c18b59ffd08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-06T19:31:11+02:00 tls: init local variables to avoid compile warnings --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/e2be8fe723ab98318816c18b59ffd08… Patch: https://github.com/kamailio/kamailio/commit/e2be8fe723ab98318816c18b59ffd08… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 2d17555fc6..d7bd9002ed 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -756,7 +756,7 @@ static int get_ssl_cert(str* res, int local, int urlencoded, sip_msg_t* msg) static int sel_ssl_cert(str* res, select_t* s, sip_msg_t* msg) { - int local, urlencoded; + int local=0, urlencoded=0; switch(s->params[s->n - 2].v.i) { case CERT_PEER: local = 0; break;

1 0

[kamailio/kamailio] Grumvalski/siptrace flag fixes (#2273)
by Federico Cabiddu 06 Apr '20

06 Apr '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2273 -- Commit Summary -- * siptrace: don't check if trace is off in ack for negative replies callback * siptrace: trace incoming CANCEL into a dedicated callback * siptrace: don't trace CANCEL if the cancelled transaction is already being traced * siptrace: skip sip_trace for ACK for negative replies if the original transaction is already being traced -- File Changes -- M src/modules/siptrace/siptrace.c (102) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2273.patch https://github.com/kamailio/kamailio/pull/2273.diff -- 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/pull/2273

2 3

git:master:8c186405: Merge pull request #2273 from kamailio/grumvalski/siptrace_flag_fixes
by GitHub 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: 8c18640583d7d057b6a9535e93f56a581a28aff8 URL: https://github.com/kamailio/kamailio/commit/8c18640583d7d057b6a9535e93f56a5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-06T16:19:06+02:00 Merge pull request #2273 from kamailio/grumvalski/siptrace_flag_fixes siptrace flag fixes --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8c18640583d7d057b6a9535e93f56a5… Patch: https://github.com/kamailio/kamailio/commit/8c18640583d7d057b6a9535e93f56a5…

1 0

git:master:2ad78641: siptrace: skip sip_trace for ACK for negative replies if the original transaction is already being traced
by Federico Cabiddu 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: 2ad786413199b487a65258c8bd33703b5ccbf04d URL: https://github.com/kamailio/kamailio/commit/2ad786413199b487a65258c8bd33703… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-05T17:20:48+02:00 siptrace: skip sip_trace for ACK for negative replies if the original transaction is already being traced --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2ad786413199b487a65258c8bd33703… Patch: https://github.com/kamailio/kamailio/commit/2ad786413199b487a65258c8bd33703… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 46116dea07..f95df0e069 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -833,8 +833,10 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, str *corid, char *dir, enum siptrace_type_t trace_type) { siptrace_info_t* info = NULL; - struct cell *t_invite; + struct cell *t_invite, *orig_t; char *p = NULL; + int canceled; + int ret = 0; if (trace_type == SIPTRACE_TRANSACTION || trace_type == SIPTRACE_DIALOG) { int alloc_size = sizeof(siptrace_info_t); @@ -853,17 +855,38 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, /* if sip_trace is called over an incoming CANCEL, skip * capturing it if the cancelled transaction is already being traced */ - if (msg->REQ_METHOD==METHOD_CANCEL) { + if (msg->REQ_METHOD==METHOD_CANCEL) { t_invite=tmb.t_lookup_original(msg); if (t_invite!=T_NULL_CELL) { if (t_invite->uas.request->msg_flags & FL_SIPTRACE) { - LM_DBG("Transaction is already been traced, skipping.\n"); - tmb.t_unref(msg); - return 1; + LM_DBG("Transaction is already been traced, skipping.\n"); + tmb.t_unref(msg); + return 1; } tmb.t_unref(msg); } } + + /* if sip_trace is called over an incoming ACK, skip + * capturing it if it's an ACK for a negative reply for + * an already traced transaction + */ + if (msg->REQ_METHOD==METHOD_ACK) { + orig_t = tmb.t_gett(); + if(tmb.t_lookup_request(msg,0,&canceled)) { + t_invite = tmb.t_gett(); + if (t_invite->uas.request->msg_flags & FL_SIPTRACE) { + LM_DBG("Transaction is already been traced, skipping.\n"); + ret = 1; + } + tmb.t_release_transaction( t_invite ); + tmb.t_unref(msg); + tmb.t_sett(orig_t, T_BR_UNDEFINED); + if (ret) + return 1; + } + } + if (trace_type == SIPTRACE_DIALOG && dlgb.get_dlg == NULL) { LM_WARN("DIALOG module not loaded! Tracing only current message!\n"); goto trace_current;

1 0

git:master:080c6e07: siptrace: don't trace CANCEL if the cancelled transaction is already being traced
by Federico Cabiddu 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: 080c6e07708f1964498a43e70c9b6240b5bdebcd URL: https://github.com/kamailio/kamailio/commit/080c6e07708f1964498a43e70c9b624… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-03T13:03:56+02:00 siptrace: don't trace CANCEL if the cancelled transaction is already being traced --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/080c6e07708f1964498a43e70c9b624… Patch: https://github.com/kamailio/kamailio/commit/080c6e07708f1964498a43e70c9b624… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3c1ec436d7..46116dea07 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -833,6 +833,7 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, str *corid, char *dir, enum siptrace_type_t trace_type) { siptrace_info_t* info = NULL; + struct cell *t_invite; char *p = NULL; if (trace_type == SIPTRACE_TRANSACTION || trace_type == SIPTRACE_DIALOG) { @@ -849,6 +850,20 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, goto trace_current; } + /* if sip_trace is called over an incoming CANCEL, skip + * capturing it if the cancelled transaction is already being traced + */ + if (msg->REQ_METHOD==METHOD_CANCEL) { + t_invite=tmb.t_lookup_original(msg); + if (t_invite!=T_NULL_CELL) { + if (t_invite->uas.request->msg_flags & FL_SIPTRACE) { + LM_DBG("Transaction is already been traced, skipping.\n"); + tmb.t_unref(msg); + return 1; + } + tmb.t_unref(msg); + } + } if (trace_type == SIPTRACE_DIALOG && dlgb.get_dlg == NULL) { LM_WARN("DIALOG module not loaded! Tracing only current message!\n"); goto trace_current;

1 0

git:master:e28f4644: siptrace: trace incoming CANCEL into a dedicated callback
by Federico Cabiddu 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: e28f464457eea47cc606c73cbfe4b30fcc8b542a URL: https://github.com/kamailio/kamailio/commit/e28f464457eea47cc606c73cbfe4b30… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-03T11:59:50+02:00 siptrace: trace incoming CANCEL into a dedicated callback --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/e28f464457eea47cc606c73cbfe4b30… Patch: https://github.com/kamailio/kamailio/commit/e28f464457eea47cc606c73cbfe4b30… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index b000d1ac8d..3c1ec436d7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -64,8 +64,7 @@ MODULE_VERSION #define SIPTRACE_ANYADDR_LEN (sizeof(SIPTRACE_ANYADDR) - 1) #define trace_is_off(_msg) \ - ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ - || ((trace_flag != 0) && (_msg->flags & trace_flag) == 0)) + (((_msg)->msg_flags & FL_SIPTRACE) == 0) #define is_null_pv(_str) \ (!str_strcmp(&_str, pv_get_null_str())) @@ -98,6 +97,7 @@ static int w_hlog2(struct sip_msg *, char *correlationid, char *message); static int sip_trace_store_db(siptrace_data_t *sto); static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps); +static void trace_cancel_in(struct cell *t, int type, struct tmcb_params *ps); static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps); static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps); static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps); @@ -1254,6 +1254,31 @@ static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2) return ki_sip_trace_mode(msg, &smode); } +static void trace_cancel_in(struct cell *t, int type, struct tmcb_params *ps) +{ + siptrace_info_t* info; + sip_msg_t *msg; + + if(t == NULL || ps == NULL) { + LM_ERR("unexpected parameter values\n"); + return; + } + + if(ps->flags & TMCB_RETR_F) { + LM_DBG("retransmission - ignoring\n"); + return; + } + + info = (siptrace_info_t *)(*ps->param); + msg = ps->req; + if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_READY, trace_onreply_out, info, 0) <= 0) { + LM_ERR("can't register trace_onreply_out\n"); + return; + } + msg->msg_flags |= FL_SIPTRACE; + sip_trace_helper(msg, NULL, NULL, NULL, NULL, 1); +} + static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) { siptrace_data_t sto; @@ -1296,19 +1321,9 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) * and can register a callback for the reply */ memset(&sto, 0, sizeof(siptrace_data_t)); - if (unlikely(type == TMCB_E2ECANCEL_IN)) { - msg->msg_flags |= FL_SIPTRACE; - - if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_READY, trace_onreply_out, info, 0) - <= 0) { - LM_ERR("can't register trace_onreply_out\n"); - return; - } - } else { - if(traced_user_avp.n != 0) - sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, - &sto.avp_value, &sto.state); - } + if(traced_user_avp.n != 0) + sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, + &sto.avp_value, &sto.state); if((sto.avp == NULL) && trace_is_off(msg)) { LM_DBG("trace off...\n"); @@ -1318,16 +1333,11 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) if(sip_trace_prepare(msg) < 0) return; - if (unlikely(type == TMCB_E2ECANCEL_IN)) { - sto.body.s = msg->buf; - sto.body.len = msg->len; + if(ps->send_buf.len > 0) { + sto.body = ps->send_buf; } else { - if(ps->send_buf.len > 0) { - sto.body = ps->send_buf; - } else { - sto.body.s = "No request buffer"; - sto.body.len = sizeof("No request buffer") - 1; - } + sto.body.s = "No request buffer"; + sto.body.len = sizeof("No request buffer") - 1; } sto.callid = msg->callid->body; @@ -1866,7 +1876,7 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int dlg_tra return; } - if(tmb.register_tmcb(msg, 0, TMCB_E2ECANCEL_IN, trace_onreq_out, info, 0) <= 0) { + if(tmb.register_tmcb(msg, 0, TMCB_E2ECANCEL_IN, trace_cancel_in, info, 0) <= 0) { LM_ERR("can't register trace_onreply_in\n"); return; }

1 0

git:master:b64b3f03: siptrace: don't check if trace is off in ack for negative replies callback
by Federico Cabiddu 06 Apr '20

06 Apr '20

Module: kamailio Branch: master Commit: b64b3f03a9c6b69587ca360465f091f873f7274b URL: https://github.com/kamailio/kamailio/commit/b64b3f03a9c6b69587ca360465f091f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-03T10:00:53+02:00 siptrace: don't check if trace is off in ack for negative replies callback --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/b64b3f03a9c6b69587ca360465f091f… Patch: https://github.com/kamailio/kamailio/commit/b64b3f03a9c6b69587ca360465f091f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index c27a9eadba..b000d1ac8d 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1658,10 +1658,6 @@ static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps return; } - if(trace_is_off(ps->req)) { - LM_DBG("trace off...\n"); - return; - } sip_trace(ps->req, (info->uriState == STRACE_PARSED_URI) ? &info->u.dest_info : NULL, NULL, NULL);

1 0

Errored: kamailio/kamailio#8657 (5.3 - 54520ce)
by Travis CI 06 Apr '20

06 Apr '20

Build Update for kamailio/kamailio ------------------------------------- Build: #8657 Status: Errored Duration: 5 mins and 6 secs Commit: 54520ce (5.3) Author: Daniel-Constantin Mierla Message: dialog: keep route block index as signed int - otherwise it can be broken value when route block doesn't exit and kemi callback should be executed - reported by David Escartin (cherry picked from commit 6c557efc1b9cb8c880a05235c94780bbaf305073) View the changeset: https://github.com/kamailio/kamailio/compare/46ad9e6dacb7...54520cee9f6f View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/671581621?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:5.3:54520cee: dialog: keep route block index as signed int
by Daniel-Constantin Mierla 06 Apr '20

06 Apr '20

Module: kamailio Branch: 5.3 Commit: 54520cee9f6f088ddcfad0e7e6f312c04322bf76 URL: https://github.com/kamailio/kamailio/commit/54520cee9f6f088ddcfad0e7e6f312c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-06T13:18:59+02:00 dialog: keep route block index as signed int - otherwise it can be broken value when route block doesn't exit and kemi callback should be executed - reported by David Escartin (cherry picked from commit 6c557efc1b9cb8c880a05235c94780bbaf305073) --- Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/54520cee9f6f088ddcfad0e7e6f312c… Patch: https://github.com/kamailio/kamailio/commit/54520cee9f6f088ddcfad0e7e6f312c… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index a2f4fa7f97..ed5cd7bef0 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -114,7 +114,7 @@ typedef struct dlg_cell unsigned int dflags; /*!< internal dialog memory flags */ unsigned int iflags; /*!< internal dialog persistent flags */ unsigned int sflags; /*!< script dialog persistent flags */ - unsigned int toroute; /*!< index of route that is executed on timeout */ + int toroute; /*!< index of route that is executed on timeout */ str toroute_name; /*!< name of route that is executed on timeout */ unsigned int from_rr_nb; /*!< information from record routing */ struct dlg_tl tl; /*!< dialog timer list */ diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 0a9ef65246..fa9eae9d1f 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -478,8 +478,8 @@ int pv_get_dlg_ctx(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, (unsigned int)_dlg_ctx.dir); case 7: - return pv_get_uintval(msg, param, res, - (unsigned int)_dlg_ctx.to_route); + return pv_get_sintval(msg, param, res, + _dlg_ctx.to_route); default: return pv_get_uintval(msg, param, res, (unsigned int)_dlg_ctx.on); @@ -601,6 +601,7 @@ int pv_get_dlg(struct sip_msg *msg, pv_param_t *param, int res_type = 0; str sv = { 0 }; unsigned int ui = 0; + int si = 0; if(param==NULL) return -1; @@ -683,8 +684,8 @@ int pv_get_dlg(struct sip_msg *msg, pv_param_t *param, sv.s[sv.len] = '\0'; break; case 9: - res_type = 1; - ui = (unsigned int)dlg->toroute; + res_type = 3; + si = dlg->toroute; break; case 10: if(dlg->cseq[DLG_CALLEE_LEG].s==NULL @@ -817,6 +818,8 @@ int pv_get_dlg(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, ui); case 2: return pv_get_strval(msg, param, res, &sv); + case 3: + return pv_get_sintval(msg, param, res, si); default: return pv_get_null(msg, param, res); }

1 0

git:master:b9b08d78: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: b9b08d7883308287b44336bcbc7003368f77d9d2 URL: https://github.com/kamailio/kamailio/commit/b9b08d7883308287b44336bcbc70033… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-05T15:16:08+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/b9b08d7883308287b44336bcbc70033… Patch: https://github.com/kamailio/kamailio/commit/b9b08d7883308287b44336bcbc70033…

1 0

git:master:d08d27bc: dispatcher: added missing ending tag for para
by Daniel-Constantin Mierla 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: d08d27bc12ffd2c519094c84f088b6bbb268e356 URL: https://github.com/kamailio/kamailio/commit/d08d27bc12ffd2c519094c84f088b6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T15:04:17+02:00 dispatcher: added missing ending tag for para --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d08d27bc12ffd2c519094c84f088b6b… Patch: https://github.com/kamailio/kamailio/commit/d08d27bc12ffd2c519094c84f088b6b… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 271ec83158..ae8102b355 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -891,7 +891,7 @@ DEST: { </emphasis> </para> <para>If parameter "ds_default_sockname" is set, then this parameter - is ignored.</para>. + is ignored.</para> <example> <title>Set the <quote>ds_default_socket</quote> parameter</title> <programlisting format="linespecific"> @@ -915,7 +915,7 @@ DEST: { </emphasis> </para> <para>This parameter is used even if "ds_default_socket" parameter is set - (this parameter has higher priority). + (this parameter has higher priority).</para> <example> <title>Set the <quote>ds_default_sockname</quote> parameter</title> <programlisting format="linespecific">

1 0

git:master:8619b4c7: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: 8619b4c7a1ac4ba245c2c839dd61a107819a6e34 URL: https://github.com/kamailio/kamailio/commit/8619b4c7a1ac4ba245c2c839dd61a10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-05T14:46:09+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/8619b4c7a1ac4ba245c2c839dd61a10… Patch: https://github.com/kamailio/kamailio/commit/8619b4c7a1ac4ba245c2c839dd61a10…

1 0

git:master:71ab3514: dispatcher: docs for sockname attribute for destination records
by Daniel-Constantin Mierla 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: 71ab351492835ded235f98d310c7085bb3195fc4 URL: https://github.com/kamailio/kamailio/commit/71ab351492835ded235f98d310c7085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T14:41:15+02:00 dispatcher: docs for sockname attribute for destination records --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/71ab351492835ded235f98d310c7085… Patch: https://github.com/kamailio/kamailio/commit/71ab351492835ded235f98d310c7085… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index d9abd0e556..271ec83158 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -369,6 +369,10 @@ modparam("dispatcher", "force_dst", 1) (value 2). </listitem> <listitem> + sockname - the sockname string - it is added only if xavp_dst_mode has bit 3 set + (value 3). + </listitem> + <listitem> dstid - the destination unique id (in case of call load distribution algorithm). </listitem> <listitem> @@ -1311,6 +1315,7 @@ DEST: { WEIGHT: 50 RWEIGHT: 50 SOCKET: + SOCKNAME: } LATENCY: { AVG: 20.104000 @@ -2041,6 +2046,11 @@ DEST: { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'sockname' - used to set by name the sending socket for the + gateway. It is used for sending the SIP traffic as well as + OPTIONS keepalives and has priority over 'socket' attribute. + </listitem> <listitem> 'ping_from' - used to set the From URI in OPTIONS keepalives. It overwrites the general ds_ping_from parameter.

1 0

git:master:80930085: dispatcher: support for per destination address socket name attribute
by Daniel-Constantin Mierla 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: 80930085504a052e450e55eb44a31eb73411f656 URL: https://github.com/kamailio/kamailio/commit/80930085504a052e450e55eb44a31eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T14:35:40+02:00 dispatcher: support for per destination address socket name attribute - attribute name is: sockname - if set to a socket name, enforce the send socket per destination address --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/80930085504a052e450e55eb44a31eb… Patch: https://github.com/kamailio/kamailio/commit/80930085504a052e450e55eb44a31eb…

1 0

git:master:228c9364: dispatcher: docs for ds_default_sockname parameter
by Daniel-Constantin Mierla 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: 228c9364e58620b960f9421cace59685539d384d URL: https://github.com/kamailio/kamailio/commit/228c9364e58620b960f9421cace5968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T10:36:16+02:00 dispatcher: docs for ds_default_sockname parameter --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/228c9364e58620b960f9421cace5968… Patch: https://github.com/kamailio/kamailio/commit/228c9364e58620b960f9421cace5968… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 3a2eaaa49c..d9abd0e556 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -886,6 +886,8 @@ DEST: { script <emphasis>listen</emphasis> directive is used. </emphasis> </para> + <para>If parameter "ds_default_sockname" is set, then this parameter + is ignored.</para>. <example> <title>Set the <quote>ds_default_socket</quote> parameter</title> <programlisting format="linespecific"> @@ -896,6 +898,32 @@ DEST: { </example> </section> + <section id="dispatcher.p.ds_default_sockname"> + <title><varname>ds_default_sockname</varname> (str)</title> + <para> + Default socket name to be used for sending pings and dispatching requests + when a gateway has no send socket configured. + </para> + <para> + <emphasis> + By default no default socket is defined, the first configuration + script <emphasis>listen</emphasis> directive is used. + </emphasis> + </para> + <para>This parameter is used even if "ds_default_socket" parameter is set + (this parameter has higher priority). + <example> + <title>Set the <quote>ds_default_sockname</quote> parameter</title> + <programlisting format="linespecific"> + ... + listen=udp:1.2.3.4:5060 name "sock1" + ... + modparam("dispatcher", "ds_default_sockname", "sock1") + ... + </programlisting> + </example> + </section> + <section id="dispatcher.p.ds_timer_mode"> <title><varname>ds_timer_mode</varname> (int)</title> <para>

1 0

git:master:db042d25: tm: local uac support for using socket names
by Daniel-Constantin Mierla 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: db042d2579c1eff50c322bbedbb73333d4f2bd06 URL: https://github.com/kamailio/kamailio/commit/db042d2579c1eff50c322bbedbb7333… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T10:58:31+02:00 tm: local uac support for using socket names --- Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/db042d2579c1eff50c322bbedbb7333… Patch: https://github.com/kamailio/kamailio/commit/db042d2579c1eff50c322bbedbb7333… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 1112d7758c..faa7e0df70 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -503,10 +503,12 @@ static inline int t_uac_prepare(uac_req_t *uac_r, request->flags |= nhtype; #ifdef SO_REUSEPORT - if (cfg_get(tcp, tcp_cfg, reuse_port) && - uac_r->ssock!=NULL && uac_r->ssock->len>0 && - request->dst.send_sock->proto == PROTO_TCP) { - request->dst.send_flags.f |= SND_F_FORCE_SOCKET; + if (cfg_get(tcp, tcp_cfg, reuse_port) + && request->dst.send_sock->proto == PROTO_TCP) { + if((uac_r->ssockname!=NULL && uac_r->ssockname->len>0) + || (uac_r->ssock!=NULL && uac_r->ssock->len>0)) { + request->dst.send_flags.f |= SND_F_FORCE_SOCKET; + } } #endif @@ -922,10 +924,14 @@ int req_within(uac_req_t *uac_r) goto err; } - if(uac_r->ssock!=NULL && uac_r->ssock->len>0 - && uac_r->dialog->send_sock==NULL) { - /* set local send socket */ - uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + if(uac_r->dialog->send_sock==NULL) { + if(uac_r->ssockname!=NULL && uac_r->ssockname->len>0) { + /* set local send socket by name */ + uac_r->dialog->send_sock = ksr_get_socket_by_name(uac_r->ssockname); + } else if(uac_r->ssock!=NULL && uac_r->ssock->len>0) { + /* set local send socket by address */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } } /* handle alias parameter in uri @@ -1002,10 +1008,14 @@ int req_outside(uac_req_t *uac_r, str* ruri, str* to, str* from, str *next_hop) if (next_hop) uac_r->dialog->dst_uri = *next_hop; w_calculate_hooks(uac_r->dialog); - if(uac_r->ssock!=NULL && uac_r->ssock->len>0 - && uac_r->dialog->send_sock==NULL) { - /* set local send socket */ - uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + if(uac_r->dialog->send_sock==NULL) { + if(uac_r->ssockname!=NULL && uac_r->ssockname->len>0) { + /* set local send socket by name */ + uac_r->dialog->send_sock = ksr_get_socket_by_name(uac_r->ssockname); + } else if(uac_r->ssock!=NULL && uac_r->ssock->len>0) { + /* set local send socket by address */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } } return t_uac(uac_r); @@ -1062,10 +1072,14 @@ int request(uac_req_t *uac_r, str* ruri, str* to, str* from, str *next_hop) */ uac_r->dialog = dialog; - if(uac_r->ssock!=NULL && uac_r->ssock->len>0 - && uac_r->dialog->send_sock==NULL) { - /* set local send socket */ - uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + if(uac_r->dialog->send_sock==NULL) { + if(uac_r->ssockname!=NULL && uac_r->ssockname->len>0) { + /* set local send socket by name */ + uac_r->dialog->send_sock = ksr_get_socket_by_name(uac_r->ssockname); + } else if(uac_r->ssock!=NULL && uac_r->ssock->len>0) { + /* set local send socket by address */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } } res = t_uac(uac_r); diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 0801fa5b5f..3b9bd64a28 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -44,6 +44,7 @@ typedef struct uac_req { str *headers; str *body; str *ssock; + str *ssockname; dlg_t *dialog; int cb_flags; transaction_cb *cb;

1 0

git:master:87f170b2: dispatcher: new parameter ds_default_sockname
by Daniel-Constantin Mierla 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: 87f170b2063f488dcf6a54c613044ef1663ef9f1 URL: https://github.com/kamailio/kamailio/commit/87f170b2063f488dcf6a54c613044ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T10:29:30+02:00 dispatcher: new parameter ds_default_sockname - allow to set default send socket by name --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/87f170b2063f488dcf6a54c613044ef… Patch: https://github.com/kamailio/kamailio/commit/87f170b2063f488dcf6a54c613044ef… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index b4080168f5..372673a9e7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -102,13 +102,14 @@ static int ds_ping_interval = 0; int ds_ping_latency_stats = 0; int ds_latency_estimator_alpha_i = 900; float ds_latency_estimator_alpha = 0.9f; -int ds_probing_mode = DS_PROBE_NONE; +int ds_probing_mode = DS_PROBE_NONE; static str ds_ping_reply_codes_str= STR_NULL; static int** ds_ping_reply_codes = NULL; static int* ds_ping_reply_codes_cnt; -str ds_default_socket = STR_NULL; +str ds_default_socket = STR_NULL; +str ds_default_sockname = STR_NULL; struct socket_info * ds_default_sockinfo = NULL; int ds_hash_size = 0; @@ -280,6 +281,7 @@ static param_export_t params[]={ {"ds_hash_check_interval", INT_PARAM, &ds_hash_check_interval}, {"outbound_proxy", PARAM_STR, &ds_outbound_proxy}, {"ds_default_socket", PARAM_STR, &ds_default_socket}, + {"ds_default_sockname",PARAM_STR, &ds_default_sockname}, {"ds_timer_mode", PARAM_INT, &ds_timer_mode}, {"event_callback", PARAM_STR, &ds_event_callback}, {"ds_attrs_none", PARAM_INT, &ds_attrs_none}, @@ -347,23 +349,34 @@ static int mod_init(void) cfg_get(dispatcher, dispatcher_cfg, inactive_threshold) = inactive_threshold; - if(ds_default_socket.s && ds_default_socket.len > 0) { - if(parse_phostport( - ds_default_socket.s, &host.s, &host.len, &port, &proto) - != 0) { - LM_ERR("bad socket <%.*s>\n", ds_default_socket.len, - ds_default_socket.s); - return -1; - } - ds_default_sockinfo = - grep_sock_info(&host, (unsigned short)port, proto); + if(ds_default_sockname.s && ds_default_sockname.len > 0) { + ds_default_sockinfo = ksr_get_socket_by_name(&ds_default_sockname); if(ds_default_sockinfo == 0) { - LM_ERR("non-local socket <%.*s>\n", ds_default_socket.len, - ds_default_socket.s); + LM_ERR("non-local socket name <%.*s>\n", ds_default_sockname.len, + ds_default_sockname.s); return -1; } - LM_INFO("default dispatcher socket set to <%.*s>\n", - ds_default_socket.len, ds_default_socket.s); + LM_INFO("default dispatcher socket set by name to <%.*s>\n", + ds_default_sockname.len, ds_default_sockname.s); + } else { + if(ds_default_socket.s && ds_default_socket.len > 0) { + if(parse_phostport( + ds_default_socket.s, &host.s, &host.len, &port, &proto) + != 0) { + LM_ERR("bad socket <%.*s>\n", ds_default_socket.len, + ds_default_socket.s); + return -1; + } + ds_default_sockinfo = + grep_sock_info(&host, (unsigned short)port, proto); + if(ds_default_sockinfo == 0) { + LM_ERR("non-local socket <%.*s>\n", ds_default_socket.len, + ds_default_socket.s); + return -1; + } + LM_INFO("default dispatcher socket set to <%.*s>\n", + ds_default_socket.len, ds_default_socket.s); + } } if(ds_init_data() != 0) @@ -1559,7 +1572,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddS", + if(rpc->struct_add(wh, "SSdddSS", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) : &data, @@ -1567,7 +1580,9 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) "WEIGHT", node->dlist[j].attrs.weight, "RWEIGHT", node->dlist[j].attrs.rweight, "SOCKET", (node->dlist[j].attrs.socket.s) - ? &(node->dlist[j].attrs.socket) : &data) + ? &(node->dlist[j].attrs.socket) : &data, + "SOCKNAME", (node->dlist[j].attrs.sockname.s) + ? &(node->dlist[j].attrs.sockname) : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

1 0

git:master:90346a28: Merge pull request #2268 from armenb/tls_escaped_ssl_cert
by GitHub 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: 90346a287165ac58d2ff5f295b92c5298878e035 URL: https://github.com/kamailio/kamailio/commit/90346a287165ac58d2ff5f295b92c52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-05T09:56:55+02:00 Merge pull request #2268 from armenb/tls_escaped_ssl_cert tls: add support for escaped cert PVs and select --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/90346a287165ac58d2ff5f295b92c52… Patch: https://github.com/kamailio/kamailio/commit/90346a287165ac58d2ff5f295b92c52…

1 0

git:master:ae03ce19: tls: add support for urlencoded cert PVs and select
by Armen Babikyan 05 Apr '20

05 Apr '20

Module: kamailio Branch: master Commit: ae03ce19333a6ed44fefdc597f785bb1e4f4c04c URL: https://github.com/kamailio/kamailio/commit/ae03ce19333a6ed44fefdc597f785bb… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2020-04-01T19:32:49-07:00 tls: add support for urlencoded cert PVs and select - new PVs: $tls_peer_raw_cert, $tls_peer_urlencoded_cert, $tls_my_raw_cert, $tls_my_urlencoded_cert - new selects: @tls.peer.raw_cert, @tls.peer.urlencoded_cert, @tls.my.raw_cert, @tls.my.urlencoded_cert --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/ae03ce19333a6ed44fefdc597f785bb… Patch: https://github.com/kamailio/kamailio/commit/ae03ce19333a6ed44fefdc597f785bb…

1 0

[kamailio/kamailio] kamctl: added secfilter to dbtext (#2261)
by Igor Olhovskiy 04 Apr '20

04 Apr '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added secfilter module scheme to dbtext, as per using `kamdbctl create` with DBTEXT, was getting following error ``` cp: cannot stat '/usr/share/kamailio//dbtext/kamailio/secfilter': No such file or directory ``` With this patch error is gone. Secfilter DBTEXT scheme is taken from SQLite scheme. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2261 -- Commit Summary -- * kamctl: added secfilter to dbtext -- File Changes -- A utils/kamctl/dbtext/kamailio/secfilter (1) M utils/kamctl/dbtext/kamailio/version (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2261.patch https://github.com/kamailio/kamailio/pull/2261.diff -- 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/pull/2261

2 4

[kamailio/kamailio] kex: added process description for rpc command pkg.stats (#2270)
by goharahmed 04 Apr '20

04 Apr '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Minor addition to output of RPC command pkg.stats, the description available next to PID and its memory utilization will help during monitoring of memory utilization(or leaks) by specific modules. Without name printed the PID was required to be matched with the output of "kamctl ps" **Old output**: ``` { entry: 2 pid: 13723 used: 2616752 free: 13180048 real_used: 3597168 total_size: 16777216 total_frags: 2 } ``` **New output:** ``` { entry: 14 pid: 29413 rank: -1 used: 2615808 free: 13181200 real_used: 3596016 total_size: 16777216 total_frags: 1 desc: USRLOC Timer } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2270 -- Commit Summary -- * kex: added process description for rpc command pkg.stats -- File Changes -- M src/modules/kex/pkg_stats.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2270.patch https://github.com/kamailio/kamailio/pull/2270.diff -- 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/pull/2270

2 2

git:master:5966b55b: Merge pull request #2270 from goharahmed/master
by GitHub 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: 5966b55bdfd87025bd4459007ffe9eb0558bc16f URL: https://github.com/kamailio/kamailio/commit/5966b55bdfd87025bd4459007ffe9eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-04T19:50:40+02:00 Merge pull request #2270 from goharahmed/master kex: added process description for rpc command pkg.stats --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/5966b55bdfd87025bd4459007ffe9eb… Patch: https://github.com/kamailio/kamailio/commit/5966b55bdfd87025bd4459007ffe9eb… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index d44f465410..9a2f4a2d37 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddd", + if(rpc->struct_add(th, "dddddddds", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank, @@ -248,7 +248,8 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) "free", _pkg_proc_stats_list[i].available, "real_used", _pkg_proc_stats_list[i].real_used, "total_size", _pkg_proc_stats_list[i].total_size, - "total_frags", _pkg_proc_stats_list[i].total_frags + "total_frags", _pkg_proc_stats_list[i].total_frags, + "desc",pt[i].desc )<0) { rpc->fault(ctx, 500, "Internal error creating rpc");

1 0

git:master:80dfbefe: kex: added process description for rpc command pkg.stats
by Gohar Ahmed 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: 80dfbefe7d20299a0fbe9515c0d074e874f6fccb URL: https://github.com/kamailio/kamailio/commit/80dfbefe7d20299a0fbe9515c0d074e… Author: Gohar Ahmed <scribedfor(a)gmail.com> Committer: Gohar Ahmed <scribedfor(a)gmail.com> Date: 2020-04-02T03:53:00Z kex: added process description for rpc command pkg.stats --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/80dfbefe7d20299a0fbe9515c0d074e… Patch: https://github.com/kamailio/kamailio/commit/80dfbefe7d20299a0fbe9515c0d074e… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index d44f465410..9a2f4a2d37 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddd", + if(rpc->struct_add(th, "dddddddds", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank, @@ -248,7 +248,8 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) "free", _pkg_proc_stats_list[i].available, "real_used", _pkg_proc_stats_list[i].real_used, "total_size", _pkg_proc_stats_list[i].total_size, - "total_frags", _pkg_proc_stats_list[i].total_frags + "total_frags", _pkg_proc_stats_list[i].total_frags, + "desc",pt[i].desc )<0) { rpc->fault(ctx, 500, "Internal error creating rpc");

1 0

git:master:0517925a: modules: readme files regenerated - nat_traversal ... [skip ci]
by Kamailio Dev 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: 0517925aceae25f0d71e7f30ea0d5f849949e6e8 URL: https://github.com/kamailio/kamailio/commit/0517925aceae25f0d71e7f30ea0d5f8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-04T10:01:12+02:00 modules: readme files regenerated - nat_traversal ... [skip ci] --- Modified: src/modules/nat_traversal/README --- Diff: https://github.com/kamailio/kamailio/commit/0517925aceae25f0d71e7f30ea0d5f8… Patch: https://github.com/kamailio/kamailio/commit/0517925aceae25f0d71e7f30ea0d5f8…

1 0

git:master:531f2551: nat_traversal: new marameter contact_match
by Daniel-Constantin Mierla 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: 531f2551affb06e71cbabbeba0e3174900e69aab URL: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-04T09:59:06+02:00 nat_traversal: new marameter contact_match - if set to 0 (default), match request-reply contacts with string comparison (behaviour so far) - if set to 1, use light uri comparison ( match uri type, user, host, port and proto ) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174… Patch: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 709b9032cd..27dbf2736d 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -59,6 +59,7 @@ #include "../../core/data_lump.h" #include "../../core/mod_fix.h" #include "../../core/script_cb.h" +#include "../../core/strutils.h" #include "../../core/timer_proc.h" #include "../../core/parser/msg_parser.h" #include "../../core/parser/parse_from.h" @@ -246,6 +247,7 @@ bool have_dlg_api = false; static int dialog_flag = -1; static unsigned dialog_default_timeout = 12 * 3600; // 12 hours +static int natt_contact_match = 0; stat_var *keepalive_endpoints = 0; stat_var *registered_endpoints = 0; @@ -287,6 +289,8 @@ static param_export_t parameters[] = { {"keepalive_extra_headers", PARAM_STRING, &keepalive_params.extra_headers}, {"keepalive_state_file", PARAM_STRING, &keepalive_state_file}, + {"contact_match", PARAM_INT, &natt_contact_match}, + {0, 0, 0} }; @@ -897,7 +901,11 @@ static time_t get_register_expire( r_contact_body = (contact_body_t *)r_hdr->parsed; for(r_contact = r_contact_body->contacts; r_contact; r_contact = r_contact->next) { - if(STR_MATCH_STR(contact->uri, r_contact->uri)) { + if((natt_contact_match==0 + && STR_MATCH_STR(contact->uri, r_contact->uri)) + || (natt_contact_match==1 + && cmp_uri_light_str(&contact->uri, + &r_contact->uri)==0)){ expires_param = r_contact->expires; if(expires_param && expires_param->body.len && str2int(&expires_param->body, &exp) == 0) @@ -1760,6 +1768,10 @@ static int mod_init(void) int *param; modparam_t type; + if(natt_contact_match!=0) { + natt_contact_match = 1; + } + if(keepalive_interval <= 0) { LM_NOTICE( "keepalive functionality is disabled from the configuration\n");

1 0

git:master:91c30dc8: nat_traversal: docs for contact_match parameter
by Daniel-Constantin Mierla 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: 91c30dc8650d778851fcf439904557bc7363fcc4 URL: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-04T09:59:06+02:00 nat_traversal: docs for contact_match parameter --- Modified: src/modules/nat_traversal/doc/nat_traversal_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… Patch: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… --- diff --git a/src/modules/nat_traversal/doc/nat_traversal_admin.xml b/src/modules/nat_traversal/doc/nat_traversal_admin.xml index f5e8ef00f5..1143e4a90b 100644 --- a/src/modules/nat_traversal/doc/nat_traversal_admin.xml +++ b/src/modules/nat_traversal/doc/nat_traversal_admin.xml @@ -493,6 +493,36 @@ modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: &kamailio;\r\n <programlisting format="linespecific"> ... modparam("nat_traversal", "keepalive_state_file", "/run/kamailio/keepalive_state") +... + </programlisting> + </example> + </section> + + <section> + <title><varname>contact_match</varname> (integer)</title> + <para> + Control how to match the contact URIs between requests and replies. + </para> + <para> + If set to 0, do string comparison. Use this mode when the contact URI + is not changed by registrar or proxy servers. + </para> + <para> + If set to 1, do light URI comparison (match URI type, user, host, + port and proto). Use this mode when the contact URI can be changed + by registrar or proxy servers (e.g., new parameters added, or the + order of parameters changed). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Setting the <varname>contact_match</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nat_traversal", "contact_match", 1) ... </programlisting> </example>

1 0

git:master:d1584cff: core: functions for light comparison of uri values
by Daniel-Constantin Mierla 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: d1584cff4766d45147cc3ed88da91ab691437799 URL: https://github.com/kamailio/kamailio/commit/d1584cff4766d45147cc3ed88da91ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-04T09:59:06+02:00 core: functions for light comparison of uri values - match uri type, user, host, port and proto, but skip params matching --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/d1584cff4766d45147cc3ed88da91ab… Patch: https://github.com/kamailio/kamailio/commit/d1584cff4766d45147cc3ed88da91ab… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 7df31727cb..e106dfe713 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -496,13 +496,13 @@ int cmp_str_params(str *s1, str *s2) } /** - * Compare SIP URI as per RFC3261, 19.1.4 + * Compare SIP URI in light mode or as per RFC3261, 19.1.4 * return: * - 0: match * - >0: no match * - <0: error */ -int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) +int cmp_uri_mode(struct sip_uri *uri1, struct sip_uri *uri2, int cmode) { if(uri1->type!=uri2->type) return 1; @@ -520,6 +520,13 @@ int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) return 1; if(cmpi_str(&uri1->host, &uri2->host)!=0) return 1; + if(cmode == 1) { + /* compare mode light - proto should be the same for match */ + if(uri1->proto == uri2->proto) { + return 0; + } + return 1; + } /* if no params, we are done */ if(uri1->params.len==0 && uri2->params.len==0) return 0; @@ -548,6 +555,30 @@ int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) return cmp_str_params(&uri1->params, &uri2->params); } +/** + * Compare SIP URI as per RFC3261, 19.1.4 (match also params) + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) +{ + return cmp_uri_mode(uri1, uri2, 0); +} + +/** + * Compare SIP URI light - uri type, user, host, port and proto match + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri_light(struct sip_uri *uri1, struct sip_uri *uri2) +{ + return cmp_uri_mode(uri1, uri2, 1); +} + /** * return: * - 0: match @@ -567,6 +598,25 @@ int cmp_uri_str(str *s1, str *s2) return cmp_uri(&uri1, &uri2); } +/** + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri_light_str(str *s1, str *s2) +{ + struct sip_uri uri1; + struct sip_uri uri2; + + /* todo: parse uri and compare the parts */ + if(parse_uri(s1->s, s1->len, &uri1)!=0) + return -1; + if(parse_uri(s2->s, s2->len, &uri2)!=0) + return -1; + return cmp_uri_light(&uri1, &uri2); +} + /** * Compare SIP AoR * - match user, host and port (if port missing, assume 5060) diff --git a/src/core/strutils.h b/src/core/strutils.h index 8b20f72e44..4747f898fd 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -45,6 +45,7 @@ int cmpi_str(str *s1, str *s2); int cmp_hdrname_str(str *s1, str *s2); int cmp_hdrname_strzn(str *s1, char *s2, size_t n); int cmp_uri_str(str *s1, str *s2); +int cmp_uri_light_str(str *s1, str *s2); int cmp_aor_str(str *s1, str *s2); /* str regexp replace */

1 0

git:master:5e484f16: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: 5e484f1677363ae3fd791911e8ed78ba40ccc81d URL: https://github.com/kamailio/kamailio/commit/5e484f1677363ae3fd791911e8ed78b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-03T09:01:17+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/5e484f1677363ae3fd791911e8ed78b… Patch: https://github.com/kamailio/kamailio/commit/5e484f1677363ae3fd791911e8ed78b…

1 0

git:master:c6c6e032: corex: functions to set socket by name
by Daniel-Constantin Mierla 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: c6c6e0326b1b4db856e25a485e13235b10b440f4 URL: https://github.com/kamailio/kamailio/commit/c6c6e0326b1b4db856e25a485e13235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-03T08:42:59+02:00 corex: functions to set socket by name --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c6c6e0326b1b4db856e25a485e13235… Patch: https://github.com/kamailio/kamailio/commit/c6c6e0326b1b4db856e25a485e13235…

1 0

git:master:e900d05f: corex: docs for new functions to set send socket by name
by Daniel-Constantin Mierla 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: e900d05fba75314ac769aceb637c0a3f61eb8f8b URL: https://github.com/kamailio/kamailio/commit/e900d05fba75314ac769aceb637c0a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-03T08:48:17+02:00 corex: docs for new functions to set send socket by name --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e900d05fba75314ac769aceb637c0a3… Patch: https://github.com/kamailio/kamailio/commit/e900d05fba75314ac769aceb637c0a3… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 0b1d587e7b..98c51f1470 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -556,6 +556,33 @@ resetxflag("1"); ... set_send_socket("udp:127.0.0.1:5060"); ... +</programlisting> + </example> + </section> + <section id="corex.f.set_send_socket_name"> + <title><function moreinfo="none">set_send_socket_name(sname)</function></title> + <para> + Set the socket for sending out. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>sname</emphasis> - the name of the local socket + (listen address). Can be a static string or contain + pseudo-variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>set_send_socket_name</function> usage</title> + <programlisting format="linespecific"> +... +set_send_socket_name("sock1"); +... </programlisting> </example> </section> @@ -583,6 +610,33 @@ set_send_socket("udp:127.0.0.1:5060"); ... set_recv_socket("udp:127.0.0.1:5060"); ... +</programlisting> + </example> + </section> + <section id="corex.f.set_recv_socket_name"> + <title><function moreinfo="none">set_recv_socket_name(sname)</function></title> + <para> + Switch local socket used for receiving the message. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>sname</emphasis> - the name of the local socket + (listen address). Can be a static string or contain + pseudo-variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>set_recv_socket_name</function> usage</title> + <programlisting format="linespecific"> +... +set_recv_socket_name("sock1"); +... </programlisting> </example> </section>

1 0

git:master:6a7aa746: kamctl: try to locate rpc fifo file in /var/run/ or /run/ folders
by Daniel-Constantin Mierla 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: 6a7aa74663a25b52651bc39e986849c62c8a50f4 URL: https://github.com/kamailio/kamailio/commit/6a7aa74663a25b52651bc39e986849c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-03T08:40:10+02:00 kamctl: try to locate rpc fifo file in /var/run/ or /run/ folders - cope better with old or non-linux systems --- Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/6a7aa74663a25b52651bc39e986849c… Patch: https://github.com/kamailio/kamailio/commit/6a7aa74663a25b52651bc39e986849c… --- diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index e8fe93f99d..743f15bc4d 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -23,7 +23,11 @@ fi ### parameters # if [ -z "$RPCFIFOPATH" ]; then - RPCFIFOPATH=/run/kamailio/kamailio_rpc.fifo + if [ -p "/var/run/kamailio/kamailio_rpc.fifo" ]; then + RPCFIFOPATH=/var/run/kamailio/kamailio_rpc.fifo + else + RPCFIFOPATH=/run/kamailio/kamailio_rpc.fifo + fi fi #

1 0

git:master:5acc7c8a: rr: try to enforce send socket using name in Route URI params
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 5acc7c8a21599fed0b30df18fefaea3a80a02854 URL: https://github.com/kamailio/kamailio/commit/5acc7c8a21599fed0b30df18fefaea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T15:09:36+02:00 rr: try to enforce send socket using name in Route URI params - done when sockname_mode=1; if param not found or no socket matching found, then it tries the classic socket lookup --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/5acc7c8a21599fed0b30df18fefaea3… Patch: https://github.com/kamailio/kamailio/commit/5acc7c8a21599fed0b30df18fefaea3… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 28bc700941..4605ba09ad 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -36,6 +36,7 @@ #include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" +#include "../../core/parser/parse_param.h" #include "../../core/mem/mem.h" #include "../../core/dset.h" #include "loose.h" @@ -61,6 +62,7 @@ static msg_ctx_id_t routed_msg_id = {0}; static str routed_params = {0,0}; extern int rr_force_send_socket; +extern int rr_sockname_mode; /*! * \brief Test whether we are processing pre-loaded route set by looking at the To tag @@ -749,7 +751,44 @@ static inline int after_strict(struct sip_msg* _m) static inline void rr_do_force_send_socket(sip_msg_t *_m, sip_uri_t *puri, rr_t* rt, int rr2on) { - socket_info_t *si; + socket_info_t *si = NULL; + param_hooks_t phooks; + param_t* plist = NULL; + param_t *pit=NULL; + str s; + + + if(rr_sockname_mode!=0 && puri->params.len>0) { + s = puri->params; + if(s.s[s.len-1]==';') { + s.len--; + } + if (parse_params(&s, CLASS_ANY, &phooks, &plist)<0) { + LM_ERR("bad sip uri parameters: %.*s\n", s.len, s.s); + return; + } + for (pit = plist; pit; pit=pit->next) { + if (pit->name.len==SOCKNAME_PARAM_LEN + && strncasecmp(pit->name.s, SOCKNAME_PARAM, + SOCKNAME_PARAM_LEN)==0) { + if(pit->body.len>0) { + si = ksr_get_socket_by_name(&pit->body); + if(si != NULL) { + LM_DBG("found socket with name: %.*s\n", + pit->body.len, pit->body.s); + set_force_socket(_m, si); + free_params(plist); + return; + } else { + LM_DBG("failed to find socket with name: %.*s\n", + pit->body.len, pit->body.s); + } + } + } + } + LM_DBG("use of sockname parameter enabled, but failed to find it\n"); + free_params(plist); + } if ((si = grep_sock_info(&puri->host, puri->port_no?puri->port_no:proto_default_port(puri->proto),

1 0

git:master:bfe48633: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: bfe48633516aa30d3b8ac0cfb4d166b21e6246c9 URL: https://github.com/kamailio/kamailio/commit/bfe48633516aa30d3b8ac0cfb4d166b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-02T14:31:10+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/bfe48633516aa30d3b8ac0cfb4d166b… Patch: https://github.com/kamailio/kamailio/commit/bfe48633516aa30d3b8ac0cfb4d166b…

1 0

git:master:9a35ca71: rr: docs for sockname_mode param
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 9a35ca7155a390b1d64feed629601e82e35e1650 URL: https://github.com/kamailio/kamailio/commit/9a35ca7155a390b1d64feed629601e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T14:25:22+02:00 rr: docs for sockname_mode param --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a35ca7155a390b1d64feed629601e8… Patch: https://github.com/kamailio/kamailio/commit/9a35ca7155a390b1d64feed629601e8… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 01bee1b451..bdb78291b6 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -313,6 +313,26 @@ modparam("rr", "ignore_sips", 1) </programlisting> </example> </section> + <section id="rr.p.sockname_mode"> + <title><varname>sockname_mode</varname> (int)</title> + <para> + If set to 1, the Record-Route URI is built to contain socket name in 'sn' + parameter. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>sockname_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rr", "sockname_mode", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:8ba747b8: rr: new param sockname_mode
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 8ba747b8af8068f0ee8e3d440ac9f094d7dec28a URL: https://github.com/kamailio/kamailio/commit/8ba747b8af8068f0ee8e3d440ac9f09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T14:18:30+02:00 rr: new param sockname_mode - if set to 1, socket name is added to Path URI in 'sn' param --- Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8ba747b8af8068f0ee8e3d440ac9f09… Patch: https://github.com/kamailio/kamailio/commit/8ba747b8af8068f0ee8e3d440ac9f09… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 936a348b22..54da64cf99 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -70,6 +70,7 @@ #define RR_PARAM_BUF_SIZE 512 /*!< buffer for RR parameter */ extern int rr_ignore_sips; +extern int rr_sockname_mode; /*! * \brief RR param buffer @@ -207,6 +208,7 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, char *p; char *rr_prefix; int rr_prefix_len; + int rr_lump_type; if(_sips==0) { rr_prefix = RR_PREFIX_SIP; @@ -281,7 +283,10 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, if (!(_l = insert_new_lump_after(_l, prefix, prefix_len, 0))) goto lump_err; prefix = 0; - _l = insert_subst_lump_after(_l, _inbound?SUBST_RCV_ALL:SUBST_SND_ALL, 0); + rr_lump_type = (_inbound)? + (rr_sockname_mode?SUBST_RCV_ALL_EX:SUBST_RCV_ALL) + :(rr_sockname_mode?SUBST_SND_ALL_EX:SUBST_SND_ALL); + _l = insert_subst_lump_after(_l, rr_lump_type, 0); if (_l ==0 ) goto lump_err; if (enable_double_rr) { diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index f61c693cb0..6643239fcb 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -62,6 +62,7 @@ int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ static str custom_user_spec = {NULL, 0}; pv_spec_t custom_user_avp; int rr_ignore_sips = 0; /*!< ignore sips schema when building record-route */ +int rr_sockname_mode = 0; /*!< add socket name to R-R header */ ob_api_t rr_obb; @@ -136,6 +137,7 @@ static param_export_t params[] ={ {"custom_user_avp", PARAM_STR, &custom_user_spec}, {"force_send_socket", PARAM_INT, &rr_force_send_socket}, {"ignore_sips", PARAM_INT, &rr_ignore_sips}, + {"sockname_mode", PARAM_INT, &rr_sockname_mode}, {0, 0, 0 } };

1 0

git:master:7d9d82cc: path: docs for sockname_mode param
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 7d9d82cc1fc6822105b32f823da8d273910f9c3f URL: https://github.com/kamailio/kamailio/commit/7d9d82cc1fc6822105b32f823da8d27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T14:24:54+02:00 path: docs for sockname_mode param --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d9d82cc1fc6822105b32f823da8d27… Patch: https://github.com/kamailio/kamailio/commit/7d9d82cc1fc6822105b32f823da8d27… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index e8d51af0a5..14c600f2a6 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -197,6 +197,25 @@ modparam("path", "received_format", 1) ... modparam("path", "enable_r2", 1) ... +</programlisting> + </example> + </section> + <section id="path.p.sockname_mode"> + <title><varname>sockname_mode</varname> (int)</title> + <para> + If set to 1, the Path URI is built to contain socket name in 'sn' parameter. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>sockname_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "sockname_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:31d92814: path: new param sockname_mode
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 31d92814679fdeca96d7f90bb85938eb9894a4e4 URL: https://github.com/kamailio/kamailio/commit/31d92814679fdeca96d7f90bb85938e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T14:17:36+02:00 path: new param sockname_mode - if set to 1, socket name is added to Path URI in 'sn' param --- Modified: src/modules/path/path.c Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/31d92814679fdeca96d7f90bb85938e… Patch: https://github.com/kamailio/kamailio/commit/31d92814679fdeca96d7f90bb85938e… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index f95d68ab70..55cd859c90 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -56,6 +56,8 @@ const static char *proto_strings[] = { [PROTO_WSS] = "%3Btransport%3Dws", }; +extern int path_sockname_mode; + static char *path_strzdup(char *src, int len) { char *res; @@ -187,7 +189,8 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, l = insert_new_lump_before(l, prefix, prefix_len, 0); if (!l) goto out3; - l = insert_subst_lump_before(l, SUBST_SND_ALL, 0); + l = insert_subst_lump_before(l, + (path_sockname_mode)?SUBST_SND_ALL_EX:SUBST_SND_ALL, 0); if (!l) goto out2; l = insert_new_lump_before(l, suffix, cp - suffix, 0); if (!l) goto out2; @@ -197,7 +200,8 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, if(dp==NULL) goto out1; l = insert_new_lump_before(l, dp, prefix_len, 0); if (!l) goto out1; - l = insert_subst_lump_before(l, SUBST_RCV_ALL, 0); + l = insert_subst_lump_before(l, + (path_sockname_mode)?SUBST_RCV_ALL_EX:SUBST_RCV_ALL, 0); if (!l) goto out1; dp = path_strzdup(suffix, cp - suffix); if(dp==NULL) goto out1; diff --git a/src/modules/path/path_mod.c b/src/modules/path/path_mod.c index 21f1a256df..cc27d1a457 100644 --- a/src/modules/path/path_mod.c +++ b/src/modules/path/path_mod.c @@ -68,6 +68,7 @@ int path_use_received = 0; int path_received_format = 0; int path_enable_r2 = 0; +int path_sockname_mode = 0; /*! \brief * Module initialization function prototype @@ -111,6 +112,7 @@ static param_export_t params[] = { {"use_received", INT_PARAM, &path_use_received }, {"received_format", INT_PARAM, &path_received_format }, {"enable_r2", INT_PARAM, &path_enable_r2 }, + {"sockname_mode", INT_PARAM, &path_sockname_mode }, { 0, 0, 0 } };

1 0

git:master:53c5d86c: core: new conditional lump types SUBST_RCV_ALL_EX and SUBST_SND_ALL_EX
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 53c5d86c37f407368cf9600a1b6745db83e38124 URL: https://github.com/kamailio/kamailio/commit/53c5d86c37f407368cf9600a1b6745d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T13:29:56+02:00 core: new conditional lump types SUBST_RCV_ALL_EX and SUBST_SND_ALL_EX - build conditional uri adding socket name in 'sn' param --- Modified: src/core/config.h Modified: src/core/lump_struct.h Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/53c5d86c37f407368cf9600a1b6745d… Patch: https://github.com/kamailio/kamailio/commit/53c5d86c37f407368cf9600a1b6745d…

1 0

[kamailio/kamailio] Kamailio ignore 404 as part of transaction during REGISTER (#2271)
by jpVm5jYYRE1VIKL 02 Apr '20

02 Apr '20

### Description In following configuration : UA -> KAMALIO PROXY -> REGISTRAR In case if REGISTRAR answer 404 on first REGISTER kamailio just ignore it and reply not passed to onreply_route. ie 404 just dropped and not passed to UA. In case if REGISTRAR answer 401 on first REGISTER kamailio works like it have to be. Grepped example : ``` 77.77.77.77 - UA 88.88.88.88 - Kamailio 10.34.64.2 - registrar U 2020/04/02 10:47:02.345372 77.77.77.77:5060 -> 88.88.88.88:7060 #26887 REGISTER sip:proxy.domain.com:7060 SIP/2.0. Via: SIP/2.0/UDP 10.32.0.9:5060;branch=z9hG4bK4153798595. From: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=3123330837. To: "999100044" <sip:999100044@proxy.domain.com:7060>. Call-ID: 2_912627073(a)10.32.0.9. CSeq: 1 REGISTER. Contact: <sip:999100044@10.32.0.9:5060>. Allow: INVITE, INFO, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE. Max-Forwards: 70. User-Agent: Yealink SIP-T46G 28.81.188.7 001565b577b2. Expires: 3600. Allow-Events: talk,hold,conference,refer,check-sync. Content-Length: 0. .. U 2020/04/02 10:47:04.289850 88.88.88.88:7060 -> 10.34.64.2:5060 #26888 REGISTER sip:proxy.domain.com:7060 SIP/2.0. Record-Route: <sip:88.88.88.88:7060;lr>. Via: SIP/2.0/UDP 88.88.88.88:7060;branch=z9hG4bK0636.d927d7e86ebc02302d9ad6ae7d778817.0. Via: SIP/2.0/UDP 10.32.0.9:5060;received=77.77.77.77;branch=z9hG4bK4153798595. From: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=3123330837. To: "999100044" <sip:999100044@proxy.domain.com:7060>. Call-ID: 2_912627073(a)10.32.0.9. CSeq: 1 REGISTER. Contact: <sip:999100044@10.32.0.9:5060>. Allow: INVITE, INFO, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE. Max-Forwards: 69. User-Agent: Yealink SIP-T46G 28.81.188.7 001565b577b2. Expires: 3600. Allow-Events: talk,hold,conference,refer,check-sync. Content-Length: 0. Path: <sip:88.88.88.88:7060;lr;received=sip:77.77.77.77:5060>. Supported: path. .. U 2020/04/02 10:47:04.290295 10.34.64.2:5060 -> 88.88.88.88:7060 #26889 SIP/2.0 404 Not Found. Via: SIP/2.0/UDP 88.88.88.88:7060;branch=z9hG4bK0636.d927d7e86ebc02302d9ad6ae7d778817.0. Via: SIP/2.0/UDP 10.32.0.9:5060;received=77.77.77.77;branch=z9hG4bK4153798595. From: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=3123330837. To: "999100044" <sip:999100044@proxy.domain.com:7060>;tag=1598650872. Call-ID: 2_912627073(a)10.32.0.9. CSeq: 1 REGISTER. Content-Length: 0. Date: Thu, 02 Apr 2020 10:47:03 GMT. Warning: Not maintaining bindings for domain. .. ``` ### Troubleshooting After checking RFC 3261 i found that ``` 5. The registrar extracts the address-of-record from the To header field of the request. If the address-of-record is not valid for the domain in the Request-URI, the registrar MUST send a 404 (Not Found) response and skip the remaining steps. ``` #### Reproduction following schema : UA -> KAMALIO PROXY -> REGISTRAR modules related to issue: in kamailio.cfg loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "db_mysql" loadmodule "domain" loadmodule "outbound" loadmodule "path" simple conception route config which illustrate issue : ``` request_route { # per request initial checks route(REQINIT); route(CATCH_CANCEL); route(RR_PARSE); route(REGISTRATION); xlog("L_INFO", "Initial relay packet\n"); $du = "sip:10.34.64.2:5060"; route(FORWARD); # update $du to set the destination address for proxying exit; } route[CATCH_CANCEL] { if (is_method("CANCEL") == true) { if (t_check_trans() == true) { route(FORWARD); } sl_reply("500", "Internal Server Error"); drop; } } route[RR_PARSE] { if(loose_route() == true ) { xlog("L_INFO", "RR-enforced\n"); append_hf("P-hint: rr-enforced\r\n"); route(FORWARD); } else { xlog("L_INFO", "RR simple\n"); record_route(); } } route[REGISTRATION] { if(is_method("REGISTER") == true) { add_path_received(); append_hf("Supported: path\r\n"); xlog("L_INFO", "GOT REGISTER\n"); } } route[FORWARD] { if(t_relay() == false) { sl_reply_error(); } drop; } onreply_route { xlog("Reply SIP message from $si:$sp\n"); if (t_check_trans() == false) { drop; } } ``` #### Debugging Data #### Log Messages ``` Apr 2 11:05:26 fsinnosbc /usr/sbin/kamailio[16037]: INFO: {1 1 REGISTER 2_1386563412(a)10.32.0.9} <script>: RR simple Apr 2 11:05:26 fsinnosbc /usr/sbin/kamailio[16037]: INFO: {1 1 REGISTER 2_1386563412(a)10.32.0.9} <script>: GOT REGISTER Apr 2 11:05:26 fsinnosbc /usr/sbin/kamailio[16037]: INFO: {1 1 REGISTER 2_1386563412(a)10.32.0.9} <script>: Initial relay packet ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` root@fsinnosbc:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster root@fsinnosbc:~# ``` -- 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/2271

3 8

git:master:10af978e: pv: new config variable $fsn - forced send socket name
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 10af978e2ee6dcb7bb2dfcec07d14987600b7c43 URL: https://github.com/kamailio/kamailio/commit/10af978e2ee6dcb7bb2dfcec07d1498… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T12:22:51+02:00 pv: new config variable $fsn - forced send socket name - retrieve the name of the forced send socket - setting the send socket can be done by assigning socket name: $fsn = "sock1"; --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/10af978e2ee6dcb7bb2dfcec07d1498… Patch: https://github.com/kamailio/kamailio/commit/10af978e2ee6dcb7bb2dfcec07d1498… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 1c4133c6e7..6ee89e7e52 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -250,6 +250,9 @@ static pv_export_t mod_pvs[] = { {{"fs", (sizeof("fs")-1)}, /* */ PVT_OTHER, pv_get_force_sock, pv_set_force_sock, 0, 0, 0, 0}, + {{"fsn", (sizeof("fsn")-1)}, /* */ + PVT_OTHER, pv_get_force_sock_name, pv_set_force_sock_name, + 0, 0, 0, 0}, {{"ft", (sizeof("ft")-1)}, /* */ PVT_OTHER, pv_get_from_attr, 0, 0, 0, pv_init_iname, 4}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 9087fe01bf..ad5db64eb4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1021,6 +1021,21 @@ int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &msg->force_send_socket->sock_str); } +int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) { + return -1; + } + + if (msg->force_send_socket==0 + || msg->force_send_socket->sockname.s == NULL) { + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &msg->force_send_socket->sockname); +} + int pv_get_useragent(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -2655,6 +2670,40 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, return -1; } +int pv_set_force_sock_name(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + struct socket_info *si; + + if(msg==NULL || param==NULL) { + LM_ERR("bad parameters\n"); + return -1; + } + + if(val==NULL || (val->flags&PV_VAL_NULL)) { + reset_force_socket(msg); + return 0; + } + + if(!(val->flags&PV_VAL_STR) || val->rs.len<=0) { + LM_ERR("str value required to set the force send sock\n"); + goto error; + } + + LM_DBG("trying to set send-socket to name [%.*s]\n", val->rs.len, val->rs.s); + si = ksr_get_socket_by_name(&val->rs); + if (si!=NULL) { + set_force_socket(msg, si); + } else { + LM_WARN("no socket found to match name [%.*s]\n", + val->rs.len, val->rs.s); + } + + return 0; +error: + return -1; +} + int pv_set_mflags(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index ee45b915cd..919fa3910f 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -175,6 +175,9 @@ int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_useragent(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); @@ -295,6 +298,9 @@ int pv_set_branch(struct sip_msg* msg, pv_param_t *param, int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_set_force_sock_name(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); + int pv_set_mflags(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val);

1 0

git:master:64069867: core: function to search socket by name
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 64069867c65239af912d96b7865f4faefb64e338 URL: https://github.com/kamailio/kamailio/commit/64069867c65239af912d96b7865f4fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T12:20:32+02:00 core: function to search socket by name --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/64069867c65239af912d96b7865f4fa… Patch: https://github.com/kamailio/kamailio/commit/64069867c65239af912d96b7865f4fa… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 82e66123b4..16a7491f83 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -687,6 +687,40 @@ struct socket_info* grep_sock_info(str* host, unsigned short port, return si; } +socket_info_t* ksr_get_socket_by_name(str *sockname) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->sockname.s == NULL) { + continue; + } + LM_DBG("checking if sockname %.*s matches %.*s\n", + sockname->len, sockname->s, + si->sockname.len, si->sockname.s); + if (sockname->len == si->sockname.len + && strncasecmp(sockname->s, si->sockname.s, + sockname->len)==0) { + return si; + } + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index ffdc419921..4bf7b3e96c 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -103,6 +103,7 @@ struct socket_info* grep_sock_info_by_port(unsigned short port, unsigned short proto); struct socket_info* find_si(struct ip_addr* ip, unsigned short port, unsigned short proto); +socket_info_t* ksr_get_socket_by_name(str *sockname); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:76889dec: core: support to asign names to listen sockets
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 76889decfc6e8371eadf15388ba18d9899f57294 URL: https://github.com/kamailio/kamailio/commit/76889decfc6e8371eadf15388ba18d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:35:00+02:00 core: support to asign names to listen sockets - full format: listen=proto:address:port advertise address:port name string - example: listen=udp:10.0.0.10:5060 advertise 1.2.3.4:5060 name "sock1" - the value for the name has to be enclosed in quotes - name can be provided also when advertise is not needed --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/76889decfc6e8371eadf15388ba18d9… Patch: https://github.com/kamailio/kamailio/commit/76889decfc6e8371eadf15388ba18d9…

1 0

git:master:cf64fcef: corex: print socket name in rpc command output
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: cf64fcef56deee64ec324ccc64054e27d051d89a URL: https://github.com/kamailio/kamailio/commit/cf64fcef56deee64ec324ccc64054e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:38:01+02:00 corex: print socket name in rpc command output --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/cf64fcef56deee64ec324ccc64054e2… Patch: https://github.com/kamailio/kamailio/commit/cf64fcef56deee64ec324ccc64054e2… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 11c8836333..8677c35d22 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -52,7 +52,7 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) struct socket_info** list; struct addr_info* ai; unsigned short proto; - + proto=PROTO_UDP; do { list=get_sock_info_list(proto); @@ -79,7 +79,7 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error address structure"); return; } - + if (si->addr_info_lst) { @@ -95,10 +95,11 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) } } - if(rpc->struct_add(th, "ssss", + if(rpc->struct_add(th, "sssss", "PORT", si->port_no_str.s, "MCAST", si->flags & SI_IS_MCAST ? "yes" : "no", "MHOMED", si->flags & SI_IS_MHOMED? "yes" : "no", + "SOCKNAME", si->sockname.s? si->sockname.s : "-", "ADVERTISE", si->useinfo.name.s?si->useinfo.name.s:"-")<0) { rpc->fault(ctx, 500, "Internal error attrs structure");

1 0

git:master:e533a7e4: pv: kemi functions for xavu management
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: e533a7e43e84745347dd11cede69db2d348e5107 URL: https://github.com/kamailio/kamailio/commit/e533a7e43e84745347dd11cede69db2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:27:13+02:00 pv: kemi functions for xavu management --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/e533a7e43e84745347dd11cede69db2… Patch: https://github.com/kamailio/kamailio/commit/e533a7e43e84745347dd11cede69db2…

1 0

git:master:02b168d3: core: function to remove an xavu child value
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 02b168d34786c363c6b5ce5a5e885c419f7de9e4 URL: https://github.com/kamailio/kamailio/commit/02b168d34786c363c6b5ce5a5e885c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T11:26:52+02:00 core: function to remove an xavu child value --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/02b168d34786c363c6b5ce5a5e885c4… Patch: https://github.com/kamailio/kamailio/commit/02b168d34786c363c6b5ce5a5e885c4… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 12c52512fd..dc60fffd0a 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1258,6 +1258,21 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) return 0; } +/** + * + */ +int xavu_rm_child_by_name(str *rname, str *cname) +{ + sr_xavp_t *avu=NULL; + + avu = xavu_lookup(rname, NULL); + + if(avu == NULL || avu->val.type!=SR_XTYPE_XAVP) { + return 0; + } + return xavu_rm_by_name(cname, &avu->val.v.xavp); +} + /** * */ diff --git a/src/core/xavp.h b/src/core/xavp.h index 66addbfff8..9145497d05 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -124,6 +124,7 @@ sr_xavp_t *xavu_get(str *name, sr_xavp_t *start); sr_xavp_t *xavu_lookup(str *name, sr_xavp_t **start); int xavu_rm(sr_xavp_t *xa, sr_xavp_t **head); int xavu_rm_by_name(str *name, sr_xavp_t **head); +int xavu_rm_child_by_name(str *rname, str *cname); sr_xavp_t *xavu_set_xval(str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavu_set_ival(str *rname, int ival); sr_xavp_t *xavu_set_sval(str *rname, str *sval);

1 0

git:master:e2f50d83: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: e2f50d830e9bbec55965fec6c35d30d73e81ccdd URL: https://github.com/kamailio/kamailio/commit/e2f50d830e9bbec55965fec6c35d30d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-01T14:01:19+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/e2f50d830e9bbec55965fec6c35d30d… Patch: https://github.com/kamailio/kamailio/commit/e2f50d830e9bbec55965fec6c35d30d… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 7dfba63f13..b9a701d5c6 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -55,9 +55,10 @@ Daniel-Constantin Mierla 4.15. sbranch_append() 4.16. sbranch_reset() 4.17. pv_xavp_print() - 4.18. pv_var_to_xavp(varname, xname) - 4.19. pv_xavp_to_var(xname) - 4.20. pv_evalx(dst, fmt) + 4.18. pv_xavu_print() + 4.19. pv_var_to_xavp(varname, xname) + 4.20. pv_xavp_to_var(xname) + 4.21. pv_evalx(dst, fmt) 5. RPC Commands @@ -86,11 +87,12 @@ Daniel-Constantin Mierla 1.18. sbranch_append() usage 1.19. sbranch_append() usage 1.20. pv_xavp_print() usage - 1.21. pv_var_to_xavp() usage - 1.22. pv_xavp_to_var() usage + 1.21. pv_xavu_print() usage + 1.22. pv_var_to_xavp() usage 1.23. pv_xavp_to_var() usage - 1.24. pv.shvSet usage - 1.25. pv.shvGet usage + 1.24. pv_xavp_to_var() usage + 1.25. pv.shvSet usage + 1.26. pv.shvGet usage Chapter 1. Admin Guide @@ -129,9 +131,10 @@ Chapter 1. Admin Guide 4.15. sbranch_append() 4.16. sbranch_reset() 4.17. pv_xavp_print() - 4.18. pv_var_to_xavp(varname, xname) - 4.19. pv_xavp_to_var(xname) - 4.20. pv_evalx(dst, fmt) + 4.18. pv_xavu_print() + 4.19. pv_var_to_xavp(varname, xname) + 4.20. pv_xavp_to_var(xname) + 4.21. pv_evalx(dst, fmt) 5. RPC Commands @@ -240,9 +243,10 @@ modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") 4.15. sbranch_append() 4.16. sbranch_reset() 4.17. pv_xavp_print() - 4.18. pv_var_to_xavp(varname, xname) - 4.19. pv_xavp_to_var(xname) - 4.20. pv_evalx(dst, fmt) + 4.18. pv_xavu_print() + 4.19. pv_var_to_xavp(varname, xname) + 4.20. pv_xavp_to_var(xname) + 4.21. pv_evalx(dst, fmt) 4.1. pv_isset(pvar) @@ -562,7 +566,18 @@ sbranch_reset(); pv_xavp_print(); ... -4.18. pv_var_to_xavp(varname, xname) +4.18. pv_xavu_print() + + Print all XAVUs to the syslog using INFO log level. + + Function can be used from ANY_ROUTE. + + Example 1.21. pv_xavu_print() usage +... +pv_xavu_print(); +... + +4.19. pv_var_to_xavp(varname, xname) Copy the script variable value into an xavp. @@ -574,7 +589,7 @@ pv_xavp_print(); Function can be used from ANY_ROUTE. - Example 1.21. pv_var_to_xavp() usage + Example 1.22. pv_var_to_xavp() usage ... $var("temp") = 3; $var("foo") = "foo indeed"; @@ -588,7 +603,7 @@ $xavp("ok[0]=>temp") now is 3 $xavp("ok[0]=>foo") now is "foo indeed" ... -4.19. pv_xavp_to_var(xname) +4.20. pv_xavp_to_var(xname) Copy xavp values into vars. Reverse of pv_var_to_xavp(). @@ -596,7 +611,7 @@ $xavp("ok[0]=>foo") now is "foo indeed" Function can be used from ANY_ROUTE. - Example 1.22. pv_xavp_to_var() usage + Example 1.23. pv_xavp_to_var() usage ... $xavp("bar=>temp") = 3; $xavp("bar[0]=>foo") = "foo indeed"; @@ -606,7 +621,7 @@ $var("temp") now is 3 $var("foo") now is "foo indeed" ... -4.20. pv_evalx(dst, fmt) +4.21. pv_evalx(dst, fmt) The fmt string is evaluated twice for exiting variables, the result is stored in dst variable. The dst must be the name of a writable @@ -615,7 +630,7 @@ $var("foo") now is "foo indeed" Function can be used from ANY_ROUTE. - Example 1.23. pv_xavp_to_var() usage + Example 1.24. pv_xavp_to_var() usage ... $var(x) = "test"; $var(y) = "$var(x)" @@ -640,7 +655,7 @@ pv_evalx("$var(z)", "$var(y) one"); + “str”: string value * _value_: value to be set - Example 1.24. pv.shvSet usage + Example 1.25. pv.shvSet usage ... $ kamcmd pv.shvSet debug int 3 ... @@ -654,7 +669,7 @@ $ kamcmd pv.shvSet debug int 3 If no name is given, all shared variables are listed. - Example 1.25. pv.shvGet usage + Example 1.26. pv.shvGet usage ... $ kamcmd pv.shvGet debug ...

1 0

git:master:bd1ca183: pv: config and kemi functions to print xavu vars
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: bd1ca1839ac0d70c70bbbe3a98e5845129cb2567 URL: https://github.com/kamailio/kamailio/commit/bd1ca1839ac0d70c70bbbe3a98e5845… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:47:21+02:00 pv: config and kemi functions to print xavu vars --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/bd1ca1839ac0d70c70bbbe3a98e5845… Patch: https://github.com/kamailio/kamailio/commit/bd1ca1839ac0d70c70bbbe3a98e5845… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index fd123a42a3..7931056ec6 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -572,6 +572,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE }, + {"pv_xavu_print", (cmd_function)pv_xavu_print, 0, 0, 0, + ANY_ROUTE }, {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, fixup_spve_null, @@ -822,6 +824,12 @@ static int ki_xavp_print(sip_msg_t* msg) return 1; } +static int ki_xavu_print(sip_msg_t* msg) +{ + xavu_print_list(NULL); + return 1; +} + /** * */ @@ -1859,6 +1867,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("pv_xavu_print"), + SR_KEMIP_INT, ki_xavu_print, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_params_explode"), SR_KEMIP_INT, ki_xavp_params_explode, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 5b14b1a3a7..0cdef80a0e 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -568,6 +568,12 @@ int pv_xavp_print(sip_msg_t* msg, char* s1, char *s2) return 1; } +int pv_xavu_print(sip_msg_t* msg, char* s1, char *s2) +{ + xavu_print_list(NULL); + return 1; +} + /** * */ diff --git a/src/modules/pv/pv_xavp.h b/src/modules/pv/pv_xavp.h index 6f2e9f474b..3d56be5a58 100644 --- a/src/modules/pv/pv_xavp.h +++ b/src/modules/pv/pv_xavp.h @@ -33,6 +33,7 @@ int pv_set_xavu(struct sip_msg* msg, pv_param_t *param, int pv_parse_xavu_name(pv_spec_p sp, str *in); int pv_xavp_print(struct sip_msg* msg, char* s1, char *s2); +int pv_xavu_print(struct sip_msg* msg, char* s1, char *s2); int xavp_params_explode(str *params, str *xname);

1 0

git:master:3a744fc6: pv: docs for pv_xavu_print() function
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 3a744fc65501d3cc21ebf020fdf821f2a1b2614f URL: https://github.com/kamailio/kamailio/commit/3a744fc65501d3cc21ebf020fdf821f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:48:43+02:00 pv: docs for pv_xavu_print() function --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3a744fc65501d3cc21ebf020fdf821f… Patch: https://github.com/kamailio/kamailio/commit/3a744fc65501d3cc21ebf020fdf821f… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 86186e02fe..88ca172eda 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -613,6 +613,25 @@ sbranch_reset(); <programlisting format="linespecific"> ... pv_xavp_print(); +... + </programlisting> + </example> + </section> + <section id="pv.f.pv_xavu_print"> + <title> + <function moreinfo="none">pv_xavu_print()</function> + </title> + <para> + Print all XAVUs to the syslog using INFO log level. + </para> + <para> + Function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pv_xavu_print()</function> usage</title> + <programlisting format="linespecific"> +... +pv_xavu_print(); ... </programlisting> </example>

1 0

git:master:729dac66: core: exposed xavu_print_list() function
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 729dac6667b8ba4f7b417351770fda3e2ecb7b8c URL: https://github.com/kamailio/kamailio/commit/729dac6667b8ba4f7b417351770fda3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:43:55+02:00 core: exposed xavu_print_list() function --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/729dac6667b8ba4f7b417351770fda3… Patch: https://github.com/kamailio/kamailio/commit/729dac6667b8ba4f7b417351770fda3… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 492bef21f3..12c52512fd 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1102,6 +1102,11 @@ void xavu_print_list_content(sr_xavp_t **head, int level) xavx_print_list_content("XAVU", head, _xavu_list_crt, level); } +void xavu_print_list(sr_xavp_t **head) +{ + xavu_print_list_content(head, 0); +} + /** * */ diff --git a/src/core/xavp.h b/src/core/xavp.h index 59a075ecc0..66addbfff8 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -114,6 +114,7 @@ int xavp_set_child_sval(str *rname, str *cname, str *sval); /** xavu api */ void xavu_print_list_content(sr_xavp_t **head, int level); +void xavu_print_list(sr_xavp_t **head); #define xavu_destroy_list_unsafe xavp_destroy_list_unsafe #define xavu_destroy_list xavp_destroy_list void xavu_reset_list(void);

1 0

git:master:af0d730f: pv: $xavu(...) config variables implementation
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: af0d730fd8f8dbbebdb223f57e452e67c00ce862 URL: https://github.com/kamailio/kamailio/commit/af0d730fd8f8dbbebdb223f57e452e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:37:08+02:00 pv: $xavu(...) config variables implementation - single (unique) value variables similar to $xavp(...) - support for root list values: $xavu(x) - support for child list values: $xavu(x=>y) - values can be int or string - assign to $null deletes the $xavu(...) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/af0d730fd8f8dbbebdb223f57e452e6… Patch: https://github.com/kamailio/kamailio/commit/af0d730fd8f8dbbebdb223f57e452e6…

1 0

git:master:5a719961: tm: process xavu list in transaction contexts
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 5a7199611a1c7c001f41d125a3ce89eebb08470c URL: https://github.com/kamailio/kamailio/commit/5a7199611a1c7c001f41d125a3ce89e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:43:21+02:00 tm: process xavu list in transaction contexts --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5a7199611a1c7c001f41d125a3ce89e… Patch: https://github.com/kamailio/kamailio/commit/5a7199611a1c7c001f41d125a3ce89e…

1 0

git:master:77ae0e27: core: function to print xavus for debugging
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 77ae0e27fe8337c41d090e43060092e0658a4ad1 URL: https://github.com/kamailio/kamailio/commit/77ae0e27fe8337c41d090e43060092e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:36:24+02:00 core: function to print xavus for debugging --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/77ae0e27fe8337c41d090e43060092e… Patch: https://github.com/kamailio/kamailio/commit/77ae0e27fe8337c41d090e43060092e…

1 0

git:master:621ba8bc: core: receive - reset xavu list after message processing
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 621ba8bc1895e8b51e1eff6cbd32d391867d5c80 URL: https://github.com/kamailio/kamailio/commit/621ba8bc1895e8b51e1eff6cbd32d39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:42:04+02:00 core: receive - reset xavu list after message processing --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/621ba8bc1895e8b51e1eff6cbd32d39… Patch: https://github.com/kamailio/kamailio/commit/621ba8bc1895e8b51e1eff6cbd32d39… --- diff --git a/src/core/receive.c b/src/core/receive.c index 428214df68..1bf288420d 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -555,10 +555,11 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) } /** - * clean up msg environment, such as avp and xavp lists + * clean up msg environment, such as avp, xavp and xavu lists */ void ksr_msg_env_reset(void) { reset_avps(); xavp_reset_list(); + xavu_reset_list(); }

1 0

git:master:db826033: core: xavu api - like xavp but with single value items
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: db826033759f1931686a061652d4b779e274bb70 URL: https://github.com/kamailio/kamailio/commit/db826033759f1931686a061652d4b77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:39:24+02:00 core: xavu api - like xavp but with single value items - simplified version without indexes --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/db826033759f1931686a061652d4b77… Patch: https://github.com/kamailio/kamailio/commit/db826033759f1931686a061652d4b77…

1 0

git:master:b536f6d5: core: pv - define xavu types
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: b536f6d5e8ffdc08b8d4a40e3236d305cf4fa03f URL: https://github.com/kamailio/kamailio/commit/b536f6d5e8ffdc08b8d4a40e3236d30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:40:38+02:00 core: pv - define xavu types --- Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/b536f6d5e8ffdc08b8d4a40e3236d30… Patch: https://github.com/kamailio/kamailio/commit/b536f6d5e8ffdc08b8d4a40e3236d30… --- diff --git a/src/core/pvar.h b/src/core/pvar.h index 2a249ea118..ffde26dedb 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -77,8 +77,8 @@ enum _pv_type { PVT_DSTURI, PVT_COLOR, PVT_BRANCH, PVT_FROM, PVT_TO, PVT_OURI, PVT_SCRIPTVAR, PVT_MSG_BODY, PVT_CONTEXT, - PVT_XAVP, PVT_HDRC, PVT_OTHER, - PVT_EXTRA /* keep it last */ + PVT_XAVP, PVT_XAVU, PVT_HDRC, + PVT_OTHER, PVT_EXTRA /* keep it last */ }; typedef enum _pv_type pv_type_t; @@ -306,6 +306,14 @@ typedef struct _pv_xavp_name { struct _pv_xavp_name *next; } pv_xavp_name_t; +/** + * XAVU + */ +typedef struct _pv_xavu_name { + str name; + struct _pv_xavu_name *next; +} pv_xavu_name_t; + int pv_eval_str(sip_msg_t *msg, str *dst, str *src); #endif

1 0

git:master:5a166124: modules: readme files regenerated - tcpops ... [skip ci]
by Kamailio Dev 31 Mar '20

31 Mar '20

Module: kamailio Branch: master Commit: 5a16612493f9d6622f2c22fa83864295c7b55c9b URL: https://github.com/kamailio/kamailio/commit/5a16612493f9d6622f2c22fa8386429… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-31T11:31:21+02:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/5a16612493f9d6622f2c22fa8386429… Patch: https://github.com/kamailio/kamailio/commit/5a16612493f9d6622f2c22fa8386429… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index 4c08b3624b..70209686f0 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -32,6 +32,8 @@ Olle E. Johansson 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) 3.7. tcp_get_conid(hostport, pvname) + 3.8. tcp_set_otcpid(conid) + 3.9. tcp_set_otcpid_flag(mode) 4. Event routes @@ -51,6 +53,8 @@ Olle E. Johansson 1.7. tcp_set_connection_lifetime usage 1.8. tcp_set_closed_event usage 1.9. tcp_get_conid usage + 1.10. tcp_set_otcpid usage + 1.11. tcp_set_otcpid_flag usage Chapter 1. Admin Guide @@ -71,6 +75,8 @@ Chapter 1. Admin Guide 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) 3.7. tcp_get_conid(hostport, pvname) + 3.8. tcp_set_otcpid(conid) + 3.9. tcp_set_otcpid_flag(mode) 4. Event routes @@ -144,6 +150,8 @@ end 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) 3.7. tcp_get_conid(hostport, pvname) + 3.8. tcp_set_otcpid(conid) + 3.9. tcp_set_otcpid_flag(mode) 3.1. tcp_conid_alive(conid) @@ -345,6 +353,53 @@ event_route[tcp:closed] { } ... +3.8. tcp_set_otcpid(conid) + + Set the value for outbound tcp connection id. + + Meaning of the parameters is as follows: + * conid - the value of tcp connection id. It can be an integer number + or a variable holding an interver value. + + Return values: + * 1: success + * -1: failure + + Example 1.10. tcp_set_otcpid usage +... + $var(conid) = 10; + tcp_set_otcpid("$var(conid)"); +... + +3.9. tcp_set_otcpid_flag(mode) + + Set or reset the internal flag for using or not the outbound tcp + connection id for sending out. The outbound connection id can be set by + module or by config using tcp_set_otcpid(...) function. An example of a + module setting the otcpid is register via lookup location function, + which sets the filed to the connection id used to receive the + registration request. + + Meaning of the parameters is as follows: + * mode - if 0, then the flag is reset, otherwise it is set. + + Return values: + * 1: success + * -1: failure + + Note: if you set the flag to use the outbound tcp connection id, then + custom config changes to the destination address, like updating the + r-uri ($ru) or dst uri ($du) are not resetting it, so the same already + set connection id is used and the SIP request might be sent to the + unexpected destination. Reset the flag in such case, if you set it + previously. + + Example 1.11. tcp_set_otcpid_flag usage +... + $var(cmode) = 1; + tcp_set_otcpid_flag("$var(cmode)"); +... + 4. Event routes 4.1. tcp:closed

1 0

git:master:d6e94d07: tcpops: docs for tcp_set_otcpid() and tcp_set_otcpid_flag() functions
by Daniel-Constantin Mierla 31 Mar '20

31 Mar '20

Module: kamailio Branch: master Commit: d6e94d074a2a1f1af2964f1ed7f24602a8dd295a URL: https://github.com/kamailio/kamailio/commit/d6e94d074a2a1f1af2964f1ed7f2460… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-31T11:23:20+02:00 tcpops: docs for tcp_set_otcpid() and tcp_set_otcpid_flag() functions --- Modified: src/modules/tcpops/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/d6e94d074a2a1f1af2964f1ed7f2460… Patch: https://github.com/kamailio/kamailio/commit/d6e94d074a2a1f1af2964f1ed7f2460… --- diff --git a/src/modules/tcpops/doc/functions.xml b/src/modules/tcpops/doc/functions.xml index 9c6409c4e6..94cefaa776 100644 --- a/src/modules/tcpops/doc/functions.xml +++ b/src/modules/tcpops/doc/functions.xml @@ -290,6 +290,87 @@ event_route[tcp:closed] { if(tcp_get_conid("127.0.0.1:5060", "$var(conid)")) { xlog("connection id is: $var(conid)\n"); } +... + ]]></programlisting> + </example> + </section> + <section id="tcpops.f.tcp_set_otcpid"> + <title> + <function>tcp_set_otcpid(conid)</function> + </title> + <para> + Set the value for outbound tcp connection id. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>conid</emphasis> - the value of tcp connection id. + It can be an integer number or a variable holding an interver value. + </para> + </listitem> + </itemizedlist> + <para>Return values:</para> + <itemizedlist> + <listitem> + <para>1: success</para> + </listitem> + <listitem> + <para>-1: failure</para> + </listitem> + </itemizedlist> + <example> + <title><function>tcp_set_otcpid</function> usage</title> + <programlisting><![CDATA[ +... + $var(conid) = 10; + tcp_set_otcpid("$var(conid)"); +... + ]]></programlisting> + </example> + </section> + <section id="tcpops.f.tcp_set_otcpid_flag"> + <title> + <function>tcp_set_otcpid_flag(mode)</function> + </title> + <para> + Set or reset the internal flag for using or not the outbound tcp + connection id for sending out. The outbound connection id can be + set by module or by config using tcp_set_otcpid(...) function. An + example of a module setting the otcpid is register via lookup location + function, which sets the filed to the connection id used to receive + the registration request. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>mode</emphasis> - if 0, then the flag is reset, + otherwise it is set. + </para> + </listitem> + </itemizedlist> + <para>Return values:</para> + <itemizedlist> + <listitem> + <para>1: success</para> + </listitem> + <listitem> + <para>-1: failure</para> + </listitem> + </itemizedlist> + <para> + Note: if you set the flag to use the outbound tcp connection id, + then custom config changes to the destination address, like + updating the r-uri ($ru) or dst uri ($du) are not resetting it, so + the same already set connection id is used and the SIP request + might be sent to the unexpected destination. Reset the flag in such + case, if you set it previously. + </para> + <example> + <title><function>tcp_set_otcpid_flag</function> usage</title> + <programlisting><![CDATA[ +... + $var(cmode) = 1; + tcp_set_otcpid_flag("$var(cmode)"); ... ]]></programlisting> </example>

1 0

git:master:f84fd657: tcpops: function to control use of outbound tcp connection id
by Daniel-Constantin Mierla 31 Mar '20

31 Mar '20

Module: kamailio Branch: master Commit: f84fd65707ff05c51f1b1764c42c98479ef74a14 URL: https://github.com/kamailio/kamailio/commit/f84fd65707ff05c51f1b1764c42c984… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-31T11:08:51+02:00 tcpops: function to control use of outbound tcp connection id - tcp_set_otcpid(id) - set the id for outbound tcp connection - tcp_set_otcpid_flag(mode) - set/reset the internal flag for using outbound tcp connection id --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f84fd65707ff05c51f1b1764c42c984… Patch: https://github.com/kamailio/kamailio/commit/f84fd65707ff05c51f1b1764c42c984… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index b95a642f8d..ee2404a9ac 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -62,6 +62,8 @@ static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); static int fixup_numpv(void** param, int param_no); +static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); +static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); str tcpops_event_callback = STR_NULL; @@ -98,6 +100,10 @@ static cmd_export_t cmds[]={ fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, fixup_numpv, 0, ANY_ROUTE}, + {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, + {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -612,6 +618,62 @@ static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn) return ki_tcp_get_conid_helper(msg, &saddr, (pv_spec_t*)pvn); } +/** + * + */ +static int ki_tcp_set_otcpid(sip_msg_t* msg, int vconid) +{ + if(msg == NULL) { + return -1; + } + msg->otcpid = vconid; + return 1; +} + +/** + * + */ +static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2) +{ + int vconid = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)conid, &vconid)<0) { + LM_ERR("failed to get connection id\n"); + return -1; + } + return ki_tcp_set_otcpid(msg, vconid); +} + +/** + * + */ +static int ki_tcp_set_otcpid_flag(sip_msg_t* msg, int vmode) +{ + if(msg == NULL) { + return -1; + } + if(vmode) { + msg->msg_flags |= FL_USE_OTCPID; + } else { + msg->msg_flags &= ~(FL_USE_OTCPID); + } + return 1; +} + +/** + * + */ +static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2) +{ + int vmode = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)mode, &vmode)<0) { + LM_ERR("failed to get mode parameter\n"); + return -1; + } + return ki_tcp_set_otcpid_flag(msg, vmode); +} + /** * */ @@ -736,6 +798,16 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tcpops"), str_init("tcp_set_otcpid"), + SR_KEMIP_INT, ki_tcp_set_otcpid, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tcpops"), str_init("tcp_set_otcpid_flag"), + SR_KEMIP_INT, ki_tcp_set_otcpid_flag, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:2846ef42: tm: use outbound tcp connection id for relaying if FL_USE_OTCPID is set
by Daniel-Constantin Mierla 31 Mar '20

31 Mar '20

Module: kamailio Branch: master Commit: 2846ef4271c4e539b3ffdfe8667a2894d7627af7 URL: https://github.com/kamailio/kamailio/commit/2846ef4271c4e539b3ffdfe8667a289… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-31T10:04:05+02:00 tm: use outbound tcp connection id for relaying if FL_USE_OTCPID is set --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/2846ef4271c4e539b3ffdfe8667a289… Patch: https://github.com/kamailio/kamailio/commit/2846ef4271c4e539b3ffdfe8667a289… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index ee06bedf43..97c0d2568b 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -285,6 +285,9 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, if ( p_msg->REQ_METHOD==METHOD_ACK) { LM_DBG("forwarding ACK statelessly\n"); init_dest_info(&dst); + if(p_msg->msg_flags & FL_USE_OTCPID) { + dst.id = p_msg->otcpid; + } if (proxy==0) { dst.proto=proto; if (get_uri_send_info(GET_NEXT_HOP(p_msg), &host, &port, diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 83f22ebf0d..0a302c438b 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1673,6 +1673,9 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, if (t->flags & T_CANCELED) goto canceled; if (branch_ret>=0) { added_branches |= 1<<branch_ret; + if(p_msg->msg_flags & FL_USE_OTCPID) { + t->uac[branch_ret].request.dst.id = p_msg->otcpid; + } } else { lowest_ret=MIN_int(lowest_ret, branch_ret); } @@ -1699,6 +1702,9 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, * branch result */ if (branch_ret>=0) { added_branches |= 1<<branch_ret; + if(p_msg->msg_flags & FL_USE_OTCPID) { + t->uac[branch_ret].request.dst.id = p_msg->otcpid; + } } else { lowest_ret=MIN_int(lowest_ret, branch_ret); }

1 0

git:master:2ec8e05f: core: use outbound tcp connection id for forward(...) if FL_USE_OTCPID is set
by Daniel-Constantin Mierla 31 Mar '20

31 Mar '20

Module: kamailio Branch: master Commit: 2ec8e05f1297d9ed69c8cd847c9d4f5d3529d3cd URL: https://github.com/kamailio/kamailio/commit/2ec8e05f1297d9ed69c8cd847c9d4f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-31T09:57:11+02:00 core: use outbound tcp connection id for forward(...) if FL_USE_OTCPID is set --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/2ec8e05f1297d9ed69c8cd847c9d4f5… Patch: https://github.com/kamailio/kamailio/commit/2ec8e05f1297d9ed69c8cd847c9d4f5… --- diff --git a/src/core/action.c b/src/core/action.c index cfb1bf934b..d72cc97a77 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -385,11 +385,17 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) #ifdef USE_TCP else if (a->type==FORWARD_TCP_T) { dst.proto= PROTO_TCP; + if(msg->msg_flags & FL_USE_OTCPID) { + dst.id = msg->otcpid; + } } #endif #ifdef USE_TLS else if (a->type==FORWARD_TLS_T) { dst.proto= PROTO_TLS; + if(msg->msg_flags & FL_USE_OTCPID) { + dst.id = msg->otcpid; + } } #endif #ifdef USE_SCTP

1 0

git:master:b9381ab2: core: parser - new internal flag FL_USE_OTCPID
by Daniel-Constantin Mierla 31 Mar '20

31 Mar '20

Module: kamailio Branch: master Commit: b9381ab2f4f3f4a791b284902757303a1cc21b90 URL: https://github.com/kamailio/kamailio/commit/b9381ab2f4f3f4a791b284902757303… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-31T09:54:47+02:00 core: parser - new internal flag FL_USE_OTCPID - mark request for routing existing outbound tcp connection id (e.g., restored from usrloc location lookup) --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/b9381ab2f4f3f4a791b284902757303… Patch: https://github.com/kamailio/kamailio/commit/b9381ab2f4f3f4a791b284902757303… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 02bba6b1b9..973b5702b4 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -110,6 +110,7 @@ typedef enum request_method { #define FL_MSG_NOREPLY (1<<23) /*!< do not send sip reply for request */ #define FL_SIPTRACE (1<<24) /*!< message to be traced in stateless replies */ #define FL_ROUTE_ADDR (1<<25) /*!< request has Route address for next hop */ +#define FL_USE_OTCPID (1<<26) /*!< request to be routed using outboud tcp con id */ /* WARNING: Value (1 << 28) is reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:8801ee89: core: parser - removed temporarily remark for module reserved internal flags
by Daniel-Constantin Mierla 31 Mar '20

31 Mar '20

Module: kamailio Branch: master Commit: 8801ee89856d4a37709869a5c01dfa66988b8f5a URL: https://github.com/kamailio/kamailio/commit/8801ee89856d4a37709869a5c01dfa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-31T09:11:40+02:00 core: parser - removed temporarily remark for module reserved internal flags --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/8801ee89856d4a37709869a5c01dfa6… Patch: https://github.com/kamailio/kamailio/commit/8801ee89856d4a37709869a5c01dfa6… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index ceedf2cda9..02bba6b1b9 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -111,16 +111,16 @@ typedef enum request_method { #define FL_SIPTRACE (1<<24) /*!< message to be traced in stateless replies */ #define FL_ROUTE_ADDR (1<<25) /*!< request has Route address for next hop */ -/* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control +/* WARNING: Value (1 << 28) is reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */ -/* WARNING: Value (1 << 29) is temporarily reserved for use in kamailio acc +/* WARNING: Value (1 << 29) is reserved for use in kamailio acc * module (flag FL_REQ_UPSTREAM)! */ -/* WARNING: Value (1 << 30) is temporarily reserved for use in kamailio +/* WARNING: Value (1 << 30) is reserved for use in kamailio * media proxy module (flag FL_USE_MEDIA_PROXY)! */ -/* WARNING: Value (1 << 31) is temporarily reserved for use in kamailio +/* WARNING: Value (1 << 31) is reserved for use in kamailio * nat_traversal module (flag FL_DO_KEEPALIVE)! */ #define FL_MTU_FB_MASK (FL_MTU_TCP_FB|FL_MTU_TLS_FB|FL_MTU_SCTP_FB)

1 0

[kamailio/kamailio] bugfix IMS_Rx dialog callback (#2263)
by annema-Kontron 31 Mar '20

31 Mar '20

ims_dialog bugfix for registering dialog callbacks ims_qos bugfix for Rx register dialog callback  #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches --> 5.3 - [x] Tested changes locally --> Tested locally based on 5.1.6 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  ims_dialog bugfix for registering dialog callbacks In Rx scenarios of parallel forking (several INVITEs with same CALLID and FROMTAG sent to PCSCF) and INVITE for orig and term handled in same PCSCF (means also INVITEs with identical CALLID and FROMTAG) the wrong dialog is selected for registering the callback (i.e. the callback for sending STR) when 200OK from terminator is processed. Root cause is that dialog is searched with callid-fromtag-totag but at the time of dialog insertion (processing of INVITE) no totag is available. fix is to get ctx dialog at 200OK processing before suspending the transaction - save dialog until AAA is received - use this dialog for registering the STR callback. ims_qos bugfix for Rx register dialog callback In some scenarios like parallel forking several INVITE with identical CALLID and FROMTAG sent to PCSCF which inserts dialogues for each INVITE. When 200OK is received in PCSCF the dialog callback must be registered for the respective dialog. Currently sometimes the wrong dialog is selected by searching with CALLID FROMTAG and TOTAG thus leading to problem no STR is sent at BYE. Fix is to pickup the right dialog before suspending the transaction during AAR/AAA processing and reuse this saved dialog after AAA reception for registering the dialog callback. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2263 -- Commit Summary -- * ims_dialog bugfix for registering dialog callbacks * ims_qos bugfix for Rx register dialog callback -- File Changes -- M src/modules/ims_dialog/dlg_cb.c (9) M src/modules/ims_dialog/dlg_cb.h (5) M src/modules/ims_dialog/dlg_handlers.c (1) M src/modules/ims_qos/ims_qos_mod.c (7) M src/modules/ims_qos/rx_aar.c (3) M src/modules/ims_qos/rx_aar.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2263.patch https://github.com/kamailio/kamailio/pull/2263.diff -- 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/pull/2263

4 10

git:5.2:91436c9f: ims_dialog: bugfix for registering dialog callbacks
by Henning Westerholt 30 Mar '20

30 Mar '20

Module: kamailio Branch: 5.2 Commit: 91436c9fc402f2038467a18ffa0aa00d1ade12a6 URL: https://github.com/kamailio/kamailio/commit/91436c9fc402f2038467a18ffa0aa00… Author: Peter Friedrich <peter.friedrich(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-30T19:09:26+02:00 ims_dialog: bugfix for registering dialog callbacks - bugfix for registering dialog callbacks - in Rx scenarios of parallel forking (several INVITEs with same CALLID and FROMTAG sent to PCSCF) and INVITE for orig and term handled in same PCSCF (means also INVITEs with identical CALLID and FROMTAG) the wrong dialog is selected for registering the callback (i.e. the callback for sending STR) when 200OK from terminator is processed. - Root cause is that dialog is searched with callid-fromtag-totag but at the time of dialog insertion (processing of INVITE) no totag is available. - fix is to get ctx dialog at 200OK processing before suspending the transaction - save dialog until AAA is received - use this dialog for registering the STR callback. (cherry picked from commit e2a1b967fd6e2cc92dc1447e1c033f6124aca446) --- Modified: src/modules/ims_dialog/dlg_cb.c Modified: src/modules/ims_dialog/dlg_cb.h Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/91436c9fc402f2038467a18ffa0aa00… Patch: https://github.com/kamailio/kamailio/commit/91436c9fc402f2038467a18ffa0aa00… --- diff --git a/src/modules/ims_dialog/dlg_cb.c b/src/modules/ims_dialog/dlg_cb.c index 1b7caa21ce..d4d0ee356c 100644 --- a/src/modules/ims_dialog/dlg_cb.c +++ b/src/modules/ims_dialog/dlg_cb.c @@ -100,15 +100,10 @@ void destroy_dlg_callbacks(unsigned int types) } } -int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, - int types, dialog_cb f, + +int register_dlgcb_nodlg(struct dlg_cell *dlg, int types, dialog_cb f, void *param, param_free_cb ff ) { - struct dlg_cell *dlg; - - unsigned int dir = DLG_DIR_NONE; - dlg = get_dlg(callid, ftag, ttag, &dir); //increments ref count! - if (!dlg) { LM_ERR("Can't find dialog to register callback\n"); return -1; diff --git a/src/modules/ims_dialog/dlg_cb.h b/src/modules/ims_dialog/dlg_cb.h index f0f9815c9c..13d76d5a74 100644 --- a/src/modules/ims_dialog/dlg_cb.h +++ b/src/modules/ims_dialog/dlg_cb.h @@ -51,8 +51,7 @@ typedef void (param_free_cb) (void *param); typedef int (*ims_register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, dialog_cb f, void *param, param_free_cb ff); -typedef int (*ims_register_dlgcb_nodlg_f)(str *callid, str *ftag, str *ttag, - int cb_types, dialog_cb f, void *param, param_free_cb ff); +typedef int (*ims_register_dlgcb_nodlg_f)(struct dlg_cell* dlg, int cb_types, dialog_cb f, void *param, param_free_cb ff); /* method to set a variable within a dialog */ //typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, @@ -103,7 +102,7 @@ void destroy_dlg_callbacks(unsigned int type); void destroy_dlg_callbacks_list(struct dlg_callback *cb); -int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, int types, dialog_cb f, void *param, param_free_cb ff ); +int register_dlgcb_nodlg(struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff); int register_dlgcb( struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff); void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg); diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index b0f5b491bb..3d8dee7ff3 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -1965,4 +1965,3 @@ struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg) { return dlg; } -

1 0

git:5.2:a1137979: ims_qos: bugfix for Rx register dialog callback
by Henning Westerholt 30 Mar '20

30 Mar '20

Module: kamailio Branch: 5.2 Commit: a11379790d1477c789fb72360bf2d5a23197fdd5 URL: https://github.com/kamailio/kamailio/commit/a11379790d1477c789fb72360bf2d5a… Author: Peter Friedrich <peter.friedrich(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-30T19:09:31+02:00 ims_qos: bugfix for Rx register dialog callback - bugfix for Rx register dialog callback - In some scenarios like parallel forking several INVITE with identical CALLID and FROMTAG sent to PCSCF which inserts dialogues for each INVITE. - When 200OK is received in PCSCF the dialog callback must be registered for the respective dialog. Currently sometimes the wrong dialog is selected by searching with CALLID FROMTAG and TOTAG thus leading to problem no STR is sent at BYE. - Fix is to pickup the right dialog before suspending the transaction during AAR/AAA processing and reuse this saved dialog. (cherry picked from commit 2768f8ce1cf6da242674e7e40c8e76eb6c630f6b) --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_aar.h --- Diff: https://github.com/kamailio/kamailio/commit/a11379790d1477c789fb72360bf2d5a… Patch: https://github.com/kamailio/kamailio/commit/a11379790d1477c789fb72360bf2d5a… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 6f68b39be1..11a2e30df5 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -1085,6 +1085,13 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int saved_t_data->aar_update = 1; //this is an update aar - we set this so on async_aar we know this is an update and act accordingly } + dlg = dlgb.get_dlg(msg); + if (!dlg) { + LM_ERR("Unable to find dialog and cannot do Rx without it\n"); + goto error; + } + saved_t_data->dlg = dlg; + LM_DBG("Suspending SIP TM transaction\n"); if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 684f3a75c5..3fa9633fb5 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -176,8 +176,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps passed_rx_session_id->len = 0; STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); - - dlgb.register_dlgcb_nodlg(&data->callid, &data->ftag, &data->ttag, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); } result = CSCF_RETURN_TRUE; } else { diff --git a/src/modules/ims_qos/rx_aar.h b/src/modules/ims_qos/rx_aar.h index f12def162f..596e0726c6 100644 --- a/src/modules/ims_qos/rx_aar.h +++ b/src/modules/ims_qos/rx_aar.h @@ -72,6 +72,7 @@ typedef struct saved_transaction { str ftag; str ttag; unsigned int aar_update; + struct dlg_cell* dlg; } saved_transaction_t; typedef struct saved_transaction_local {

1 0

git:5.3:46ad9e6d: ims_qos: bugfix for Rx register dialog callback
by Henning Westerholt 30 Mar '20

30 Mar '20

Module: kamailio Branch: 5.3 Commit: 46ad9e6dacb7b6040e50ba0c53d72585510dac28 URL: https://github.com/kamailio/kamailio/commit/46ad9e6dacb7b6040e50ba0c53d7258… Author: Peter Friedrich <peter.friedrich(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-30T19:08:31+02:00 ims_qos: bugfix for Rx register dialog callback - bugfix for Rx register dialog callback - In some scenarios like parallel forking several INVITE with identical CALLID and FROMTAG sent to PCSCF which inserts dialogues for each INVITE. - When 200OK is received in PCSCF the dialog callback must be registered for the respective dialog. Currently sometimes the wrong dialog is selected by searching with CALLID FROMTAG and TOTAG thus leading to problem no STR is sent at BYE. - Fix is to pickup the right dialog before suspending the transaction during AAR/AAA processing and reuse this saved dialog. (cherry picked from commit 2768f8ce1cf6da242674e7e40c8e76eb6c630f6b) --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_aar.h --- Diff: https://github.com/kamailio/kamailio/commit/46ad9e6dacb7b6040e50ba0c53d7258… Patch: https://github.com/kamailio/kamailio/commit/46ad9e6dacb7b6040e50ba0c53d7258… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 7e0d50b2df..24a7a14531 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -1089,6 +1089,13 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int saved_t_data->aar_update = 1; //this is an update aar - we set this so on async_aar we know this is an update and act accordingly } + dlg = dlgb.get_dlg(msg); + if (!dlg) { + LM_ERR("Unable to find dialog and cannot do Rx without it\n"); + goto error; + } + saved_t_data->dlg = dlg; + LM_DBG("Suspending SIP TM transaction\n"); if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 2029035415..b1e8df51b8 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -176,8 +176,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps passed_rx_session_id->len = 0; STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); - - dlgb.register_dlgcb_nodlg(&data->callid, &data->ftag, &data->ttag, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); } result = CSCF_RETURN_TRUE; } else { diff --git a/src/modules/ims_qos/rx_aar.h b/src/modules/ims_qos/rx_aar.h index 10fa2cc059..550202fa40 100644 --- a/src/modules/ims_qos/rx_aar.h +++ b/src/modules/ims_qos/rx_aar.h @@ -72,6 +72,7 @@ typedef struct saved_transaction { str ftag; str ttag; unsigned int aar_update; + struct dlg_cell* dlg; } saved_transaction_t; typedef struct saved_transaction_local {

1 0

git:5.3:8cee1675: ims_dialog: bugfix for registering dialog callbacks
by Henning Westerholt 30 Mar '20

30 Mar '20

Module: kamailio Branch: 5.3 Commit: 8cee1675e95363462d20cdc2b8aaac1a6976eb9c URL: https://github.com/kamailio/kamailio/commit/8cee1675e95363462d20cdc2b8aaac1… Author: Peter Friedrich <peter.friedrich(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-30T19:08:17+02:00 ims_dialog: bugfix for registering dialog callbacks - bugfix for registering dialog callbacks - in Rx scenarios of parallel forking (several INVITEs with same CALLID and FROMTAG sent to PCSCF) and INVITE for orig and term handled in same PCSCF (means also INVITEs with identical CALLID and FROMTAG) the wrong dialog is selected for registering the callback (i.e. the callback for sending STR) when 200OK from terminator is processed. - Root cause is that dialog is searched with callid-fromtag-totag but at the time of dialog insertion (processing of INVITE) no totag is available. - fix is to get ctx dialog at 200OK processing before suspending the transaction - save dialog until AAA is received - use this dialog for registering the STR callback. (cherry picked from commit e2a1b967fd6e2cc92dc1447e1c033f6124aca446) --- Modified: src/modules/ims_dialog/dlg_cb.c Modified: src/modules/ims_dialog/dlg_cb.h Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/8cee1675e95363462d20cdc2b8aaac1… Patch: https://github.com/kamailio/kamailio/commit/8cee1675e95363462d20cdc2b8aaac1… --- diff --git a/src/modules/ims_dialog/dlg_cb.c b/src/modules/ims_dialog/dlg_cb.c index 1b7caa21ce..d4d0ee356c 100644 --- a/src/modules/ims_dialog/dlg_cb.c +++ b/src/modules/ims_dialog/dlg_cb.c @@ -100,15 +100,10 @@ void destroy_dlg_callbacks(unsigned int types) } } -int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, - int types, dialog_cb f, + +int register_dlgcb_nodlg(struct dlg_cell *dlg, int types, dialog_cb f, void *param, param_free_cb ff ) { - struct dlg_cell *dlg; - - unsigned int dir = DLG_DIR_NONE; - dlg = get_dlg(callid, ftag, ttag, &dir); //increments ref count! - if (!dlg) { LM_ERR("Can't find dialog to register callback\n"); return -1; diff --git a/src/modules/ims_dialog/dlg_cb.h b/src/modules/ims_dialog/dlg_cb.h index f0f9815c9c..13d76d5a74 100644 --- a/src/modules/ims_dialog/dlg_cb.h +++ b/src/modules/ims_dialog/dlg_cb.h @@ -51,8 +51,7 @@ typedef void (param_free_cb) (void *param); typedef int (*ims_register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, dialog_cb f, void *param, param_free_cb ff); -typedef int (*ims_register_dlgcb_nodlg_f)(str *callid, str *ftag, str *ttag, - int cb_types, dialog_cb f, void *param, param_free_cb ff); +typedef int (*ims_register_dlgcb_nodlg_f)(struct dlg_cell* dlg, int cb_types, dialog_cb f, void *param, param_free_cb ff); /* method to set a variable within a dialog */ //typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, @@ -103,7 +102,7 @@ void destroy_dlg_callbacks(unsigned int type); void destroy_dlg_callbacks_list(struct dlg_callback *cb); -int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, int types, dialog_cb f, void *param, param_free_cb ff ); +int register_dlgcb_nodlg(struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff); int register_dlgcb( struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff); void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg); diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index b0f5b491bb..3d8dee7ff3 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -1965,4 +1965,3 @@ struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg) { return dlg; } -

1 0

git:master:2768f8ce: ims_qos: bugfix for Rx register dialog callback
by Henning Westerholt 30 Mar '20

30 Mar '20

Module: kamailio Branch: master Commit: 2768f8ce1cf6da242674e7e40c8e76eb6c630f6b URL: https://github.com/kamailio/kamailio/commit/2768f8ce1cf6da242674e7e40c8e76e… Author: Peter Friedrich <peter.friedrich(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-30T19:02:29+02:00 ims_qos: bugfix for Rx register dialog callback - bugfix for Rx register dialog callback - In some scenarios like parallel forking several INVITE with identical CALLID and FROMTAG sent to PCSCF which inserts dialogues for each INVITE. - When 200OK is received in PCSCF the dialog callback must be registered for the respective dialog. Currently sometimes the wrong dialog is selected by searching with CALLID FROMTAG and TOTAG thus leading to problem no STR is sent at BYE. - Fix is to pickup the right dialog before suspending the transaction during AAR/AAA processing and reuse this saved dialog. --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_aar.h --- Diff: https://github.com/kamailio/kamailio/commit/2768f8ce1cf6da242674e7e40c8e76e… Patch: https://github.com/kamailio/kamailio/commit/2768f8ce1cf6da242674e7e40c8e76e… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index c2e2ae06a1..e58dd2c140 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -1095,6 +1095,13 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int saved_t_data->aar_update = 1; //this is an update aar - we set this so on async_aar we know this is an update and act accordingly } + dlg = dlgb.get_dlg(msg); + if (!dlg) { + LM_ERR("Unable to find dialog and cannot do Rx without it\n"); + goto error; + } + saved_t_data->dlg = dlg; + LM_DBG("Suspending SIP TM transaction\n"); if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 2029035415..b1e8df51b8 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -176,8 +176,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps passed_rx_session_id->len = 0; STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); - - dlgb.register_dlgcb_nodlg(&data->callid, &data->ftag, &data->ttag, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); } result = CSCF_RETURN_TRUE; } else { diff --git a/src/modules/ims_qos/rx_aar.h b/src/modules/ims_qos/rx_aar.h index 10fa2cc059..550202fa40 100644 --- a/src/modules/ims_qos/rx_aar.h +++ b/src/modules/ims_qos/rx_aar.h @@ -72,6 +72,7 @@ typedef struct saved_transaction { str ftag; str ttag; unsigned int aar_update; + struct dlg_cell* dlg; } saved_transaction_t; typedef struct saved_transaction_local {

1 0

git:master:e2a1b967: ims_dialog: bugfix for registering dialog callbacks
by Henning Westerholt 30 Mar '20

30 Mar '20

Module: kamailio Branch: master Commit: e2a1b967fd6e2cc92dc1447e1c033f6124aca446 URL: https://github.com/kamailio/kamailio/commit/e2a1b967fd6e2cc92dc1447e1c033f6… Author: Peter Friedrich <peter.friedrich(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-30T19:00:58+02:00 ims_dialog: bugfix for registering dialog callbacks - bugfix for registering dialog callbacks - in Rx scenarios of parallel forking (several INVITEs with same CALLID and FROMTAG sent to PCSCF) and INVITE for orig and term handled in same PCSCF (means also INVITEs with identical CALLID and FROMTAG) the wrong dialog is selected for registering the callback (i.e. the callback for sending STR) when 200OK from terminator is processed. - Root cause is that dialog is searched with callid-fromtag-totag but at the time of dialog insertion (processing of INVITE) no totag is available. - fix is to get ctx dialog at 200OK processing before suspending the transaction - save dialog until AAA is received - use this dialog for registering the STR callback. --- Modified: src/modules/ims_dialog/dlg_cb.c Modified: src/modules/ims_dialog/dlg_cb.h Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/e2a1b967fd6e2cc92dc1447e1c033f6… Patch: https://github.com/kamailio/kamailio/commit/e2a1b967fd6e2cc92dc1447e1c033f6… --- diff --git a/src/modules/ims_dialog/dlg_cb.c b/src/modules/ims_dialog/dlg_cb.c index 1b7caa21ce..d4d0ee356c 100644 --- a/src/modules/ims_dialog/dlg_cb.c +++ b/src/modules/ims_dialog/dlg_cb.c @@ -100,15 +100,10 @@ void destroy_dlg_callbacks(unsigned int types) } } -int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, - int types, dialog_cb f, + +int register_dlgcb_nodlg(struct dlg_cell *dlg, int types, dialog_cb f, void *param, param_free_cb ff ) { - struct dlg_cell *dlg; - - unsigned int dir = DLG_DIR_NONE; - dlg = get_dlg(callid, ftag, ttag, &dir); //increments ref count! - if (!dlg) { LM_ERR("Can't find dialog to register callback\n"); return -1; diff --git a/src/modules/ims_dialog/dlg_cb.h b/src/modules/ims_dialog/dlg_cb.h index f0f9815c9c..13d76d5a74 100644 --- a/src/modules/ims_dialog/dlg_cb.h +++ b/src/modules/ims_dialog/dlg_cb.h @@ -51,8 +51,7 @@ typedef void (param_free_cb) (void *param); typedef int (*ims_register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, dialog_cb f, void *param, param_free_cb ff); -typedef int (*ims_register_dlgcb_nodlg_f)(str *callid, str *ftag, str *ttag, - int cb_types, dialog_cb f, void *param, param_free_cb ff); +typedef int (*ims_register_dlgcb_nodlg_f)(struct dlg_cell* dlg, int cb_types, dialog_cb f, void *param, param_free_cb ff); /* method to set a variable within a dialog */ //typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, @@ -103,7 +102,7 @@ void destroy_dlg_callbacks(unsigned int type); void destroy_dlg_callbacks_list(struct dlg_callback *cb); -int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, int types, dialog_cb f, void *param, param_free_cb ff ); +int register_dlgcb_nodlg(struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff); int register_dlgcb( struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff); void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg); diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index b0f5b491bb..3d8dee7ff3 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -1965,4 +1965,3 @@ struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg) { return dlg; } -

1 0

git:5.3:40586f8a: tm: do not set msg tcp connection id in the dst info
by Daniel-Constantin Mierla 30 Mar '20

30 Mar '20

Module: kamailio Branch: 5.3 Commit: 40586f8a61a27cc25df6c4bffff60205617eba88 URL: https://github.com/kamailio/kamailio/commit/40586f8a61a27cc25df6c4bffff6020… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-30T10:23:22+02:00 tm: do not set msg tcp connection id in the dst info (cherry picked from commit 974c50aea6b581b5f8545f3d710e98b53d44bd67) --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/40586f8a61a27cc25df6c4bffff6020… Patch: https://github.com/kamailio/kamailio/commit/40586f8a61a27cc25df6c4bffff6020… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index 0e484d9ebf..ee06bedf43 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -285,7 +285,6 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, if ( p_msg->REQ_METHOD==METHOD_ACK) { LM_DBG("forwarding ACK statelessly\n"); init_dest_info(&dst); - dst.id = p_msg->otcpid; if (proxy==0) { dst.proto=proto; if (get_uri_send_info(GET_NEXT_HOP(p_msg), &host, &port, diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 81a0f20841..83f22ebf0d 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1673,7 +1673,6 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, if (t->flags & T_CANCELED) goto canceled; if (branch_ret>=0) { added_branches |= 1<<branch_ret; - t->uac[branch_ret].request.dst.id = p_msg->otcpid; } else { lowest_ret=MIN_int(lowest_ret, branch_ret); } @@ -1700,7 +1699,6 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, * branch result */ if (branch_ret>=0) { added_branches |= 1<<branch_ret; - t->uac[branch_ret].request.dst.id = obranch.otcpid; } else { lowest_ret=MIN_int(lowest_ret, branch_ret); }

1 0

git:5.3:2b8bf4fe: core: do not set msg tcp connection id in the dst info
by Daniel-Constantin Mierla 30 Mar '20

30 Mar '20

Module: kamailio Branch: 5.3 Commit: 2b8bf4fee656242eddc9bbc45bdb234d96eb518a URL: https://github.com/kamailio/kamailio/commit/2b8bf4fee656242eddc9bbc45bdb234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-30T10:23:12+02:00 core: do not set msg tcp connection id in the dst info (cherry picked from commit f9eaa1298f7263be53b709ab7b68336d09e9de0b) --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/2b8bf4fee656242eddc9bbc45bdb234… Patch: https://github.com/kamailio/kamailio/commit/2b8bf4fee656242eddc9bbc45bdb234… --- diff --git a/src/core/action.c b/src/core/action.c index 8211cf00f7..1520f87877 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -385,13 +385,11 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) #ifdef USE_TCP else if (a->type==FORWARD_TCP_T) { dst.proto= PROTO_TCP; - dst.id = msg->otcpid; } #endif #ifdef USE_TLS else if (a->type==FORWARD_TLS_T) { dst.proto= PROTO_TLS; - dst.id = msg->otcpid; } #endif #ifdef USE_SCTP

1 0

git:master:974c50ae: tm: do not set msg tcp connection id in the dst info
by Daniel-Constantin Mierla 30 Mar '20

30 Mar '20

Module: kamailio Branch: master Commit: 974c50aea6b581b5f8545f3d710e98b53d44bd67 URL: https://github.com/kamailio/kamailio/commit/974c50aea6b581b5f8545f3d710e98b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-30T10:19:29+02:00 tm: do not set msg tcp connection id in the dst info --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/974c50aea6b581b5f8545f3d710e98b… Patch: https://github.com/kamailio/kamailio/commit/974c50aea6b581b5f8545f3d710e98b… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index 0e484d9ebf..ee06bedf43 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -285,7 +285,6 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, if ( p_msg->REQ_METHOD==METHOD_ACK) { LM_DBG("forwarding ACK statelessly\n"); init_dest_info(&dst); - dst.id = p_msg->otcpid; if (proxy==0) { dst.proto=proto; if (get_uri_send_info(GET_NEXT_HOP(p_msg), &host, &port, diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 81a0f20841..83f22ebf0d 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1673,7 +1673,6 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, if (t->flags & T_CANCELED) goto canceled; if (branch_ret>=0) { added_branches |= 1<<branch_ret; - t->uac[branch_ret].request.dst.id = p_msg->otcpid; } else { lowest_ret=MIN_int(lowest_ret, branch_ret); } @@ -1700,7 +1699,6 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, * branch result */ if (branch_ret>=0) { added_branches |= 1<<branch_ret; - t->uac[branch_ret].request.dst.id = obranch.otcpid; } else { lowest_ret=MIN_int(lowest_ret, branch_ret); }

1 0

git:master:f9eaa129: core: do not set msg tcp connection id in the dst info
by Daniel-Constantin Mierla 30 Mar '20

30 Mar '20

Module: kamailio Branch: master Commit: f9eaa1298f7263be53b709ab7b68336d09e9de0b URL: https://github.com/kamailio/kamailio/commit/f9eaa1298f7263be53b709ab7b68336… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-30T10:19:29+02:00 core: do not set msg tcp connection id in the dst info --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/f9eaa1298f7263be53b709ab7b68336… Patch: https://github.com/kamailio/kamailio/commit/f9eaa1298f7263be53b709ab7b68336… --- diff --git a/src/core/action.c b/src/core/action.c index 633a38da16..cfb1bf934b 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -385,13 +385,11 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) #ifdef USE_TCP else if (a->type==FORWARD_TCP_T) { dst.proto= PROTO_TCP; - dst.id = msg->otcpid; } #endif #ifdef USE_TLS else if (a->type==FORWARD_TLS_T) { dst.proto= PROTO_TLS; - dst.id = msg->otcpid; } #endif #ifdef USE_SCTP

1 0

Transaction Matching Failed ACK & BYE
by egemen ulus 30 Mar '20

30 Mar '20

Hi All, I'm trying to establish a topology with Kamailio which is located between Asterisk and Outside. My issue is "transaction matching failed" (t_check_trans failed). That means Kamailio does not recognise ACK & BYE message to forwards. I had a check on email list and google but found nothing. I'm using it with record_route. SIP signalling and part of kamailio.cfg is below. Is there any suggestion? route[WITHINDLG] { if (!has_totag()) return; if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { xlog("ack is came: $si:$sp\n"); route(NATMANAGE); } else if ( is_method("NOTIFY") ) { record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { route(PRESENCE); exit; } if ( is_method("ACK") ) { if ( t_check_trans() ) { route(RELAY); exit; } else { exit; } } sl_send_reply("404","Not here"); exit; } route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } route(RTPPROXY); if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } #!endif return; } Asterisk > Kamailio INVITE sip:user@outside_ip SIP/2.0 Via: SIP/2.0/UDP asterisk_ip:5060;branch=z9hG4bK1b56cce0 Max-Forwards: 70 From: "KUYRUK" <sip:0553847<tel:+10553847>aaaa@asterisk_ip>;tag=as3dde7cdb To: <sip:user@outside_ip> Contact: <sip:0553847<tel:+10553847>aaaa@asterisk_ip:5060> Call-ID: 62a480bf71d2a1aa0ec94b454cd98945@asterisk_ip:5060 CSeq: 102 INVITE User-Agent: Asterisk PBX 1.8.32.3 Kamailio > Outside INVITE sip:user@outside_ip SIP/2.0 Record-Route: <sip:kamailio_ip;lr;nat=yes> Via: SIP/2.0/UDP kamailio_ip;branch=z9hG4bK7b3f.8e4716eeea4b0dc45cc51d21b5aded57.0 Via: SIP/2.0/UDP asterisk_ip:5060;rport=5060;branch=z9hG4bK1b56cce0 From: "KUYRUK" <sip:0553847<tel:+10553847>aaaa@asterisk_ip>;tag=as3dde7cdb To: <sip:user@outside_ip> Contact: <sip:0553847<tel:+10553847>aaaa@asterisk_ip:5060;alias=asterisk_ip~5060~1> Call-ID: 62a480bf71d2a1aa0ec94b454cd98945@asterisk_ip:5060 CSeq: 102 INVITE User-Agent: Asterisk PBX 1.8.32.3 Outside > Kamailio SIP/2.0 200 OK Via: SIP/2.0/UDP kamailio_ip;branch=z9hG4bK7b3f.8e4716eeea4b0dc45cc51d21b5aded57.0 Via: SIP/2.0/UDP asterisk_ip:5060;rport=5060;branch=z9hG4bK1b56cce0 From: "KUYRUK" <sip:0553847<tel:+10553847>aaaa@asterisk_ip>;tag=as3dde7cdb To: <sip:user@outside_ip>;tag=kv8iml6ur9 Call-ID: 62a480bf71d2a1aa0ec94b454cd98945@asterisk_ip:5060 CSeq: 102 INVITE Record-Route: <sip:kamailio_ip;lr;nat=yes> Contact: <sip:user@outside_ip:5060;alias=x.x.x.x~18005~6;transport=udp> Kamailio > Asterisk SIP/2.0 200 OK Via: SIP/2.0/UDP asterisk_ip:5060;rport=5060;branch=z9hG4bK1b56cce0 From: "KUYRUK" <sip:0553847<tel:+10553847>aaaa@asterisk_ip>;tag=as3dde7cdb To: <sip:user@outside_ip>;tag=kv8iml6ur9 Call-ID: 62a480bf71d2a1aa0ec94b454cd98945@asterisk_ip:5060 CSeq: 102 INVITE Record-Route: <sip:kamailio_ip;lr;nat=yes> Contact: <sip:user@outside_ip:5060;alias=x.x.x.x~18005~6;transport=udp> Asterisk > Kamailio THIS ACK IS NOT ROUTED TO OUTSIDE BY KAMAILIO!! ACK sip:user@outside_ip:5060;alias=x.x.x.x~18005~6;transport=udp SIP/2.0 Via: SIP/2.0/UDP asterisk_ip:5060;branch=z9hG4bK73366924 Route: <sip:kamailio_ip;lr;nat=yes> From: "KUYRUK" <sip:0553847<tel:+10553847>aaaa@asterisk_ip>;tag=as3dde7cdb To: <sip:user@outside_ip>;tag=kv8iml6ur9 Contact: <sip:0553847<tel:+10553847>aaaa@asterisk_ip:5060> Call-ID: 62a480bf71d2a1aa0ec94b454cd98945@asterisk_ip:5060 CSeq: 102 ACK User-Agent: Asterisk PBX 1.8.32.3 Get Outlook for Android<https://aka.ms/ghei36>

2 1

git:master:b505a4df: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 29 Mar '20

29 Mar '20

Module: kamailio Branch: master Commit: b505a4df46c241f8676f663ddcdddba935c0b3e4 URL: https://github.com/kamailio/kamailio/commit/b505a4df46c241f8676f663ddcdddba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-29T17:31:14+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/b505a4df46c241f8676f663ddcdddba… Patch: https://github.com/kamailio/kamailio/commit/b505a4df46c241f8676f663ddcdddba… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 5ec1281c47..ac3a6b7bb6 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1166,9 +1166,9 @@ modparam("usrloc", "ka_filter", 1) 3.55. ka_loglevel (int) The level to print the log message when the keepalive response is - received. It should be a value between LOG_ALERT + received. It should be a value between -5 (L_ALERT) and 3 (L_DBG). - Default value is “kamailio.org”. + Default value is “255” (disabled). Example 1.55. ka_loglevel parameter usage ... @@ -1185,11 +1185,11 @@ modparam("usrloc", "ka_loglevel", 1) The value of this parameter can contain script variables that are evaluated with the SIP response. - Default value is “ to-uri: [$tu] src-uri: [$su]”. + Default value is “ to-uri: [$tu] remote-addr: [$sas]”. Example 1.56. ka_logmsg parameter usage ... -modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ... 4. RPC Commands

1 0

git:master:8525a26f: usrloc: default keepalive log message prints remote address in socket format
by Daniel-Constantin Mierla 29 Mar '20

29 Mar '20

Module: kamailio Branch: master Commit: 8525a26fa60c70035df22495ecf309d01019d093 URL: https://github.com/kamailio/kamailio/commit/8525a26fa60c70035df22495ecf309d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T17:25:28+02:00 usrloc: default keepalive log message prints remote address in socket format - more compact than sip uri format --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8525a26fa60c70035df22495ecf309d… Patch: https://github.com/kamailio/kamailio/commit/8525a26fa60c70035df22495ecf309d… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 8d3cfffdbf..dfc0bc5141 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -124,7 +124,7 @@ str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; int ul_ka_loglevel = 255; -str ul_ka_logmsg = str_init(" to-uri: [$tu] src-uri: [$su]"); +str ul_ka_logmsg = str_init(" to-uri: [$tu] remote-addr: [$sas]"); pv_elem_t *ul_ka_logfmt = NULL; /* sruid to get internal uid for mi/rpc commands */

1 0

git:master:c3a8a97d: usrloc: docs - updates for ka_loglevel and ka_logmsg params
by Daniel-Constantin Mierla 29 Mar '20

29 Mar '20

Module: kamailio Branch: master Commit: c3a8a97d235b2399994c191a7b289bd943ce6388 URL: https://github.com/kamailio/kamailio/commit/c3a8a97d235b2399994c191a7b289bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T17:30:03+02:00 usrloc: docs - updates for ka_loglevel and ka_logmsg params --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c3a8a97d235b2399994c191a7b289bd… Patch: https://github.com/kamailio/kamailio/commit/c3a8a97d235b2399994c191a7b289bd… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index a6d9654d51..396d89828d 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1428,10 +1428,10 @@ modparam("usrloc", "ka_filter", 1) <title><varname>ka_loglevel</varname> (int)</title> <para> The level to print the log message when the keepalive response is - received. It should be a value between LOG_ALERT + received. It should be a value between -5 (L_ALERT) and 3 (L_DBG). </para> <para> - Default value is <quote>kamailio.org</quote>. + Default value is <quote>255</quote> (disabled). </para> <example> <title><varname>ka_loglevel</varname> parameter usage</title> @@ -1456,13 +1456,13 @@ modparam("usrloc", "ka_loglevel", 1) evaluated with the SIP response. </para> <para> - Default value is <quote> to-uri: [$tu] src-uri: [$su]</quote>. + Default value is <quote> to-uri: [$tu] remote-addr: [$sas]</quote>. </para> <example> <title><varname>ka_logmsg</varname> parameter usage</title> <programlisting format="linespecific"> ... -modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ... </programlisting> </example>

1 0

[kamailio/kamailio] Kamailio breaks RFC's 'Contact Header' (#2266)
by ObakeFilter 29 Mar '20

29 Mar '20

### Description I'm running Kamailio 5.2.0, whenever I relay an invite via Kamailio, my original contact header is changed from the original: <sip:+XXXXXXXXX@YYY.YYY.YYY.YYYY:5060;transport=udp;gw=netvision> To <sip:YYY.YYY.YYY.YYY;line=sr-.n274i0TMfsHMcCAlVyAMV5IlgCXvV8n4edQlgIUlgKQ4Vk74gI1LmZ69NM79FZAR3JC.cDNLfHUj3Wnp3MP9nd*>. Even when I set it correctly on my route, using: remove_hf("Contact"); append_hf("Contact: <sip:$tU@YYY.YYY.YYY.YYY:5060;transport=udp;gw=netvision>\r\n", "Contact"); It still ends up being modified. What can I do to keep the contact header as it is?  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` U YYY.YYY.YYY.YYY:5060 -> 81.24.193.248:5060 INVITE sip:+442033202609@81.24.193.248:5060 SIP/2.0. Record-Route: <sip:YYY.YYY.YYY.YYY;r2=on;lr=on;ftag=mp0S9yH11vryH;vsf=AAAAAAAAAAAAAAAAAAAAAAADCAEACRgPGB8AAy4xNjM->. Record-Route: <sip:2YYY.YYY.YYY.YYY;line=sr-.n274V8TlidQMVyUlg87vV8nlfDXlVHB9VD0.VHB9VDoLGtNRbH7ltlTEkyQl3jXEky1LNMoRkt5ukt5ukt5ukt5ukt5ukt5ukt5ukt5W8M5WktckoLuWAsduktTMm64pCAD>. Via: SIP/2.0/UDP YYY.YYY.YYY.YYY;branch=z9hG4bK53e9.308596b23ed683368534c9d609dce0f6.0. Via: SIP/2.0/UDP YYY.YYY.YYY.YYY;branch=z9hG4bKsr-kA2uvfsUlerJWtIylgCXvV8n4edQlgIUlgKQ4Vk74gI1.oJVjb2njburlgCXvV8n4edQlgIUlgKQ4HWsRbWPLVDX.GrXLcAHlcC74nZXKbTVpcHh4b6mMGZvJgLsLcJTkgtGu2PGgy**. Max-Forwards: 67. From: +18702935016 <sip:+18702935016@YYY.YYY.YYY.YYY>;tag=mp0S9yH11vryH. To: <sip:+442033202609@81.24.193.248>. Call-ID: !!:jbkfMgyHjbsDjblfjqAQlVldvgyHKolDlcIHlcknKVIdjcIT. CSeq: 18182498 INVITE. Contact: <sip:YYY.YYY.YYY.YYY;line=sr-.n274i0TMfsHMcCAlVyAMV5IlgCXvV8n4edQlgIUlgKQ4Vk74gI1LmZ69NM79FZAR3JC.cDNLfHUj3Wnp3MP9nd*>. User-Agent: FreeSWITCH-mod_sofia/1.9.0+git~20180706T160334Z~de3df8dc0e~64bit. Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY. Supported: timer, path, replaces. Allow-Events: talk, hold, conference, refer. Content-Type: application/sdp. Content-Disposition: session. Content-Length: 224. Remote-Party-ID: "+18702935016" <sip:+18702935016@YYY.YYY.YYY.YYY>;party=calling;screen=yes;privacy=off. .. v=0. o=FreeSWITCH 1585439298 1585439299 IN IP4 ZZZ.ZZZ.ZZZ.ZZZ. s=FreeSWITCH. c=IN IP4 ZZZ.ZZZ ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.0-dev6 (x86_64/linux) c4daee flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c4daee compiled on 15:59:42 Aug 22 2018 with gcc 5.4.0 ``` * **Operating System**:  ``` Linux version 4.4.0-98-generic (buildd@lcy01-03) (gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4) ) #121-Ubuntu SMP Tue Oct 10 14:24:03 UTC 2017 Linux kamaillioegress 4.4.0-98-generic #121-Ubuntu SMP Tue Oct 10 14:24:03 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2266

2 2

master xml warnings
by Juha Heinanen 29 Mar '20

29 Mar '20

version.xml:14: namespace error : Namespace prefix db on para is not defined <db:para> ^

3 3

git:master:367a865e: lib/srdb1/schema: removed kamailio-extensions.xml file
by Daniel-Constantin Mierla 29 Mar '20

29 Mar '20

Module: kamailio Branch: master Commit: 367a865e7f0c9cd67fda9176add1ca3c0dad2d46 URL: https://github.com/kamailio/kamailio/commit/367a865e7f0c9cd67fda9176add1ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T14:17:19+02:00 lib/srdb1/schema: removed kamailio-extensions.xml file - file didn't have any content itself, tried to include an inexistent extra.xml, which generated an warning for 'make dbschema' --- Removed: src/lib/srdb1/schema/kamailio-extensions.xml --- Diff: https://github.com/kamailio/kamailio/commit/367a865e7f0c9cd67fda9176add1ca3… Patch: https://github.com/kamailio/kamailio/commit/367a865e7f0c9cd67fda9176add1ca3… --- diff --git a/src/lib/srdb1/schema/kamailio-extensions.xml b/src/lib/srdb1/schema/kamailio-extensions.xml deleted file mode 100644 index f4a0aec097..0000000000 --- a/src/lib/srdb1/schema/kamailio-extensions.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" - "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ - - <!ENTITY % entities SYSTEM "entities.xml"> - %entities; -]> - - - -<database xmlns:xi="http://www.w3.org/2001/XInclude"> - <name>CUSTOM Extensions</name> -  - <xi:include href="extra.xml"> - <xi:fallback/> - </xi:include> -  -  -</database>

1 0

master compiler warnings
by Juha Heinanen 29 Mar '20

29 Mar '20

CC (gcc) [M usrloc.so] ul_keepalive.o ul_keepalive.c: In function 'ul_ka_urecord': ul_keepalive.c:61:18: warning: format '%x' expects argument of type 'unsigned int', but argument 26 has type '__suseconds_t' {aka 'long int'} [-Wformat=] #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ ^~~~~~~~~~~~~~~~~~~~~~~ ul_keepalive.c:193:50: note: in expansion of macro 'ULKA_MSG' kabuf_len = snprintf(kabuf, ULKA_BUF_SIZE - 1, ULKA_MSG, ^~~~~~~~ ul_keepalive.c:64:34: note: format string is defined here "From: <%.*s>;tag=%.*s-%x-%lx-%x-%x.%x\r\n" \ ~^ %lx In file included from ul_keepalive.c:30: ul_keepalive.c: In function 'ul_ka_reply_received': ../../core/dprint.h:316:24: warning: format '%u' expects argument of type 'unsigned int', but argument 11 has type '__suseconds_t' {aka 'long int'} [-Wformat=] fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/dprint.h:340:4: note: in expansion of macro 'LOG_FX' LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) ^~~~~~ ../../core/dprint.h:346:4: note: in expansion of macro 'LOG_FL' LOG_FL(facility, level, NULL, prefix, fmt, ## args) ^~~~~~ ../../core/dprint.h:349:4: note: in expansion of macro 'LOG_FP' LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) ^~~~~~ ../../core/dprint.h:396:32: note: in expansion of macro 'LOG' # define DBG(fmt, args...) LOG(L_DBG, fmt , ## args) ^~~ ../../core/dprint.h:400:30: note: in expansion of macro 'DBG' # define DEBUG(fmt, args...) DBG(fmt , ## args) ^~~ ../../core/dprint.h:417:16: note: in expansion of macro 'DEBUG' #define LM_DBG DEBUG ^~~~~ ul_keepalive.c:366:2: note: in expansion of macro 'LM_DBG' LM_DBG("tv usec is [%u]\n", tvm.tv_usec); ^~~~~~ ul_keepalive.c:366:23: note: format string is defined here LM_DBG("tv usec is [%u]\n", tvm.tv_usec); ~^ %lu

2 2

git:master:ea2d21c2: usrloc: cast to get rid of warnings for different OSes in keepalive printing
by Daniel-Constantin Mierla 29 Mar '20

29 Mar '20

Module: kamailio Branch: master Commit: ea2d21c2bb53ffa54d4fedcdd1d582707c654da6 URL: https://github.com/kamailio/kamailio/commit/ea2d21c2bb53ffa54d4fedcdd1d5827… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T12:41:32+02:00 usrloc: cast to get rid of warnings for different OSes in keepalive printing --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/ea2d21c2bb53ffa54d4fedcdd1d5827… Patch: https://github.com/kamailio/kamailio/commit/ea2d21c2bb53ffa54d4fedcdd1d5827… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 0addb21a42..6038a6002a 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -61,7 +61,7 @@ Content-Length: 0\r\n\r\n" #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ "Via: SIP/2.0/%.*s %.*s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ "%.*s%.*s" \ - "From: <%.*s>;tag=%.*s-%x-%lx-%x-%x.%x\r\n" \ + "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ "Call-ID: " ULKA_CALLID_PREFIX "%u.%u\r\n" \ "CSeq: 80 %.*s\r\n" \ @@ -203,7 +203,8 @@ int ul_ka_urecord(urecord_t *ur) (uc->path.len>0)?"\r\n":"", ul_ka_from.len, ul_ka_from.s, uc->ruid.len, uc->ruid.s, ur->aorhash, - tv.tv_sec, tv.tv_usec, _ul_ka_counter, bcnt, + (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec, + _ul_ka_counter, bcnt, ur->aor.len, ur->aor.s, (aortype==1)?"":"@", (aortype==1)?0:ul_ka_domain.len, (aortype==1)?"":ul_ka_domain.s, @@ -363,7 +364,7 @@ int ul_ka_reply_received(sip_msg_t *msg) LM_DBG("invalid tv usec value\n"); return 1; } - LM_DBG("tv usec is [%u]\n", tvm.tv_usec); + LM_DBG("tv usec is [%lu]\n", (unsigned long)tvm.tv_usec); /* tv_sec hash */ tok.len = p - fb->tag_value.s; @@ -385,7 +386,7 @@ int ul_ka_reply_received(sip_msg_t *msg) LM_DBG("invalid tv sec value\n"); return 1; } - LM_DBG("tv sec is [%lu]\n", tvm.tv_sec); + LM_DBG("tv sec is [%lu]\n", (unsigned long)tvm.tv_sec); /* aor hash */ tok.len = p - fb->tag_value.s;

1 0

git:5.2:ad4bd72a: doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date
by Henning Westerholt 29 Mar '20

29 Mar '20

Module: kamailio Branch: 5.2 Commit: ad4bd72a29c9b3805152970f5eb9761dfc7e7a4d URL: https://github.com/kamailio/kamailio/commit/ad4bd72a29c9b3805152970f5eb9761… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:42:04+02:00 doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date (cherry picked from commit 446dc8006240050a1e0c13c7094e9f9739cc16c8) --- Modified: doc/stylesheets/dbschema_k/bookinfo.xml --- Diff: https://github.com/kamailio/kamailio/commit/ad4bd72a29c9b3805152970f5eb9761… Patch: https://github.com/kamailio/kamailio/commit/ad4bd72a29c9b3805152970f5eb9761… --- diff --git a/doc/stylesheets/dbschema_k/bookinfo.xml b/doc/stylesheets/dbschema_k/bookinfo.xml index 5e4ce4bf71..e88d18761d 100644 --- a/doc/stylesheets/dbschema_k/bookinfo.xml +++ b/doc/stylesheets/dbschema_k/bookinfo.xml @@ -12,10 +12,6 @@ <editor> <firstname>Henning</firstname> <surname>Westerholt</surname> - <affiliation><orgname>1und1 Internet AG</orgname></affiliation> - <address> - <email>henning.westerholt(a)1und1.de</email> - </address> </editor> <editor> <firstname>Norman</firstname> @@ -23,7 +19,7 @@ </editor> </authorgroup> <copyright> - <year>2008-2017</year> + <year>2008-2020</year> <holder>&kamailio; Project</holder> </copyright> </bookinfo>

1 0

git:5.3:cf28e401: doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date
by Henning Westerholt 29 Mar '20

29 Mar '20

Module: kamailio Branch: 5.3 Commit: cf28e401122daa6cd880af58e51519c2c7a43fda URL: https://github.com/kamailio/kamailio/commit/cf28e401122daa6cd880af58e51519c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:41:42+02:00 doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date (cherry picked from commit 446dc8006240050a1e0c13c7094e9f9739cc16c8) --- Modified: doc/stylesheets/dbschema_k/bookinfo.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf28e401122daa6cd880af58e51519c… Patch: https://github.com/kamailio/kamailio/commit/cf28e401122daa6cd880af58e51519c… --- diff --git a/doc/stylesheets/dbschema_k/bookinfo.xml b/doc/stylesheets/dbschema_k/bookinfo.xml index 5e4ce4bf71..e88d18761d 100644 --- a/doc/stylesheets/dbschema_k/bookinfo.xml +++ b/doc/stylesheets/dbschema_k/bookinfo.xml @@ -12,10 +12,6 @@ <editor> <firstname>Henning</firstname> <surname>Westerholt</surname> - <affiliation><orgname>1und1 Internet AG</orgname></affiliation> - <address> - <email>henning.westerholt(a)1und1.de</email> - </address> </editor> <editor> <firstname>Norman</firstname> @@ -23,7 +19,7 @@ </editor> </authorgroup> <copyright> - <year>2008-2017</year> + <year>2008-2020</year> <holder>&kamailio; Project</holder> </copyright> </bookinfo>

1 0

git:master:446dc800: doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date
by Henning Westerholt 29 Mar '20

29 Mar '20

Module: kamailio Branch: master Commit: 446dc8006240050a1e0c13c7094e9f9739cc16c8 URL: https://github.com/kamailio/kamailio/commit/446dc8006240050a1e0c13c7094e9f9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:39:34+02:00 doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date --- Modified: doc/stylesheets/dbschema_k/bookinfo.xml --- Diff: https://github.com/kamailio/kamailio/commit/446dc8006240050a1e0c13c7094e9f9… Patch: https://github.com/kamailio/kamailio/commit/446dc8006240050a1e0c13c7094e9f9… --- diff --git a/doc/stylesheets/dbschema_k/bookinfo.xml b/doc/stylesheets/dbschema_k/bookinfo.xml index 5e4ce4bf71..e88d18761d 100644 --- a/doc/stylesheets/dbschema_k/bookinfo.xml +++ b/doc/stylesheets/dbschema_k/bookinfo.xml @@ -12,10 +12,6 @@ <editor> <firstname>Henning</firstname> <surname>Westerholt</surname> - <affiliation><orgname>1und1 Internet AG</orgname></affiliation> - <address> - <email>henning.westerholt(a)1und1.de</email> - </address> </editor> <editor> <firstname>Norman</firstname> @@ -23,7 +19,7 @@ </editor> </authorgroup> <copyright> - <year>2008-2017</year> + <year>2008-2020</year> <holder>&kamailio; Project</holder> </copyright> </bookinfo>

1 0

git:master:d4311f3d: lib/srdb1: fix warning about wrong namespace in version.xml
by Henning Westerholt 29 Mar '20

29 Mar '20

Module: kamailio Branch: master Commit: d4311f3dfa3fc6c3836e8573fb12bc2ae4b6c264 URL: https://github.com/kamailio/kamailio/commit/d4311f3dfa3fc6c3836e8573fb12bc2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:27:07+02:00 lib/srdb1: fix warning about wrong namespace in version.xml --- Modified: src/lib/srdb1/schema/version.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4311f3dfa3fc6c3836e8573fb12bc2… Patch: https://github.com/kamailio/kamailio/commit/d4311f3dfa3fc6c3836e8573fb12bc2… --- diff --git a/src/lib/srdb1/schema/version.xml b/src/lib/srdb1/schema/version.xml index 42734bb2b9..2b65f68dae 100644 --- a/src/lib/srdb1/schema/version.xml +++ b/src/lib/srdb1/schema/version.xml @@ -6,7 +6,7 @@ ]> -<table id="version" xmlns:xi="http://www.w3.org/2001/XInclude"> +<table id="version" xmlns:db="http://docbook.org/ns/docbook">> <name>version</name> <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type>

1 0

git:master:91c1b9a0: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: 91c1b9a0e68c8a76a84fc7696b755cc1c8205aa5 URL: https://github.com/kamailio/kamailio/commit/91c1b9a0e68c8a76a84fc7696b755cc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-28T10:31:12+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/91c1b9a0e68c8a76a84fc7696b755cc… Patch: https://github.com/kamailio/kamailio/commit/91c1b9a0e68c8a76a84fc7696b755cc… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 5f3592be47..5ec1281c47 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -94,6 +94,8 @@ Carsten Bock 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) + 3.55. ka_loglevel (int) + 3.56. ka_logmsg (str) 4. RPC Commands @@ -195,6 +197,8 @@ Carsten Bock 1.52. ka_from parameter usage 1.53. ka_domain parameter usage 1.54. ka_filter parameter usage + 1.55. ka_loglevel parameter usage + 1.56. ka_logmsg parameter usage Chapter 1. Admin Guide @@ -265,6 +269,8 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) + 3.55. ka_loglevel (int) + 3.56. ka_logmsg (str) 4. RPC Commands @@ -398,6 +404,8 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) + 3.55. ka_loglevel (int) + 3.56. ka_logmsg (str) 3.1. nat_bflag (int) @@ -1155,6 +1163,35 @@ modparam("usrloc", "ka_domain", "mydomain.com") modparam("usrloc", "ka_filter", 1) ... +3.55. ka_loglevel (int) + + The level to print the log message when the keepalive response is + received. It should be a value between LOG_ALERT + + Default value is “kamailio.org”. + + Example 1.55. ka_loglevel parameter usage +... +modparam("usrloc", "ka_loglevel", 1) +... + +3.56. ka_logmsg (str) + + The formatted log specification to be added to the message printed when + the keepalive is received and roundtrip time is computed. The log + message starts with "keepalive roundtrip: %u.%06u sec - ruid [%.*s]", + then concatenates the value of this parameter and the end of line. + + The value of this parameter can contain script variables that are + evaluated with the SIP response. + + Default value is “ to-uri: [$tu] src-uri: [$su]”. + + Example 1.56. ka_logmsg parameter usage +... +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:54bce5c7: usrloc: docs for ka_loglevel and ka_logmsg params
by Daniel-Constantin Mierla 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: 54bce5c707feb91b2de90abe64e75952972816f0 URL: https://github.com/kamailio/kamailio/commit/54bce5c707feb91b2de90abe64e7595… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-28T10:11:54+01:00 usrloc: docs for ka_loglevel and ka_logmsg params --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/54bce5c707feb91b2de90abe64e7595… Patch: https://github.com/kamailio/kamailio/commit/54bce5c707feb91b2de90abe64e7595… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 7b945a76bb..a6d9654d51 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1424,6 +1424,50 @@ modparam("usrloc", "ka_filter", 1) </example> </section> + <section id="usrloc.p.ka_loglevel"> + <title><varname>ka_loglevel</varname> (int)</title> + <para> + The level to print the log message when the keepalive response is + received. It should be a value between LOG_ALERT + </para> + <para> + Default value is <quote>kamailio.org</quote>. + </para> + <example> + <title><varname>ka_loglevel</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_loglevel", 1) +... + </programlisting> + </example> + </section> + + <section id="usrloc.p.ka_logmsg"> + <title><varname>ka_logmsg</varname> (str)</title> + <para> + The formatted log specification to be added to the message printed when + the keepalive is received and roundtrip time is computed. The log + message starts with "keepalive roundtrip: %u.%06u sec - ruid [%.*s]", + then concatenates the value of this parameter and the end of line. + </para> + <para> + The value of this parameter can contain script variables that are + evaluated with the SIP response. + </para> + <para> + Default value is <quote> to-uri: [$tu] src-uri: [$su]</quote>. + </para> + <example> + <title><varname>ka_logmsg</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:0d912f11: usrloc: fexible logging for roundtrip details
by Daniel-Constantin Mierla 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: 0d912f11c9618ea399b81fe7d38faf335fe911c7 URL: https://github.com/kamailio/kamailio/commit/0d912f11c9618ea399b81fe7d38faf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-28T10:11:54+01:00 usrloc: fexible logging for roundtrip details - new params ka_loglevel and ka_logmsg --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0d912f11c9618ea399b81fe7d38faf3… Patch: https://github.com/kamailio/kamailio/commit/0d912f11c9618ea399b81fe7d38faf3… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 7955efa14b..0addb21a42 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -32,6 +32,7 @@ #include "../../core/resolve.h" #include "../../core/forward.h" #include "../../core/globals.h" +#include "../../core/pvar.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -71,6 +72,9 @@ extern str ul_ka_domain; extern str ul_ka_method; extern int ul_ka_mode; extern int ul_ka_filter; +extern int ul_ka_loglevel; +extern pv_elem_t *ul_ka_logfmt; + extern unsigned int nat_bflag; static unsigned int _ul_ka_counter = 0; @@ -417,11 +421,19 @@ int ul_ka_reply_received(sip_msg_t *msg) gettimeofday(&tvn, NULL); tvdiff = (tvn.tv_sec - tvm.tv_sec) * 1000000 + (tvn.tv_usec - tvm.tv_usec); + ul_update_keepalive(aorhash, &ruid, tvn.tv_sec, tvdiff); - LM_DBG("reply for keepalive of [%.*s:%u] roundtrip: %u.%06usec\n", - ruid.len, ruid.s, aorhash, tvdiff/1000000, tvdiff%1000000); + if(ul_ka_loglevel != 255 && ul_ka_logfmt != NULL) { + if (pv_printf_s(msg, ul_ka_logfmt, &tok) == 0) { + LOG(ul_ka_loglevel, "keepalive roundtrip: %u.%06u sec - ruid [%.*s]%.*s\n", + tvdiff/1000000, tvdiff%1000000, ruid.len, ruid.s, + tok.len, tok.s); + return 0; + } + } - ul_update_keepalive(aorhash, &ruid, tvn.tv_sec, tvdiff); + LM_DBG("response of keepalive for ruid [%.*s] aorhash [%u] roundtrip: %u.%06u secs\n", + ruid.len, ruid.s, aorhash, tvdiff/1000000, tvdiff%1000000); return 0; } diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 0cceb0b0e5..8d3cfffdbf 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -123,6 +123,9 @@ str ul_ka_domain = str_init("kamailio.org"); str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; +int ul_ka_loglevel = 255; +str ul_ka_logmsg = str_init(" to-uri: [$tu] src-uri: [$su]"); +pv_elem_t *ul_ka_logfmt = NULL; /* sruid to get internal uid for mi/rpc commands */ sruid_t _ul_sruid; @@ -255,6 +258,7 @@ static param_export_t params[] = { {"ka_domain", PARAM_STR, &ul_ka_domain}, {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, + {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {0, 0, 0} }; @@ -396,9 +400,17 @@ static int mod_init(void) ul_set_xavp_contact_clone(1); } - /* set max partition number for timers processing of db records */ - if((ul_ka_mode != ULKA_NONE) && (ul_timer_procs > 1)) { - ul_set_max_partition((unsigned int)ul_timer_procs); + if(ul_ka_mode != ULKA_NONE) { + /* set max partition number for timers processing of db records */ + if (ul_timer_procs > 1) { + ul_set_max_partition((unsigned int)ul_timer_procs); + } + if(ul_ka_logmsg.len > 0) { + if(pv_parse_format(&ul_ka_logmsg, &ul_ka_logfmt) < 0) { + LM_ERR("failed parsing ka log message format\n"); + return -1; + } + } } init_flag = 1;

1 0

[kamailio/kamailio] pv: remove urlencode/urldecode functions (moved to core/strutils) (#2265)
by Armen Babikyan 28 Mar '20

28 Mar '20

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2265 -- Commit Summary -- * pv: remove urlencode/urldecode functions; moved to core/strutils -- File Changes -- M src/modules/pv/pv_trans.c (80) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2265.patch https://github.com/kamailio/kamailio/pull/2265.diff -- 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/pull/2265

2 1

git:master:7883a5e4: Merge pull request #2265 from armenb/pv_remove_urlencode_urldecode
by GitHub 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: 7883a5e417d10e88d187c7d88f61e28506483b7d URL: https://github.com/kamailio/kamailio/commit/7883a5e417d10e88d187c7d88f61e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-28T08:31:03+01:00 Merge pull request #2265 from armenb/pv_remove_urlencode_urldecode pv: remove urlencode/urldecode functions (moved to core/strutils) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/7883a5e417d10e88d187c7d88f61e28… Patch: https://github.com/kamailio/kamailio/commit/7883a5e417d10e88d187c7d88f61e28… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 36dbcf24b5..826fa9c2ef 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -107,78 +107,6 @@ char *tr_set_crt_buffer(void) /* -- helper functions */ -/* Converts a hex character to its integer value */ -static char pv_from_hex(char ch) -{ - return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10; -} - -/* Converts an integer value to its hex character */ -static char pv_to_hex(char code) -{ - static char hex[] = "0123456789abcdef"; - return hex[code & 15]; -} - -/*! \brief - * URL Encodes a string for use in a HTTP query - */ -static int urlencode_param(str *sin, str *sout) -{ - char *at, *p; - - if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || - sin->len<0 || sout->len < 3*sin->len+1) - return -1; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') - *at++ = *p; - else if (*p == ' ') - *at++ = '+'; - else - *at++ = '%', *at++ = pv_to_hex(*p >> 4), *at++ = pv_to_hex(*p & 15); - p++; - } - - *at = 0; - sout->len = at - sout->s; - LM_DBG("urlencoded string is <%s>\n", sout->s); - - return 0; -} - -/* URL Decode a string */ -static int urldecode_param(str *sin, str *sout) { - char *at, *p; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (*p == '%') { - if (p[1] && p[2]) { - *at++ = pv_from_hex(p[1]) << 4 | pv_from_hex(p[2]); - p += 2; - } - } else if (*p == '+') { - *at++ = ' '; - } else { - *at++ = *p; - } - p++; - } - - *at = 0; - sout->len = at - sout->s; - - LM_DBG("urldecoded string is <%s>\n", sout->s); - return 0; -} - /* Encode 7BIT PDU */ static int pdu_7bit_encode(str sin) { int i, j; @@ -215,8 +143,8 @@ static int pdu_7bit_decode(str sin) { unsigned char oldfill = 0; j = 0; for(i = 0; i < sin.len; i += 2) { - _tr_buffer[j] = (unsigned char)pv_from_hex(sin.s[i]) << 4; - _tr_buffer[j] |= (unsigned char)pv_from_hex(sin.s[i+1]); + _tr_buffer[j] = (unsigned char)hex_to_char(sin.s[i]) << 4; + _tr_buffer[j] |= (unsigned char)hex_to_char(sin.s[i+1]); fill = (unsigned char)_tr_buffer[j]; fill >>= (8 - nleft); _tr_buffer[j] <<= (nleft -1 ); @@ -1246,7 +1174,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urlencode_param(&val->rs, &st) < 0) + if (urlencode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; @@ -1260,7 +1188,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urldecode_param(&val->rs, &st) < 0) + if (urldecode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR;

1 0

git:master:c2ddf608: pv: remove urlencode/urldecode functions; moved to core/strutils
by Armen Babikyan 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: c2ddf608dd3cdb3a071763769e336157f9e831c9 URL: https://github.com/kamailio/kamailio/commit/c2ddf608dd3cdb3a071763769e33615… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2020-03-27T14:14:53-07:00 pv: remove urlencode/urldecode functions; moved to core/strutils --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/c2ddf608dd3cdb3a071763769e33615… Patch: https://github.com/kamailio/kamailio/commit/c2ddf608dd3cdb3a071763769e33615… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 36dbcf24b5..826fa9c2ef 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -107,78 +107,6 @@ char *tr_set_crt_buffer(void) /* -- helper functions */ -/* Converts a hex character to its integer value */ -static char pv_from_hex(char ch) -{ - return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10; -} - -/* Converts an integer value to its hex character */ -static char pv_to_hex(char code) -{ - static char hex[] = "0123456789abcdef"; - return hex[code & 15]; -} - -/*! \brief - * URL Encodes a string for use in a HTTP query - */ -static int urlencode_param(str *sin, str *sout) -{ - char *at, *p; - - if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || - sin->len<0 || sout->len < 3*sin->len+1) - return -1; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') - *at++ = *p; - else if (*p == ' ') - *at++ = '+'; - else - *at++ = '%', *at++ = pv_to_hex(*p >> 4), *at++ = pv_to_hex(*p & 15); - p++; - } - - *at = 0; - sout->len = at - sout->s; - LM_DBG("urlencoded string is <%s>\n", sout->s); - - return 0; -} - -/* URL Decode a string */ -static int urldecode_param(str *sin, str *sout) { - char *at, *p; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (*p == '%') { - if (p[1] && p[2]) { - *at++ = pv_from_hex(p[1]) << 4 | pv_from_hex(p[2]); - p += 2; - } - } else if (*p == '+') { - *at++ = ' '; - } else { - *at++ = *p; - } - p++; - } - - *at = 0; - sout->len = at - sout->s; - - LM_DBG("urldecoded string is <%s>\n", sout->s); - return 0; -} - /* Encode 7BIT PDU */ static int pdu_7bit_encode(str sin) { int i, j; @@ -215,8 +143,8 @@ static int pdu_7bit_decode(str sin) { unsigned char oldfill = 0; j = 0; for(i = 0; i < sin.len; i += 2) { - _tr_buffer[j] = (unsigned char)pv_from_hex(sin.s[i]) << 4; - _tr_buffer[j] |= (unsigned char)pv_from_hex(sin.s[i+1]); + _tr_buffer[j] = (unsigned char)hex_to_char(sin.s[i]) << 4; + _tr_buffer[j] |= (unsigned char)hex_to_char(sin.s[i+1]); fill = (unsigned char)_tr_buffer[j]; fill >>= (8 - nleft); _tr_buffer[j] <<= (nleft -1 ); @@ -1246,7 +1174,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urlencode_param(&val->rs, &st) < 0) + if (urlencode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; @@ -1260,7 +1188,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urldecode_param(&val->rs, &st) < 0) + if (urldecode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR;

1 0

[kamailio/kamailio] core: strutils - add urlencode and urldecode functions (#2264)
by Armen Babikyan 28 Mar '20

28 Mar '20

- moved from modules/pv/pv_trans.c and exported, so they can be used in other modules - genericized fn names You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2264 -- Commit Summary -- * core: strutils - add urlencode and urldecode functions -- File Changes -- M src/core/strutils.c (73) M src/core/strutils.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2264.patch https://github.com/kamailio/kamailio/pull/2264.diff -- 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/pull/2264

2 2

git:master:c5bac154: Merge pull request #2264 from armenb/core_strutils_urlencode_urldecode
by GitHub 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: c5bac15472ad7db452e35f000a3236a839f14cf8 URL: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-28T08:30:16+01:00 Merge pull request #2264 from armenb/core_strutils_urlencode_urldecode core: strutils - add urlencode and urldecode functions --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… Patch: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index b06fa44175..7df31727cb 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -701,3 +701,76 @@ int reg_replace(char *pattern, char *replacement, char *string, str *result) return replace(&pmatch[0], string, replacement, result); } + +/* Converts a hex character to its integer value */ +char hex_to_char(char hex_code) +{ + return isdigit(hex_code) ? hex_code - '0' : tolower(hex_code) - 'a' + 10; +} + +/* Converts an integer value to its hex character */ +char char_to_hex(char char_code) +{ + static char hex[] = "0123456789abcdef"; + return hex[char_code & 15]; +} + +/*! \brief + * URL Encodes a string + */ +int urlencode(str *sin, str *sout) +{ + char *at, *p; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') + *at++ = *p; + else + *at++ = '%', *at++ = char_to_hex(*p >> 4), *at++ = char_to_hex(*p & 15); + p++; + } + + *at = 0; + sout->len = at - sout->s; + LM_DBG("urlencoded string is <%s>\n", sout->s); + + return 0; +} + +/*! \brief + * URL Decodes a string + */ +int urldecode(str *sin, str *sout) +{ + char *at, *p; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (*p == '%') { + if (p[1] && p[2]) { + *at++ = hex_to_char(p[1]) << 4 | hex_to_char(p[2]); + p += 2; + } + } else if (*p == '+') { + *at++ = ' '; + } else { + *at++ = *p; + } + p++; + } + + *at = 0; + sout->len = at - sout->s; + + LM_DBG("urldecoded string is <%s>\n", sout->s); + return 0; +} diff --git a/src/core/strutils.h b/src/core/strutils.h index 37152dd18d..8b20f72e44 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -61,4 +61,8 @@ int escape_param(str *sin, str *sout); int unescape_param(str *sin, str *sout); int escape_csv(str *sin, str *sout); +char hex_to_char(char hex_code); +char char_to_hex(char char_code); +int urlencode(str *sin, str *sout); +int urldecode(str *sin, str *sout); #endif

1 0

git:master:0973bee7: core: strutils - add urlencode and urldecode functions
by Armen Babikyan 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: 0973bee70e2a7f6ea274c357083fb67b6b2e27ad URL: https://github.com/kamailio/kamailio/commit/0973bee70e2a7f6ea274c357083fb67… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2020-03-27T14:32:29-07:00 core: strutils - add urlencode and urldecode functions - moved from modules/pv/pv_trans.c and exported, so they can be used in other modules - genericized fn names --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/0973bee70e2a7f6ea274c357083fb67… Patch: https://github.com/kamailio/kamailio/commit/0973bee70e2a7f6ea274c357083fb67… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index b06fa44175..7df31727cb 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -701,3 +701,76 @@ int reg_replace(char *pattern, char *replacement, char *string, str *result) return replace(&pmatch[0], string, replacement, result); } + +/* Converts a hex character to its integer value */ +char hex_to_char(char hex_code) +{ + return isdigit(hex_code) ? hex_code - '0' : tolower(hex_code) - 'a' + 10; +} + +/* Converts an integer value to its hex character */ +char char_to_hex(char char_code) +{ + static char hex[] = "0123456789abcdef"; + return hex[char_code & 15]; +} + +/*! \brief + * URL Encodes a string + */ +int urlencode(str *sin, str *sout) +{ + char *at, *p; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') + *at++ = *p; + else + *at++ = '%', *at++ = char_to_hex(*p >> 4), *at++ = char_to_hex(*p & 15); + p++; + } + + *at = 0; + sout->len = at - sout->s; + LM_DBG("urlencoded string is <%s>\n", sout->s); + + return 0; +} + +/*! \brief + * URL Decodes a string + */ +int urldecode(str *sin, str *sout) +{ + char *at, *p; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (*p == '%') { + if (p[1] && p[2]) { + *at++ = hex_to_char(p[1]) << 4 | hex_to_char(p[2]); + p += 2; + } + } else if (*p == '+') { + *at++ = ' '; + } else { + *at++ = *p; + } + p++; + } + + *at = 0; + sout->len = at - sout->s; + + LM_DBG("urldecoded string is <%s>\n", sout->s); + return 0; +} diff --git a/src/core/strutils.h b/src/core/strutils.h index 37152dd18d..8b20f72e44 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -61,4 +61,8 @@ int escape_param(str *sin, str *sout); int unescape_param(str *sin, str *sout); int escape_csv(str *sin, str *sout); +char hex_to_char(char hex_code); +char char_to_hex(char char_code); +int urlencode(str *sin, str *sout); +int urldecode(str *sin, str *sout); #endif

1 0

git:master:7d1e27e9: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 7d1e27e945b09674f07bdb56f69947b41e8e945a URL: https://github.com/kamailio/kamailio/commit/7d1e27e945b09674f07bdb56f69947b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-27T18:31:09+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/7d1e27e945b09674f07bdb56f69947b… Patch: https://github.com/kamailio/kamailio/commit/7d1e27e945b09674f07bdb56f69947b… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 4637de5a55..5f3592be47 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -93,6 +93,7 @@ Carsten Bock 3.51. ka_method (str) 3.52. ka_from (str) 3.53. ka_domain (str) + 3.54. ka_filter (int) 4. RPC Commands @@ -193,6 +194,7 @@ Carsten Bock 1.51. ka_method parameter usage 1.52. ka_from parameter usage 1.53. ka_domain parameter usage + 1.54. ka_filter parameter usage Chapter 1. Admin Guide @@ -262,6 +264,7 @@ Chapter 1. Admin Guide 3.51. ka_method (str) 3.52. ka_from (str) 3.53. ka_domain (str) + 3.54. ka_filter (int) 4. RPC Commands @@ -394,6 +397,7 @@ Chapter 1. Admin Guide 3.51. ka_method (str) 3.52. ka_from (str) 3.53. ka_domain (str) + 3.54. ka_filter (int) 3.1. nat_bflag (int) @@ -1066,14 +1070,15 @@ modparam("usrloc", "version_table", 0) 3.50. ka_mode (int) Keepalive mode - control the internal keepalive mechanism. With this - feature enable, the module sends periodically (based on timer interval) - SIP requests to location contacts and measures the round trip in - microseconds (the round trip value can be seen in the response of the - RPC command 'ul.dump'). + feature enabled, the module sends periodically (based on timer + interval) SIP requests to location contacts and measures the round trip + in microseconds (the round trip value can be seen in the response of + the RPC command 'ul.dump'). Its value is a set of flags: * 0 - if the value is zero, no keepalive is sent - * 1 - if set to 1, the keepalive is enabled for all contacts + * 1 (bit 1 set) - if set to 1, the keepalive is enabled for all + contacts * 2 (bit 2 set) - the keepalive is sent only for natted contacts (nat_bflag set) * 4 (bit 3 set) - the keepalive is sent only for UDP contacts @@ -1134,6 +1139,22 @@ modparam("usrloc", "ka_from", "sip:server@mydomain.com") modparam("usrloc", "ka_domain", "mydomain.com") ... +3.54. ka_filter (int) + + Set filters for keepalive processing. + + Its value is a set of flags: + * 0 - if the value is zero, no filter is enabled for keepalives + * 1 (bit 1 set) - keepalives sent only to records matching the + server_id global parameter. + + Default value is “0” (no filter). + + Example 1.54. ka_filter parameter usage +... +modparam("usrloc", "ka_filter", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:30eda8a8: usrloc: keepalive server id filtering also for in-memory contacts
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 30eda8a8f244e3e6eba66b50fa355b11735d8f7d URL: https://github.com/kamailio/kamailio/commit/30eda8a8f244e3e6eba66b50fa355b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T18:16:28+01:00 usrloc: keepalive server id filtering also for in-memory contacts --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/30eda8a8f244e3e6eba66b50fa355b1… Patch: https://github.com/kamailio/kamailio/commit/30eda8a8f244e3e6eba66b50fa355b1… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 14eb75b1d4..a811df5326 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -222,6 +222,9 @@ int ul_ka_db_records(int partidx) /* flags */ uc.cflags = VAL_BITMAP(ROW_VALUES(row) + 3); + /* server id */ + uc.server_id = server_id; + /* aor from username and domain */ ur.aor.s = aorbuf; ur.domain = &dom->name; diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 3557848e34..7955efa14b 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -31,6 +31,7 @@ #include "../../core/ut.h" #include "../../core/resolve.h" #include "../../core/forward.h" +#include "../../core/globals.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -69,6 +70,7 @@ extern str ul_ka_from; extern str ul_ka_domain; extern str ul_ka_method; extern int ul_ka_mode; +extern int ul_ka_filter; extern unsigned int nat_bflag; static unsigned int _ul_ka_counter = 0; @@ -113,6 +115,9 @@ int ul_ka_urecord(urecord_t *ur) if (uc->c.len <= 0) { continue; } + if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { + continue; + } if(ul_ka_mode & ULKA_NAT) { /* keepalive for natted contacts only */ if (nat_bflag == 0) {

1 0

git:master:c4f3de7b: usrloc: internal keepalive support for db only mode
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: c4f3de7bfa704551e4b6cbf16e543c469a42c99c URL: https://github.com/kamailio/kamailio/commit/c4f3de7bfa704551e4b6cbf16e543c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T17:54:00+01:00 usrloc: internal keepalive support for db only mode - new parameter ka_filter to enable server_id filtering of db records processed for keepalive --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c4f3de7bfa704551e4b6cbf16e543c4… Patch: https://github.com/kamailio/kamailio/commit/c4f3de7bfa704551e4b6cbf16e543c4…

1 0

git:master:1968b324: usrloc: docs for ka_filter parameter
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 1968b3248acc9d71974f5765e489af82ecf4849a URL: https://github.com/kamailio/kamailio/commit/1968b3248acc9d71974f5765e489af8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T18:06:46+01:00 usrloc: docs for ka_filter parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1968b3248acc9d71974f5765e489af8… Patch: https://github.com/kamailio/kamailio/commit/1968b3248acc9d71974f5765e489af8… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index d4f96db94f..7b945a76bb 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1229,9 +1229,12 @@ modparam("usrloc", "rm_expired_delay", 30) <section id="usrloc.p.server_id_filter"> <title><varname>server_id_filter</varname> (int)</title> <para> - Enable (1) or disable (0) filter records by server_id on load and during cleaning of expired db records. - It could be useful when you want to use the same location table for several kamailio instances which are configured to work in db_mode=1 or db_mode=2 (cache modes). - Otherwise one instance of proxy cleans records made by another proxy and that breaks its cache. + Enable (1) or disable (0) filter records by server_id on load and + during cleaning of expired db records. It could be useful when you + want to use the same location table for several kamailio instances + which are configured to work in db_mode=1 or db_mode=2 (cache modes). + Otherwise one instance of proxy cleans records made by another proxy + and that breaks its cache. </para> <para> <emphasis> @@ -1271,7 +1274,7 @@ modparam("usrloc", "version_table", 0) <title><varname>ka_mode</varname> (int)</title> <para> Keepalive mode - control the internal keepalive mechanism. With this feature - enable, the module sends periodically (based on timer interval) SIP requests + enabled, the module sends periodically (based on timer interval) SIP requests to location contacts and measures the round trip in microseconds (the round trip value can be seen in the response of the RPC command 'ul.dump'). </para> @@ -1286,7 +1289,7 @@ modparam("usrloc", "version_table", 0) </listitem> <listitem> <para> - 1 - if set to 1, the keepalive is enabled for all contacts + 1 (bit 1 set) - if set to 1, the keepalive is enabled for all contacts </para> </listitem> <listitem> @@ -1349,7 +1352,7 @@ modparam("usrloc", "ka_method", "NOTIFY") </example> </section> - <section id="usrloc.p.from"> + <section id="usrloc.p.ka_from"> <title><varname>ka_from</varname> (str)</title> <para> The SIP URI to be set in the From header of the keepalive requests. @@ -1367,7 +1370,7 @@ modparam("usrloc", "ka_from", "sip:server@mydomain.com") </example> </section> - <section id="usrloc.p.domain"> + <section id="usrloc.p.ka_domain"> <title><varname>ka_domain</varname> (str)</title> <para> The domain to be set in To header URI if the multi-domain is not enabled. @@ -1387,6 +1390,40 @@ modparam("usrloc", "ka_domain", "mydomain.com") </example> </section> + <section id="usrloc.p.ka_filter"> + <title><varname>ka_filter</varname> (int)</title> + <para> + Set filters for keepalive processing. + </para> + <para> + Its value is a set of flags: + </para> + <itemizedlist> + <listitem> + <para> + 0 - if the value is zero, no filter is enabled for keepalives + </para> + </listitem> + <listitem> + <para> + 1 (bit 1 set) - keepalives sent only to records matching the + server_id global parameter. + </para> + </listitem> + </itemizedlist> + <para> + Default value is <quote>0</quote> (no filter). + </para> + <example> + <title><varname>ka_filter</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_filter", 1) +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:f47700bb: usrloc: fixed wrong comments related to the flags fields in ucontact_t
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: f47700bb55cbf19f7d3f7d967bd4c4755a994db5 URL: https://github.com/kamailio/kamailio/commit/f47700bb55cbf19f7d3f7d967bd4c47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T17:52:53+01:00 usrloc: fixed wrong comments related to the flags fields in ucontact_t --- Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/f47700bb55cbf19f7d3f7d967bd4c47… Patch: https://github.com/kamailio/kamailio/commit/f47700bb55cbf19f7d3f7d967bd4c47… --- diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index 5d071c1734..a9a0309d9d 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -82,8 +82,8 @@ typedef struct ucontact { str callid; /*!< Call-ID header field of registration */ int cseq; /*!< CSeq value */ cstate_t state; /*!< State of the contact (\ref cstate) */ - unsigned int flags; /*!< Various flags (NAT, ping type, etc) */ - unsigned int cflags; /*!< Custom contact flags (from script) */ + unsigned int flags; /*!< Various internal flags (sync, etc) */ + unsigned int cflags; /*!< Custom contact flags (from script - bflags) */ str user_agent; /*!< User-Agent header field */ str uniq; /*!< Uniq header field */ struct socket_info *sock; /*!< received socket */

1 0

git:master:bef747a3: usrloc: global root var for domains list renamed to _ksr_ul_root
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: bef747a3ff728fb92593c565229d20e642b8b6c4 URL: https://github.com/kamailio/kamailio/commit/bef747a3ff728fb92593c565229d20e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T13:58:56+01:00 usrloc: global root var for domains list renamed to _ksr_ul_root --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/dlist.h Modified: src/modules/usrloc/ul_rpc.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bef747a3ff728fb92593c565229d20e… Patch: https://github.com/kamailio/kamailio/commit/bef747a3ff728fb92593c565229d20e…

1 0

git:master:3b706926: pkg/kamailio/deb: version set 5.4.0~dev4
by Victor Seva 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 3b7069269f28be7869a90420682ef03641a741e4 URL: https://github.com/kamailio/kamailio/commit/3b7069269f28be7869a90420682ef03… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-27T12:55:43+01:00 pkg/kamailio/deb: version set 5.4.0~dev4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/3b7069269f28be7869a90420682ef03… Patch: https://github.com/kamailio/kamailio/commit/3b7069269f28be7869a90420682ef03…

1 0

[kamailio/kamailio] [FEATURE REQUEST] - Add RTT metric to usrloc for measuring subscriber latency (#2223)
by Joel Serrano 27 Mar '20

27 Mar '20

## Description ### Add RTT metric to usrloc for measuring subscriber latency This has been discussed several times in the mailing list. As I personally need this too I though it would be a good idea to open this issue for tracking. Unfortunately I'm not aware of the complexity of implementing this and I cannot code it myself, I'm happy to do any testing though or help with any other tasks. Some threads were this has been commented and some solutions proposed by @miconda: https://lists.kamailio.org/pipermail/sr-users/2015-April/088031.html (1st post, see complete thread) https://lists.kamailio.org/pipermail/sr-users/2019-January/104291.html (1st post, see complete thread) Thanks! -- 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/2223

2 2

[kamailio/kamailio] qm_free(): BUG: freeing already freed pointer (#2224)
by ibaques 27 Mar '20

27 Mar '20

### Description Kamailio is crashing randomly 1 or 2 times a day. We have 2 kamailio with DMQ/Dialog sharing. #### Debugging Data ``` #0 0x00007feb7466ddf3 in destroy_linkers () from /usr/lib64/kamailio/modules/dialog.so No symbol table info available. #1 0x00007feb7463a42e in dlg_dmq_handle_msg () from /usr/lib64/kamailio/modules/dialog.so No symbol table info available. #2 0x00007feb74d90718 in worker_loop () from /usr/lib64/kamailio/modules/dmq.so No symbol table info available. #3 0x00007feb74d73686 in ?? () from /usr/lib64/kamailio/modules/dmq.so No symbol table info available. #4 0x00000000005e79b0 in ?? () No symbol table info available. #5 0x00000000005e763c in ?? () No symbol table info available. #6 0x00000000005e763c in ?? () No symbol table info available. #7 0x00000000005e763c in ?? () No symbol table info available. #8 0x00000000005e763c in ?? () No symbol table info available. #9 0x00000000005e763c in ?? () No symbol table info available. #10 0x00000000005e763c in ?? () No symbol table info available. #11 0x00000000005e763c in ?? () No symbol table info available. #12 0x00000000005e80e9 in init_child () No symbol table info available. #13 0x0000000000426b94 in main_loop () ---Type <return> to continue, or q <return> to quit--- No symbol table info available. #14 0x000000000042e52a in main () No symbol table info available. ``` #### Log Messages ``` /usr/sbin/kamailio[9221]: CRITICAL: <core> [core/mem/q_malloc.c:521]: qm_free(): BUG: freeing already freed pointer (0x7feb781ee500), called from dialog: dlg_profile.c: destroy_linkers(291), first free dialog: dlg_profile.c: destroy_linkers(291) - ignoring /usr/sbin/kamailio[9221]: ALERT: <core> [main.c:767]: handle_sigs(): child process 9495 exited by a signal 11 /usr/sbin/kamailio[9221]: ALERT: <core> [main.c:770]: handle_sigs(): core was generated /usr/sbin/kamailio[9221]: CRITICAL: <core> [main.c:678]: sig_alarm_abort(): shutdown timeout triggered, dying... ``` ### Additional Information ``` version: kamailio 5.3.2 (x86_64/linux) 7ba545 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 7ba545 compiled on 11:29:01 Jan 9 2020 with gcc 4.4.7 ``` * **Operating System**: ``` 2.6.32-042stab140.1 #1 SMP Thu Aug 15 13:32:22 MSK 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2224

3 7

git:master:b4d38c4a: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: b4d38c4a1bf40e190628a82db87a2b913abecf22 URL: https://github.com/kamailio/kamailio/commit/b4d38c4a1bf40e190628a82db87a2b9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-27T10:31:18+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/b4d38c4a1bf40e190628a82db87a2b9… Patch: https://github.com/kamailio/kamailio/commit/b4d38c4a1bf40e190628a82db87a2b9… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 2cc6ddc0f3..4637de5a55 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -89,6 +89,10 @@ Carsten Bock 3.47. rm_expired_delay (int) 3.48. server_id_filter (int) 3.49. version_table (int) + 3.50. ka_mode (int) + 3.51. ka_method (str) + 3.52. ka_from (str) + 3.53. ka_domain (str) 4. RPC Commands @@ -185,6 +189,10 @@ Carsten Bock 1.47. Set rm_expired_delay parameter 1.48. Set server_id_filter parameter 1.49. version_table parameter usage + 1.50. ka_mode parameter usage + 1.51. ka_method parameter usage + 1.52. ka_from parameter usage + 1.53. ka_domain parameter usage Chapter 1. Admin Guide @@ -250,6 +258,10 @@ Chapter 1. Admin Guide 3.47. rm_expired_delay (int) 3.48. server_id_filter (int) 3.49. version_table (int) + 3.50. ka_mode (int) + 3.51. ka_method (str) + 3.52. ka_from (str) + 3.53. ka_domain (str) 4. RPC Commands @@ -378,6 +390,10 @@ Chapter 1. Admin Guide 3.47. rm_expired_delay (int) 3.48. server_id_filter (int) 3.49. version_table (int) + 3.50. ka_mode (int) + 3.51. ka_method (str) + 3.52. ka_from (str) + 3.53. ka_domain (str) 3.1. nat_bflag (int) @@ -1047,6 +1063,77 @@ modparam("usrloc", "server_id_filter", 1) modparam("usrloc", "version_table", 0) ... +3.50. ka_mode (int) + + Keepalive mode - control the internal keepalive mechanism. With this + feature enable, the module sends periodically (based on timer interval) + SIP requests to location contacts and measures the round trip in + microseconds (the round trip value can be seen in the response of the + RPC command 'ul.dump'). + + Its value is a set of flags: + * 0 - if the value is zero, no keepalive is sent + * 1 - if set to 1, the keepalive is enabled for all contacts + * 2 (bit 2 set) - the keepalive is sent only for natted contacts + (nat_bflag set) + * 4 (bit 3 set) - the keepalive is sent only for UDP contacts + + For example, if set to 6, then keepalive is sent only natted UDP + contacs. + + Note: the internal keepalive of usrloc module conflicts in some way + with the keepalive done by nathelper module. It is recommended to + enable only one. + + Note: the internal keepalive is for the moment implemented only for + contact records stored in memory. + + Note: it is recommeder to set 'timer_procs' parameter in order to have + dedicated timer processes for usrloc module and off-load the keepalive + sending process from the core timers. + + Default value is “0 (keepalive disabled)”. + + Example 1.50. ka_mode parameter usage +... +modparam("usrloc", "ka_mode", 1) +... + +3.51. ka_method (str) + + The SIP method type for keepalive requests. + + Default value is “OPTIONS”. + + Example 1.51. ka_method parameter usage +... +modparam("usrloc", "ka_method", "NOTIFY") +... + +3.52. ka_from (str) + + The SIP URI to be set in the From header of the keepalive requests. + + Default value is “sip:server@kamailio.org”. + + Example 1.52. ka_from parameter usage +... +modparam("usrloc", "ka_from", "sip:server@mydomain.com") +... + +3.53. ka_domain (str) + + The domain to be set in To header URI if the multi-domain is not + enabled. If multi-domain is enabled, then the domain from the location + record is used and this parameter is ignored. + + Default value is “kamailio.org”. + + Example 1.53. ka_domain parameter usage +... +modparam("usrloc", "ka_domain", "mydomain.com") +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:91bf474a: usrloc: options to do keepalive for natted or udp contacts only
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 91bf474a77ad594edccc5e5f8aca9f0abd905aca URL: https://github.com/kamailio/kamailio/commit/91bf474a77ad594edccc5e5f8aca9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T10:16:23+01:00 usrloc: options to do keepalive for natted or udp contacts only - variants to make it emulate the current nathelper keepalive, which is done for UDP only - usrloc keepalive can be sent for all types of contacts --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/ul_keepalive.h Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/91bf474a77ad594edccc5e5f8aca9f0… Patch: https://github.com/kamailio/kamailio/commit/91bf474a77ad594edccc5e5f8aca9f0… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index b40a93040a..3557848e34 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -97,7 +97,7 @@ int ul_ka_urecord(urecord_t *ur) int i; struct timeval tv; - if (ul_ka_mode == 0) { + if (ul_ka_mode == ULKA_NONE) { return 0; } LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); @@ -113,7 +113,7 @@ int ul_ka_urecord(urecord_t *ur) if (uc->c.len <= 0) { continue; } - if(ul_ka_mode == 2) { + if(ul_ka_mode & ULKA_NAT) { /* keepalive for natted contacts only */ if (nat_bflag == 0) { continue; @@ -145,9 +145,15 @@ int ul_ka_urecord(urecord_t *ur) dproto = duri.proto; he = sip_resolvehost(&duri.host, &duri.port_no, &dproto); if(he == NULL) { - LM_ERR("can't resolve_host\n"); + LM_ERR("cannot resolve destination\n"); continue; } + if(ul_ka_mode & ULKA_UDP) { + if(dproto != PROTO_UDP) { + LM_DBG("skipping non-udp contact - proto %d\n", (int)dproto); + continue; + } + } init_dest_info(&idst); hostent2su(&idst.to, he, 0, duri.port_no); ssock = uc->sock; diff --git a/src/modules/usrloc/ul_keepalive.h b/src/modules/usrloc/ul_keepalive.h index b5c673efce..71a59db81a 100644 --- a/src/modules/usrloc/ul_keepalive.h +++ b/src/modules/usrloc/ul_keepalive.h @@ -28,6 +28,11 @@ #include "urecord.h" +#define ULKA_NONE 0 +#define ULKA_ALL 1 +#define ULKA_NAT (1<<1) +#define ULKA_UDP (1<<2) + int ul_ka_urecord(urecord_t *ur); int ul_ka_reply_received(sip_msg_t *msg); diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index b633e4c1ed..42964e1315 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -251,8 +251,8 @@ static param_export_t params[] = { {"version_table", PARAM_INT, &ul_version_table}, {"ka_mode", PARAM_INT, &ul_ka_mode}, {"ka_from", PARAM_STR, &ul_ka_from}, - {"ka_domain", PARAM_STR, &ul_ka_domain}, - {"ka_method", PARAM_STR, &ul_ka_method}, + {"ka_domain", PARAM_STR, &ul_ka_domain}, + {"ka_method", PARAM_STR, &ul_ka_method}, {0, 0, 0} };

1 0

git:master:d1a221af: usrloc: docs for keepalive parameters
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: d1a221af4cac226199365c18a6a121090dc4cf82 URL: https://github.com/kamailio/kamailio/commit/d1a221af4cac226199365c18a6a1210… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T10:16:03+01:00 usrloc: docs for keepalive parameters --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1a221af4cac226199365c18a6a1210… Patch: https://github.com/kamailio/kamailio/commit/d1a221af4cac226199365c18a6a1210… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 902d0586c1..d4f96db94f 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1267,6 +1267,126 @@ modparam("usrloc", "version_table", 0) </example> </section> + <section id="usrloc.p.ka_mode"> + <title><varname>ka_mode</varname> (int)</title> + <para> + Keepalive mode - control the internal keepalive mechanism. With this feature + enable, the module sends periodically (based on timer interval) SIP requests + to location contacts and measures the round trip in microseconds (the + round trip value can be seen in the response of the RPC command 'ul.dump'). + </para> + <para> + Its value is a set of flags: + </para> + <itemizedlist> + <listitem> + <para> + 0 - if the value is zero, no keepalive is sent + </para> + </listitem> + <listitem> + <para> + 1 - if set to 1, the keepalive is enabled for all contacts + </para> + </listitem> + <listitem> + <para> + 2 (bit 2 set) - the keepalive is sent only for natted contacts + (nat_bflag set) + </para> + </listitem> + <listitem> + <para> + 4 (bit 3 set) - the keepalive is sent only for UDP contacts + </para> + </listitem> + </itemizedlist> + <para> + For example, if set to 6, then keepalive is sent only natted UDP contacs. + </para> + <para> + Note: the internal keepalive of usrloc module conflicts in some way with + the keepalive done by nathelper module. It is recommended to enable only + one. + </para> + <para> + Note: the internal keepalive is for the moment implemented only for + contact records stored in memory. + </para> + <para> + Note: it is recommeder to set 'timer_procs' parameter in order to have + dedicated timer processes for usrloc module and off-load the keepalive + sending process from the core timers. + </para> + <para> + Default value is <quote>0 (keepalive disabled)</quote>. + </para> + <example> + <title><varname>ka_mode</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_mode", 1) +... + </programlisting> + </example> + </section> + + <section id="usrloc.p.ka_method"> + <title><varname>ka_method</varname> (str)</title> + <para> + The SIP method type for keepalive requests. + </para> + <para> + Default value is <quote>OPTIONS</quote>. + </para> + <example> + <title><varname>ka_method</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_method", "NOTIFY") +... + </programlisting> + </example> + </section> + + <section id="usrloc.p.from"> + <title><varname>ka_from</varname> (str)</title> + <para> + The SIP URI to be set in the From header of the keepalive requests. + </para> + <para> + Default value is <quote>sip:server@kamailio.org</quote>. + </para> + <example> + <title><varname>ka_from</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_from", "sip:server@mydomain.com") +... + </programlisting> + </example> + </section> + + <section id="usrloc.p.domain"> + <title><varname>ka_domain</varname> (str)</title> + <para> + The domain to be set in To header URI if the multi-domain is not enabled. + If multi-domain is enabled, then the domain from the location record is + used and this parameter is ignored. + </para> + <para> + Default value is <quote>kamailio.org</quote>. + </para> + <example> + <title><varname>ka_domain</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_domain", "mydomain.com") +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:4652a116: usrloc: print ka roundtrip via rpc dump command
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 4652a116fb940fbda527e1b04a5a0a32f7b9a3fe URL: https://github.com/kamailio/kamailio/commit/4652a116fb940fbda527e1b04a5a0a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T09:12:34+01:00 usrloc: print ka roundtrip via rpc dump command --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4652a116fb940fbda527e1b04a5a0a3… Patch: https://github.com/kamailio/kamailio/commit/4652a116fb940fbda527e1b04a5a0a3… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 11366cc0f7..ab88801e9e 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -524,9 +524,10 @@ int ul_update_keepalive(unsigned int _aorhash, str *_ruid, time_t tval, { /* found */ c->last_keepalive = tval; - LM_DBG("updated keepalive for [%.*s:%u] to %u\n", + c->ka_roundtrip = rtrip; + LM_DBG("updated keepalive for [%.*s:%u] to %u (rtrip: %u)\n", _ruid->len, _ruid->s, _aorhash, - (unsigned int)c->last_keepalive); + (unsigned int)c->last_keepalive, c->ka_roundtrip); unlock_ulslot(p->d, i); return 0; } diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 6c00c87c63..32417d06e5 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -200,6 +200,11 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding last_keepalive"); return -1; } + if(rpc->struct_add(vh, "d", "KA-Roundtrip", (int)c->ka_roundtrip)<0) + { + rpc->fault(ctx, 500, "Internal error adding keepalive roundtrip"); + return -1; + } if(rpc->struct_add(vh, "d", "Last-Modified", (int)c->last_modified)<0) { rpc->fault(ctx, 500, "Internal error adding last_modified");

1 0

git:5.3:d91b5440: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Mar '20

27 Mar '20

Module: kamailio Branch: 5.3 Commit: d91b5440947884ac00889bfc985d35564699dc8f URL: https://github.com/kamailio/kamailio/commit/d91b5440947884ac00889bfc985d355… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-27T08:46:30+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/corex/README Modified: src/modules/pike/README Modified: src/modules/sst/README --- Diff: https://github.com/kamailio/kamailio/commit/d91b5440947884ac00889bfc985d355… Patch: https://github.com/kamailio/kamailio/commit/d91b5440947884ac00889bfc985d355… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index a67289bdb5..e9f8045f3a 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -10,8 +10,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Muhammad Shahzad Shafi <shahzad(a)voip-demos.com> @@ -574,7 +572,15 @@ via_add_srv("1"); Example 1.23. via_add_xavp_params usage ... -via_add_xavp_params("1"); +xavp_via_params="xvia" +... +request_route { + ... + $xavp(xvia=>srvid) = "1"; + $xavp(xvia[0]=>myval) = "xyz"; + via_add_xavp_params("1"); + ... +} ... 4.20. via_use_xavp_fields(flags) @@ -589,7 +595,15 @@ via_add_xavp_params("1"); Example 1.24. via_use_xavp_fields usage ... -via_use_xavp_fields("1"); +xavp_via_fields="mvia" +... +request_route { + ... + $xavp(mvia=>address) = "10.10.10.10"; + $xavp(mvia[0]=>port) = "5060"; + via_use_xavp_fields("1"); + ... +} ... 5. RPC Commands diff --git a/src/modules/pike/README b/src/modules/pike/README index 34a26d7020..a7f66697e7 100644 --- a/src/modules/pike/README +++ b/src/modules/pike/README @@ -247,9 +247,9 @@ Chapter 3. Developer Guide Example 3.1. Tree of IP addresses / 193 - 175 - 132 - 164 -tree root / \ 142 +tree root / \ - 142 \ 195 - 37 - 78 - 163 - \ 79 - 134 + \ - 79 - 134 To detect the whole address, step by step, from the root to the leafs, the nodes corresponding to each byte of the ip address are expanded. In diff --git a/src/modules/sst/README b/src/modules/sst/README index 725cffc95d..3444863563 100644 --- a/src/modules/sst/README +++ b/src/modules/sst/README @@ -219,20 +219,36 @@ modparam("sst", "min_se", 2400) 4.3. timeout_avp (string) - This parameter MUST be set to the same value as the dialog module - parameter of the same name. If this parameter is NOT set, the sst - module will not do anything! + This parameter must be set to the same value as the dialog module + parameter of the same name, when it is wanted to update dialog timeout + using Session-Expires header value. If this parameter is not set, the + sst module will not update dialog timeout. - This is how the sst module knows which avp in the dialog module it has - to change with the new expire value. + With this parameter, the sst module knows which avp is expected by the + dialog module to change to a new expire value. - Default value is “NULL!” it is not set by default. + Note that the avp is set only for requests within dialog, not for the + initial INVITE. For this one, it can be done using script operations, + see the next example for such solution. + + Default value is “NULL” (not set by default). Example 1.4. Set timeout_avp parameter ... -modparam("dialog", "timeout_avp", "$avp(i:10)") +modparam("dialog", "timeout_avp", "$avp(dlgtimeout)") # Set the sst modules timeout_avp to be the same value -modparam("sst", "timeout_avp", "$avp(i:10)") +modparam("sst", "timeout_avp", "$avp(dlgtimeout)") +... +request_route { + ... + # when wanting to use Session-Expires value for initial INVITE + if(is_method("INVITE") and !has_totag()) { + if(is_present_hf("Session-Expires")) { + $avp(dlgtimeout) = $(hdr(Session-Expires){s.int}); + } + } + ... +} ... 4.4. reject_to_small (integer)

1 0

git: new commits in branch 5.3
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

- URL: https://github.com/kamailio/kamailio/commit/382e55f8b1fa8c79b01a90438e674fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:21:52+01:00 dmq: init worker structure in chid_init for PROC_INIT rank - have it ready when other processes are started (cherry picked from commit 21bdbff049571ca22f1205a041c8b1162005d319) - URL: https://github.com/kamailio/kamailio/commit/18f17c944f0ab48d3e7af69deac1f58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:22:02+01:00 dialog: detailed debug messages when resolving the timeout (cherry picked from commit 20013e4e2bf1a5d5ce8535e07320dca034639286) - URL: https://github.com/kamailio/kamailio/commit/5cdcb3a77879266303daa2be22b424e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:22:14+01:00 sst: debug message when setting timeout avp (cherry picked from commit 56ed5c028bd97837c7a9e0017a2599f09554211f) - URL: https://github.com/kamailio/kamailio/commit/01defdb59e7017d284d8519bcb0043c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:22:24+01:00 corex: docs - examples with setting xavps for via functions (cherry picked from commit 1e58a56cb7f9d83ca0c943481d02c429d33e188a) - URL: https://github.com/kamailio/kamailio/commit/975d09a68cbd15f4f042c1c97e0c4d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:22:55+01:00 dialog: functions to search dialog by uuid and keep table entry locked - helper macros to lock/unlock table entry with dlg cell structure (cherry picked from commit a4f8c0291bfd32752c0c2c323f618c6ac0c91d53) - URL: https://github.com/kamailio/kamailio/commit/3b8d925ff74ed30f259fa9858d17ab7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:23:05+01:00 dialog: exposed functions to search dlg and lock table entry (cherry picked from commit 125031daeade9dab5c36b912dda65700d95c4c6a) - URL: https://github.com/kamailio/kamailio/commit/e59362c76599b29efa7722cebacb8ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:23:17+01:00 dialog: dmq operations under locked dlg table entry - protect against races that could be due to rentransmissions or other parallel processing cases - related to GH #2224 (cherry picked from commit 8965ff07f2e9fa105fc56896eed9caf4b6faf261) - URL: https://github.com/kamailio/kamailio/commit/f127bcec39888a8b34524e9f8ad336b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:23:28+01:00 rtpengine: replaced rtpproxy with rtpengine - avoid confusion in printed log messges (cherry picked from commit dda07c69420e1a38948dae4b71f8005b2375253b) - URL: https://github.com/kamailio/kamailio/commit/5fc4b6871a2c9f8cca841350d4bd0c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:24:24+01:00 lib/srdb1: schema - added xml file for sefilter module (cherry picked from commit 09c18bb06691ad29b71990179a3006b5bdfbf602) - URL: https://github.com/kamailio/kamailio/commit/f8b1f4f3b9447b2400c7cb241a83249… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:24:34+01:00 lib/srdb1: schema - use smallint for secfilter - tinyint is not supported (cherry picked from commit 7c8fdb0df37ee1466d7171ff3cff77e5b961abb4) - URL: https://github.com/kamailio/kamailio/commit/261af6718472a7d3d62cb269f135ea1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:24:43+01:00 kamctl: regenerated db schema file with secfilter updates (cherry picked from commit 63cd404d4b46e4514ae1490303189a0f81def942) - URL: https://github.com/kamailio/kamailio/commit/c3273ba4bc3bc8d1395823f019ad871… Author: Zero King <l2dy(a)icloud.com> Date: 2020-03-27T08:24:55+01:00 nathelper: fix zero-length log placeholder (cherry picked from commit 69714b26c63c75df6759f9158c7181d4f86b4764) - URL: https://github.com/kamailio/kamailio/commit/6ac87dbf749c3c53cc1dfd031185ffd… Author: Zero King <l2dy(a)icloud.com> Date: 2020-03-27T08:25:05+01:00 rtpproxy: fix zero-length log placeholder (cherry picked from commit 030f18b5cffeb117dcf582cf12c5b3c35ace1469) - URL: https://github.com/kamailio/kamailio/commit/6b5052823d9e123a0e34c53d258b94b… Author: Zero King <l2dy(a)icloud.com> Date: 2020-03-27T08:25:14+01:00 rtpengine: fix zero-length log placeholder (cherry picked from commit 740afac15b3d8d618b5101a761a37f5808d4b4f0) - URL: https://github.com/kamailio/kamailio/commit/98b651a5cd3c5c782462867a4492717… Author: Nathan Bruning <nathan(a)iperity.com> Date: 2020-03-27T08:25:27+01:00 core: fix returning multiple IPs for a cached DNS entry (cherry picked from commit 29a35ec3cec8b9c3ee4b45c8d84308701bda097c) - URL: https://github.com/kamailio/kamailio/commit/4b5d7ae9911d320a7c3335fb627791c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:25:38+01:00 sst: docs - more info about how timeout_avp is used (cherry picked from commit b800ffb9fb1de6ee0d7b6c2b42a25669022c1142) - URL: https://github.com/kamailio/kamailio/commit/6760931a9938fcd92e36a30821c5bc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:25:51+01:00 pike: docs - aligned ip tree example (cherry picked from commit e65ce2fd407626acc89879033a2114cf521457dc) - URL: https://github.com/kamailio/kamailio/commit/082e7dfd9048c79e2d6b7cc6365bf4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T08:26:37+01:00 core: receive_msg() - init local variables for better runtime troubleshooting (cherry picked from commit 1611766a329aa60a690803d7ff179159a4657a56)

1 0

[kamailio/kamailio] Request for new RPC htable.flush to DB (#2201)
by Sergiu Pojoga 27 Mar '20

27 Mar '20

### Description Ability to flush on-demand htable from memory to DB. ### Possible Solutions Implement a new RPC `htable.flush` command Flush hash table to database. Name: dhtable.flush Parameters: htable : Name of the hash table to flush Example: ... kamcmd htable.flush ... -- 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/2201

2 3

git:master:de849323: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 26 Mar '20

26 Mar '20

Module: kamailio Branch: master Commit: de8493232eb6aefa742e038cb3ca6282aadf1a6a URL: https://github.com/kamailio/kamailio/commit/de8493232eb6aefa742e038cb3ca628… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-26T22:46:08+01:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/de8493232eb6aefa742e038cb3ca628… Patch: https://github.com/kamailio/kamailio/commit/de8493232eb6aefa742e038cb3ca628… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 036451cd21..be5e43711c 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -198,7 +198,8 @@ Chapter 1. Admin Guide * pidf-lo - the PIDF-LO returned in the HELD locationRequest response * url - the location reference returned in the HELD locationRequest response - this reference may be added as Geolocation header value - and forwarded downstream + and forwarded downstream Note: to work properly, it is required to + include "locationURI" in the location_type parameter. * error - any error code returned in the HELD locationRequest response

1 0

git:master:340bb1ef: lost: fixed defects reported from Coverity Scan
by Wolfgang Kampichler 26 Mar '20

26 Mar '20

Module: kamailio Branch: master Commit: 340bb1efbf5fc9ba9e1ef2ec8d3074c40be5d0ca URL: https://github.com/kamailio/kamailio/commit/340bb1efbf5fc9ba9e1ef2ec8d3074c… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2020-03-26T22:36:05+01:00 lost: fixed defects reported from Coverity Scan - in lost_function(): illegal access - in lost_held_type(): null pointer dereferences - in lost_xpath_location(): resource leak, control flow, null pointer dereferences - besides: README update and code refactoring. --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/340bb1efbf5fc9ba9e1ef2ec8d3074c… Patch: https://github.com/kamailio/kamailio/commit/340bb1efbf5fc9ba9e1ef2ec8d3074c…

1 0

git:master:68928e95: usrloc: store keepalive roundtrip in contact structure
by Daniel-Constantin Mierla 26 Mar '20

26 Mar '20

Module: kamailio Branch: master Commit: 68928e95f50581170097373dafe7a441e7f88304 URL: https://github.com/kamailio/kamailio/commit/68928e95f50581170097373dafe7a44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-26T21:57:08+01:00 usrloc: store keepalive roundtrip in contact structure --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/68928e95f50581170097373dafe7a44… Patch: https://github.com/kamailio/kamailio/commit/68928e95f50581170097373dafe7a44… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index a4c838e1f6..11366cc0f7 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -489,11 +489,11 @@ int get_all_ucontacts(void *buf, int len, unsigned int flags, } - /** * */ -int ul_refresh_keepalive(unsigned int _aorhash, str *_ruid) +int ul_update_keepalive(unsigned int _aorhash, str *_ruid, time_t tval, + unsigned int rtrip) { dlist_t *p; urecord_t *r; @@ -523,7 +523,7 @@ int ul_refresh_keepalive(unsigned int _aorhash, str *_ruid) && !memcmp(c->ruid.s, _ruid->s, _ruid->len)) { /* found */ - c->last_keepalive = time(NULL); + c->last_keepalive = tval; LM_DBG("updated keepalive for [%.*s:%u] to %u\n", _ruid->len, _ruid->s, _aorhash, (unsigned int)c->last_keepalive); @@ -539,6 +539,14 @@ int ul_refresh_keepalive(unsigned int _aorhash, str *_ruid) return 0; } +/** + * + */ +int ul_refresh_keepalive(unsigned int _aorhash, str *_ruid) +{ + return ul_update_keepalive(_aorhash, _ruid, time(NULL), 0); +} + /*! * \brief Create a new domain structure * \return 0 if everything went OK, otherwise value < 0 is returned diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 83bce13c77..b40a93040a 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -410,7 +410,7 @@ int ul_ka_reply_received(sip_msg_t *msg) LM_DBG("reply for keepalive of [%.*s:%u] roundtrip: %u.%06usec\n", ruid.len, ruid.s, aorhash, tvdiff/1000000, tvdiff%1000000); - ul_refresh_keepalive(aorhash, &ruid); + ul_update_keepalive(aorhash, &ruid, tvn.tv_sec, tvdiff); return 0; } diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index a1e26da211..5d071c1734 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -88,7 +88,8 @@ typedef struct ucontact { str uniq; /*!< Uniq header field */ struct socket_info *sock; /*!< received socket */ time_t last_modified; /*!< When the record was last modified */ - time_t last_keepalive; /*!< last keepalive timestamp */ + time_t last_keepalive; /*!< Last keepalive timestamp */ + unsigned int ka_roundtrip; /*!< Keepalive roundtrip in microseconds */ unsigned int methods; /*!< Supported methods */ str instance; /*!< SIP instance value - gruu */ unsigned int reg_id; /*!< reg-id parameters */ @@ -192,6 +193,8 @@ int ul_set_keepalive_timeout(int _to); typedef int (*ul_refresh_keepalive_t)(unsigned int _aorhash, str *_ruid); int ul_refresh_keepalive(unsigned int _aorhash, str *_ruid); +int ul_update_keepalive(unsigned int _aorhash, str *_ruid, time_t tval, + unsigned int rtrip); typedef void (*ul_set_max_partition_t)(unsigned int m);

1 0

git:master:87c5d45a: usrloc: process keepalive response
by Daniel-Constantin Mierla 26 Mar '20

26 Mar '20

Module: kamailio Branch: master Commit: 87c5d45a66d2d1ecfca4d2677be4d3ff633dc218 URL: https://github.com/kamailio/kamailio/commit/87c5d45a66d2d1ecfca4d2677be4d3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-26T21:02:09+01:00 usrloc: process keepalive response --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/ul_keepalive.h Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/87c5d45a66d2d1ecfca4d2677be4d3f… Patch: https://github.com/kamailio/kamailio/commit/87c5d45a66d2d1ecfca4d2677be4d3f…

1 0

git:master:b3677f75: usrloc: ability to send keep alive requests
by Daniel-Constantin Mierla 26 Mar '20

26 Mar '20

Module: kamailio Branch: master Commit: b3677f7508cfdcea54f48ed01688fa0cf9380e58 URL: https://github.com/kamailio/kamailio/commit/b3677f7508cfdcea54f48ed01688fa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-26T16:18:17+01:00 usrloc: ability to send keep alive requests - GH #2223 - work in progress --- Added: src/modules/usrloc/ul_keepalive.c Added: src/modules/usrloc/ul_keepalive.h Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b3677f7508cfdcea54f48ed01688fa0… Patch: https://github.com/kamailio/kamailio/commit/b3677f7508cfdcea54f48ed01688fa0…

1 0

git:master:1611766a: core: receive_msg() - init local variables for better runtime troubleshooting
by Daniel-Constantin Mierla 26 Mar '20

26 Mar '20

Module: kamailio Branch: master Commit: 1611766a329aa60a690803d7ff179159a4657a56 URL: https://github.com/kamailio/kamailio/commit/1611766a329aa60a690803d7ff17915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-26T11:28:51+01:00 core: receive_msg() - init local variables for better runtime troubleshooting --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/1611766a329aa60a690803d7ff17915… Patch: https://github.com/kamailio/kamailio/commit/1611766a329aa60a690803d7ff17915… --- diff --git a/src/core/receive.c b/src/core/receive.c index b780440030..428214df68 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -223,15 +223,15 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) */ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) { - struct sip_msg *msg; + struct sip_msg *msg = NULL; struct run_act_ctx ctx; - struct run_act_ctx *bctx; - int ret; + struct run_act_ctx *bctx = NULL; + int ret = -1; struct timeval tvb, tve; struct timezone tz; unsigned int diff = 0; - str inb; - sr_net_info_t netinfo; + str inb = STR_NULL; + sr_net_info_t netinfo = {0}; sr_kemi_eng_t *keng = NULL; sr_event_param_t evp = {0}; unsigned int cidlockidx = 0;

1 0

git:master:1d01ae5e: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: 1d01ae5e7934cc84bb40ae4d18e6a48f6a78e5e2 URL: https://github.com/kamailio/kamailio/commit/1d01ae5e7934cc84bb40ae4d18e6a48… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-25T19:46:12+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/1d01ae5e7934cc84bb40ae4d18e6a48… Patch: https://github.com/kamailio/kamailio/commit/1d01ae5e7934cc84bb40ae4d18e6a48… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 78b7547085..4aa4c258a9 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -80,9 +80,10 @@ Ovidiu Sas 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.flush htable - 6.8. htable.listTables - 6.9. htable.stats + 6.7. htable.store htable + 6.8. htable.flush htable + 6.9. htable.listTables + 6.10. htable.stats 7. Event routes @@ -183,9 +184,10 @@ Chapter 1. Admin Guide 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.flush htable - 6.8. htable.listTables - 6.9. htable.stats + 6.7. htable.store htable + 6.8. htable.flush htable + 6.9. htable.listTables + 6.10. htable.stats 7. Event routes @@ -977,9 +979,10 @@ if(sht_match_str_value("ha", "eq", "alice")) { 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.flush htable - 6.8. htable.listTables - 6.9. htable.stats + 6.7. htable.store htable + 6.8. htable.flush htable + 6.9. htable.listTables + 6.10. htable.stats 6.1. htable.get htable key @@ -1063,7 +1066,7 @@ kamcmd htable.sets test x[0] 123 Lists all the values in a hash table - Name: dhtable.dump + Name: htable.dump Parameters: * htable : Name of the hash table to dump @@ -1077,7 +1080,7 @@ kamcmd htable.dump ipban Reload hash table from database. - Name: dhtable.reload + Name: htable.reload Parameters: * htable : Name of the hash table to reload @@ -1087,7 +1090,21 @@ kamcmd htable.dump ipban kamcmd htable.reload ipban ... -6.7. htable.flush htable +6.7. htable.store htable + + Store hash table to database. + + Name: htable.store + + Parameters: + * htable : Name of the hash table to store + + Example: +... +kamcmd htable.store ipban +... + +6.8. htable.flush htable Empty the hash table @@ -1101,7 +1118,7 @@ kamcmd htable.reload ipban kamcmd htable.flush ipban ... -6.8. htable.listTables +6.9. htable.listTables Lists all defined tables @@ -1115,7 +1132,7 @@ kamcmd htable.flush ipban kamcmd htable.listTables ... -6.9. htable.stats +6.10. htable.stats Get statistics for hash tables - name, number of slots, number of items, max number of items per slot, min number of items per slot.

1 0

git:master:01933ac0: htable: docs for rpc command htable.store
by Daniel-Constantin Mierla 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: 01933ac03f3db92f1c5f493a16ed3e4e75565e62 URL: https://github.com/kamailio/kamailio/commit/01933ac03f3db92f1c5f493a16ed3e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-25T19:36:37+01:00 htable: docs for rpc command htable.store --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01933ac03f3db92f1c5f493a16ed3e4… Patch: https://github.com/kamailio/kamailio/commit/01933ac03f3db92f1c5f493a16ed3e4…

1 0

git:master:17ed8ddf: htable: new rpc command htable.store
by Daniel-Constantin Mierla 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: 17ed8ddf20338e0728cf4e8c496f726650577898 URL: https://github.com/kamailio/kamailio/commit/17ed8ddf20338e0728cf4e8c496f726… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-25T19:31:49+01:00 htable: new rpc command htable.store - save the content of hash table to database --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/17ed8ddf20338e0728cf4e8c496f726… Patch: https://github.com/kamailio/kamailio/commit/17ed8ddf20338e0728cf4e8c496f726… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 144a65beaa..a1a8e04c48 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1285,9 +1285,14 @@ static const char* htable_flush_doc[2] = { 0 }; static const char* htable_reload_doc[2] = { - "Reload hash table.", + "Reload hash table from database.", 0 }; +static const char* htable_store_doc[2] = { + "Store hash table to database.", + 0 +}; + static void htable_rpc_delete(rpc_t* rpc, void* c) { str htname, keyname; @@ -1754,6 +1759,56 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) return; } +/*! \brief RPC htable.store command to store content of a hash table to db */ +static void htable_rpc_store(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + + if(ht_db_url.len<=0) { + rpc->fault(c, 500, "No htable db_url"); + return; + } + if(ht_db_init_con()!=0) { + rpc->fault(c, 500, "Failed to init htable db connection"); + return; + } + if(ht_db_open_con()!=0) { + rpc->fault(c, 500, "Failed to open htable db connection"); + return; + } + + if (rpc->scan(c, "S", &htname) < 1) { + ht_db_close_con(); + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) { + ht_db_close_con(); + rpc->fault(c, 500, "No such htable"); + return; + } + if(ht->dbtable.s==NULL || ht->dbtable.len<=0) { + ht_db_close_con(); + rpc->fault(c, 500, "No database htable"); + return; + } + LM_DBG("sync db table [%.*s] from ht [%.*s]\n", + ht->dbtable.len, ht->dbtable.s, + ht->name.len, ht->name.s); + ht_db_delete_records(&ht->dbtable); + if(ht_db_save_table(ht, &ht->dbtable)!=0) { + LM_ERR("failed syncing hash table [%.*s] to db\n", + ht->name.len, ht->name.s); + ht_db_close_con(); + rpc->fault(c, 500, "Storing htable failed"); + return; + } + ht_db_close_con(); + return; +} + rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, RET_ARRAY}, {"htable.delete", htable_rpc_delete, htable_delete_doc, 0}, @@ -1762,6 +1817,7 @@ rpc_export_t htable_rpc[] = { {"htable.seti", htable_rpc_seti, htable_seti_doc, 0}, {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, + {"htable.store", htable_rpc_store, htable_store_doc, 0}, {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, {0, 0, 0, 0}

1 0

git:master:06d545bb: Makefile.defs: version set to 5.4.0-dev4
by Daniel-Constantin Mierla 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: 06d545bb3e3e0921cdd70dbdd7fd290b74824b55 URL: https://github.com/kamailio/kamailio/commit/06d545bb3e3e0921cdd70dbdd7fd290… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-25T17:34:07+01:00 Makefile.defs: version set to 5.4.0-dev4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/06d545bb3e3e0921cdd70dbdd7fd290… Patch: https://github.com/kamailio/kamailio/commit/06d545bb3e3e0921cdd70dbdd7fd290… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f6f39e3a01..9b36b0b56e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:daf74e8a: sipdump: test initialization of faked msg structure
by Daniel-Constantin Mierla 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: daf74e8a7356014a0227352d8f7be44d4c4fd9d0 URL: https://github.com/kamailio/kamailio/commit/daf74e8a7356014a0227352d8f7be44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-25T17:17:00+01:00 sipdump: test initialization of faked msg structure --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/daf74e8a7356014a0227352d8f7be44… Patch: https://github.com/kamailio/kamailio/commit/daf74e8a7356014a0227352d8f7be44… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index d686dc897e..ad867ff0ce 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -137,7 +137,10 @@ static int mod_init(void) if (sipdump_event_route_idx>=0 && event_rt.rlist[sipdump_event_route_idx]==0) { sipdump_event_route_idx = -1; /* disable */ } - faked_msg_init(); + if(faked_msg_init() <0) { + LM_ERR("cannot initialize faked msg structure\n"); + return -1; + } } if(sipdump_mode & SIPDUMP_MODE_WFILE) {

1 0

git:master:d8acd8b9: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: d8acd8b9329955c21093df9507ebd8edd916eac9 URL: https://github.com/kamailio/kamailio/commit/d8acd8b9329955c21093df9507ebd8e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-25T15:01:15+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/d8acd8b9329955c21093df9507ebd8e… Patch: https://github.com/kamailio/kamailio/commit/d8acd8b9329955c21093df9507ebd8e… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index d6ae750551..638760ee09 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2097,6 +2097,18 @@ rtpengine_offer(); here will still be accepted and used for transcoding on the offering side.Useful only in combination with codec-transcode. all keyword can be used to mask all offered codecs + + T.38=decode - If the offered SDP contains a media section + advertising T.38 over UDPTL, translate it to a regular audio + media section over RTP. By default, PCMU and PCMA will be used + as audio codecs, but that can be overriden using the codec + options described above. Other transport protocols (e.g. SRTP) + can also be selected in the same way. If the offered SDP does + not contain a T.38 section, then this flag has no effect. + + T.38=force - Any audio media section (over RTP) in the offered + SDP will be translated into a T.38 section over UDPTL. + + T.38=stop - Stops a previously established T.38 to audio + gateway and reverts the session back to media passthrough. + This is useful when handling a rejected T.38 offer. Check also the documentation of RTPEngine, these flags are documented there as well: https://github.com/sipwise/rtpengine.

1 0

git:master:de5b28f8: rtpengine: document new T.38 options
by Richard Fuchs 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: de5b28f89aadfbbf70f023bce7a6fcdd55bfd044 URL: https://github.com/kamailio/kamailio/commit/de5b28f89aadfbbf70f023bce7a6fcd… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-03-25T09:56:56-04:00 rtpengine: document new T.38 options --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/de5b28f89aadfbbf70f023bce7a6fcd… Patch: https://github.com/kamailio/kamailio/commit/de5b28f89aadfbbf70f023bce7a6fcd… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index fafff2e4c5..d9230209f6 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2404,6 +2404,23 @@ rtpengine_offer(); and used for transcoding on the offering side.Useful only in combination with codec-transcode. <emphasis>all</emphasis> keyword can be used to mask all offered codecs </para></listitem> + <listitem><para> + <emphasis>T.38=decode</emphasis> - If the offered &sdp; contains a media section + advertising T.38 over UDPTL, translate it to a regular audio media section + over RTP. By default, PCMU and PCMA will be used as audio codecs, but that can + be overriden using the codec options described above. Other transport protocols + (e.g. SRTP) can also be selected in the same way. If the offered &sdp; does not + contain a T.38 section, then this flag has no effect. + </para></listitem> + <listitem><para> + <emphasis>T.38=force</emphasis> - Any audio media section (over RTP) in the + offered &sdp; will be translated into a T.38 section over UDPTL. + </para></listitem> + <listitem><para> + <emphasis>T.38=stop</emphasis> - Stops a previously established T.38 to audio + gateway and reverts the session back to media passthrough. This is useful when + handling a rejected T.38 offer. + </para></listitem> </itemizedlist> <para> Check also the documentation of RTPEngine, these flags are documented there as well:

1 0

git:master:6ab14314: rtpengine: add support for new T.38 options
by Richard Fuchs 25 Mar '20

25 Mar '20

Module: kamailio Branch: master Commit: 6ab1431464f97e856812e0f69d77bc96e3dd8f57 URL: https://github.com/kamailio/kamailio/commit/6ab1431464f97e856812e0f69d77bc9… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-03-25T09:00:40-04:00 rtpengine: add support for new T.38 options --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/6ab1431464f97e856812e0f69d77bc9… Patch: https://github.com/kamailio/kamailio/commit/6ab1431464f97e856812e0f69d77bc9… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6d821aee7a..7be7968660 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -118,6 +118,7 @@ enum { struct ng_flags_parse { int via, to, packetize, transport, directional; bencode_item_t *dict, *flags, *direction, *replace, *rtcp_mux, *sdes, + *t38, *codec, *codec_strip, *codec_offer, *codec_transcode, *codec_mask; str call_id, from_tag, to_tag; }; @@ -2125,6 +2126,10 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu bencode_list_add_str(ng_flags->sdes, &s); goto next; } + if (str_key_val_prefix(&key, "T38", &val, &s) || str_key_val_prefix(&key, "T.38", &val, &s)) { + bencode_list_add_str(ng_flags->t38, &s); + goto next; + } if (str_key_val_prefix(&key, "rtcp-mux", &val, &s)) { bencode_list_add_str(ng_flags->rtcp_mux, &s); goto next; @@ -2402,6 +2407,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ ng_flags.replace = bencode_list(bencbuf); ng_flags.rtcp_mux = bencode_list(bencbuf); ng_flags.sdes = bencode_list(bencbuf); + ng_flags.t38 = bencode_list(bencbuf); ng_flags.codec = bencode_dictionary(bencbuf); if (read_sdp_pvar!= NULL) { @@ -2455,6 +2461,8 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ bencode_dictionary_add(ng_flags.dict, "rtcp-mux", ng_flags.rtcp_mux); if (ng_flags.sdes && ng_flags.sdes->child) bencode_dictionary_add(ng_flags.dict, "SDES", ng_flags.sdes); + if (ng_flags.t38 && ng_flags.t38->child) + bencode_dictionary_add(ng_flags.dict, "T.38", ng_flags.t38); bencode_dictionary_add_str(ng_flags.dict, "call-id", &ng_flags.call_id);

1 0

Broken: kamailio/kamailio#8606 (5.2 - 09985a4)
by Travis CI 25 Mar '20

25 Mar '20

Build Update for kamailio/kamailio ------------------------------------- Build: #8606 Status: Broken Duration: 3 mins and 56 secs Commit: 09985a4 (5.2) Author: Henning Westerholt Message: uac: also set socket for in dialog REGISTER (GH #2262) (cherry picked from commit a752411df65b93f82aaad43a767cff102f5a6100) View the changeset: https://github.com/kamailio/kamailio/compare/3858b3057c8a...09985a448ffd View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/666801142?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:5.3:7404e276: uac: also set socket for in dialog REGISTER (GH #2262)
by Henning Westerholt 25 Mar '20

25 Mar '20

Module: kamailio Branch: 5.3 Commit: 7404e276680cebc925002ff3bb714127ea20b265 URL: https://github.com/kamailio/kamailio/commit/7404e276680cebc925002ff3bb71412… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-25T14:57:02+01:00 uac: also set socket for in dialog REGISTER (GH #2262) (cherry picked from commit a752411df65b93f82aaad43a767cff102f5a6100) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/7404e276680cebc925002ff3bb71412… Patch: https://github.com/kamailio/kamailio/commit/7404e276680cebc925002ff3bb71412… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index fb45a4fd3d..2ce37258e1 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1131,6 +1131,19 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) /* Callback parameter */ uac_r.cbp = (void*)uuid; + if(reg->socket.s != NULL && reg->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + reg->socket.len, reg->socket.s); + uac_r.ssock = &reg->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + if (reg_keep_callid && reg->flags & UAC_REG_ONLINE && reg->cseq > 0 && reg->cseq < 2147483638 && reg->callid.len > 0) @@ -1150,19 +1163,6 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) ret = uac_tmb.t_request_within(&uac_r); } else { - /* custom socket */ - if(reg->socket.s != NULL && reg->socket.len > 0) { - LM_DBG("using custom socket %.*s to send request\n", - reg->socket.len, reg->socket.s); - uac_r.ssock = &reg->socket; - } - /* default socket */ - else { - if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { - LM_DBG("using configured default_socket to send request\n"); - uac_r.ssock = &uac_default_socket; - } - } ret = uac_tmb.t_request(&uac_r, /* UAC Req */ &s_ruri, /* Request-URI */ &s_turi, /* To */

1 0

git:5.2:0506dee4: Revert "uac: also set socket for in dialog REGISTER (GH #2262)"
by Henning Westerholt 25 Mar '20

25 Mar '20

Module: kamailio Branch: 5.2 Commit: 0506dee4af74b5e1190ca1e28b1f4cc4a4f3e334 URL: https://github.com/kamailio/kamailio/commit/0506dee4af74b5e1190ca1e28b1f4cc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-25T14:56:32+01:00 Revert "uac: also set socket for in dialog REGISTER (GH #2262)" This reverts commit 09985a448ffd34375be0d93f4b16f17c7dac3dc0. --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/0506dee4af74b5e1190ca1e28b1f4cc… Patch: https://github.com/kamailio/kamailio/commit/0506dee4af74b5e1190ca1e28b1f4cc… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index b944ebf4f9..f75c7cf38a 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1150,19 +1150,6 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) /* Callback parameter */ uac_r.cbp = (void*)uuid; - if(reg->socket.s != NULL && reg->socket.len > 0) { - /* custom socket */ - LM_DBG("using custom socket %.*s to send request\n", - reg->socket.len, reg->socket.s); - uac_r.ssock = &reg->socket; - } else { - /* default socket */ - if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { - LM_DBG("using configured default_socket to send request\n"); - uac_r.ssock = &uac_default_socket; - } - } - if (reg_keep_callid && reg->flags & UAC_REG_ONLINE && reg->cseq > 0 && reg->cseq < 2147483638 && reg->callid.len > 0)

1 0

git:5.2:09985a44: uac: also set socket for in dialog REGISTER (GH #2262)
by Henning Westerholt 25 Mar '20

25 Mar '20

Module: kamailio Branch: 5.2 Commit: 09985a448ffd34375be0d93f4b16f17c7dac3dc0 URL: https://github.com/kamailio/kamailio/commit/09985a448ffd34375be0d93f4b16f17… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-25T14:54:53+01:00 uac: also set socket for in dialog REGISTER (GH #2262) (cherry picked from commit a752411df65b93f82aaad43a767cff102f5a6100) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/09985a448ffd34375be0d93f4b16f17… Patch: https://github.com/kamailio/kamailio/commit/09985a448ffd34375be0d93f4b16f17… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index f75c7cf38a..b944ebf4f9 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1150,6 +1150,19 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) /* Callback parameter */ uac_r.cbp = (void*)uuid; + if(reg->socket.s != NULL && reg->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + reg->socket.len, reg->socket.s); + uac_r.ssock = &reg->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + if (reg_keep_callid && reg->flags & UAC_REG_ONLINE && reg->cseq > 0 && reg->cseq < 2147483638 && reg->callid.len > 0)

1 0

git:master:4b2e79d9: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 4b2e79d932840c6810038e0e386354bc3cc90e6c URL: https://github.com/kamailio/kamailio/commit/4b2e79d932840c6810038e0e386354b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-24T22:46:07+01:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/4b2e79d932840c6810038e0e386354b… Patch: https://github.com/kamailio/kamailio/commit/4b2e79d932840c6810038e0e386354b… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index fdd95cd8e9..8b87eb20d3 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -238,8 +238,8 @@ ot exists add new header Insert new header value before an existing header, if no index acquired insert before first hf header. Note that a header may consist of comma - delimited list of values. To insert value behind last value use - appenf_hf_value. + delimited list of values. To insert a value behind the last value use + append_hf_value. Meaning of the parameters is as follows: * hf - Header field to be appended. Format: HFNAME [ [IDX] ]. If

1 0

git:master:a752411d: uac: also set socket for in dialog REGISTER (GH #2262)
by Henning Westerholt 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: a752411df65b93f82aaad43a767cff102f5a6100 URL: https://github.com/kamailio/kamailio/commit/a752411df65b93f82aaad43a767cff1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-24T22:43:42+01:00 uac: also set socket for in dialog REGISTER (GH #2262) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/a752411df65b93f82aaad43a767cff1… Patch: https://github.com/kamailio/kamailio/commit/a752411df65b93f82aaad43a767cff1… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index f35fedf384..c0cd5179b8 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1131,6 +1131,19 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) /* Callback parameter */ uac_r.cbp = (void*)uuid; + if(reg->socket.s != NULL && reg->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + reg->socket.len, reg->socket.s); + uac_r.ssock = &reg->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + if (reg_keep_callid && reg->flags & UAC_REG_ONLINE && reg->cseq > 0 && reg->cseq < 2147483638 && reg->callid.len > 0) @@ -1150,19 +1163,6 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) ret = uac_tmb.t_request_within(&uac_r); } else { - /* custom socket */ - if(reg->socket.s != NULL && reg->socket.len > 0) { - LM_DBG("using custom socket %.*s to send request\n", - reg->socket.len, reg->socket.s); - uac_r.ssock = &reg->socket; - } - /* default socket */ - else { - if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { - LM_DBG("using configured default_socket to send request\n"); - uac_r.ssock = &uac_default_socket; - } - } ret = uac_tmb.t_request(&uac_r, /* UAC Req */ &s_ruri, /* Request-URI */ &s_turi, /* To */

1 0

git:master:53ccb420: textopsx: small spelling fix in docs
by Henning Westerholt 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 53ccb420c0414a12af0783add864bb4d97a65d90 URL: https://github.com/kamailio/kamailio/commit/53ccb420c0414a12af0783add864bb4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-24T22:43:42+01:00 textopsx: small spelling fix in docs --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/53ccb420c0414a12af0783add864bb4… Patch: https://github.com/kamailio/kamailio/commit/53ccb420c0414a12af0783add864bb4… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 768e291f73..717b8ddb40 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -200,7 +200,7 @@ append_hf_value("foo[-1]", "$var(Bar)") # try add value to the last header, if n <para> Insert new header value before an existing header, if no index acquired insert before first hf header. Note that a header may consist of comma delimited list of values. - To insert value behind last value use <function>appenf_hf_value</function>. + To insert a value behind the last value use <function>append_hf_value</function>. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:master:61e1fa2d: pike: renamed common name structs and globals to have module prefix
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 61e1fa2db0b6cdfaa4a5dc3791b646c38e3aaed2 URL: https://github.com/kamailio/kamailio/commit/61e1fa2db0b6cdfaa4a5dc3791b646c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T16:40:35+01:00 pike: renamed common name structs and globals to have module prefix --- Modified: src/modules/pike/ip_tree.c Modified: src/modules/pike/ip_tree.h Modified: src/modules/pike/pike.c Modified: src/modules/pike/pike_funcs.c Modified: src/modules/pike/pike_funcs.h Modified: src/modules/pike/pike_rpc.c Modified: src/modules/pike/pike_rpc.h Modified: src/modules/pike/pike_top.c Modified: src/modules/pike/pike_top.h Modified: src/modules/pike/timer.c Modified: src/modules/pike/timer.h --- Diff: https://github.com/kamailio/kamailio/commit/61e1fa2db0b6cdfaa4a5dc3791b646c… Patch: https://github.com/kamailio/kamailio/commit/61e1fa2db0b6cdfaa4a5dc3791b646c…

1 0

git:master:55e721ee: modules: readme files regenerated - pike ... [skip ci]
by Kamailio Dev 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 55e721eed77f129ab22d043a7d03fbca21e64200 URL: https://github.com/kamailio/kamailio/commit/55e721eed77f129ab22d043a7d03fbc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-24T15:31:11+01:00 modules: readme files regenerated - pike ... [skip ci] --- Modified: src/modules/pike/README --- Diff: https://github.com/kamailio/kamailio/commit/55e721eed77f129ab22d043a7d03fbc… Patch: https://github.com/kamailio/kamailio/commit/55e721eed77f129ab22d043a7d03fbc… --- diff --git a/src/modules/pike/README b/src/modules/pike/README index 34a26d7020..a7f66697e7 100644 --- a/src/modules/pike/README +++ b/src/modules/pike/README @@ -247,9 +247,9 @@ Chapter 3. Developer Guide Example 3.1. Tree of IP addresses / 193 - 175 - 132 - 164 -tree root / \ 142 +tree root / \ - 142 \ 195 - 37 - 78 - 163 - \ 79 - 134 + \ - 79 - 134 To detect the whole address, step by step, from the root to the leafs, the nodes corresponding to each byte of the ip address are expanded. In

1 0

git:master:e65ce2fd: pike: docs - aligned ip tree example
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: e65ce2fd407626acc89879033a2114cf521457dc URL: https://github.com/kamailio/kamailio/commit/e65ce2fd407626acc89879033a2114c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T15:23:10+01:00 pike: docs - aligned ip tree example --- Modified: src/modules/pike/doc/pike_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/e65ce2fd407626acc89879033a2114c… Patch: https://github.com/kamailio/kamailio/commit/e65ce2fd407626acc89879033a2114c… --- diff --git a/src/modules/pike/doc/pike_devel.xml b/src/modules/pike/doc/pike_devel.xml index 3b96276da5..950b54cf90 100644 --- a/src/modules/pike/doc/pike_devel.xml +++ b/src/modules/pike/doc/pike_devel.xml @@ -19,10 +19,10 @@ <example> <title>Tree of &ip; addresses</title> <programlisting format="linespecific"> - / 193 - 175 - 132 - 164 -tree root / \ 142 - \ 195 - 37 - 78 - 163 - \ 79 - 134 + / 193 - 175 - 132 - 164 +tree root / \ - 142 + \ 195 - 37 - 78 - 163 + \ - 79 - 134 </programlisting> </example> <para>

1 0

git:master:ca33c2de: modules: readme files regenerated - sst ... [skip ci]
by Kamailio Dev 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: ca33c2deb73e4532488ac8181622f2c7f723bd5f URL: https://github.com/kamailio/kamailio/commit/ca33c2deb73e4532488ac8181622f2c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-24T15:01:12+01:00 modules: readme files regenerated - sst ... [skip ci] --- Modified: src/modules/sst/README --- Diff: https://github.com/kamailio/kamailio/commit/ca33c2deb73e4532488ac8181622f2c… Patch: https://github.com/kamailio/kamailio/commit/ca33c2deb73e4532488ac8181622f2c… --- diff --git a/src/modules/sst/README b/src/modules/sst/README index 725cffc95d..3444863563 100644 --- a/src/modules/sst/README +++ b/src/modules/sst/README @@ -219,20 +219,36 @@ modparam("sst", "min_se", 2400) 4.3. timeout_avp (string) - This parameter MUST be set to the same value as the dialog module - parameter of the same name. If this parameter is NOT set, the sst - module will not do anything! + This parameter must be set to the same value as the dialog module + parameter of the same name, when it is wanted to update dialog timeout + using Session-Expires header value. If this parameter is not set, the + sst module will not update dialog timeout. - This is how the sst module knows which avp in the dialog module it has - to change with the new expire value. + With this parameter, the sst module knows which avp is expected by the + dialog module to change to a new expire value. - Default value is “NULL!” it is not set by default. + Note that the avp is set only for requests within dialog, not for the + initial INVITE. For this one, it can be done using script operations, + see the next example for such solution. + + Default value is “NULL” (not set by default). Example 1.4. Set timeout_avp parameter ... -modparam("dialog", "timeout_avp", "$avp(i:10)") +modparam("dialog", "timeout_avp", "$avp(dlgtimeout)") # Set the sst modules timeout_avp to be the same value -modparam("sst", "timeout_avp", "$avp(i:10)") +modparam("sst", "timeout_avp", "$avp(dlgtimeout)") +... +request_route { + ... + # when wanting to use Session-Expires value for initial INVITE + if(is_method("INVITE") and !has_totag()) { + if(is_present_hf("Session-Expires")) { + $avp(dlgtimeout) = $(hdr(Session-Expires){s.int}); + } + } + ... +} ... 4.4. reject_to_small (integer)

1 0

git:master:b800ffb9: sst: docs - more info about how timeout_avp is used
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: b800ffb9fb1de6ee0d7b6c2b42a25669022c1142 URL: https://github.com/kamailio/kamailio/commit/b800ffb9fb1de6ee0d7b6c2b42a2566… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T14:50:58+01:00 sst: docs - more info about how timeout_avp is used --- Modified: src/modules/sst/doc/sst_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b800ffb9fb1de6ee0d7b6c2b42a2566… Patch: https://github.com/kamailio/kamailio/commit/b800ffb9fb1de6ee0d7b6c2b42a2566… --- diff --git a/src/modules/sst/doc/sst_admin.xml b/src/modules/sst/doc/sst_admin.xml index 49f2630287..a82132bd6e 100644 --- a/src/modules/sst/doc/sst_admin.xml +++ b/src/modules/sst/doc/sst_admin.xml @@ -207,25 +207,41 @@ modparam("sst", "min_se", 2400) <section id="sst.p.timeout_avp"> <title><varname>timeout_avp</varname> (string)</title> - <para>This parameter MUST be set to the same value as the - dialog module parameter of the same name. If this parameter is - NOT set, the sst module will not do anything!</para> - - <para>This is how the sst module knows which avp in the - dialog module it has to change with the new expire value.</para> + <para>This parameter must be set to the same value as the + dialog module parameter of the same name, when it is wanted to update + dialog timeout using Session-Expires header value. If this parameter is + not set, the sst module will not update dialog timeout.</para> + <para>With this parameter, the sst module knows which avp is expected + by the dialog module to change to a new expire value.</para> + <para> <para> + Note that the avp is set only for requests within dialog, not for + the initial INVITE. For this one, it can be done using script operations, + see the next example for such solution. + </para> <emphasis> - Default value is <quote>NULL!</quote> it is not set by default. + Default value is <quote>NULL</quote> (not set by default). </emphasis> </para> <example> <title>Set <varname>timeout_avp</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "timeout_avp", "$avp(i:10)") +modparam("dialog", "timeout_avp", "$avp(dlgtimeout)") # Set the sst modules timeout_avp to be the same value -modparam("sst", "timeout_avp", "$avp(i:10)") +modparam("sst", "timeout_avp", "$avp(dlgtimeout)") +... +request_route { + ... + # when wanting to use Session-Expires value for initial INVITE + if(is_method("INVITE") and !has_totag()) { + if(is_present_hf("Session-Expires")) { + $avp(dlgtimeout) = $(hdr(Session-Expires){s.int}); + } + } + ... +} ... </programlisting> </example>

1 0

[kamailio/kamailio] Fix returning multiple IP's for a cached DNS entry (#2260)
by Nathan 24 Mar '20

24 Mar '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The method `dns_entry2he` was returning 10 `hostent` structures, containing the same record, because the rr counter was never updated (10 being the value of `DNS_HE_MAX_ADDR`). With this fix, the cache correctly returns all records found by the resolver. In the documentation of `dns_int_match_ip`, it says: >> At this moment, the function might not check all the IP addresses as returned by dns_sys_match_ip(), because the internal resolver targets to discover the first address to be used for relaying SIP traffic. I believe that with this patch, `dns_int_match_ip` now also works for DNS entries with multiple values. I'm not sure about mixed ipv4/ipv6 though. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2260 -- Commit Summary -- * Fix returning multiple IP's for a cached DNS entry -- File Changes -- M src/core/dns_cache.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2260.patch https://github.com/kamailio/kamailio/pull/2260.diff -- 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/pull/2260

2 2

git:master:29a35ec3: core: fix returning multiple IPs for a cached DNS entry
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 29a35ec3cec8b9c3ee4b45c8d84308701bda097c URL: https://github.com/kamailio/kamailio/commit/29a35ec3cec8b9c3ee4b45c8d843087… Author: Nathan Bruning <nathan(a)iperity.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T11:24:28+01:00 core: fix returning multiple IPs for a cached DNS entry --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/29a35ec3cec8b9c3ee4b45c8d843087… Patch: https://github.com/kamailio/kamailio/commit/29a35ec3cec8b9c3ee4b45c8d843087… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 8f3f4aeaf9..81fc6a9e45 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2304,6 +2304,7 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) return 0; } memcpy(p_addr[i], ip, len); + rr_no++; } if (i==0){ LM_DBG("no good records found (%d) for %.*s (%d)\n",

1 0

[kamailio/kamailio] modules: fix zero-length log placeholder (#2241)
by Zero King 24 Mar '20

24 Mar '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2241 -- Commit Summary -- * modules: fix zero-length log placeholder -- File Changes -- M src/modules/nathelper/nhelpr_funcs.c (2) M src/modules/rtpengine/rtpengine_funcs.c (2) M src/modules/rtpproxy/rtpproxy_funcs.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2241.patch https://github.com/kamailio/kamailio/pull/2241.diff -- 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/pull/2241

3 3

git:master:740afac1: rtpengine: fix zero-length log placeholder
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 740afac15b3d8d618b5101a761a37f5808d4b4f0 URL: https://github.com/kamailio/kamailio/commit/740afac15b3d8d618b5101a761a37f5… Author: Zero King <l2dy(a)icloud.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T11:12:39+01:00 rtpengine: fix zero-length log placeholder --- Modified: src/modules/rtpengine/rtpengine_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/740afac15b3d8d618b5101a761a37f5… Patch: https://github.com/kamailio/kamailio/commit/740afac15b3d8d618b5101a761a37f5… --- diff --git a/src/modules/rtpengine/rtpengine_funcs.c b/src/modules/rtpengine/rtpengine_funcs.c index b99153a063..598af6360e 100644 --- a/src/modules/rtpengine/rtpengine_funcs.c +++ b/src/modules/rtpengine/rtpengine_funcs.c @@ -231,7 +231,7 @@ int extract_body(struct sip_msg *msg, str *body ) /* p2 is text limit for application parsing */ rest = eat_line(p1 + mpdel.len + 2, p2 - p1 - mpdel.len - 2); if ( rest > p2 ) { - LM_ERR("Unparsable <%.*s>\n", (int)(p1-p1), p1); + LM_ERR("Unparsable <%.*s>\n", (int)(p2-p1), p1); return -1; } while( rest<p2 ) {

1 0

git:master:69714b26: nathelper: fix zero-length log placeholder
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 69714b26c63c75df6759f9158c7181d4f86b4764 URL: https://github.com/kamailio/kamailio/commit/69714b26c63c75df6759f9158c7181d… Author: Zero King <l2dy(a)icloud.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T11:11:54+01:00 nathelper: fix zero-length log placeholder --- Modified: src/modules/nathelper/nhelpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/69714b26c63c75df6759f9158c7181d… Patch: https://github.com/kamailio/kamailio/commit/69714b26c63c75df6759f9158c7181d… --- diff --git a/src/modules/nathelper/nhelpr_funcs.c b/src/modules/nathelper/nhelpr_funcs.c index 7300868532..c0db297c1e 100644 --- a/src/modules/nathelper/nhelpr_funcs.c +++ b/src/modules/nathelper/nhelpr_funcs.c @@ -227,7 +227,7 @@ int extract_body(struct sip_msg *msg, str *body) /* p2 is text limit for application parsing */ rest = eat_line(p1 + mpdel.len + 2, p2 - p1 - mpdel.len - 2); if(rest > p2) { - LM_ERR("Unparsable <%.*s>\n", (int)(p1 - p1), p1); + LM_ERR("Unparsable <%.*s>\n", (int)(p2 - p1), p1); return -1; } while(rest < p2) {

1 0

git:master:030f18b5: rtpproxy: fix zero-length log placeholder
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 030f18b5cffeb117dcf582cf12c5b3c35ace1469 URL: https://github.com/kamailio/kamailio/commit/030f18b5cffeb117dcf582cf12c5b3c… Author: Zero King <l2dy(a)icloud.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T11:12:25+01:00 rtpproxy: fix zero-length log placeholder --- Modified: src/modules/rtpproxy/rtpproxy_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/030f18b5cffeb117dcf582cf12c5b3c… Patch: https://github.com/kamailio/kamailio/commit/030f18b5cffeb117dcf582cf12c5b3c… --- diff --git a/src/modules/rtpproxy/rtpproxy_funcs.c b/src/modules/rtpproxy/rtpproxy_funcs.c index 858c5196d5..35401cdb24 100644 --- a/src/modules/rtpproxy/rtpproxy_funcs.c +++ b/src/modules/rtpproxy/rtpproxy_funcs.c @@ -228,7 +228,7 @@ int extract_body(struct sip_msg *msg, str *body ) /* p2 is text limit for application parsing */ rest = eat_line(p1 + mpdel.len + 2, p2 - p1 - mpdel.len - 2); if ( rest > p2 ) { - LM_ERR("Unparsable <%.*s>\n", (int)(p1-p1), p1); + LM_ERR("Unparsable <%.*s>\n", (int)(p2-p1), p1); return -1; } while( rest<p2 ) {

1 0

git:master:63cd404d: kamctl: regenerated db schema file with secfilter updates
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 63cd404d4b46e4514ae1490303189a0f81def942 URL: https://github.com/kamailio/kamailio/commit/63cd404d4b46e4514ae1490303189a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T10:33:30+01:00 kamctl: regenerated db schema file with secfilter updates --- Added: utils/kamctl/db_berkeley/kamailio/secfilter Added: utils/kamctl/db_redis/kamailio/secfilter Added: utils/kamctl/dbtext/kamailio/secfilter Added: utils/kamctl/mongodb/kamailio/secfilter.json Added: utils/kamctl/xhttp_pi/secfilter-mod Added: utils/kamctl/xhttp_pi/secfilter-table Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/secfilter-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/secfilter-create.sql Modified: utils/kamctl/oracle/secfilter-create.sql Modified: utils/kamctl/postgres/secfilter-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/63cd404d4b46e4514ae1490303189a0… Patch: https://github.com/kamailio/kamailio/commit/63cd404d4b46e4514ae1490303189a0…

1 0

git:master:7c8fdb0d: lib/srdb1: schema - use smallint for secfilter
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 7c8fdb0df37ee1466d7171ff3cff77e5b961abb4 URL: https://github.com/kamailio/kamailio/commit/7c8fdb0df37ee1466d7171ff3cff77e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T10:33:30+01:00 lib/srdb1: schema - use smallint for secfilter - tinyint is not supported --- Modified: src/lib/srdb1/schema/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/7c8fdb0df37ee1466d7171ff3cff77e… Patch: https://github.com/kamailio/kamailio/commit/7c8fdb0df37ee1466d7171ff3cff77e… --- diff --git a/src/lib/srdb1/schema/secfilter.xml b/src/lib/srdb1/schema/secfilter.xml index 3e0037da5a..4edab34e6c 100644 --- a/src/lib/srdb1/schema/secfilter.xml +++ b/src/lib/srdb1/schema/secfilter.xml @@ -36,14 +36,14 @@ <column id="action"> <name>action</name> - <type>tinyint</type> + <type>short</type> <default/> <description>Action to do (0=blacklisted data, 1=whitelisted data, 2=blacklisted destination).</description> </column> <column id="type"> <name>type</name> - <type>tinyint</type> + <type>short</type> <default/> <description>Type of data (0=user-agent, 1=country, 2=domain, 3=IP address, 4=user).</description> </column>

1 0

git:master:09c18bb0: lib/srdb1: schema - added xml file for sefilter module
by Daniel-Constantin Mierla 24 Mar '20

24 Mar '20

Module: kamailio Branch: master Commit: 09c18bb06691ad29b71990179a3006b5bdfbf602 URL: https://github.com/kamailio/kamailio/commit/09c18bb06691ad29b71990179a3006b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-24T10:33:30+01:00 lib/srdb1: schema - added xml file for sefilter module --- Added: src/lib/srdb1/schema/kamailio-secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/09c18bb06691ad29b71990179a3006b… Patch: https://github.com/kamailio/kamailio/commit/09c18bb06691ad29b71990179a3006b… --- diff --git a/src/lib/srdb1/schema/kamailio-secfilter.xml b/src/lib/srdb1/schema/kamailio-secfilter.xml new file mode 100644 index 0000000000..ae34ded087 --- /dev/null +++ b/src/lib/srdb1/schema/kamailio-secfilter.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + + <!ENTITY % entities SYSTEM "entities.xml"> + %entities; +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>SECFILTER Module</name> + <xi:include href="secfilter.xml"/> +</database>

1 0

plan for finding dependencies?
by Greg Troxel 24 Mar '20

24 Mar '20

[I've been working through making kamailio build on NetBSD -- thanks for merging my recent PR with two small fixes.] In src/Makefile.defs, there is a setting of LOCALBASE, which is basically a case statement by OS. A few examples: Linux /usr/local presuambly the tradition /usr/local per autucoonf FreeBSD /usr/local hijacked by ports system - not traditional /usr/local NetBSD /usr/pkg pkgsrc puts things here (local is still local) There is a need for two separate prefixes when building something like this: where the software being built should be installed: basically like --prefix=/foo in autoconf where things that the software depends on should be found, sort of what autoconf would use for --with-bar=/baz, so that /baz/include is added to CPPFLAGS and "-L/baz/lib -R/baz/lib" to LDFLAGS. I needed to add the C_INCLUDES as ifeq ($(OS), netbsd) C_INCLUDES+= -I$(LOCALBASE)/include since otherwise a libxml2 header is not found (and with the above it builds fine): gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -Wall -DNAME='"kamailio"' -DVERSION='"5.4.0-dev3"' -DARCH='"x86_64"' -DOS='netbsd_' -DOS_QUOTED='"netbsd"' -DCOMPILER='"gcc 5.5.0"' -D__CPU_x86_64 -D__OS_netbsd -DVERSIONVAL=5004000 -DCFG_DIR='"/usr/pkg/etc/kamailio/"' -DSHARE_DIR='"/usr/pkg/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM -DHAVE_SELECT -I/usr/pkg/include/libxml2 -I/usr/include -DMOD_NAME='"ims_registrar_pcscf"' -c notify.c -o notify.o -MMD -MP notify.c:38:36: fatal error: libxml2/libxml/globals.h: No such file or directory Of course, on Linux this issue is usually avoided because everything is installed with --prefix=/usr which is in te default search path. So my questions are: Is LOCALBASE supposed to be where kamailio is built into? (If so, then /usr/pkg seems like a wrong default on NetBSD, following the autoconf /usr/local norm, even though pkgsrc builds would pass in /usr/pkg.) Or is it where dependencies are? (If so, why isn't LOCALBASE/include put in cflags?) If dependencies are supposed to be someplace else, what's the mechanism to look for them? C_INCLUDES is set to empty, so I can't pass that in. Shouldn't the plan be explained in INSTALL (and sorry if I missed it)? Even a very brief clue would be appreciated, so I can align my changes with the overall intent. Thanks, Greg

2 1

git:master:7c879b17: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 7c879b176df397b87332418dc071c49c17fb5781 URL: https://github.com/kamailio/kamailio/commit/7c879b176df397b87332418dc071c49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-23T23:01:10+01:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/7c879b176df397b87332418dc071c49… Patch: https://github.com/kamailio/kamailio/commit/7c879b176df397b87332418dc071c49…

1 0

git:master:d5b2c1df: lost: new module parameters to set HeLD request attributes
by Wolfgang Kampichler 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: d5b2c1dfe37fbeb443912f2b80fb2877ebf09672 URL: https://github.com/kamailio/kamailio/commit/d5b2c1dfe37fbeb443912f2b80fb287… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2020-03-23T22:44:27+01:00 lost: new module parameters to set HeLD request attributes - parameters are exact_type, response_time, and location_type - the module function lost_held_query now supports proper handling of location types 'any', 'civic', 'geodetic' or 'locationURI' (or any combination). - besides: README update and code refactoring. --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/d5b2c1dfe37fbeb443912f2b80fb287… Patch: https://github.com/kamailio/kamailio/commit/d5b2c1dfe37fbeb443912f2b80fb287…

1 0

git:master:dda07c69: rtpengine: replaced rtpproxy with rtpengine
by Daniel-Constantin Mierla 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: dda07c69420e1a38948dae4b71f8005b2375253b URL: https://github.com/kamailio/kamailio/commit/dda07c69420e1a38948dae4b71f8005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-23T18:42:23+01:00 rtpengine: replaced rtpproxy with rtpengine - avoid confusion in printed log messges --- Modified: src/modules/rtpengine/config.c Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h Modified: src/modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/dda07c69420e1a38948dae4b71f8005… Patch: https://github.com/kamailio/kamailio/commit/dda07c69420e1a38948dae4b71f8005…

1 0

git:master:125031da: dialog: exposed functions to search dlg and lock table entry
by Daniel-Constantin Mierla 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 125031daeade9dab5c36b912dda65700d95c4c6a URL: https://github.com/kamailio/kamailio/commit/125031daeade9dab5c36b912dda6570… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-23T17:48:39+01:00 dialog: exposed functions to search dlg and lock table entry --- Modified: src/modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/125031daeade9dab5c36b912dda6570… Patch: https://github.com/kamailio/kamailio/commit/125031daeade9dab5c36b912dda6570… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index eb933c5acb..ed5cd7bef0 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -324,6 +324,18 @@ int dlg_update_rr_set(struct dlg_cell * dlg, unsigned int leg, str *rr); int dlg_set_toroute(dlg_cell_t *dlg, str *route); +/*! + * \brief Lookup a dialog in the global list + * + * Note that the caller is responsible for decrementing (or reusing) + * the reference counter by one again iff a dialog has been found. + * \param h_entry number of the hash table entry + * \param h_id id of the hash table entry + * \param lmode id if 0, then dlg table entry is unlocked, otherwise is locked + * \return dialog structure on success, NULL on failure + */ +dlg_cell_t *dlg_lookup_mode(unsigned int h_entry, unsigned int h_id, int lmode); + /*! * \brief Lookup a dialog in the global list * @@ -335,6 +347,17 @@ int dlg_set_toroute(dlg_cell_t *dlg, str *route); */ dlg_cell_t* dlg_lookup(unsigned int h_entry, unsigned int h_id); +/*! + * \brief Search a dialog in the global list by iuid + * + * Note that the caller is responsible for decrementing (or reusing) + * the reference counter by one again if a dialog has been found. + * \param diuid internal unique id per dialog + * \param lmode id if 0, then dlg table entry is unlocked, otherwise is locked + * \return dialog structure on success, NULL on failure + */ +dlg_cell_t* dlg_get_by_iuid_mode(dlg_iuid_t *diuid, int lmode); + /*! * \brief Search and return dialog in the global list by iuid *

1 0

git:master:8965ff07: dialog: dmq operations under locked dlg table entry
by Daniel-Constantin Mierla 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 8965ff07f2e9fa105fc56896eed9caf4b6faf261 URL: https://github.com/kamailio/kamailio/commit/8965ff07f2e9fa105fc56896eed9caf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-23T17:57:48+01:00 dialog: dmq operations under locked dlg table entry - protect against races that could be due to rentransmissions or other parallel processing cases - related to GH #2224 --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/8965ff07f2e9fa105fc56896eed9caf… Patch: https://github.com/kamailio/kamailio/commit/8965ff07f2e9fa105fc56896eed9caf… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 08dbc84686..fdca3f0f0a 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -99,7 +99,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no { int content_length; str body; - dlg_cell_t *dlg; + dlg_cell_t *dlg = NULL; int unref = 0; int ret; srjson_doc_t jdoc, prof_jdoc; @@ -216,7 +216,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no } } - dlg = dlg_get_by_iuid(&iuid); + dlg = dlg_get_by_iuid_mode(&iuid, 1); if (dlg) { LM_DBG("found dialog [%u:%u] at %p\n", iuid.h_entry, iuid.h_id, dlg); unref++; @@ -237,6 +237,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no LM_ERR("inconsistent hash data from peer: " "make sure all Kamailio's use the same hash size\n"); shm_free(dlg); + dlg = NULL; goto error; } @@ -391,8 +392,14 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no case DLG_DMQ_NONE: break; } - if (dlg && unref) - dlg_unref(dlg, unref); + if (dlg) { + if(unref) { + dlg_unref(dlg, unref); + } + if(newdlg == 0) { + dlg_cell_unlock(dlg); + } + } srjson_DestroyDoc(&jdoc); resp->reason = dmq_200_rpl; @@ -407,6 +414,11 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no return 0; error: + if (dlg) { + if(newdlg == 0) { + dlg_cell_unlock(dlg); + } + } srjson_DestroyDoc(&jdoc); resp->reason = dmq_500_rpl; resp->resp_code = 500;

1 0

git:master:a4f8c029: dialog: functions to search dialog by uuid and keep table entry locked
by Daniel-Constantin Mierla 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: a4f8c0291bfd32752c0c2c323f618c6ac0c91d53 URL: https://github.com/kamailio/kamailio/commit/a4f8c0291bfd32752c0c2c323f618c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-23T17:36:44+01:00 dialog: functions to search dialog by uuid and keep table entry locked - helper macros to lock/unlock table entry with dlg cell structure --- Modified: src/modules/dialog/dlg_hash.c Modified: src/modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/a4f8c0291bfd32752c0c2c323f618c6… Patch: https://github.com/kamailio/kamailio/commit/a4f8c0291bfd32752c0c2c323f618c6… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 4e0e28b788..5557e87574 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -762,9 +762,10 @@ int dlg_update_rr_set(struct dlg_cell * dlg, unsigned int leg, str *rr) * the reference counter by one again iff a dialog has been found. * \param h_entry number of the hash table entry * \param h_id id of the hash table entry + * \param lmode id if 0, then dlg table entry is unlocked, otherwise is locked * \return dialog structure on success, NULL on failure */ -dlg_cell_t *dlg_lookup( unsigned int h_entry, unsigned int h_id) +dlg_cell_t *dlg_lookup_mode(unsigned int h_entry, unsigned int h_id, int lmode) { dlg_cell_t *dlg; dlg_entry_t *d_entry; @@ -777,24 +778,59 @@ dlg_cell_t *dlg_lookup( unsigned int h_entry, unsigned int h_id) d_entry = &(d_table->entries[h_entry]); - dlg_lock( d_table, d_entry); + dlg_lock(d_table, d_entry); for( dlg=d_entry->first ; dlg ; dlg=dlg->next ) { if (dlg->h_id == h_id) { ref_dlg_unsafe(dlg, 1); - dlg_unlock( d_table, d_entry); + if (likely(lmode == 0)) { + dlg_unlock(d_table, d_entry); + } LM_DBG("dialog id=%u found on entry %u\n", h_id, h_entry); return dlg; } } - dlg_unlock( d_table, d_entry); + dlg_unlock(d_table, d_entry); not_found: LM_DBG("no dialog id=%u found on entry %u\n", h_id, h_entry); return 0; } +/*! + * \brief Lookup a dialog in the global list + * + * Note that the caller is responsible for decrementing (or reusing) + * the reference counter by one again iff a dialog has been found. + * \param h_entry number of the hash table entry + * \param h_id id of the hash table entry + * \return dialog structure on success, NULL on failure + */ +dlg_cell_t *dlg_lookup(unsigned int h_entry, unsigned int h_id) +{ + return dlg_lookup_mode(h_entry, h_id, 0); +} + +/*! + * \brief Search a dialog in the global list by iuid + * + * Note that the caller is responsible for decrementing (or reusing) + * the reference counter by one again if a dialog has been found. + * \param diuid internal unique id per dialog + * \param lmode id if 0, then dlg table entry is unlocked, otherwise is locked + * \return dialog structure on success, NULL on failure + */ +dlg_cell_t* dlg_get_by_iuid_mode(dlg_iuid_t *diuid, int lmode) +{ + if(diuid==NULL) + return NULL; + if(diuid->h_id==0) + return NULL; + /* dlg ref counter is increased by next line */ + return dlg_lookup_mode(diuid->h_entry, diuid->h_id, lmode); +} + /*! * \brief Search a dialog in the global list by iuid * @@ -810,7 +846,7 @@ dlg_cell_t* dlg_get_by_iuid(dlg_iuid_t *diuid) if(diuid->h_id==0) return NULL; /* dlg ref counter is increased by next line */ - return dlg_lookup(diuid->h_entry, diuid->h_id); + return dlg_lookup_mode(diuid->h_entry, diuid->h_id, 0); } /*! diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index 5ecf13f871..eb933c5acb 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -201,6 +201,21 @@ extern dlg_table_t *d_table; } \ } while(0) +/*! + * \brief Set a dialog lock (re-entrant) + * \param _dlg dialog cell + */ +#define dlg_cell_lock(_dlg) \ + dlg_lock(d_table, &(d_table->entries[(_dlg)->h_entry])) + +/*! + * \brief Set a dialog lock (re-entrant) + * \param _dlg dialog cell + */ +#define dlg_cell_unlock(_dlg) \ + dlg_unlock(d_table, &(d_table->entries[(_dlg)->h_entry])) + + /*! * \brief Unlink a dialog from the list without locking * \see unref_dlg_unsafe

1 0

git:master:eb846397: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: eb846397009066c719ee37478a72f5296317f3b6 URL: https://github.com/kamailio/kamailio/commit/eb846397009066c719ee37478a72f52… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-23T15:31:17+01:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/eb846397009066c719ee37478a72f52… Patch: https://github.com/kamailio/kamailio/commit/eb846397009066c719ee37478a72f52… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index 201243ac17..6d671b5da6 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -51,6 +51,7 @@ Alexandr Dubovikov 3.20. topoh_unmask (int) 3.21. nonsip_hook (int) 3.22. event_callback (str) + 3.23. capture_bad_msgs (int) 4. Functions @@ -94,11 +95,12 @@ Alexandr Dubovikov 1.20. Set topoh_unmask parameter 1.21. Set nonsip_hook parameter 1.22. Set event_callback parameter - 1.23. sip_capture() usage - 1.24. report_capture() usage + 1.23. Set capture_bad_msgs parameter + 1.24. sip_capture() usage 1.25. report_capture() usage - 1.26. sip_capture_forward() usage - 1.27. event_route[sipcapture:request] usage + 1.26. report_capture() usage + 1.27. sip_capture_forward() usage + 1.28. event_route[sipcapture:request] usage Chapter 1. Admin Guide @@ -134,6 +136,7 @@ Chapter 1. Admin Guide 3.20. topoh_unmask (int) 3.21. nonsip_hook (int) 3.22. event_callback (str) + 3.23. capture_bad_msgs (int) 4. Functions @@ -209,6 +212,7 @@ Chapter 1. Admin Guide 3.20. topoh_unmask (int) 3.21. nonsip_hook (int) 3.22. event_callback (str) + 3.23. capture_bad_msgs (int) 3.1. db_url (str) @@ -513,6 +517,18 @@ function ksr_sipcapture_event(evname) end ... +3.23. capture_bad_msgs (int) + + If set to something different than 0, tries to capture also the broken + SIP messages. + + Default value is 0. + + Example 1.23. Set capture_bad_msgs parameter +... +modparam("sipcapture", "capture_bad_msgs", 1) +... + 4. Functions 4.1. sip_capture([table], [cmode]) @@ -536,7 +552,7 @@ end This function can be used from ANY_ROUTE. Default value is "NULL". - Example 1.23. sip_capture() usage + Example 1.24. sip_capture() usage ... sip_capture(); ... @@ -557,7 +573,7 @@ sip_capture("", "cmode"); This function can be used from ANY_ROUTE. Default value is "NULL". - Example 1.24. report_capture() usage + Example 1.25. report_capture() usage ... report_capture(); ... @@ -573,7 +589,7 @@ report_capture("report_data", "$ci", "{\"MOS\":4.1,\"PACKET_LOST\":100"}); This function can be used from ANY_ROUTE. - Example 1.25. report_capture() usage + Example 1.26. report_capture() usage ... $var(res) = float2int("10.5", "1"); ... @@ -588,7 +604,7 @@ $var(res) = float2int("10.5", "1"); This function can be used from ANY_ROUTE. - Example 1.26. sip_capture_forward() usage + Example 1.27. sip_capture_forward() usage ... event_route[sipcapture:request] { ... @@ -609,7 +625,7 @@ $var(res) = float2int("10.5", "1"); Event route block to be executed when HEP packet is received. It requires module parameter 'nonsip_hook' to be set to 1. - Example 1.27. event_route[sipcapture:request] usage + Example 1.28. event_route[sipcapture:request] usage ... # new event sipcapture socket modparam("sipcapture", "nonsip_hook", 1)

1 0

[kamailio/kamailio] sipcapture: add new capture_bad_msgs modparam (#2245)
by Stefan Mititelu 23 Mar '20

23 Mar '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Enable the parsing of broken SIP messages. @lbalaceanu is the original developer of this patch. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2245 -- Commit Summary -- * sipcapture: add new capture_bad_msgs modparam -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (18) M src/modules/sipcapture/sipcapture.c (182) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2245.patch https://github.com/kamailio/kamailio/pull/2245.diff -- 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/pull/2245

2 5

git:master:51bbc555: sipcapture: add new capture_bad_msgs modparam
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 51bbc5557edf4d4c1cdcb268f70d00ef406b53fc URL: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:17:18+01:00 sipcapture: add new capture_bad_msgs modparam In order to enable the parsing of broken SIP messages. By default this behavior is disabled. Updated doc. --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e… Patch: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e…

1 0

git:master:9d0ea2b4: seas: use ip_addr2sbuf instead of (redundant) buf_print_ip
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 9d0ea2b4323bcafd73322cc2b234231273013bcd URL: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:07:42+01:00 seas: use ip_addr2sbuf instead of (redundant) buf_print_ip --- Modified: src/modules/seas/event_dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… Patch: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 6031310aa1..e1c7047beb 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -850,7 +850,7 @@ int process_bind_action(as_p as,unsigned char processor_id,unsigned int flags,ch memcpy(&port,payload+k,2); k+=2; port=ntohs(port); - buf_print_ip(buffer, &my_addr,300); + ip_addr2sbuf(&my_addr,buffer,300); switch(proto){ case PROTO_UDP: proto_s="UDP";

1 0

git:master:3708022d: Revert "core: add new function buf_print_ip(..) to print an IP address to an buffer"
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 3708022dfa24cf250cb34f0d5e5f990711f91d1b URL: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:05:51+01:00 Revert "core: add new function buf_print_ip(..) to print an IP address to an buffer" This reverts commit 4acca8ad2f31f465b08f15d98cc4780236e2beb0. --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… Patch: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 82f746e0d6..9989063fff 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -274,35 +274,6 @@ void stdout_print_ip(struct ip_addr* ip) } -void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len) -{ - if (len < INET6_ADDRSTRLEN) { - LM_ERR("insufficent buffer length\n"); - return; - } - switch(ip->af){ - case AF_INET: - snprintf(buf, len, "%d.%d.%d.%d", ip->u.addr[0], - ip->u.addr[1], - ip->u.addr[2], - ip->u.addr[3]); - break; - case AF_INET6: - snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", htons(ip->u.addr16[0]), - htons(ip->u.addr16[1]), - htons(ip->u.addr16[2]), - htons(ip->u.addr16[3]), - htons(ip->u.addr16[4]), - htons(ip->u.addr16[5]), - htons(ip->u.addr16[6]), - htons(ip->u.addr16[7]) - ); - break; - default: - snprintf(buf, len, "warning unknown address family %d\n", ip->af); - } -} - void print_net(struct net* net) { diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 896d4b757e..9a7b67ac5d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -265,8 +265,6 @@ int mk_net_str(struct net* dst, str* s); void print_ip(char* prefix, struct ip_addr* ip, char* suffix); void stdout_print_ip(struct ip_addr* ip); -void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len); - void print_net(struct net* net); char* get_proto_name(unsigned int proto);

1 0

git:master:279848dd: tls: use ip_addr2sbuf instead of (redundant) buf_print_ip
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 279848dda1fc24428ad3662f6890b6f51fef3518 URL: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:06:33+01:00 tls: use ip_addr2sbuf instead of (redundant) buf_print_ip --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… Patch: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index d084aaecd3..c8e5852556 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -885,10 +885,10 @@ int tls_encode_f(struct tcp_connection *c, ERR("protocol level error\n"); TLS_ERR(err_src); memset(ip_buf, 0, sizeof(buf)); - buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); memset(ip_buf, 0, sizeof(buf)); - buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); ERR("destination IP: %s\n", ip_buf); goto error; @@ -1283,10 +1283,10 @@ int tls_read_f(struct tcp_connection* c, int* flags) ERR("protocol level error\n"); TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); - buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); memset(ip_buf, 0, sizeof(ip_buf)); - buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); ERR("destination IP: %s\n", ip_buf); goto error;

1 0

git:master:4acca8ad: core: add new function buf_print_ip(..) to print an IP address to an buffer
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 4acca8ad2f31f465b08f15d98cc4780236e2beb0 URL: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:04:54+01:00 core: add new function buf_print_ip(..) to print an IP address to an buffer --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… Patch: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 9989063fff..82f746e0d6 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -274,6 +274,35 @@ void stdout_print_ip(struct ip_addr* ip) } +void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len) +{ + if (len < INET6_ADDRSTRLEN) { + LM_ERR("insufficent buffer length\n"); + return; + } + switch(ip->af){ + case AF_INET: + snprintf(buf, len, "%d.%d.%d.%d", ip->u.addr[0], + ip->u.addr[1], + ip->u.addr[2], + ip->u.addr[3]); + break; + case AF_INET6: + snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", htons(ip->u.addr16[0]), + htons(ip->u.addr16[1]), + htons(ip->u.addr16[2]), + htons(ip->u.addr16[3]), + htons(ip->u.addr16[4]), + htons(ip->u.addr16[5]), + htons(ip->u.addr16[6]), + htons(ip->u.addr16[7]) + ); + break; + default: + snprintf(buf, len, "warning unknown address family %d\n", ip->af); + } +} + void print_net(struct net* net) { diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 9a7b67ac5d..896d4b757e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -265,6 +265,8 @@ int mk_net_str(struct net* dst, str* s); void print_ip(char* prefix, struct ip_addr* ip, char* suffix); void stdout_print_ip(struct ip_addr* ip); +void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len); + void print_net(struct net* net); char* get_proto_name(unsigned int proto);

2 2

Re: [sr-dev] error_readline_pkg-config with latest Makefile
by Ovidiu Sas 23 Mar '20

23 Mar '20

Take a look at this makefile: https://github.com/Optware/Optware-ng/blob/master/make/kamailio.mk It was used to cross compile kamailio for several platforms. Through CC_EXTRA_OPTS you can pass extra compiler flags and paths for the target platform. Also, please keep the list in cc, otherwise e-mails will go unanswered, Regards, Ovidiu Sas On Thu, Mar 19, 2020 at 11:53 PM subhra giri <subhraprakash79(a)gmail.com> wrote: > > Dear ovidiu > I am not able to fix the issue in makefile. > Please help me what i should update in makefile for cross-compiling readline for mips. > readline.h is located at > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/readline.h > > And libreadline*.so* are present at > > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/shlib/libreadline.so.5.1 > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/shlib/readline.so > Thanks and Regards > Subhra Prakash -- VoIP Embedded, Inc. http://www.voipembedded.com

2 3

git:master:cc34d05b: seas: use new introduced buf_print_ip to print IP addresses instead of own implemenation
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: cc34d05b8371c57cdcfe468fdba036d2b710dbb5 URL: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:06:58+01:00 seas: use new introduced buf_print_ip to print IP addresses instead of own implemenation --- Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/seas/seas.h --- Diff: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… Patch: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 86f1b0d722..6031310aa1 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -850,7 +850,7 @@ int process_bind_action(as_p as,unsigned char processor_id,unsigned int flags,ch memcpy(&port,payload+k,2); k+=2; port=ntohs(port); - print_ip_buf(&my_addr,buffer,300); + buf_print_ip(buffer, &my_addr,300); switch(proto){ case PROTO_UDP: proto_s="UDP"; diff --git a/src/modules/seas/seas.h b/src/modules/seas/seas.h index 9f525f48c4..3244cc9692 100644 --- a/src/modules/seas/seas.h +++ b/src/modules/seas/seas.h @@ -159,19 +159,4 @@ void seas_sighandler(int signo); char* create_as_event_t(struct cell *t,struct sip_msg *msg,char processor_id,int *evt_len,int flags); char* create_as_event_sl(struct sip_msg *msg,char processor_id,int *evt_len,int flags); -static inline void print_ip_buf(struct ip_addr* ip, char *where,int len) -{ - switch(ip->af){ - case AF_INET: - snprintf(where,len,"%d.%d.%d.%d", ip->u.addr[0], ip->u.addr[1], ip->u.addr[2], ip->u.addr[3]); - break; - case AF_INET6: - snprintf(where,len,"%x:%x:%x:%x:%x:%x:%x:%x",htons(ip->u.addr16[0]),htons(ip->u.addr16[1]),htons(ip->u.addr16[2]), - htons(ip->u.addr16[3]), htons(ip->u.addr16[4]), htons(ip->u.addr16[5]), htons(ip->u.addr16[6]), - htons(ip->u.addr16[7])); - break; - default: - break; - } -} #endif

1 0

git:master:328d4521: tls: log src and dst IPs in case of protocol level errors in send/receive
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 328d45215514f03d2fcfd88d49e56027f2002b86 URL: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:06:26+01:00 tls: log src and dst IPs in case of protocol level errors in send/receive - log src and dst IPs in case of protocol level errors in send/receive - to help debugging TLS errors in multi-domain/multi-dispatching scenarios --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… Patch: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 9ce1b5e2f3..d084aaecd3 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -752,6 +752,7 @@ int tls_encode_f(struct tcp_connection *c, struct tls_mbuf rd, wr; int ssl_error; char* err_src; + char ip_buf[64]; const char* buf; unsigned int len; int x; @@ -881,7 +882,15 @@ int tls_encode_f(struct tcp_connection *c, break; /* or goto end */ case SSL_ERROR_SSL: /* protocol level error */ + ERR("protocol level error\n"); TLS_ERR(err_src); + memset(ip_buf, 0, sizeof(buf)); + buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ERR("source IP: %s\n", ip_buf); + memset(ip_buf, 0, sizeof(buf)); + buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ERR("destination IP: %s\n", ip_buf); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT: @@ -994,6 +1003,7 @@ int tls_read_f(struct tcp_connection* c, int* flags) struct tls_rd_buf* enc_rd_buf; int n, flush_flags; char* err_src; + char ip_buf[64]; int x; int tls_dbg; @@ -1270,7 +1280,15 @@ int tls_read_f(struct tcp_connection* c, int* flags) goto bug; case SSL_ERROR_SSL: /* protocol level error */ + ERR("protocol level error\n"); TLS_ERR(err_src); + memset(ip_buf, 0, sizeof(ip_buf)); + buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ERR("source IP: %s\n", ip_buf); + memset(ip_buf, 0, sizeof(ip_buf)); + buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ERR("destination IP: %s\n", ip_buf); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT:

1 0

git:master:ae95a6a2: ims_usrloc_pcscf: fix warning: this âifâ clause does not guard...
by --list 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: ae95a6a2f73e6a4153a415c70d9e21562c651c1a URL: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… Author: --list <hw(a)skalatan.de> Committer: --list <hw(a)skalatan.de> Date: 2020-03-23T11:14:38+01:00 ims_usrloc_pcscf: fix warning: this âifâ clause does not guard... --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… Patch: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 0d156d39c4..1ac55734d7 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -119,11 +119,12 @@ void free_ppublic(ppublic_t* _p) // Keep them in sync! void free_security(security_t* _p) { - if (!_p) + if (!_p) { return; + } - if(_p->sec_header.s) - shm_free(_p->sec_header.s); + if(_p->sec_header.s) + shm_free(_p->sec_header.s); switch (_p->type) {

2 1

git:5.3:f31542bb: ims_usrloc_pcscf: fix warning: this âifâ clause does not guard...
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: 5.3 Commit: f31542bb188d69eb4d4e88a54060efc82d1a0bf0 URL: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T11:19:52+01:00 ims_usrloc_pcscf: fix warning: this âifâ clause does not guard... --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… Patch: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 0d156d39c4..1ac55734d7 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -119,11 +119,12 @@ void free_ppublic(ppublic_t* _p) // Keep them in sync! void free_security(security_t* _p) { - if (!_p) + if (!_p) { return; + } - if(_p->sec_header.s) - shm_free(_p->sec_header.s); + if(_p->sec_header.s) + shm_free(_p->sec_header.s); switch (_p->type) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev