sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
396 discussions

git:5.3:fca18567: cnxcc: updated readme file [skip ci]
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: fca18567f458fd3860a63ab37a9e7e2fe89f0019 URL: https://github.com/kamailio/kamailio/commit/fca18567f458fd3860a63ab37a9e7e2… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T14:19:48+02:00 cnxcc: updated readme file [skip ci] (cherry picked from commit cea7fa14b0aefc647d28eb1bf56faaec89d90d67) --- Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fca18567f458fd3860a63ab37a9e7e2… Patch: https://github.com/kamailio/kamailio/commit/fca18567f458fd3860a63ab37a9e7e2… --- diff --git a/src/modules/cnxcc/doc/cnxcc_admin.xml b/src/modules/cnxcc/doc/cnxcc_admin.xml index 4284437a8b..0c26cb0a58 100644 --- a/src/modules/cnxcc/doc/cnxcc_admin.xml +++ b/src/modules/cnxcc/doc/cnxcc_admin.xml @@ -128,21 +128,37 @@ modparam("cnxcc", "credit_check_period", 1) <para> Associates the call with a customer id and sets the max credit, connect cost, cost per second, initial pulse and final pulse. The discount - is calculated in pulses (30/6, 1/1, etc) and subtracted from the pool + is calculated in pulses (1/1, 60/1, etc) and subtracted from the pool of credit. </para> <para> The customer value can be provided as a string or a variable holding - a string. + a string. This value identifies all calls from the same customer. + </para> + <para> + The maxcredit (float) value is the maximum credit available for the current call. + </para> + <para> + The connect (float) value is the connect cost for the current call. + </para> + <para> + The cps (float) value is the cost per second for the current call. + </para> + <para> + The ipuse (integer) value is the initial pulse and establishes the minimum + time to be charged. For example, value 1 establishes a charge per second + and value 60 sets a charge per minute. If it is taken as value 60, even + if the duration is 5 seconds, 1 minute will be charged. </para> <para> - The maxcredit, connect and cps can be double (float) or integer values, they - have to be provided as static string values of variables holding string - values. + The fpulse (integer) value is the final pulse and establishes, from the initial + pulse, the time range to be charged. For example, the value 1 establishes a charge + per second, 5 sets a charge in blocks of 5 seconds, 60 sets a full minute charge. </para> <para> - The ipulse and fpulse values are integer values, they can be also - given via variables holding integers. + 1/1 will make a charge per seconds for the entire call. 60/1 will make a + charge per seconds with the first full minute. 60/60 always perform + a full minute charge. </para> <para> <emphasis>Return code:</emphasis> @@ -173,12 +189,15 @@ modparam("cnxcc", "credit_check_period", 1) ... cnxcc_set_max_credit("john-doe", "100", "3.0", "0.5", 60, 1); ... -$var(customer) = "john-doe-premium"; # customer id -$var(credit) = "100"; # max credit -$var(connect) = "3.0"; # connect const -$var(cps) = "0.5"; # cost per second -$var(initial_p) = 60; # initial pulse -$var(final_p) = 1; # final pulse +$var(customer) = "john-doe"; # customer id +$var(credit) = "100"; # max credit for all calls with the same + # customer id +$var(connect) = "3.0"; # connect cost or initial cost for the call +$var(cps) = "0.5"; # cost per second +$var(initial_p) = 60; # initial pulse (60 = the first minute will be + # charged even if the call is shorter) +$var(final_p) = 1; # final pulse (after the first minute, it will + # be charge in ranges of 1 second) cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", "$var(cps)", "$var(initial_p)", "$var(final_p)"); ...

1 0

git:5.3:daecf049: cnxcc: use snprintf() instead of sprintf()
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: daecf0490c144a6f3fd5c66c53a86f33b6295681 URL: https://github.com/kamailio/kamailio/commit/daecf0490c144a6f3fd5c66c53a86f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T14:17:17+02:00 cnxcc: use snprintf() instead of sprintf() (cherry picked from commit 05bd956a9980ffc8938cdbce6bab3af5086350dd) --- Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c --- Diff: https://github.com/kamailio/kamailio/commit/daecf0490c144a6f3fd5c66c53a86f3… Patch: https://github.com/kamailio/kamailio/commit/daecf0490c144a6f3fd5c66c53a86f3… --- diff --git a/src/modules/cnxcc/cnxcc_sip_msg_faker.c b/src/modules/cnxcc/cnxcc_sip_msg_faker.c index 7b601d537a..dbb8694f6a 100644 --- a/src/modules/cnxcc/cnxcc_sip_msg_faker.c +++ b/src/modules/cnxcc/cnxcc_sip_msg_faker.c @@ -40,7 +40,7 @@ int faked_msg_init_with_dlg_info(str *callid, str *from_uri, str *from_tag, { memset(_faked_sip_msg_buf, 0, FAKED_SIP_MSG_BUF_LEN); - sprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_FORMAT, from_uri->len, + snprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_BUF_LEN, FAKED_SIP_MSG_FORMAT, from_uri->len, from_uri->s, from_tag->len, from_tag->s, to_uri->len, to_uri->s, to_tag->len, to_tag->s, callid->len, callid->s);

1 0

git:master:8e2c2e39: Merge pull request #2342 from kamailio/grumvalski/ds_load_table
by GitHub 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 8e2c2e391eb90f53b0fdc3e108bb84dab4e11593 URL: https://github.com/kamailio/kamailio/commit/8e2c2e391eb90f53b0fdc3e108bb84d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-06-05T13:28:33+02:00 Merge pull request #2342 from kamailio/grumvalski/ds_load_table dispatcher: don't reset load table when adding/removing a destinationâ¦ --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/8e2c2e391eb90f53b0fdc3e108bb84d… Patch: https://github.com/kamailio/kamailio/commit/8e2c2e391eb90f53b0fdc3e108bb84d… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d859dc3907..f481cb4d61 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -878,7 +878,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1126,7 +1126,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1617,22 +1616,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2336,6 +2337,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2348,6 +2350,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2395,12 +2398,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; } @@ -2448,7 +2457,7 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -2503,7 +2512,7 @@ int ds_remove_dst(int group, str *address) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0;

1 0

git:master:4099a6ca: dispatcher: don't reset load table when adding/removing a destination or reloading the list
by Federico Cabiddu 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 4099a6caf856c9af4d7d89aec73db143efbcd40b URL: https://github.com/kamailio/kamailio/commit/4099a6caf856c9af4d7d89aec73db14… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-06-01T07:30:14+02:00 dispatcher: don't reset load table when adding/removing a destination or reloading the list --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4099a6caf856c9af4d7d89aec73db14… Patch: https://github.com/kamailio/kamailio/commit/4099a6caf856c9af4d7d89aec73db14… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d859dc3907..f481cb4d61 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -878,7 +878,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1126,7 +1126,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1617,22 +1616,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2336,6 +2337,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2348,6 +2350,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2395,12 +2398,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; } @@ -2448,7 +2457,7 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -2503,7 +2512,7 @@ int ds_remove_dst(int group, str *address) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0;

1 0

git:5.3:a41dcf32: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: a41dcf3259d72dfecf4cd34638d885734dc7a5ea URL: https://github.com/kamailio/kamailio/commit/a41dcf3259d72dfecf4cd34638d8857… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T12:31:49+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/a41dcf3259d72dfecf4cd34638d8857… Patch: https://github.com/kamailio/kamailio/commit/a41dcf3259d72dfecf4cd34638d8857… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 5eab39eb23..df5b99f7cc 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -472,8 +472,10 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to - it. Based on mode, one can trace the current message('m' - default), - the current transaction('t') or the current dialog('d'). + it. Based on mode, one can trace the current message('m'), the current + transaction('t') or the current dialog('d'). If no mode is given, it + falls back to the default mode - transaction tracking when trace_flag + is set, otherwise only the current message. Meaning of the parameters is as follows: * address - The address in form of SIP URI where to send a duplicate @@ -564,13 +566,13 @@ kamcmd siptrace.status check 6. Database setup - 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 SQL script - in the database directories in the kamailio/scripts folder as template. - You can also find the complete database documentation on the project - webpage, + Before running Kamailio with siptrace and activated trace_to_database + parameter, 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 SQL script in the database directories + in the kamailio/scripts folder as template. You can also find the + complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. 7. Known issues

1 0

git:master:a118641a: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: a118641af8fb6bdd288e97c17b12076db6442ef9 URL: https://github.com/kamailio/kamailio/commit/a118641af8fb6bdd288e97c17b12076… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T12:31:22+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/a118641af8fb6bdd288e97c17b12076… Patch: https://github.com/kamailio/kamailio/commit/a118641af8fb6bdd288e97c17b12076… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 9006415a23..d9130a312e 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -551,8 +551,10 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to - it. Based on mode, one can trace the current message('m' - default), - the current transaction('t') or the current dialog('d'). + it. Based on mode, one can trace the current message('m'), the current + transaction('t') or the current dialog('d'). If no mode is given, it + falls back to the default mode - transaction tracking when trace_flag + is set, otherwise only the current message. Meaning of the parameters is as follows: * address - The address in form of SIP URI where to send a duplicate @@ -643,13 +645,13 @@ kamcmd siptrace.status check 6. Database setup - 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 SQL script - in the database directories in the kamailio/scripts folder as template. - You can also find the complete database documentation on the project - webpage, + Before running Kamailio with siptrace and activated trace_to_database + parameter, 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 SQL script in the database directories + in the kamailio/scripts folder as template. You can also find the + complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. 7. Known issues

1 0

git:5.3:0f733090: siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode()
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: 0f733090f69f88a153040e0051057bfd3a9a8404 URL: https://github.com/kamailio/kamailio/commit/0f733090f69f88a153040e0051057bf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:29:48Z siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - it was not working properly without destination uri in non-HEP mode (cherry picked from commit 21338195e74b09ccca29d6479e698417ed34cd42) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0f733090f69f88a153040e0051057bf… Patch: https://github.com/kamailio/kamailio/commit/0f733090f69f88a153040e0051057bf… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index e49946e525..161986d2cf 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -534,7 +534,8 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, trace_send_hep_duplicate( &sto->body, &sto->fromip, &sto->toip, dst, correlation_id_str); } else { - if(dst) { + /* sip_trace_mode() will not set a destination, uses duplicate_uri */ + if(dst || trace_to_database == 0) { trace_send_duplicate(sto->body.s, sto->body.len, dst); } } @@ -996,10 +997,13 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * dest_info_t dest_info; enum siptrace_type_t trace_type; - if (dest) { - if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { - LM_ERR("unable to parse the dest URI string\n"); - return -1; + /* to support tracing to database without destination parameter - old mode */ + if (dest || trace_to_database == 0) { + if (dest) { + if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { + LM_ERR("unable to parse the dest URI string\n"); + return -1; + } } if (dup_uri_param_str.s == 0 || (is_null_pv(dup_uri_param_str))) {

1 0

git:5.3:05a6f13c: siptrace: manual backport of 75e6e370ceb7, improve documentation for siptrace and DB setup
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: 05a6f13c40249e0d658016652ae46b8512149857 URL: https://github.com/kamailio/kamailio/commit/05a6f13c40249e0d658016652ae46b8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:29:10Z siptrace: manual backport of 75e6e370ceb7, improve documentation for siptrace and DB setup --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/05a6f13c40249e0d658016652ae46b8… Patch: https://github.com/kamailio/kamailio/commit/05a6f13c40249e0d658016652ae46b8… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 6b3a1f49f8..f5be1c663c 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -522,7 +522,9 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") <para> Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to it. Based on mode, one can trace - the current message('m' - default), the current transaction('t') or the current dialog('d'). + the current message('m'), the current transaction('t') or the current dialog('d'). + If no mode is given, it falls back to the default mode - transaction tracking when + trace_flag is set, otherwise only the current message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -674,12 +676,12 @@ 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 - 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 - <acronym>SQL</acronym> script in the database directories in the - kamailio/scripts folder as template. + Before running &kamailio; with siptrace and activated trace_to_database + parameter, 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 <acronym>SQL</acronym> script in + the database directories in the kamailio/scripts folder as template. You can also find the complete database documentation on the project webpage, &kamailiodbdocslink;. </para>

1 0

git:master:21338195: siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode()
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 21338195e74b09ccca29d6479e698417ed34cd42 URL: https://github.com/kamailio/kamailio/commit/21338195e74b09ccca29d6479e69841… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:25:46Z siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - it was not working properly without destination uri in non-HEP mode --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/21338195e74b09ccca29d6479e69841… Patch: https://github.com/kamailio/kamailio/commit/21338195e74b09ccca29d6479e69841… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 6cc3471fcf..1368e954a6 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -562,7 +562,8 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, trace_send_hep_duplicate( &sto->body, &sto->fromip, &sto->toip, dst, correlation_id_str); } else { - if(dst) { + /* sip_trace_mode() will not set a destination, uses duplicate_uri */ + if(dst || trace_to_database == 0) { trace_send_duplicate(sto->body.s, sto->body.len, dst); } } @@ -1070,10 +1071,13 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * dest_info_t dest_info; enum siptrace_type_t trace_type; - if (dest) { - if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { - LM_ERR("unable to parse the dest URI string\n"); - return -1; + /* to support tracing to database without destination parameter - old mode */ + if (dest || trace_to_database == 0) { + if (dest) { + if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { + LM_ERR("unable to parse the dest URI string\n"); + return -1; + } } if (dup_uri_param_str.s == 0 || (is_null_pv(dup_uri_param_str))) {

1 0

git:master:75e6e370: siptrace: improve documentation about sip_trace and DB setup
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 75e6e370ceb701eabbdb2a1b7f12311ba0ae5024 URL: https://github.com/kamailio/kamailio/commit/75e6e370ceb701eabbdb2a1b7f12311… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:25:46Z siptrace: improve documentation about sip_trace and DB setup --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/75e6e370ceb701eabbdb2a1b7f12311… Patch: https://github.com/kamailio/kamailio/commit/75e6e370ceb701eabbdb2a1b7f12311… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 5bd274a2f0..7d5b0d34ef 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -643,7 +643,9 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") <para> Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to it. Based on mode, one can trace - the current message('m' - default), the current transaction('t') or the current dialog('d'). + the current message('m'), the current transaction('t') or the current dialog('d'). + If no mode is given, it falls back to the default mode - transaction tracking when + trace_flag is set, otherwise only the current message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -795,12 +797,12 @@ 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 - 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 - <acronym>SQL</acronym> script in the database directories in the - kamailio/scripts folder as template. + Before running &kamailio; with siptrace and activated trace_to_database + parameter, 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 <acronym>SQL</acronym> script in + the database directories in the kamailio/scripts folder as template. You can also find the complete database documentation on the project webpage, &kamailiodbdocslink;. </para>

1 0

← Newer
1
...
33
34
35
36
37
38
39
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020