sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

[kamailio/kamailio] ims_isc: initial fix of issue #1168 (#1553)
by Christoph VALENTIN 04 Jun '18

04 Jun '18

Function isc_match_filter() got a new local variable firstflag in order to handle the case where a FAILURE_ROUTE callback is received before the first AS has been contacted. The firstflag is also forwarded to function isc_forward() as parameter.   #### 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 against Version 5.1.0 - [x] Related to issue #1168 (replace XXXX with an open issue number) #### Description  This is the 5.1 pull request, which was created by cherry-pick from the master pull request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1553 -- Commit Summary -- * ims_isc: initial fix of issue #1168 -- File Changes -- M src/modules/ims_isc/ims_isc_mod.c (9) M src/modules/ims_isc/isc.c (4) M src/modules/ims_isc/isc.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1553.patch https://github.com/kamailio/kamailio/pull/1553.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/1553

2 2

git:master:ae22ba7e: core: msg translator - skip last ; from xavp serialized in via params
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: ae22ba7eb41259f9def7e1e0e30b755214e26234 URL: https://github.com/kamailio/kamailio/commit/ae22ba7eb41259f9def7e1e0e30b755… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T11:27:08+02:00 core: msg translator - skip last ; from xavp serialized in via params --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/ae22ba7eb41259f9def7e1e0e30b755… Patch: https://github.com/kamailio/kamailio/commit/ae22ba7eb41259f9def7e1e0e30b755… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 2e649ac6c6..88019b869b 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2945,7 +2945,7 @@ char* create_via_hf( unsigned int *len, xparams.len = xavp_serialize_fields(&_ksr_xavp_via_params, xparams.s, pv_get_buffer_size()); if(xparams.len>0) { - via = (char*)pkg_malloc(extra_params.len+xparams.len+1); + via = (char*)pkg_malloc(extra_params.len+xparams.len+2); if(via==0) { LM_ERR("building xavps params failed\n"); if (extra_params.s) pkg_free(extra_params.s); @@ -2955,7 +2955,10 @@ char* create_via_hf( unsigned int *len, memcpy(via, extra_params.s, extra_params.len); pkg_free(extra_params.s); } - memcpy(via + extra_params.len, xparams.s, xparams.len); + /* add ';' between via parameters */ + via[extra_params.len] = ';'; + /* skip last ';' from xavp serialized output */ + memcpy(via + extra_params.len + 1, xparams.s, xparams.len - 1); extra_params.s = via; extra_params.len += xparams.len; extra_params.s[extra_params.len] = '\0';

1 0

git:master:2c6dae75: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 2c6dae75628f5e426e81e71c203765f9c4bb5633 URL: https://github.com/kamailio/kamailio/commit/2c6dae75628f5e426e81e71c203765f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-04T08:31:55+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/2c6dae75628f5e426e81e71c203765f… Patch: https://github.com/kamailio/kamailio/commit/2c6dae75628f5e426e81e71c203765f…

1 0

git:master:e19f6f23: corex: send_data() and sendx() exported to kemi framework
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: e19f6f23f942ffbd940cbd194c405cae45dd38e0 URL: https://github.com/kamailio/kamailio/commit/e19f6f23f942ffbd940cbd194c405ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: send_data() and sendx() exported to kemi framework --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e19f6f23f942ffbd940cbd194c405ca… Patch: https://github.com/kamailio/kamailio/commit/e19f6f23f942ffbd940cbd194c405ca… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index ee1d506b69..4831535f67 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -245,6 +245,13 @@ static int w_send_data(sip_msg_t *msg, char *suri, char *sdata) return 1; } +static int ki_send_data(sip_msg_t *msg, str *uri, str *data) +{ + if(corex_send_data(uri, NULL, data) < 0) + return -1; + return 1; +} + static int w_sendx(sip_msg_t *msg, char *suri, char *ssock, char *sdata) { str uri; @@ -271,6 +278,13 @@ static int w_sendx(sip_msg_t *msg, char *suri, char *ssock, char *sdata) return 1; } +static int ki_sendx(sip_msg_t *msg, str *uri, str *sock, str *data) +{ + if(corex_send_data(uri, sock, data) < 0) + return -1; + return 1; +} + int corex_alias_subdomains_param(modparam_t type, void *val) { if(val==NULL) @@ -898,6 +912,16 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("send_data"), + SR_KEMIP_INT, ki_send_data, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("sendx"), + SR_KEMIP_INT, ki_sendx, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + 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:f5422833: corex: docs - send() updated to send_udp()
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: f5422833fbb42149d3a47450d863f0e5e1d29c6b URL: https://github.com/kamailio/kamailio/commit/f5422833fbb42149d3a47450d863f0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: docs - send() updated to send_udp() - example for send_tcp() --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f5422833fbb42149d3a47450d863f0e… Patch: https://github.com/kamailio/kamailio/commit/f5422833fbb42149d3a47450d863f0e… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index bee0ec4791..346ecf2019 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -205,9 +205,9 @@ modparam("corex", "msg_avp", "$avp(msg)") </example> </section> - <section id="corex.f.send"> + <section id="corex.f.send_udp"> <title> - <function moreinfo="none">send([ host [ :port ] ])</function> + <function moreinfo="none">send_udp([ host [ :port ] ])</function> </title> <para> Send the original SIP message to a specific destination in stateless @@ -228,13 +228,13 @@ modparam("corex", "msg_avp", "$avp(msg)") This function can be used from REQUEST_ROUTE or FAILURE_ROUTE. </para> <example> - <title><function>send</function> usage</title> + <title><function>send_udp</function> usage</title> <programlisting format="linespecific"> ... - send(); - send("10.20.15.10"); - send("sip.example.com:5070"); - send("$var(res)"); + send_udp(); + send_udp("10.20.15.10"); + send_udp("sip.example.com:5070"); + send_udp("$var(res)"); ... </programlisting> </example> @@ -245,10 +245,21 @@ modparam("corex", "msg_avp", "$avp(msg)") <function moreinfo="none">send_tcp([ host [ :port ] ])</function> </title> <para> - This function is identical to <emphasis>send()</emphasis> + This function is identical to <emphasis>send_udp()</emphasis> described above, except that it sends the SIP message using the TCP protocol instead of UDP. </para> + <example> + <title><function>send_tcp</function> usage</title> + <programlisting format="linespecific"> +... + send_tcp(); + send_tcp("10.20.15.10"); + send_tcp("sip.example.com:5070"); + send_tcp("$var(res)"); +... +</programlisting> + </example> </section> <section id="corex.f.send_data">

1 0

git:master:3f2e41af: corex: send() renamed to send_udp()
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 3f2e41aff06f7e158e0a1547f1413eaca3f4b9c6 URL: https://github.com/kamailio/kamailio/commit/3f2e41aff06f7e158e0a1547f1413ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: send() renamed to send_udp() - reflect better that it uses UDP always, similar to send_tcp() --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3f2e41aff06f7e158e0a1547f1413ea… Patch: https://github.com/kamailio/kamailio/commit/3f2e41aff06f7e158e0a1547f1413ea… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index f95aaf46c7..ee1d506b69 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -41,7 +41,7 @@ MODULE_VERSION static int nio_intercept = 0; static int w_append_branch(sip_msg_t *msg, char *su, char *sq); -static int w_send(sip_msg_t *msg, char *su, char *sq); +static int w_send_udp(sip_msg_t *msg, char *su, char *sq); static int w_send_tcp(sip_msg_t *msg, char *su, char *sq); static int w_send_data(sip_msg_t *msg, char *suri, char *sdata); static int w_sendx(sip_msg_t *msg, char *suri, char *ssock, char *sdata); @@ -81,9 +81,9 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 2, fixup_spve_spve, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"send", (cmd_function)w_send, 0, 0, + {"send_udp", (cmd_function)w_send_udp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"send", (cmd_function)w_send, 1, fixup_spve_spve, + {"send_udp", (cmd_function)w_send_udp, 1, fixup_spve_null, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, @@ -206,14 +206,18 @@ static int w_append_branch(sip_msg_t *msg, char *su, char *sq) } /** - * config wrapper for send() and send_tcp() + * config wrapper for send_udp() */ -static int w_send(sip_msg_t *msg, char *su, char *sq) +static int w_send_udp(sip_msg_t *msg, char *su, char *sq) { if(corex_send(msg, (gparam_t*)su, PROTO_UDP) < 0) return -1; return 1; } + +/** + * config wrapper for send_tcp() + */ static int w_send_tcp(sip_msg_t *msg, char *su, char *sq) { if(corex_send(msg, (gparam_t*)su, PROTO_TCP) < 0)

1 0

git:master:706a72f1: corex: documentation for sendx() function
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 706a72f14362d4bfb609ec45856de6b4339c9563 URL: https://github.com/kamailio/kamailio/commit/706a72f14362d4bfb609ec45856de6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: documentation for sendx() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/706a72f14362d4bfb609ec45856de6b… Patch: https://github.com/kamailio/kamailio/commit/706a72f14362d4bfb609ec45856de6b… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index bada400b9f..bee0ec4791 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -272,7 +272,32 @@ modparam("corex", "msg_avp", "$avp(msg)") </programlisting> </example> </section> - <section id="corex.f.is_incoming"> + + <section id="corex.f.sendx"> + <title> + <function moreinfo="none">sendx(uri, sock, data)</function> + </title> + <para> + Send the data to address specified by uri using a specific local + socket. All parameters can contain pseudo-variables. The uri + parameter has to be a valid SIP URI. The sock parameter has to be + a valid socket specifier (like values assigned to $fs). The data + parameter can by any arbitrary content. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sendx</function> usage</title> + <programlisting format="linespecific"> +... +sendx("sip:example.com:5070;transport=sctp", "sctp:2.3.4.5:5060", "Message at $Ts"); +... +</programlisting> + </example> + </section> + + <section id="corex.f.is_incoming"> <title> <function moreinfo="none">is_incoming()</function> </title>

1 0

git:master:cf11f16c: corex: added sendx(uri, socket, data)
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: cf11f16c605ae83af5f1683a066db4340012b0c6 URL: https://github.com/kamailio/kamailio/commit/cf11f16c605ae83af5f1683a066db43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 corex: added sendx(uri, socket, data) - send data to destination uri by using local socket --- Modified: src/modules/corex/corex_lib.c Modified: src/modules/corex/corex_lib.h Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf11f16c605ae83af5f1683a066db43… Patch: https://github.com/kamailio/kamailio/commit/cf11f16c605ae83af5f1683a066db43…

1 0

git:master:b8ab2db0: core: parse methods recognize more by id
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: b8ab2db0480cf584a1e838aea3740547441bf639 URL: https://github.com/kamailio/kamailio/commit/b8ab2db0480cf584a1e838aea374054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 core: parse methods recognize more by id --- Modified: src/core/parser/parse_methods.c --- Diff: https://github.com/kamailio/kamailio/commit/b8ab2db0480cf584a1e838aea374054… Patch: https://github.com/kamailio/kamailio/commit/b8ab2db0480cf584a1e838aea374054… --- diff --git a/src/core/parser/parse_methods.c b/src/core/parser/parse_methods.c index 5823a48a10..6242e88667 100644 --- a/src/core/parser/parse_methods.c +++ b/src/core/parser/parse_methods.c @@ -106,6 +106,14 @@ int parse_method_name(const str* const s, enum request_method* const method) *method = METHOD_PUBLISH; return 0; } + if (likely((s->len==4) && !strncasecmp(s->s + 1, "ost", 3))) { + *method = METHOD_POST; + return 0; + } + if (likely((s->len==3) && !strncasecmp(s->s + 1, "ut", 2))) { + *method = METHOD_PUT; + return 0; + } break; case 'C': case 'c': @@ -156,6 +164,27 @@ int parse_method_name(const str* const s, enum request_method* const method) return 0; } break; + case 'D': + case 'd': + if (likely((s->len==6) && !strncasecmp(s->s + 1, "elete", 5))){ + *method = METHOD_DELETE; + return 0; + } + break; + case 'G': + case 'g': + if (likely((s->len==3) && !strncasecmp(s->s + 1, "et", 2))){ + *method = METHOD_GET; + return 0; + } + break; + case 'K': + case 'k': + if (likely((s->len==4) && !strncasecmp(s->s + 1, "dmq", 3))){ + *method = METHOD_KDMQ; + return 0; + } + break; default: break; } @@ -287,6 +316,18 @@ static int parse_method_advance(str* const _next, enum request_method* const _me _next->s += 7; goto found; } + if ((_next->len > 3) && !strncasecmp(_next->s + 1, "ost", 3)) { + *_method = METHOD_POST; + _next->len -= 4; + _next->s += 4; + goto found; + } + if ((_next->len > 2) && !strncasecmp(_next->s + 1, "ut", 2)) { + *_method = METHOD_PUT; + _next->len -= 3; + _next->s += 3; + goto found; + } goto unknown; case 'R': @@ -330,7 +371,36 @@ static int parse_method_advance(str* const _next, enum request_method* const _me } else { goto unknown; } - + case 'D': + case 'd': + if ((_next->len>5) && !strncasecmp(_next->s + 1, "elete", 5)){ + *_method = METHOD_DELETE; + _next->len -= 6; + _next->s += 6; + goto found; + } else { + goto unknown; + } + case 'G': + case 'g': + if ((_next->len>2) && !strncasecmp(_next->s + 1, "et", 2)){ + *_method = METHOD_GET; + _next->len -= 3; + _next->s += 3; + goto found; + } else { + goto unknown; + } + case 'K': + case 'k': + if ((_next->len>3) && !strncasecmp(_next->s + 1, "dmq", 3)){ + *_method = METHOD_KDMQ; + _next->len -= 4; + _next->s += 4; + goto found; + } else { + goto unknown; + } default: goto unknown; }

1 0

git:master:4fe95ab7: core: parser - assign ids for more methods
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 4fe95ab7db7f3fca83578bb7e2b2f478828793d3 URL: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 core: parser - assign ids for more methods - KDMQ and HTTP method types GET, POST, PUT and DELETE --- Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_methods.c --- Diff: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… Patch: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 9d9d73a36e..5922cfc1cc 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -74,7 +74,12 @@ typedef enum request_method { METHOD_UPDATE=2048, /*!< 2048 - 2^11 */ METHOD_REFER=4096, /*!< 4096 - 2^12 */ METHOD_PUBLISH=8192, /*!< 8192 - 2^13 */ - METHOD_OTHER=16384 /*!< 16384 - 2^14 */ + METHOD_KDMQ=16384, /*!< 16384 - 2^14 */ + METHOD_GET=32768, /*!< 32768 - 2^15 */ + METHOD_POST=65536, /*!< 65536 - 2^16 */ + METHOD_PUT=131072, /*!< 131072 - 2^17 */ + METHOD_DELETE=262144, /*!< 262144 - 2^18 */ + METHOD_OTHER=524288 /*!< 524288 - 2^19 */ } request_method_t; #define FL_FORCE_RPORT (1 << 0) /*!< force rport */ diff --git a/src/core/parser/parse_methods.c b/src/core/parser/parse_methods.c index de36d602c1..5823a48a10 100644 --- a/src/core/parser/parse_methods.c +++ b/src/core/parser/parse_methods.c @@ -65,7 +65,7 @@ int parse_method_name(const str* const s, enum request_method* const method) } switch ((s->s)[0]) { - /* ordered after probability of aparition on a normal proxy */ + /* ordered after probability of apparition on a normal proxy */ case 'R': case 'r': if (likely((s->len == 8) &&

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 June 2018