sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
226 discussions

[kamailio/kamailio] make ruxc build optional (#2808)

by sergey-safarov

### Description I during master compilation I see an error ``` [root@safarov-dell kamailio]# make -C src/modules/ruxc/ make: Entering directory '/tmp/kamailio/src/modules/ruxc' CC (gcc) [M ruxc.so] ruxc_mod.o ruxc_mod.c:28:10: fatal error: ruxc.h: No such file or directory 28 | #include <ruxc.h> | ^~~~~~~~ compilation terminated. ``` I was not able to figure out how to install the required dependency on CentOS dist and Fedora. Could you make build this module build optional -- 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/2808

2 years, 10 months

git:master:61cbb5e8: core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 61cbb5e861aeb9b7f69ebb8d284e3ded0ede9cd8 URL: https://github.com/kamailio/kamailio/commit/61cbb5e861aeb9b7f69ebb8d284e3de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-27T16:52:12+02:00 core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots - GH #2798 --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/61cbb5e861aeb9b7f69ebb8d284e3de… Patch: https://github.com/kamailio/kamailio/commit/61cbb5e861aeb9b7f69ebb8d284e3de… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 5fc2952ed9..a87c91756c 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2147,6 +2147,7 @@ int pv_init_buffer(void) _pv_print_buffer_slots, _pv_print_buffer_size); _pv_print_buffer_slots_active = _pv_print_buffer_slots; _pv_print_buffer_size_active = _pv_print_buffer_size; + _pv_print_buffer_index = 0; return 0; } @@ -2168,6 +2169,7 @@ void pv_destroy_buffer(void) pkg_free(_pv_print_buffer); _pv_print_buffer_slots_active = 0; _pv_print_buffer_size_active = 0; + _pv_print_buffer_index = 0; _pv_print_buffer = NULL; } @@ -2177,8 +2179,9 @@ void pv_destroy_buffer(void) int pv_reinit_buffer(void) { if(_pv_print_buffer_size==_pv_print_buffer_size_active - && _pv_print_buffer_slots==_pv_print_buffer_slots_active) + && _pv_print_buffer_slots==_pv_print_buffer_slots_active) { return 0; + } pv_destroy_buffer(); return pv_init_buffer(); }

2 years, 10 months

git:master:4e239991: modules: readme files regenerated - outbound ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 4e2399916ce7f00d4c141004194a73f786a40b12 URL: https://github.com/kamailio/kamailio/commit/4e2399916ce7f00d4c141004194a73f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-27T16:01:15+02:00 modules: readme files regenerated - outbound ... [skip ci] --- Modified: src/modules/outbound/README --- Diff: https://github.com/kamailio/kamailio/commit/4e2399916ce7f00d4c141004194a73f… Patch: https://github.com/kamailio/kamailio/commit/4e2399916ce7f00d4c141004194a73f… --- diff --git a/src/modules/outbound/README b/src/modules/outbound/README index 163e5e2b27..8e65a606dc 100644 --- a/src/modules/outbound/README +++ b/src/modules/outbound/README @@ -25,6 +25,7 @@ Peter Dunkley 3.1. force_outbound_flag (integer) 3.2. force_no_outbound_flag (integer) + 3.3. flow_token_secret (string) List of Examples @@ -32,6 +33,7 @@ Peter Dunkley 1.2. Registrar Configuration 1.3. Set force_outbound_flag parameter 1.4. Set force_no_outbound_flag parameter + 1.5. Set flow_token_secret parameter Chapter 1. Admin Guide @@ -51,6 +53,7 @@ Chapter 1. Admin Guide 3.1. force_outbound_flag (integer) 3.2. force_no_outbound_flag (integer) + 3.3. flow_token_secret (string) 1. Overview @@ -480,6 +483,7 @@ event_route[tm:branch-failure:FAIL-BRANCH] { 3.1. force_outbound_flag (integer) 3.2. force_no_outbound_flag (integer) + 3.3. flow_token_secret (string) 3.1. force_outbound_flag (integer) @@ -506,3 +510,15 @@ modparam("outbound", "force_outbound_flag", 1) ... modparam("outbound", "force_no_outbound_flag", 2) ... + +3.3. flow_token_secret (string) + + Secret phrase used to calculate the outbound key value used for flow + tokens validation. Allows to set persistent outbound key. + + If not specified, outbound will use randomly generated outbound key + + Example 1.5. Set flow_token_secret parameter +... +modparam("outbound", "flow_token_secret", "johndoessecretphrase") +...

2 years, 10 months

[kamailio/kamailio] outbound: add flow_token_secret param (#2801)

by Michael Furmur

- calculate ob_key as SHA1(flow_token_secret) if specified - keep old behavior with randomly generated ob_key if not specified   #### 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  Adds ``flow_token_secret``(string) parameter for **outbound** module to give the ability to use persistent ob_key which is used for flow tokens validation. Useful for cluster configurations with floating IP and ensures successful validation of the previously generated flow tokens after the **kamailio** restart. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2801 -- Commit Summary -- * outbound: add flow_token_secret param -- File Changes -- M src/modules/outbound/doc/outbound_admin.xml (22) M src/modules/outbound/outbound_mod.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2801.patch https://github.com/kamailio/kamailio/pull/2801.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/2801

2 years, 10 months

git:master:cc32abd9: outbound: add flow_token_secret param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc32abd91888f3978708eddc88c4409ef5a6b122 URL: https://github.com/kamailio/kamailio/commit/cc32abd91888f3978708eddc88c4409… Author: Michael Furmur <m.furmur(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-27T15:54:34+02:00 outbound: add flow_token_secret param - calculate ob_key as SHA1(flow_token_secret) if specified - keep old behavior with randomly generated ob_key if not specified --- Modified: src/modules/outbound/doc/outbound_admin.xml Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc32abd91888f3978708eddc88c4409… Patch: https://github.com/kamailio/kamailio/commit/cc32abd91888f3978708eddc88c4409… --- diff --git a/src/modules/outbound/doc/outbound_admin.xml b/src/modules/outbound/doc/outbound_admin.xml index 7418cecfd9..0fe4e278b2 100644 --- a/src/modules/outbound/doc/outbound_admin.xml +++ b/src/modules/outbound/doc/outbound_admin.xml @@ -499,6 +499,28 @@ modparam("outbound", "force_no_outbound_flag", 2) </example> </section> + <section> + <title><varname>flow_token_secret</varname> (string)</title> + <para> + Secret phrase used to calculate the outbound key value + used for flow tokens validation. + Allows to set persistent outbound key. + </para> + <para> + If not specified, <emphasis>outbound</emphasis> will use randomly generated outbound key + </para> + <example> + <title> + Set <varname>flow_token_secret</varname> parameter + </title> + <programlisting format="linespecific"> +... +modparam("outbound", "flow_token_secret", "johndoessecretphrase") +... + </programlisting> + </example> + </section> + </section> </chapter> diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 82d18a3eca..ada7062454 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -25,6 +25,7 @@ */ #include <openssl/hmac.h> #include <openssl/rand.h> +#include <openssl/sha.h> #include "../../core/basex.h" #include "../../core/dprint.h" @@ -52,6 +53,7 @@ static void destroy(void); static unsigned int ob_force_flag = (unsigned int) -1; static unsigned int ob_force_no_flag = (unsigned int) -1; static str ob_key = {0, 0}; +static str flow_token_secret = {0, 0}; static cmd_export_t cmds[]= { @@ -63,8 +65,9 @@ static cmd_export_t cmds[]= static param_export_t params[]= { - { "force_outbound_flag", INT_PARAM, &ob_force_flag }, - { "force_no_outbound_flag", INT_PARAM, &ob_force_no_flag }, + { "force_outbound_flag", PARAM_INT, &ob_force_flag }, + { "force_no_outbound_flag", PARAM_INT, &ob_force_no_flag }, + { "flow_token_secret", PARAM_STRING, &flow_token_secret}, { 0, 0, 0 } }; @@ -102,10 +105,17 @@ static int mod_init(void) return -1; } ob_key.len = OB_KEY_LEN; - if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) - { - LM_ERR("unable to get %d cryptographically strong pseudo-" - "random bytes\n", ob_key.len); + + if(flow_token_secret.s) { + assert(ob_key.len == SHA_DIGEST_LENGTH); + LM_DBG("flow_token_secret mod param set. use persistent ob_key"); + SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); + } else { + if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) + { + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", ob_key.len); + } } if (cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg,

2 years, 10 months

git:master:3c9037e9: pv: added variable $msgbuf(index)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3c9037e94a33396487ddd72ade607756ea1a91bc URL: https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade60775… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-27T15:45:21+02:00 pv: added variable $msgbuf(index) - get/set the character at the position index in the message buffer --- 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/3c9037e94a33396487ddd72ade60775… Patch: https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade60775… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index cc976c86c0..c4e33b4d31 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -552,6 +552,8 @@ static pv_export_t mod_pvs[] = { pv_parse_via_name, 0, 0, 0}, {{"viaZ", (sizeof("viaZ")-1)}, PVT_OTHER, pv_get_viaZ, 0, pv_parse_via_name, 0, 0, 0}, + {{"msgbuf", (sizeof("msgbuf")-1)}, PVT_OTHER, pv_get_msgbuf, pv_set_msgbuf, + pv_parse_msgbuf_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 292c96758c..44cc551212 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4633,3 +4633,115 @@ int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_via_attr(msg, vbZ, param, res); } + +/** + * + */ +int pv_parse_msgbuf_name(pv_spec_t *sp, str *in) +{ + int n; + char *p; + pv_spec_t *nsp = 0; + + if(in==NULL || in->s==NULL || in->len<=0 || sp==NULL) { + return -1; + } + + p = in->s; + if(*p==PV_MARKER) { + nsp = (pv_spec_p)pkg_malloc(sizeof(pv_spec_t)); + if(nsp==NULL) { + LM_ERR("no more memory\n"); + return -1; + } + p = pv_parse_spec(in, nsp); + if(p==NULL) { + LM_ERR("invalid variable [%.*s]\n", in->len, in->s); + pv_spec_free(nsp); + return -1; + } + //LM_ERR("dynamic name [%.*s]\n", in->len, in->s); + //pv_print_spec(nsp); + sp->pvp.pvn.type = PV_NAME_PVAR; + sp->pvp.pvn.u.dname = (void*)nsp; + return 0; + } + + if (str2sint(in, &n) != 0) { + LM_ERR("bad index value: [%.*s]\n", in->len, in->s); + return -1; + } + + sp->pvp.pvn.u.isname.name.n = n; + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; +} + +/** + * + */ +int pv_get_vparam_ival(sip_msg_t *msg, pv_param_t *param) +{ + pv_value_t vval; + + if(param->pvn.type==PV_NAME_PVAR) { + /* pvar */ + if(pv_get_spec_value(msg, (pv_spec_t*)(param->pvn.u.dname), &vval)!=0) { + LM_ERR("cannot get name value\n"); + return -1; + } + return vval.ri; + } else { + return param->pvn.u.isname.name.n; + } +} + +/** + * + */ +int pv_get_msgbuf(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + int n; + static char outmsgbuf[4]; + + n = pv_get_vparam_ival(msg, param); + + if(n<0 || n>=msg->len) { + LM_ERR("index out of range\n"); + return pv_get_null(msg, param, res); + } + outmsgbuf[0] = msg->buf[n]; + outmsgbuf[1] = '\0'; + return pv_get_strlval(msg, param, res, outmsgbuf, 2); +} + +/** + * + */ +int pv_set_msgbuf(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val) +{ + int n; + + n = pv_get_vparam_ival(msg, param); + + if(n<0 || n>=msg->len) { + LM_ERR("index out of range\n"); + return -1; + } + + if((val==NULL) || (val->flags&PV_VAL_NULL)) { + LM_ERR("null value - skipping\n"); + return 1; + } + if(!(val->flags&PV_VAL_STR) || val->rs.len<=0) { + LM_ERR("error - str value required\n"); + return -1; + } + + msg->buf[n] = val->rs.s[0]; + + return 0; +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 14c79ce86c..6406d9054a 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -416,5 +416,11 @@ int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_get_via1(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_msgbuf_name(pv_spec_t *sp, str *in); +int pv_get_msgbuf(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_set_msgbuf(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val); + + #endif

2 years, 10 months

git:5.4:17fab5e2: pv_headers: pvh_set_header, remove values to set null when necessary

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 17fab5e2cf3dad61816dbd76977c72f88a345bdc URL: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-27T11:33:34+02:00 pv_headers: pvh_set_header, remove values to set null when necessary * fix pvh_set_xavi for SR_XTYPE_NULL (cherry picked from commit af926514ac3e70dff51408baf326b29bce4eecfc) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… Patch: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 96fdc292b0..b8e4f92e61 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -375,7 +375,7 @@ int pvh_set_xavi(struct sip_msg *msg, str *xname, str *name, void *data, LM_DBG("br_xname: %.*s name: %.*s append:%d\n", br_xname.len, br_xname.s, name->len, name->s, append); memset(&xval, 0, sizeof(sr_xval_t)); - if(data == NULL || SR_XTYPE_NULL) { + if(data == NULL || type == SR_XTYPE_NULL) { xval.type = SR_XTYPE_NULL; } else if(type == SR_XTYPE_STR) { xval.type = SR_XTYPE_STR; @@ -618,9 +618,11 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &avi); - LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, - xavi->name.len, xavi->name.s, hname->len, hname->s); + if(hname_cnt > 1) { + cnt = xavi_rm_by_name(hname, 1, &avi); + LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, + xavi->name.len, xavi->name.s, hname->len, hname->s); + } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) < 0) goto err;

2 years, 10 months

git:5.5:d20841db: pv_headers: pvh_set_header, remove values to set null when necessary

by Victor Seva

Module: kamailio Branch: 5.5 Commit: d20841db501fbc1a4053a6cb7293d3fa3f3fee94 URL: https://github.com/kamailio/kamailio/commit/d20841db501fbc1a4053a6cb7293d3f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-27T11:33:10+02:00 pv_headers: pvh_set_header, remove values to set null when necessary * fix pvh_set_xavi for SR_XTYPE_NULL (cherry picked from commit af926514ac3e70dff51408baf326b29bce4eecfc) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/d20841db501fbc1a4053a6cb7293d3f… Patch: https://github.com/kamailio/kamailio/commit/d20841db501fbc1a4053a6cb7293d3f… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 96fdc292b0..b8e4f92e61 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -375,7 +375,7 @@ int pvh_set_xavi(struct sip_msg *msg, str *xname, str *name, void *data, LM_DBG("br_xname: %.*s name: %.*s append:%d\n", br_xname.len, br_xname.s, name->len, name->s, append); memset(&xval, 0, sizeof(sr_xval_t)); - if(data == NULL || SR_XTYPE_NULL) { + if(data == NULL || type == SR_XTYPE_NULL) { xval.type = SR_XTYPE_NULL; } else if(type == SR_XTYPE_STR) { xval.type = SR_XTYPE_STR; @@ -618,9 +618,11 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &avi); - LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, - xavi->name.len, xavi->name.s, hname->len, hname->s); + if(hname_cnt > 1) { + cnt = xavi_rm_by_name(hname, 1, &avi); + LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, + xavi->name.len, xavi->name.s, hname->len, hname->s); + } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) < 0) goto err;

2 years, 10 months

git:master:af926514: pv_headers: pvh_set_header, remove values to set null when necessary

by Victor Seva

Module: kamailio Branch: master Commit: af926514ac3e70dff51408baf326b29bce4eecfc URL: https://github.com/kamailio/kamailio/commit/af926514ac3e70dff51408baf326b29… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-27T10:52:21+02:00 pv_headers: pvh_set_header, remove values to set null when necessary * fix pvh_set_xavi for SR_XTYPE_NULL --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/af926514ac3e70dff51408baf326b29… Patch: https://github.com/kamailio/kamailio/commit/af926514ac3e70dff51408baf326b29… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 96fdc292b0..b8e4f92e61 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -375,7 +375,7 @@ int pvh_set_xavi(struct sip_msg *msg, str *xname, str *name, void *data, LM_DBG("br_xname: %.*s name: %.*s append:%d\n", br_xname.len, br_xname.s, name->len, name->s, append); memset(&xval, 0, sizeof(sr_xval_t)); - if(data == NULL || SR_XTYPE_NULL) { + if(data == NULL || type == SR_XTYPE_NULL) { xval.type = SR_XTYPE_NULL; } else if(type == SR_XTYPE_STR) { xval.type = SR_XTYPE_STR; @@ -618,9 +618,11 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &avi); - LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, - xavi->name.len, xavi->name.s, hname->len, hname->s); + if(hname_cnt > 1) { + cnt = xavi_rm_by_name(hname, 1, &avi); + LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, + xavi->name.len, xavi->name.s, hname->len, hname->s); + } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) < 0) goto err;

2 years, 10 months

[kamailio/kamailio] Wrong return code used by sl_reply_error() (#2802)

by Norbixin

### Description I wanted to change 478 response to 503 in case of t_relay() failure, but leave default behavior in rest error cases. I used part of code from "Example 1.1." inside https://www.kamailio.org/docs/modules/devel/modules/outbound.html. When I get -478 from t_relay() it works fine, but when this code is different sl_reply_erorr() don't use it as it should be. This is my part of kamailio.cfg: ``` route[RELAY] { if (!t_relay()) { switch($rc) { case -478: xlog("L_WARN","T_Relay returned 478, sending back 503.\n"); sl_send_reply("503", "Service Unavailable"); exit; default: sl_reply_error(); exit; } } exit; } ``` When I log $rc value before sl_reply_error() it is valid, but not used by sl_reply_error() as SIP error value, it sends 500 instead. ### Troubleshooting #### Reproduction I've added incorrect hostnames with flag 16 to set where the message should be sent and t_relay() returns -478. To check the default case inside switch I changed case -478 to -479. #### Log Messages  ``` 1(8) ERROR: <core> [core/resolve.c:1731]: sip_hostport2su(): could not resolve hostname: "va4brhino" 1(8) ERROR: tm [ut.h:309]: uri2dst2(): failed to resolve "va4brhino" 1(8) ERROR: tm [t_fwd.c:1759]: t_forward_nonack(): failure to add branches 1(8) ERROR: sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) ``` Logs with different route relay ``` route[RELAY] { if (!t_relay()) { switch($rc) { case -479: xlog("L_WARN","T_Relay returned 479, sending back 503.\n"); sl_send_reply("503", "Service Unavailable"); exit; default: xlog("L_WARN","Return code: $rc\n"); sl_reply_error(); exit; } } exit; } ``` ``` 1(8) ERROR: <core> [core/resolve.c:1731]: sip_hostport2su(): could not resolve hostname: "va4brhino" 1(8) ERROR: tm [ut.h:309]: uri2dst2(): failed to resolve "va4brhino" 1(8) ERROR: tm [t_fwd.c:1759]: t_forward_nonack(): failure to add branches 1(8) WARNING: <script>: Return code: -478 1(8) ERROR: sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0 (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_BLOCKLIST, 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: unknown compiled with gcc 4.8.4 ``` * **Operating System**:  ``` Linux v4bkamailio 5.10.25-linuxkit #1 SMP Tue Mar 23 09:27:39 UTC 2021 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/2802

2 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021