sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

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: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: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: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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020