sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
436 discussions

[kamailio/kamailio] Create lol (#2086)
by Amiya Chaturvedi 01 Oct '19

01 Oct '19

#### 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 - [ ] 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/2086 -- Commit Summary -- * Create lol -- File Changes -- A Amiya_Chaturvedi/lol (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2086.patch https://github.com/kamailio/kamailio/pull/2086.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/2086

2 2

git:master:3033a26a: siptrace: docs for sip_trace_mode() function
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 3033a26a6a8a8e7075dd5a86bf376c73830f2bbe URL: https://github.com/kamailio/kamailio/commit/3033a26a6a8a8e7075dd5a86bf376c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T13:31:47+02:00 siptrace: docs for sip_trace_mode() function --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3033a26a6a8a8e7075dd5a86bf376c7… Patch: https://github.com/kamailio/kamailio/commit/3033a26a6a8a8e7075dd5a86bf376c7… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 21d6090c74..df8fe2f017 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -512,7 +512,7 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") </example> </section> </section> - + <section> <title>Functions</title> <section id="siptrace.f.sip_trace"> @@ -569,6 +569,35 @@ sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); </example> </section> + <section id="siptrace.f.sip_trace_mode"> + <title> + <function moreinfo="none">sip_trace_mode(tmode])</function> + </title> + <para> + Set the tracing mode: message, transaction or dialog. Only the first + character of the parameter matters: m or M for message; t or T for + transaction; d or D for dialog. + </para> + <para> + In message tracing mode only the current message is stored or mirrored. + In transaction tracing mode, all the messages of the current transaction + are stored or mirrored. In dialog tracing mode, all the messages of the + current dialog are stored or mirrored. + </para> + <para> + This function can be used in ANY_ROUTE. + </para> + </emphasis> + <example> + <title><function>sip_trace_mode()</function> usage</title> + <programlisting format="linespecific"> +... +sip_trace_mode("t"); +... +</programlisting> + </example> + </section> + <section id="siptrace.f.hlog"> <title> <function moreinfo="none">hlog([correlation_id,] message)</function>

1 0

git:master:929ff145: siptrace: added sip_trace_mode(tmode)
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 929ff145d78b70f29c388b31e76f84c4b438ee90 URL: https://github.com/kamailio/kamailio/commit/929ff145d78b70f29c388b31e76f84c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T13:23:06+02:00 siptrace: added sip_trace_mode(tmode) - function to specify the tracing mode: message, transaction, dialog - a short form of siptrace with 3 params when the duplicate uri and correlation id are not used - the variant for the older setflag(...)/sip_trace(...) to track all the messages in a transaction --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/929ff145d78b70f29c388b31e76f84c… Patch: https://github.com/kamailio/kamailio/commit/929ff145d78b70f29c388b31e76f84c… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 544fb5392a..20c0c8a907 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -87,6 +87,7 @@ static int w_sip_trace1(struct sip_msg *, char *dest, char *p2); static int w_sip_trace2(struct sip_msg *, char *dest, char *correlation_id); static int w_sip_trace3(struct sip_msg *, char *dest, char *correlation_id, char *trace_type); static int fixup_siptrace(void **param, int param_no); +static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2); static int parse_siptrace_uri(str* duri, dest_info_t* dst); static enum siptrace_type_t parse_siptrace_flag(str* sflags); @@ -198,6 +199,8 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"hlog", (cmd_function)w_hlog2, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"sip_trace_mode", (cmd_function)w_sip_trace_mode, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -1182,6 +1185,54 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, return sip_trace_store(&sto, dst, correlation_id_str); } + +/** + * + */ +static int ki_sip_trace_mode(sip_msg_t *msg, str *smode) +{ + enum siptrace_type_t trace_type; + + if(smode==NULL || smode->s==NULL || smode->len<=0) { + LM_INFO("no tracing mode - trace message\n"); + trace_type = SIPTRACE_MESSAGE; + } else { + switch(smode->s[0]) { + case 'M': + case 'm': + trace_type = SIPTRACE_MESSAGE; + break; + case 'T': + case 't': + trace_type = SIPTRACE_TRANSACTION; + break; + case 'D': + case 'd': + trace_type = SIPTRACE_DIALOG; + break; + default: + trace_type = SIPTRACE_MESSAGE; + LM_INFO("unexpected tracing mode [%.*s] - trace message\n", + smode->len, smode->s); + } + } + + return sip_trace_helper(msg, NULL, NULL, NULL, NULL, trace_type); +} + +/** + * + */ +static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2) +{ + str smode = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)pmode, &smode)<0) { + LM_ERR("failed to get tracing mode parameter\n"); + return -1; + } + return ki_sip_trace_mode(msg, &smode); +} + static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) { siptrace_data_t sto; @@ -2134,6 +2185,11 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siptrace"), str_init("sip_trace_mode"), + SR_KEMIP_INT, ki_sip_trace_mode, + { SR_KEMIP_STR, 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:41f6ddb8: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 41f6ddb8162960633b005c759b74efd86296d021 URL: https://github.com/kamailio/kamailio/commit/41f6ddb8162960633b005c759b74efd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-01T10:17:03+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/41f6ddb8162960633b005c759b74efd… Patch: https://github.com/kamailio/kamailio/commit/41f6ddb8162960633b005c759b74efd… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 35b1dd78a3..951482065d 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -435,8 +435,9 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") 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 traffic, no need to - set the siptrace flag per request. + 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 set to 0, no automatic mirroring of SIP traffic via HEP.

4 4

git:master:47e0649e: pdt: init len variable to avoid using garbage value
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 47e0649eca286bfc26c39dd1142169fc06eea077 URL: https://github.com/kamailio/kamailio/commit/47e0649eca286bfc26c39dd1142169f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T12:22:34+02:00 pdt: init len variable to avoid using garbage value --- Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/47e0649eca286bfc26c39dd1142169f… Patch: https://github.com/kamailio/kamailio/commit/47e0649eca286bfc26c39dd1142169f… --- diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index e55f5bdfa5..d0ff43871a 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -278,7 +278,6 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) *plen = len; return domain; - } /** @@ -287,7 +286,7 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) { pdt_tree_t *it; - int len; + int len = 0; str *domain=NULL; if(pl==NULL || sdomain==NULL || sdomain->s==NULL || code == NULL @@ -300,13 +299,14 @@ str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) it = pl; while(it!=NULL && str_strcmp(&it->sdomain, sdomain)<0) it = it->next; - + if(it==NULL || str_strcmp(&it->sdomain, sdomain)>0) return NULL; - + domain = get_domain(it, code, &len); if(plen!=NULL) - *plen = len; + *plen = len; + return domain; }

1 0

git:master:6861995e: speeddial: fix stripping domain prefix
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 6861995e417c40e9ab530d4c0bed97c57de184fd URL: https://github.com/kamailio/kamailio/commit/6861995e417c40e9ab530d4c0bed97c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T12:17:48+02:00 speeddial: fix stripping domain prefix - increment the index after the value is adjusted --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/6861995e417c40e9ab530d4c0bed97c… Patch: https://github.com/kamailio/kamailio/commit/6861995e417c40e9ab530d4c0bed97c… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index d9e52bf3cd..e26bc37bb8 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -117,7 +117,6 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = puri->host.s; db_vals[nr_keys].val.str_val.len = puri->host.len; - nr_keys++; if (dstrip_s.s!=NULL && dstrip_s.len>0 && dstrip_s.len<puri->host.len @@ -126,6 +125,7 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].val.str_val.s += dstrip_s.len; db_vals[nr_keys].val.str_val.len -= dstrip_s.len; } + nr_keys++; } /* take sd from r-uri */ if (parse_sip_msg_uri(_msg) < 0)

1 0

sip_trace() broken in master
by Juha Heinanen 01 Oct '19

01 Oct '19

In 5.2 setflag(TRACE); sip_trace(); traces both requests and responses. In master, only requests. Please fix. -- Juha

4 15

git:master:dfe8db75: core: init local structs to avoid use of garbage values
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: dfe8db758f84f5e88e0cb35b80a65dcd48158897 URL: https://github.com/kamailio/kamailio/commit/dfe8db758f84f5e88e0cb35b80a65dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T10:28:43+02:00 core: init local structs to avoid use of garbage values --- Modified: src/core/forward.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/dfe8db758f84f5e88e0cb35b80a65dc… Patch: https://github.com/kamailio/kamailio/commit/dfe8db758f84f5e88e0cb35b80a65dc… --- diff --git a/src/core/forward.c b/src/core/forward.c index 8216ccf88a..a31c1c2af5 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -471,6 +471,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, prev_send_sock=0; err=0; + memset(&dns_srv_h, 0, sizeof(struct dns_srv_handle)); #endif buf=0; diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 668179c45e..afbaece075 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -421,6 +421,7 @@ static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) break; default: LM_CRIT("unknown address family %d\n", su->s.sa_family); + memset(ip, 0, sizeof(ip_addr_t)); } }

1 0

git:master:a886f8ef: core: tcp - safety check that dst address is provided for tcp_send()
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: a886f8ef15677b951e36407735f1fb5b94f0edd0 URL: https://github.com/kamailio/kamailio/commit/a886f8ef15677b951e36407735f1fb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T10:28:43+02:00 core: tcp - safety check that dst address is provided for tcp_send() --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/a886f8ef15677b951e36407735f1fb5… Patch: https://github.com/kamailio/kamailio/commit/a886f8ef15677b951e36407735f1fb5… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 61a692af85..99d33ee719 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2002,8 +2002,13 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, snd_flags_t t_send_flags; #endif /* USE_TLS */ + if(unlikely(dst==NULL)) { + LM_ERR("no destination address provided\n"); + return -1; + } + port=su_getport(&dst->to); - try_local_port = (dst && dst->send_sock)?dst->send_sock->port_no:0; + try_local_port = (dst->send_sock)?dst->send_sock->port_no:0; con_lifetime=cfg_get(tcp, tcp_cfg, con_lifetime); if (likely(port)){ su2ip_addr(&ip, &dst->to);

1 0

git:master:3f23f9ef: siptrace: docs - more info on using trace_mode vs flag/sip_trace()
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 3f23f9ef88e4fa2af8d24c3260cb9821aa2f64cc URL: https://github.com/kamailio/kamailio/commit/3f23f9ef88e4fa2af8d24c3260cb982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T10:06:47+02:00 siptrace: docs - more info on using trace_mode vs flag/sip_trace() --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f23f9ef88e4fa2af8d24c3260cb982… Patch: https://github.com/kamailio/kamailio/commit/3f23f9ef88e4fa2af8d24c3260cb982… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 875dc2348f..21d6090c74 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -471,8 +471,10 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") <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 traffic, - no need to set the siptrace flag per request. + 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. </para> <para> If set to 0, no automatic mirroring of SIP traffic via HEP.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019