- sr-dev - kamailio.org

git:master:b92b931c: core: str list - added function to insert a block string in list
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: b92b931c26c199b756fd08e9c80cc9305469fd2b URL: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:55:32+02:00 core: str list - added function to insert a block string in list --- Modified: src/core/str_list.c Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… Patch: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… --- diff --git a/src/core/str_list.c b/src/core/str_list.c index f63b4c9151..207cee5bc3 100644 --- a/src/core/str_list.c +++ b/src/core/str_list.c @@ -13,13 +13,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions * @ingroup core * Module: @ref core @@ -32,7 +32,7 @@ /** * @brief Add a new allocated list element to an existing list - * + * * Add a new allocated list element to an existing list, the allocation is done * from the private memory pool * @param s input character @@ -43,18 +43,45 @@ */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) { - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { + struct str_list *nv; + nv = pkg_malloc(sizeof(struct str_list)); + if (!nv) { PKG_MEM_ERROR; return 0; } - new->s.s = s; - new->s.len = len; - new->next = 0; + nv->s.s = s; + nv->s.len = len; + nv->next = 0; - (*last)->next = new; - *last = new; + (*last)->next = nv; + *last = nv; *total += len; - return new; + return nv; +} + +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len) +{ + str_list_t *nv; + nv = pkg_mallocxz(sizeof(str_list_t) + (len+1)*sizeof(char)); + if (!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->s.s = (char*)nv + sizeof(str_list_t); + memcpy(nv->s.s, s, len); + nv->s.len = len; + nv->next = *head; + *head = nv; + + return nv; } diff --git a/src/core/str_list.h b/src/core/str_list.h index db3fa12887..1eac2578b0 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -51,4 +51,16 @@ typedef struct str_list { */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len); + #endif

1 0

git:master:68db2457: core: clone modparamx evaluated values
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 68db24577dae35de1e9045f994d9a751b50ad14d URL: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T09:18:05+02:00 core: clone modparamx evaluated values --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… Patch: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 041ce841c4..361536691d 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -31,11 +31,14 @@ #include "dprint.h" #include "fmsg.h" #include "pvar.h" +#include "str_list.h" #include "mem/mem.h" #include <sys/types.h> #include <regex.h> #include <string.h> +static str_list_t *_ksr_modparam_strlist = NULL; + static char *get_mod_param_type_str(int ptype) { if(ptype & PARAM_USE_FUNC) { @@ -190,6 +193,7 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) char* epname; pv_spec_t *pvs; pv_value_t pvv; + str_list_t *sb; emname = mname; if(strchr(mname, '$') != NULL) { @@ -197,7 +201,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = mname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + emname = sb->s.s; } } @@ -207,7 +216,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = pname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - epname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + epname = sb->s.s; } } @@ -218,8 +232,13 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = (char*)pval; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)seval.s); + (void*)sb->s.s); } else { LM_ERR("failed to evaluate parameter [%s]\n", (char*)pval); return -1; @@ -267,8 +286,14 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.len, sfmt.s); return -1; } + sb = str_list_block_add(&_ksr_modparam_strlist, pvv.rs.s, pvv.rs.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)pvv.rs.s); + (void*)sb->s.s); default: LM_ERR("invalid parameter type: %d\n", ptype); return -1;

1 0

git:master:7741ad79: http_client: check if shm is initialized in curl_parse_param()
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 7741ad7979d54fb4ee1247760d8d5c3666353a96 URL: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T07:31:10+02:00 http_client: check if shm is initialized in curl_parse_param() --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… Patch: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index c71df5cd75..7df146493f 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -32,6 +32,7 @@ #include "../../core/dprint.h" #include "../../core/parser/parse_param.h" #include "../../core/usr_avp.h" +#include "../../core/shm_init.h" #include "../../core/cfg_parser.h" #include "http_client.h" #include "curlcon.h" @@ -237,6 +238,11 @@ int curl_parse_param(char *val) LM_DBG("modparam httpcon: %s\n", val); LM_DBG(" *** Default httproxy: %s\n", http_proxy.s); + if(!shm_initialized()) { + LM_ERR("shared memory was not initialized\n"); + return -1; + } + /* parse: name=>http_url*/ in.s = val; in.len = strlen(in.s);

1 0

git:master:9429083c: http_client: clone name in http connection structures
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 9429083c87b1323e31983cc71551676c199bf640 URL: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:09:22+02:00 http_client: clone name in http connection structures - use name to lookup private memory structure, hash id is not unique, can be collisions for different names --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… Patch: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 7df146493f..b1bfa3bd48 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -172,7 +172,8 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) ccp = _curl_con_pkg_root; while(ccp) { - if(ccp->conid == con->conid) { + if(ccp->conid == con->conid && ccp->name.len == con->name.len + && strncmp(ccp->name.s, con->name.s, con->name.len) == 0) { return ccp; } ccp = ccp->next; @@ -814,8 +815,9 @@ curl_con_t *curl_init_con(str *name) cc = cc->next; } - cc = (curl_con_t *)shm_malloc(sizeof( - curl_con_t)); /* Connection structures are shared by all children processes */ + /* Connection structures are shared by all children processes */ + cc = (curl_con_t *)shm_malloc(sizeof(curl_con_t) + + (name->len + 1)*sizeof(char)); if(cc == NULL) { LM_ERR("no shm memory\n"); return NULL; @@ -823,7 +825,8 @@ curl_con_t *curl_init_con(str *name) /* Each structure is allocated in package memory so each process can write into it without any locks or such stuff */ - ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t)); + ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t) + + (name->len + 1)*sizeof(char)); if(ccp == NULL) { /* We failed to allocate ccp, so let's free cc and quit */ shm_free(cc); @@ -831,17 +834,21 @@ curl_con_t *curl_init_con(str *name) return NULL; } - memset(cc, 0, sizeof(curl_con_t)); + memset(cc, 0, sizeof(curl_con_t) + (name->len + 1)*sizeof(char)); cc->next = _curl_con_root; cc->conid = conid; + cc->name.s = (char*)cc + sizeof(curl_con_t); + memcpy(cc->name.s, name->s, name->len); + cc->name.len = name->len; _curl_con_root = cc; - cc->name = *name; /* Put the new ccp first in line */ - memset(ccp, 0, sizeof(curl_con_pkg_t)); + memset(ccp, 0, sizeof(curl_con_pkg_t) + (name->len + 1)*sizeof(char)); ccp->next = _curl_con_pkg_root; ccp->conid = conid; - ccp->curl = NULL; + ccp->name.s = (char*)ccp + sizeof(curl_con_pkg_t); + memcpy(ccp->name.s, name->s, name->len); + ccp->name.len = name->len; _curl_con_pkg_root = ccp; LM_DBG("CURL: Added connection [%.*s]\n", name->len, name->s); diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 29b451ba4d..a37bdbe4a5 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -93,7 +93,7 @@ enum connection_status typedef struct _curl_con { str name; /*!< Connection name */ - unsigned int conid; /*!< Connection ID */ + unsigned int conid; /*!< Connection hash ID */ enum connection_status connstate; /*!< Connection status */ str url; /*!< The URL without schema (host + base URL)*/ str schema; /*!< The URL schema */ @@ -125,7 +125,8 @@ typedef struct _curl_con /*! Per-process copy of connection object -stored in pkg memory */ typedef struct _curl_con_pkg { - unsigned int conid; /*!< Connection ID (referring to core connection id */ + str name; /*!< Connection name */ + unsigned int conid; /*!< Connection hash ID */ char redirecturl [512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ unsigned int last_result; /*!< Last result of accessing this connection */

1 0

git:master:84d245fb: http_client: removed function names from logs
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 84d245fb4eda7690a89b4057301f81685a9452d8 URL: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:23:56+02:00 http_client: removed function names from logs --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… Patch: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index b1bfa3bd48..0c00bb97de 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -113,7 +113,7 @@ static cfg_option_t http_client_options[] = { {"keepconnections", .f = cfg_parse_int_opt}, /* 17 */ {0}}; -/*! Count the number of connections +/*! Count the number of connections */ unsigned int curl_connection_count() { @@ -136,7 +136,7 @@ int http_connection_exists(str *name) return 1; } - LM_DBG("curl_connection_exists no success in looking for httpcon: [%.*s]\n", + LM_DBG("no success in looking for httpcon: [%.*s]\n", name->len, name->s); return 0; } @@ -149,7 +149,7 @@ curl_con_t *curl_get_connection(str *name) unsigned int conid; conid = core_case_hash(name, 0, 0); - LM_DBG("curl_get_connection looking for httpcon: [%.*s] ID %u\n", name->len, + LM_DBG("looking for httpcon: [%.*s] ID %u\n", name->len, name->s, conid); cc = _curl_con_root; @@ -160,8 +160,8 @@ curl_con_t *curl_get_connection(str *name) } cc = cc->next; } - LM_DBG("curl_get_connection no success in looking for httpcon: [%.*s]\n", - name->len, name->s); + LM_DBG("no success in looking for httpcon: [%.*s] (list: %p)\n", + name->len, name->s, _curl_con_root); return NULL; } @@ -178,7 +178,7 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) } ccp = ccp->next; } - LM_ERR("curl_get_pkg_connection no success in looking for pkg memory for " + LM_ERR("no success in looking for pkg memory for " "httpcon: [%.*s]\n", con->name.len, con->name.s); return NULL;

1 0

git:master:c836bca7: Makefile.groups: added build group for nats module
by Daniel-Constantin Mierla 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: c836bca76551b76836f03a612c2a913284729622 URL: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-28T23:03:47+02:00 Makefile.groups: added build group for nats module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… Patch: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 42c036d670..4eea749671 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -223,6 +223,9 @@ mod_list_kafka=kafka # - modules depending on mqtt mosquitto and ev library mod_list_mqtt=mqtt +# - modules depending on nats and ev library +mod_list_nats=nats + # - modules depending on secsipid library mod_list_secsipid=secsipid secsipid_proc @@ -264,6 +267,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_phonenum) \ $(mod_list_kafka) \ $(mod_list_mqtt) \ + $(mod_list_nats) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ @@ -497,6 +501,9 @@ module_group_kkafka=$(mod_list_kafka) # K mqtt modules module_group_kmqtt=$(mod_list_mqtt) +# K nats modules +module_group_knats=$(mod_list_nats) + # K secsipid modules module_group_ksecsipid=$(mod_list_secsipid)

1 0

[kamailio/kamailio] nats: new nats message consumer module (#2790)
by Emmanuel Schmidbauer 28 Jun '21

28 Jun '21

#### 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  New Module to consume messages from NATS messaging system. Initial Features: - automatic reconnect with connected/disconnected event routes - connect to up to 10 NATS URLs - subscribe to any number of subjects - receive messages via event route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2790 -- Commit Summary -- * nats: new nats message consumer module -- File Changes -- A src/modules/nats/Makefile (16) A src/modules/nats/doc/Makefile (4) A src/modules/nats/doc/nats.xml (42) A src/modules/nats/doc/nats_admin.xml (207) A src/modules/nats/nats_mod.c (569) A src/modules/nats/nats_mod.h (99) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2790.patch https://github.com/kamailio/kamailio/pull/2790.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/2790

7 9

git:master:6078dbf6: nats: new nats message consumer module
by Emmanuel Schmidbauer 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: 6078dbf6a7aa8eac8c3c4a57d939716f232799f5 URL: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-06-27T07:58:58-04:00 nats: new nats message consumer module --- Added: src/modules/nats/Makefile Added: src/modules/nats/doc/Makefile Added: src/modules/nats/doc/nats.xml Added: src/modules/nats/doc/nats_admin.xml Added: src/modules/nats/nats_mod.c Added: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716… Patch: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716…

1 0

git:master:480969f2: Merge pull request #2790 from kamailio/nats-module
by GitHub 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: 480969f28d2b539b31df5d4ff292c0ab95f30d17 URL: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-28T06:44:52-04:00 Merge pull request #2790 from kamailio/nats-module nats: new nats message consumer module --- Added: src/modules/nats/Makefile Added: src/modules/nats/doc/Makefile Added: src/modules/nats/doc/nats.xml Added: src/modules/nats/doc/nats_admin.xml Added: src/modules/nats/nats_mod.c Added: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a… Patch: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a…

1 0

[kamailio/kamailio] built warning (#2787)
by sergey-safarov 26 Jun '21

26 Jun '21

**defined but not used** ``` rtpproxy.c:943:1: warning: ‘rp_extract_mediaip’ defined but not used [-Wunused-function] rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) ^~~~~~~~~~~~~~~~~~ CC (gcc) [M rtpproxy.so] rtpproxy_db.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2787

2 2

git:master:14d92c0d: rtpproxy: removed unused rp_extract_mediaip()
by Daniel-Constantin Mierla 26 Jun '21

26 Jun '21

Module: kamailio Branch: master Commit: 14d92c0d7ab1229996176b131ab8edcabc3a5717 URL: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-26T07:05:29+02:00 rtpproxy: removed unused rp_extract_mediaip() - GH #2787 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… Patch: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 733ea3cec8..bd2eb5368d 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -114,7 +114,6 @@ static str DEFAULT_RTPP_SET_ID_STR = str_init("0"); #define PTL_CPROTOVER "20081102" #define CPORT "22222" -static int rp_extract_mediaip(str *, str *, int *, char *); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int alter_mediaport(struct sip_msg *, str *, str *, str *, int); static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport); @@ -939,61 +938,6 @@ isnulladdr(str *sx, int pf) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) - static int -rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) -{ - char *cp, *cp1; - int len, nextisip; - - cp1 = NULL; - for (cp = body->s; (len = body->s + body->len - cp) > 0;) { - cp1 = ser_memmem(cp, line, len, 2); - if (cp1 == NULL || cp1[-1] == '\n' || cp1[-1] == '\r') - break; - cp = cp1 + 2; - } - if (cp1 == NULL) - return -1; - - mediaip->s = cp1 + 2; - mediaip->len = eat_line(mediaip->s, body->s + body->len - mediaip->s) - - mediaip->s; - trim_len(mediaip->len, mediaip->s, *mediaip); - - nextisip = 0; - for (cp = mediaip->s; cp < mediaip->s + mediaip->len;) { - len = eat_token_end(cp, mediaip->s + mediaip->len) - cp; - if (nextisip == 1) { - mediaip->s = cp; - mediaip->len = len; - nextisip++; - break; - } - if (len == 3 && memcmp(cp, "IP", 2) == 0) { - switch (cp[2]) { - case '4': - nextisip = 1; - *pf = AF_INET; - break; - - case '6': - nextisip = 1; - *pf = AF_INET6; - break; - - default: - break; - } - } - cp = eat_space_end(cp + len, mediaip->s + mediaip->len); - } - if (nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n",line); - return -1; - } - return 1; -} - static int alter_mediaip(struct sip_msg *msg, str *body, str *oldip, int oldpf, str *newip, int newpf, int preserve)

1 0

[kamailio/kamailio] kazoo: different binding for private module and for current 5.4.5 (#2747)
by sergey-safarov 25 Jun '21

25 Jun '21

### Description I want to use some customization for Kamailio 5.4 branch. Before start I want to make sure 5.4.5 tag works with `kazoo-config-kamailio`. During a tests, I found the `kazoo` module not able to receive registration responses. If I replace `kazoo` module in Kamailio 5.4.5 with to the same version from `2600hz/staging` repo then all as expected. I checked RabbitMQ bindgs for both module and binding different for `kazoo` module from Kamailio 5.4.5 and from `2600hz/staging` repo. I think some commits not published in the Kamailio repo. ### Troubleshooting *binding for kazoo module from Kamailio 5.4.5* ``` root@rmq-2 ~]# rabbitmqctl list_bindings| grep -P "bcf-e-2.la.cal911.net" | sed -e 's/la.cal911.net/example.com/g' exchange kamailio(a)bcf-e-2.example.com-<1-23> queue kamailio(a)bcf-e-2.example.com-<1-23> [] exchange kamailio(a)bcf-e-2.example.com-<1-11> queue kamailio(a)bcf-e-2.example.com-<1-11> [] exchange registrar-sync-bcf-e-2.example.com queue registrar-sync-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-10> queue kamailio(a)bcf-e-2.example.com-<1-10> [] exchange kamailio(a)bcf-e-2.example.com-<1-5> queue kamailio(a)bcf-e-2.example.com-<1-5> [] exchange kamailio(a)bcf-e-2.example.com-<1-18> queue kamailio(a)bcf-e-2.example.com-<1-18> [] exchange kamailio(a)bcf-e-2.example.com-<1-13> queue kamailio(a)bcf-e-2.example.com-<1-13> [] exchange kamailio(a)bcf-e-2.example.com-<1-16> queue kamailio(a)bcf-e-2.example.com-<1-16> [] exchange registrar-flush-bcf-e-2.example.com queue registrar-flush-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-8> queue kamailio(a)bcf-e-2.example.com-<1-8> [] exchange kamailio(a)bcf-e-2.example.com-<1-15> queue kamailio(a)bcf-e-2.example.com-<1-15> [] exchange kamailio(a)bcf-e-2.example.com-<1-14> queue kamailio(a)bcf-e-2.example.com-<1-14> [] exchange kamailio(a)bcf-e-2.example.com-<1-3> queue kamailio(a)bcf-e-2.example.com-<1-3> [] exchange kamailio(a)bcf-e-2.example.com-<1-22> queue kamailio(a)bcf-e-2.example.com-<1-22> [] exchange kamailio(a)bcf-e-2.example.com-<1-0> queue kamailio(a)bcf-e-2.example.com-<1-0> [] exchange kamailio(a)bcf-e-2.example.com-<1-4> queue kamailio(a)bcf-e-2.example.com-<1-4> [] exchange kamailio(a)bcf-e-2.example.com-<1-2> queue kamailio(a)bcf-e-2.example.com-<1-2> [] exchange kamailio(a)bcf-e-2.example.com-<1-20> queue kamailio(a)bcf-e-2.example.com-<1-20> [] exchange kamailio(a)bcf-e-2.example.com-<1-17> queue kamailio(a)bcf-e-2.example.com-<1-17> [] exchange presence-dialog-bcf-e-2.example.com queue presence-dialog-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-6> queue kamailio(a)bcf-e-2.example.com-<1-6> [] exchange nodes-bcf-e-2.example.com queue nodes-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-19> queue kamailio(a)bcf-e-2.example.com-<1-19> [] exchange kamailio(a)bcf-e-2.example.com-<1-24> queue kamailio(a)bcf-e-2.example.com-<1-24> [] exchange MSG-QUEUE-bcf-e-2.example.com queue MSG-QUEUE-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-21> queue kamailio(a)bcf-e-2.example.com-<1-21> [] exchange kamailio(a)bcf-e-2.example.com-<1-1> queue kamailio(a)bcf-e-2.example.com-<1-1> [] exchange presence-api-bcf-e-2.example.com queue presence-api-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-12> queue kamailio(a)bcf-e-2.example.com-<1-12> [] exchange kamailio(a)bcf-e-2.example.com-<1-9> queue kamailio(a)bcf-e-2.example.com-<1-9> [] exchange kamailio(a)bcf-e-2.example.com-<1-7> queue kamailio(a)bcf-e-2.example.com-<1-7> [] im exchange MSG-QUEUE-bcf-e-2.example.com queue sms.outbound.kamailio%40bcf-e-2%2Eexample%2Ecom.* [] nodes exchange nodes-bcf-e-2.example.com queue [] presence exchange presence-dialog-bcf-e-2.example.com queue dialog.*.* [] presence exchange presence-dialog-bcf-e-2.example.com queue mwi_updates.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.reset.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.search_req.* [] presence exchange presence-dialog-bcf-e-2.example.com queue update.*.* [] registrar exchange registrar-flush-bcf-e-2.example.com queue registration.flush.* [] registrar exchange registrar-sync-bcf-e-2.example.com queue registration.sync [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-0> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-0 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-1> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-1 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-10> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-10 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-11> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-11 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-12> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-12 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-13> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-13 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-14> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-14 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-15> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-15 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-16> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-16 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-17> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-17 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-18> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-18 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-19> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-19 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-2> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-2 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-20> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-20 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-21> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-21 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-22> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-22 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-23> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-23 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-24> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-24 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-3> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-3 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-4> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-4 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-5> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-5 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-6> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-6 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-7> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-7 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-8> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-8 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-9> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-9 [] ``` *binding for kazoo module from 2600hz/staging repo* ``` [root@rmq-2 ~]# rabbitmqctl list_bindings| grep -P "bcf-e-2.la.cal911.net" | sed -e 's/la.cal911.net/example.com/g' exchange registrar-sync-bcf-e-2.example.com queue registrar-sync-bcf-e-2.example.com [] exchange registrar-flush-bcf-e-2.example.com queue registrar-flush-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-default<..> queue kamailio(a)bcf-e-2.example.com-default<..> [] exchange presence-dialog-bcf-e-2.example.com queue presence-dialog-bcf-e-2.example.com [] exchange nodes-bcf-e-2.example.com queue nodes-bcf-e-2.example.com [] exchange MSG-QUEUE-bcf-e-2.example.com queue MSG-QUEUE-bcf-e-2.example.com [] exchange presence-api-bcf-e-2.example.com queue presence-api-bcf-e-2.example.com [] im exchange MSG-QUEUE-bcf-e-2.example.com queue sms.outbound.kamailio%40bcf-e-2%2Eexample%2Ecom.* [] nodes exchange nodes-bcf-e-2.example.com queue [] presence exchange presence-dialog-bcf-e-2.example.com queue dialog.*.* [] presence exchange presence-dialog-bcf-e-2.example.com queue mwi_updates.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.reset.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.search_req.* [] presence exchange presence-dialog-bcf-e-2.example.com queue update.*.* [] registrar exchange registrar-flush-bcf-e-2.example.com queue registration.flush.* [] registrar exchange registrar-sync-bcf-e-2.example.com queue registration.sync [] targeted exchange kamailio(a)bcf-e-2.example.com-default<..> queue kamailio(a)bcf-e-2.example.com-default<..> [] ``` #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` @lazedo could you look at why the stock `kazoo` module uses the different binding. -- 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/2747

2 4

git:master:d2369fa7: pv: added {s.fmtlines, n, m} and {s.fmtlinet, n, m}
by Daniel-Constantin Mierla 25 Jun '21

25 Jun '21

Module: kamailio Branch: master Commit: d2369fa78c63994a35a965ffbc2b7d9a189a00df URL: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-25T10:58:23+02:00 pv: added {s.fmtlines,n,m} and {s.fmtlinet,n,m} - format the value in lines of n characters, adding m spaces or tabs to the start of each new line (not to first line) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9… Patch: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9…

1 0

git:master:3a7f6c18: pv: added {s.rafter, x} and {s.rbefore, x}
by Daniel-Constantin Mierla 25 Jun '21

25 Jun '21

Module: kamailio Branch: master Commit: 3a7f6c18810cb307332fbf061a248252996b0464 URL: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-25T09:51:10+02:00 pv: added {s.rafter,x} and {s.rbefore,x} - similar to {s.after,x} and {s.before,x}, but searches from end of the value --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… Patch: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 98cce7caa8..6a026cc9ae 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1340,6 +1340,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, break; case TR_S_BEFORE: + case TR_S_RBEFORE: if(tp==NULL) { LM_ERR("invalid parameters (cfg line: %d)\n", @@ -1366,11 +1367,20 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } st = v.rs; } - for(i=0; i<val->rs.len; i++) { - if(val->rs.s[i]==st.s[0]) { - break; + if(subtype==TR_S_BEFORE) { + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } + } + } else { + for(i=val->rs.len-1; i>=0; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } } } + if(i==0) { _tr_buffer[0] = '\0'; val->rs.len = 0; @@ -1384,6 +1394,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, break; case TR_S_AFTER: + case TR_S_RAFTER: if(tp==NULL) { LM_ERR("invalid parameters (cfg line: %d)\n", @@ -1410,9 +1421,17 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } st = v.rs; } - for(i=0; i<val->rs.len; i++) { - if(val->rs.s[i]==st.s[0]) { - break; + if(subtype==TR_S_AFTER) { + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } + } + } else { + for(i=val->rs.len-1; i>=0; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } } } if(i>=val->rs.len-1) { @@ -3012,6 +3031,46 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==7 && strncasecmp(name.s, "rbefore", 7)==0) { + t->subtype = TR_S_RBEFORE; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid rbefore transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid rbefore transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; + } else if(name.len==6 && strncasecmp(name.s, "rafter", 6)==0) { + t->subtype = TR_S_RAFTER; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid rafter transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid rafter transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 4b8e1ff12f..9d474cf08b 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -45,7 +45,7 @@ enum _tr_s_subtype { TR_S_UNBRACKET, TR_S_COUNT, TR_S_ENCODEBASE64T, TR_S_DECODEBASE64T, TR_S_ENCODEBASE64URL, TR_S_DECODEBASE64URL, TR_S_ENCODEBASE64URLT, TR_S_DECODEBASE64URLT, TR_S_RMWS, TR_S_BEFORE, - TR_S_AFTER + TR_S_AFTER, TR_S_RBEFORE, TR_S_RAFTER }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio/kamailio] pua_json for KEMI framework (#2783)
by Zhan Bazarov 24 Jun '21

24 Jun '21

Hello everyone, is module pua_json going to be implemented for KEMI framework? I've tried to use KSR.x.modf("pua_json_publish", "json_here") and I'm getting error ### python code ``` def ksr_xhttp_event(self, evmsg, evname): if evname == "xhttp:request": try: KSR.err("===== xhttp module triggered event: " + evname + "\n") if "/presence" in KSR.pv.get("$hu"): rb = json.loads(KSR.kx.get_body()) if rb["Event-Package"] == "message-summary": KSR.info("request received- " + rb["Call-ID"] + "update for: " + rb[ "From"] + "request body: " + json.dumps(rb) + "\n") KSR.x.modf("pua_json_publish", json.dumps(rb)); KSR.xhttp.xhttp_reply(200, "OK", "text/html", "<html><body>Entity state updated</body></html>") return 1 if "/RCP" in KSR.pv.get("$hu"): KSR.jsonrpcs.dispatch() return 1 else: KSR.xhttp.xhttp_reply(200, "OK", "text/html", "<html><body>Wrong URL</body></html>") return 1 except: KSR.err("===== unsupported " + evname + "\n") return -255 ``` #### Debugging Data ``` app_python [python_support.c:154]: python_handle_exception(): apy_exec: ksr_xhttp_event(xhttp:request): Unhandled exception in the Python code: RuntimeError: self is NULL ``` * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.5 (x86_64/linux) c46342 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_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: c46342 compiled on 14:37:00 Apr 27 2021 with gcc 7.5.0 ``` * **Operating System**:  ``` Linux ip-10-199-240-110 4.15.0-1057-aws #59-Ubuntu SMP Wed Dec 4 10:02:00 UTC 2019 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/2783

2 5

git:5.5:1ff0d8bc: tls: debug messages with memory management functions
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 1ff0d8bce7a84a2afca206cd5efee781edc264d6 URL: https://github.com/kamailio/kamailio/commit/1ff0d8bce7a84a2afca206cd5efee78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:47+02:00 tls: debug messages with memory management functions (cherry picked from commit 81ace1c94369fb98081918acb55a6a13686784e3) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff0d8bce7a84a2afca206cd5efee78… Patch: https://github.com/kamailio/kamailio/commit/1ff0d8bce7a84a2afca206cd5efee78… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 8bdd14f2cc..b71bbbd28b 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -593,6 +593,12 @@ int tls_pre_init(void) * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 */ + CRYPTO_get_mem_functions(&mf, &rf, &ff); + LM_DBG("initial memory functions - malloc: %p realloc: %p free: %p\n", + mf, rf, ff); + mf = NULL; + rf = NULL; + ff = NULL; #ifdef TLS_MALLOC_DBG if (!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { #else @@ -602,10 +608,14 @@ int tls_pre_init(void) CRYPTO_get_mem_functions(&mf, &rf, &ff); LM_ERR("libssl current mem functions - m: %p r: %p f: %p\n", mf, rf, ff); + LM_ERR("module mem functions - m: %p r: %p f: %p\n", + ser_malloc, ser_realloc, ser_free); LM_ERR("Be sure tls module is loaded before any other module using" " libssl (can be loaded first to be safe)\n"); return -1; } + LM_DBG("updated memory functions - malloc: %p realloc: %p free: %p\n", + ser_malloc, ser_realloc, ser_free); #endif /* LIBRESSL_VERSION_NUMBER */ if (tls_init_locks()<0)

1 0

git:5.5:a7007532: tls: info log when libssl is linked static
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: a7007532ff6d351629bf1467a1e74b29c0125917 URL: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:56+02:00 tls: info log when libssl is linked static (cherry picked from commit 365e7e46dfb4f605bafe43b57e37e1ff68077567) --- Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… Patch: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 3b90ec8fd6..32495099c0 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -39,6 +39,8 @@ endif # ifneq ($(CRYPTO_BUILDER),) else # $(LIBSSL_STATIC),yes) + DEFS += -DKSR_LIBSSL_STATIC + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index b71bbbd28b..4c858bbbd8 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -589,6 +589,10 @@ int tls_pre_init(void) void (*ff)(void *, const char *, int) = NULL; #endif +#ifdef KSR_LIBSSL_STATIC + LM_INFO("libssl linked mode: static\n"); +#endif + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0

1 0

git:5.5:cf6c70f0: xhttp: warning log if tcp_accept_no_cl is not set
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: cf6c70f00fda196ac9eba4a2ccd24b382d41b240 URL: https://github.com/kamailio/kamailio/commit/cf6c70f00fda196ac9eba4a2ccd24b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:10+02:00 xhttp: warning log if tcp_accept_no_cl is not set (cherry picked from commit b8fbf5e8c199b8277053f9c15231695a16058d6e) --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf6c70f00fda196ac9eba4a2ccd24b3… Patch: https://github.com/kamailio/kamailio/commit/cf6c70f00fda196ac9eba4a2ccd24b3… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index f62c880a9a..1aec2763d9 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -41,6 +41,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/mod_fix.h" #include "../../core/pvar.h" +#include "../../core/tcp_options.h" #include "../../core/kemi.h" #include "api.h" @@ -142,6 +143,11 @@ static int mod_init(void) xhttp_route_no = route_no; } + if(cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { + LM_WARN("tcp_accept_no_cl not set - usually required" + " to handle HTTP requests with no Content-Lenght\n"); + } + /* bind the SL API */ if(sl_load_api(&slb) != 0) { LM_ERR("cannot bind to SL API\n");

1 0

git:5.5:6a527503: http_client: docs - fixed small typo
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 6a527503a653d554ffb38f8bd7a40fd75441ff4d URL: https://github.com/kamailio/kamailio/commit/6a527503a653d554ffb38f8bd7a40fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:23+02:00 http_client: docs - fixed small typo (cherry picked from commit 1f67ac5a62b58b35df52aedbd1a3d2234a72817e) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a527503a653d554ffb38f8bd7a40fd… Patch: https://github.com/kamailio/kamailio/commit/6a527503a653d554ffb38f8bd7a40fd… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 2c8295f07f..e52ec5ce26 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -446,7 +446,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: <itemizedlist> <listitem><para>0 - Return the entire HTTP result body</para></listitem> - <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + <listitem><para>1 - Return the first line from HTTP result body</para></listitem> </itemizedlist> </para> <para>

1 0

git:5.5:390c668e: tls: Makefile - pkg-config for libcrypto
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 390c668e03d3347dbf429e395f7e5de230523629 URL: https://github.com/kamailio/kamailio/commit/390c668e03d3347dbf429e395f7e5de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:38+02:00 tls: Makefile - pkg-config for libcrypto - some distros have it separate of libssl (cherry picked from commit 2a9e8b9d5c5556a10229813c8878a81933325a01) --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/390c668e03d3347dbf429e395f7e5de… Patch: https://github.com/kamailio/kamailio/commit/390c668e03d3347dbf429e395f7e5de… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 48cb886619..3b90ec8fd6 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -20,25 +20,41 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) +CRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) endif ifneq ($(SSL_BUILDER),) + ifneq ($(LIBSSL_STATIC),yes) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) -else + +ifneq ($(CRYPTO_BUILDER),) + DEFS += $(shell $(CRYPTO_BUILDER) --cflags) + LIBS += $(shell $(CRYPTO_BUILDER) --libs) +endif # ifneq ($(CRYPTO_BUILDER),) + +else # $(LIBSSL_STATIC),yes) + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs-only-L) + # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a else ## when linking against static libs compiled from sources DEFS += -I$(LIBSSL_STATIC_SRCPATH)/include LIBS += $(LIBSSL_STATIC_SRCPATH)/libssl.a $(LIBSSL_STATIC_SRCPATH)/libcrypto.a endif # ifneq ($(LIBSSL_STATIC_SRCLIB),yes) + endif # ifneq ($(LIBSSL_STATIC),yes) -else + +else # ifneq ($(SSL_BUILDER),) + DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ @@ -46,7 +62,8 @@ else # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" -endif + +endif # ifneq ($(SSL_BUILDER),) LIBS+= $(TLS_EXTRA_LIBS)

1 0

git:5.5:42df0f0b: xhttp: extended example for event_route[xhttp:request]
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 42df0f0b58a2b5780a9bf613a5a29d4af27b4f67 URL: https://github.com/kamailio/kamailio/commit/42df0f0b58a2b5780a9bf613a5a29d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:33:45+02:00 xhttp: extended example for event_route[xhttp:request] (cherry picked from commit 195de260f102f1a016ad7bd1021571c1dd8a983f) --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/42df0f0b58a2b5780a9bf613a5a29d4… Patch: https://github.com/kamailio/kamailio/commit/42df0f0b58a2b5780a9bf613a5a29d4… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index c2a18f9d44..507283b90f 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -222,6 +222,11 @@ event_route[xhttp:request] { </para> <programlisting format="linespecific"> ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

1 0

git:5.5:9d730165: websocket: docs - added tcp_accept_no_cl=yes to example
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 9d7301652ca7f051df4a23b6be3a83d3f21baa5d URL: https://github.com/kamailio/kamailio/commit/9d7301652ca7f051df4a23b6be3a83d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:33:54+02:00 websocket: docs - added tcp_accept_no_cl=yes to example (cherry picked from commit a05b4d7c2e413032b1a63f3d017243446a0bc6ec) --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d7301652ca7f051df4a23b6be3a83d… Patch: https://github.com/kamailio/kamailio/commit/9d7301652ca7f051df4a23b6be3a83d… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 7cc6e09069..b4b5e2c8ce 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -43,6 +43,8 @@ <title>event_route[xhttp:request]</title> <programlisting><![CDATA[ ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets

1 0

git:5.5:2ea0baf9: htable: fix documentation
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 2ea0baf9cf2cb0b30e6474cc150eb3580d8cdf5b URL: https://github.com/kamailio/kamailio/commit/2ea0baf9cf2cb0b30e6474cc150eb35… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:14:13+02:00 htable: fix documentation - reported by arkadiam on Github (cherry picked from commit ee9c2bc2046103f0f7888c078b1f88d0befd6f7d) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2ea0baf9cf2cb0b30e6474cc150eb35… Patch: https://github.com/kamailio/kamailio/commit/2ea0baf9cf2cb0b30e6474cc150eb35… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 3a7f101bca..5ef04b2ee6 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1363,7 +1363,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... </programlisting> </section>

1 0

git:5.5:5ebbb557: dispatcher: print eol in some log messages
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: 5ebbb557729df2f888f288ac21f61a662f7d8aa8 URL: https://github.com/kamailio/kamailio/commit/5ebbb557729df2f888f288ac21f61a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:33:26+02:00 dispatcher: print eol in some log messages (cherry picked from commit e6f4e929efb61a1a51aa1b4b5587999acc8dc55d) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/5ebbb557729df2f888f288ac21f61a6… Patch: https://github.com/kamailio/kamailio/commit/5ebbb557729df2f888f288ac21f61a6… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 78ece3fffe..674678417d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -325,7 +325,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.weight = tmp_ival; } else { dest->attrs.weight = 0; - LM_ERR("weight %d not in 1-100 range - ignoring destination", + LM_ERR("weight %d not in 1-100 range - ignoring destination\n", tmp_ival); } } else if(pit->name.len == 7 @@ -350,7 +350,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.rweight = tmp_ival; } else { dest->attrs.rweight = 0; - LM_WARN("rweight %d not in 1-100 range - ignoring", tmp_ival); + LM_WARN("rweight %d not in 1-100 range - ignoring\n", tmp_ival); } } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) {

1 0

git:master:365e7e46: tls: info log when libssl is linked static
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: master Commit: 365e7e46dfb4f605bafe43b57e37e1ff68077567 URL: https://github.com/kamailio/kamailio/commit/365e7e46dfb4f605bafe43b57e37e1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T14:24:06+02:00 tls: info log when libssl is linked static --- Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/365e7e46dfb4f605bafe43b57e37e1f… Patch: https://github.com/kamailio/kamailio/commit/365e7e46dfb4f605bafe43b57e37e1f… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 3b90ec8fd6..32495099c0 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -39,6 +39,8 @@ endif # ifneq ($(CRYPTO_BUILDER),) else # $(LIBSSL_STATIC),yes) + DEFS += -DKSR_LIBSSL_STATIC + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index b71bbbd28b..4c858bbbd8 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -589,6 +589,10 @@ int tls_pre_init(void) void (*ff)(void *, const char *, int) = NULL; #endif +#ifdef KSR_LIBSSL_STATIC + LM_INFO("libssl linked mode: static\n"); +#endif + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0

1 0

git:master:81ace1c9: tls: debug messages with memory management functions
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: master Commit: 81ace1c94369fb98081918acb55a6a13686784e3 URL: https://github.com/kamailio/kamailio/commit/81ace1c94369fb98081918acb55a6a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T11:29:40+02:00 tls: debug messages with memory management functions --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/81ace1c94369fb98081918acb55a6a1… Patch: https://github.com/kamailio/kamailio/commit/81ace1c94369fb98081918acb55a6a1… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 8bdd14f2cc..b71bbbd28b 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -593,6 +593,12 @@ int tls_pre_init(void) * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 */ + CRYPTO_get_mem_functions(&mf, &rf, &ff); + LM_DBG("initial memory functions - malloc: %p realloc: %p free: %p\n", + mf, rf, ff); + mf = NULL; + rf = NULL; + ff = NULL; #ifdef TLS_MALLOC_DBG if (!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { #else @@ -602,10 +608,14 @@ int tls_pre_init(void) CRYPTO_get_mem_functions(&mf, &rf, &ff); LM_ERR("libssl current mem functions - m: %p r: %p f: %p\n", mf, rf, ff); + LM_ERR("module mem functions - m: %p r: %p f: %p\n", + ser_malloc, ser_realloc, ser_free); LM_ERR("Be sure tls module is loaded before any other module using" " libssl (can be loaded first to be safe)\n"); return -1; } + LM_DBG("updated memory functions - malloc: %p realloc: %p free: %p\n", + ser_malloc, ser_realloc, ser_free); #endif /* LIBRESSL_VERSION_NUMBER */ if (tls_init_locks()<0)

1 0

git:master:2a9e8b9d: tls: Makefile - pkg-config for libcrypto
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: master Commit: 2a9e8b9d5c5556a10229813c8878a81933325a01 URL: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T10:15:23+02:00 tls: Makefile - pkg-config for libcrypto - some distros have it separate of libssl --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… Patch: https://github.com/kamailio/kamailio/commit/2a9e8b9d5c5556a10229813c8878a81… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 48cb886619..3b90ec8fd6 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -20,25 +20,41 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) +CRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) endif ifneq ($(SSL_BUILDER),) + ifneq ($(LIBSSL_STATIC),yes) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) -else + +ifneq ($(CRYPTO_BUILDER),) + DEFS += $(shell $(CRYPTO_BUILDER) --cflags) + LIBS += $(shell $(CRYPTO_BUILDER) --libs) +endif # ifneq ($(CRYPTO_BUILDER),) + +else # $(LIBSSL_STATIC),yes) + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs-only-L) + # TODO: explore use of LIBS += -Wl,-Bstatic $(shell $(SSL_BUILDER) --libs-only-l) LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a else ## when linking against static libs compiled from sources DEFS += -I$(LIBSSL_STATIC_SRCPATH)/include LIBS += $(LIBSSL_STATIC_SRCPATH)/libssl.a $(LIBSSL_STATIC_SRCPATH)/libcrypto.a endif # ifneq ($(LIBSSL_STATIC_SRCLIB),yes) + endif # ifneq ($(LIBSSL_STATIC),yes) -else + +else # ifneq ($(SSL_BUILDER),) + DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ @@ -46,7 +62,8 @@ else # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" -endif + +endif # ifneq ($(SSL_BUILDER),) LIBS+= $(TLS_EXTRA_LIBS)

1 0

git:master:795a9f57: core: kemi - exported KSR.to_UDP()
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 795a9f5714607f829d5a0abfc53cb61cb2f8d421 URL: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T18:39:54+02:00 core: kemi - exported KSR.to_UDP() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… Patch: https://github.com/kamailio/kamailio/commit/795a9f5714607f829d5a0abfc53cb61… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 63be6bb0fc..76ace9c3d2 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2042,6 +2042,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("to_UDP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_udp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("to_TCP"), SR_KEMIP_BOOL, sr_kemi_core_to_proto_tcp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:bff78b91: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: bff78b91788a35e51bd70c6a693b9addd5b48701 URL: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-23T13:16:19+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… Patch: https://github.com/kamailio/kamailio/commit/bff78b91788a35e51bd70c6a693b9ad… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 0028f9e623..a3de550a2b 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -503,7 +503,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: * 0 - Return the entire HTTP result body - * 1 - Return the first oine from HTTP result body + * 1 - Return the first line from HTTP result body Default value: 1 (return first line).

1 0

[kamailio/kamailio] siptrace: added extra params to $siptrace() pseudo-variable (#2777)
by sergey-safarov 23 Jun '21

23 Jun '21

#### 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 added 1. $siptrace(src_addr) 2. $siptrace(src_host) 3. $siptrace(src_port) 4. $siptrace(src_proto) 5. $siptrace(dst_addr) 6. $siptrace(dst_host) 7. $siptrace(dst_port) 8. $siptrace(dst_proto) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2777 -- Commit Summary -- * siptrace: added extra params to $siptrace() pseudo-variable -- File Changes -- M src/modules/siptrace/siptrace.c (74) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2777.patch https://github.com/kamailio/kamailio/pull/2777.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/2777

2 12

git:master:1f67ac5a: http_client: docs - fixed small typo
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 1f67ac5a62b58b35df52aedbd1a3d2234a72817e URL: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T13:06:19+02:00 http_client: docs - fixed small typo --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… Patch: https://github.com/kamailio/kamailio/commit/1f67ac5a62b58b35df52aedbd1a3d22… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 2c8295f07f..e52ec5ce26 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -446,7 +446,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: <itemizedlist> <listitem><para>0 - Return the entire HTTP result body</para></listitem> - <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + <listitem><para>1 - Return the first line from HTTP result body</para></listitem> </itemizedlist> </para> <para>

1 0

git:master:261c57ae: siptrace: added extra params to $siptrace() pseudo-variable
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 261c57aedf1f35ddc3959a21043b34750274935f URL: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T09:56:51+02:00 siptrace: added extra params to $siptrace() pseudo-variable for more details check GH #2777 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… Patch: https://github.com/kamailio/kamailio/commit/261c57aedf1f35ddc3959a21043b347… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 13cc220457..d7416506dd 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2505,16 +2505,82 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { + str host; + int port; + int proto; + str sproto; if (siptrace_event_data==NULL) { return pv_get_null(msg, param, res); } switch(param->pvn.u.isname.name.n) { - case 1: /* dst_uri*/ + case 2: /* src_host */ + case 4: /* src_port */ + case 6: /* src_proto */ + case 8: /* src_hostip */ + if (parse_phostport(siptrace_event_data->fromip.s, &host.s, &host.len, &port, &proto)!=0) { + LM_ERR("invalid src_addr: %.*s\n", siptrace_event_data->fromip.len, siptrace_event_data->fromip.s); + return pv_get_null(msg, param, res); + } + break; + case 3: /* dst_host */ + case 5: /* dst_port */ + case 7: /* dst_proto */ + case 9: /* dst_hostip */ + if (parse_phostport(siptrace_event_data->toip.s, &host.s, &host.len, &port, &proto)!=0) { + LM_ERR("invalid dst_addr: %.*s\n", siptrace_event_data->toip.len, siptrace_event_data->toip.s); + return pv_get_null(msg, param, res); + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 6: /* src_proto */ + case 7: /* dst_proto */ + if(get_valid_proto_string(proto, 0, 0, &sproto)<0) + { + sproto.s = "none"; + sproto.len = 4; + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 8: /* src_hostip */ + case 9: /* dst_hostip */ + + /* now IPv6 address has brakets that not wanted in IP address operations */ + if(host.s[0] == '[' && host.s[host.len-1] == ']') { + host.s++; + host.len = host.len - 2; + } + break; + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* src_addr */ + return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + case 1: /* dst_addr */ return pv_get_strval(msg, param, res, &siptrace_event_data->toip); + case 2: /* src_host */ + return pv_get_strval(msg, param, res, &host); + case 3: /* dst_host */ + return pv_get_strval(msg, param, res, &host); + case 4: /* src_port */ + return pv_get_sintval(msg, param, res, port); + case 5: /* dst_port */ + return pv_get_sintval(msg, param, res, port); + case 6: /* src_proto */ + return pv_get_strintval(msg, param, res, &sproto, proto); + case 7: /* dst_proto */ + return pv_get_strintval(msg, param, res, &sproto, proto); + case 8: /* src_hostip */ + return pv_get_strval(msg, param, res, &host); + case 9: /* dst_hostip */ + return pv_get_strval(msg, param, res, &host); default: - /* 0 - src_uri */ - return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + LM_ERR("unexpected config param\n"); + return pv_get_null(msg, param, res); } } @@ -2533,6 +2599,28 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "dst_addr", 8)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "src_host", 8)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "dst_host", 8)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "src_port", 8)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "dst_port", 8)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + case 9: + if(strncmp(in->s, "src_proto", 9)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else if(strncmp(in->s, "dst_proto", 9)==0) + sp->pvp.pvn.u.isname.name.n = 7; + else goto error; + break; + case 10: + if(strncmp(in->s, "src_hostip", 10)==0) + sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "dst_hostip", 10)==0) + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; default:

1 0

git:master:b8fbf5e8: xhttp: warning log if tcp_accept_no_cl is not set
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: b8fbf5e8c199b8277053f9c15231695a16058d6e URL: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T08:49:38+02:00 xhttp: warning log if tcp_accept_no_cl is not set --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… Patch: https://github.com/kamailio/kamailio/commit/b8fbf5e8c199b8277053f9c15231695… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index f62c880a9a..1aec2763d9 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -41,6 +41,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/mod_fix.h" #include "../../core/pvar.h" +#include "../../core/tcp_options.h" #include "../../core/kemi.h" #include "api.h" @@ -142,6 +143,11 @@ static int mod_init(void) xhttp_route_no = route_no; } + if(cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { + LM_WARN("tcp_accept_no_cl not set - usually required" + " to handle HTTP requests with no Content-Lenght\n"); + } + /* bind the SL API */ if(sl_load_api(&slb) != 0) { LM_ERR("cannot bind to SL API\n");

1 0

git:master:7979925f: modules: readme files regenerated - tcpops ... [skip ci]
by Kamailio Dev 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 7979925ff2a53dcc2111c1ebbbc94b2cac6103df URL: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-23T08:46:24+02:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… Patch: https://github.com/kamailio/kamailio/commit/7979925ff2a53dcc2111c1ebbbc94b2… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index 70209686f0..5bbd683440 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -34,6 +34,7 @@ Olle E. Johansson 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 4. Event routes @@ -55,6 +56,7 @@ Olle E. Johansson 1.9. tcp_get_conid usage 1.10. tcp_set_otcpid usage 1.11. tcp_set_otcpid_flag usage + 1.12. tcp_close_connection usage Chapter 1. Admin Guide @@ -77,6 +79,7 @@ Chapter 1. Admin Guide 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 4. Event routes @@ -152,6 +155,7 @@ end 3.7. tcp_get_conid(hostport, pvname) 3.8. tcp_set_otcpid(conid) 3.9. tcp_set_otcpid_flag(mode) + 3.10. tcp_close_connection([conid]) 3.1. tcp_conid_alive(conid) @@ -400,6 +404,25 @@ event_route[tcp:closed] { tcp_set_otcpid_flag("$var(cmode)"); ... +3.10. tcp_close_connection([conid]) + + Trigger a close of the connection corresponding to current SIP message + or to connection id 'conid'. + + Meaning of the parameters is as follows: + * conid - the value of tcp connection id. It can be an integer number + or a variable holding an interver value. + + Return values: + * 1: success + * -1 (or other negative values): failure + + Example 1.12. tcp_close_connection usage +... + $var(conid) = 10; + tcp_close_connection("$var(conid)"); +... + 4. Event routes 4.1. tcp:closed

1 0

git:master:4ea4f598: tcpops: docs for tcp_close_connection()
by Daniel-Constantin Mierla 23 Jun '21

23 Jun '21

Module: kamailio Branch: master Commit: 4ea4f598a10b6f0f690cf8a9b6174997ccb62b6f URL: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-23T08:40:46+02:00 tcpops: docs for tcp_close_connection() --- Modified: src/modules/tcpops/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… Patch: https://github.com/kamailio/kamailio/commit/4ea4f598a10b6f0f690cf8a9b617499… --- diff --git a/src/modules/tcpops/doc/functions.xml b/src/modules/tcpops/doc/functions.xml index 94cefaa776..1502386598 100644 --- a/src/modules/tcpops/doc/functions.xml +++ b/src/modules/tcpops/doc/functions.xml @@ -375,4 +375,40 @@ event_route[tcp:closed] { ]]></programlisting> </example> </section> + <section id="tcpops.f.tcp_close_connection"> + <title> + <function>tcp_close_connection([conid])</function> + </title> + <para> + Trigger a close of the connection corresponding to current SIP + message or to connection id 'conid'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>conid</emphasis> - the value of tcp connection id. + It can be an integer number or a variable holding an interver value. + </para> + </listitem> + </itemizedlist> + <para>Return values:</para> + <itemizedlist> + <listitem> + <para>1: success</para> + </listitem> + <listitem> + <para>-1 (or other negative values): failure</para> + </listitem> + </itemizedlist> + <example> + <title><function>tcp_close_connection</function> usage</title> + <programlisting><![CDATA[ +... + $var(conid) = 10; + tcp_close_connection("$var(conid)"); +... + ]]></programlisting> + </example> + </section> + </section>

1 0

git:master:ac55488b: tcpops: added tcp_close_connection([conid])
by Daniel-Constantin Mierla 22 Jun '21

22 Jun '21

Module: kamailio Branch: master Commit: ac55488bc2fac333b0b777d38875b7516c430925 URL: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-22T19:01:02+02:00 tcpops: added tcp_close_connection([conid]) - close connection for current sip message or by conid --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… Patch: https://github.com/kamailio/kamailio/commit/ac55488bc2fac333b0b777d38875b75… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 23036fd771..8590e4b6b6 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -39,6 +39,7 @@ #include "../../core/mod_fix.h" #include "../../core/events.h" #include "../../core/kemi.h" +#include "../../core/pass_fd.h" #include "tcpops.h" @@ -63,6 +64,8 @@ static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); +static int w_tcp_close_connection(sip_msg_t* msg, char* p1, char *p2); +static int w_tcp_close_connection_id(sip_msg_t* msg, char* pconid, char *p2); str tcpops_event_callback = STR_NULL; @@ -103,6 +106,10 @@ static cmd_export_t cmds[]={ fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, + {"tcp_close_connection", (cmd_function)w_tcp_close_connection, 0, + 0, 0, ANY_ROUTE}, + {"tcp_close_connection", (cmd_function)w_tcp_close_connection_id, 1, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -665,6 +672,65 @@ static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2) return ki_tcp_set_otcpid_flag(msg, vmode); } +/*! + * \brief Close a TCP connection + * + * Requests the TCP main process to close the specified TCP connection + * \param conid the internal connection ID + */ +static int ki_tcp_close_connection_id(sip_msg_t *msg, int conid) +{ + struct tcp_connection *con; + long mcmd[2]; + int n; + + if ((con = tcpconn_get(conid, 0, 0, 0, 0))) { + mcmd[0] = (long)con; + mcmd[1] = CONN_EOF; + + con->send_flags.f |= SND_F_CON_CLOSE; + con->flags |= F_CONN_FORCE_EOF; + + n = send_all(unix_tcp_sock, mcmd, sizeof(mcmd)); + if (unlikely(n <= 0)){ + LM_ERR("failed to send close request: %s (%d)\n", strerror(errno), errno); + return -2; + } + return 1; + } + return -1; +} + +/** + * + */ +static int ki_tcp_close_connection(sip_msg_t *msg) +{ + return ki_tcp_close_connection_id(msg, msg->rcv.proto_reserved1); +} + +/** + * + */ +static int w_tcp_close_connection_id(sip_msg_t* msg, char* pconid, char *p2) +{ + int conid = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)pconid, &conid)<0) { + LM_ERR("failed to get conid parameter\n"); + return -1; + } + return ki_tcp_close_connection_id(msg, conid); +} + +/** + * + */ +static int w_tcp_close_connection(sip_msg_t* msg, char* p1, char *p2) +{ + return ki_tcp_close_connection_id(msg, msg->rcv.proto_reserved1); +} + /** * */ @@ -799,6 +865,16 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tcpops"), str_init("tcp_close_connection"), + SR_KEMIP_INT, ki_tcp_close_connection, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tcpops"), str_init("tcp_close_connection_id"), + SR_KEMIP_INT, ki_tcp_close_connection_id, + { SR_KEMIP_INT, 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:77896de7: secsipid: added kemi function to get $secsioid(val)
by Daniel-Constantin Mierla 22 Jun '21

22 Jun '21

Module: kamailio Branch: master Commit: 77896de79710063469a123efb5e1d2ab1dfd5e25 URL: https://github.com/kamailio/kamailio/commit/77896de79710063469a123efb5e1d2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-22T11:20:42+02:00 secsipid: added kemi function to get $secsioid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/77896de79710063469a123efb5e1d2a… Patch: https://github.com/kamailio/kamailio/commit/77896de79710063469a123efb5e1d2a… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 6a42076c0b..27216e1cec 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -815,6 +815,23 @@ static int pv_parse_secsipid_name(pv_spec_p sp, str *in) } + +/** + * + */ +static sr_kemi_xval_t* ki_secsipid_get_val(sip_msg_t *msg) +{ + memset(&_sr_kemi_secsipid_xval, 0, sizeof(sr_kemi_xval_t)); + if(_secsipid_data.value.s==NULL || _secsipid_data.value.len<=0) { + sr_kemi_xval_null(&_sr_kemi_secsipid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_secsipid_xval; + } + _sr_kemi_secsipid_xval.vtype = SR_KEMIP_STR; + _sr_kemi_secsipid_xval.v.s = _secsipid_data.value; + + return &_sr_kemi_secsipid_xval; +} + /** * */ @@ -845,6 +862,11 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR } }, + { str_init("secsipid"), str_init("secsipid_get_val"), + SR_KEMIP_XVAL, ki_secsipid_get_val, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("secsipid"), str_init("secsipid_get_url"), SR_KEMIP_XVAL, ki_secsipid_get_url, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:03248001: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: 0324800109442bf5786dae6d8238a3bf4e0e51f4 URL: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-21T09:46:15+02:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… Patch: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 7ac759b205..cbe8fd98eb 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -162,6 +162,8 @@ Chapter 1. Admin Guide Example 1.1. event_route[xhttp:request] ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index a38599775f..781ac41392 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -220,6 +220,11 @@ event_route[xhttp:request] { The event route is executed when a new HTTP request is received. ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

1 0

git:master:a05b4d7c: websocket: docs - added tcp_accept_no_cl=yes to example
by Daniel-Constantin Mierla 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: a05b4d7c2e413032b1a63f3d017243446a0bc6ec URL: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T09:43:55+02:00 websocket: docs - added tcp_accept_no_cl=yes to example --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… Patch: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 7cc6e09069..b4b5e2c8ce 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -43,6 +43,8 @@ <title>event_route[xhttp:request]</title> <programlisting><![CDATA[ ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets

1 0

git:master:195de260: xhttp: extended example for event_route[xhttp:request]
by Daniel-Constantin Mierla 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: 195de260f102f1a016ad7bd1021571c1dd8a983f URL: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T09:42:28+02:00 xhttp: extended example for event_route[xhttp:request] --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… Patch: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index c2a18f9d44..507283b90f 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -222,6 +222,11 @@ event_route[xhttp:request] { </para> <programlisting format="linespecific"> ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

1 0

git:master:c825673b: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: c825673bad8b04dcbf0dc8c150e3048a791091e8 URL: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-21T08:16:23+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… Patch: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index aaae0747e1..87a33aebfd 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -45,6 +45,8 @@ Daniel-Constantin Mierla 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 5. Installation List of Examples @@ -61,7 +63,8 @@ Daniel-Constantin Mierla 1.10. secsipid_get_url usage 1.11. secsipid_add_identity usage 1.12. secsipid_build_identity usage - 1.13. Libsecsipid Usage + 1.13. secsipid_sign usage + 1.14. Libsecsipid Usage Chapter 1. Admin Guide @@ -94,6 +97,8 @@ Chapter 1. Admin Guide 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 5. Installation 1. Overview @@ -227,6 +232,8 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.1. secsipid_check_identity(keyPath) Check the validity of the Identity header using the keys stored in the @@ -376,6 +383,30 @@ request_route { } ... +4.7. secsipid_sign(sheaders, spaypload, keyPath) + + Build Identity value using the key specified by "keyPath" to sign the + JWT body. The sheaders and spayload have to be string representation of + JSON headers and payload to be signed. On success, the Indentity value + is stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. secsipid_sign usage +... +request_route { + ... + if(secsipid_sign("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + 5. Installation The module needs "secsipdi_proc.so" module that depends on @@ -390,7 +421,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.13. Libsecsipid Usage + Example 1.14. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

1 0

git:master:a5997c29: secsipid: docs for secsipid_sign()
by Daniel-Constantin Mierla 21 Jun '21

21 Jun '21

Module: kamailio Branch: master Commit: a5997c29468efabb5a7745bc5b1c99c0f9eb8999 URL: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T08:12:15+02:00 secsipid: docs for secsipid_sign() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… Patch: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 28f3dce68a..cc9c6c9fdf 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -397,6 +397,39 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_sign"> + <title> + <function moreinfo="none">secsipid_sign(sheaders, spaypload, keyPath)</function> + </title> + <para> + Build Identity value using the key specified by "keyPath" to sign the JWT body. + The sheaders and spayload have to be string representation of JSON + headers and payload to be signed. On success, the Indentity value is + stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_sign</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_sign("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 0

git:master:35f45d41: secsipid: added secsipid_sign(headers, payload, keypath)
by Daniel-Constantin Mierla 20 Jun '21

20 Jun '21

Module: kamailio Branch: master Commit: 35f45d412c0e3b01eac34af74f2783d7bb1fdbf6 URL: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-20T11:28:37+02:00 secsipid: added secsipid_sign(headers, payload, keypath) - store the result in $secsipid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… Patch: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 83a1f236dc..6a42076c0b 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -58,6 +58,7 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); +static int w_secsipid_sign(sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeypath); static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *pout); static int secsipid_libopt_param(modparam_t type, void *val); @@ -89,6 +90,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_build_identity", (cmd_function)w_secsipid_build_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"secsipid_sign", (cmd_function)w_secsipid_sign, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_get_url", (cmd_function)w_secsipid_get_url, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -379,6 +382,7 @@ static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) return ki_secsipid_check(msg, &sidentity, &keypath); } + /** * */ @@ -573,6 +577,75 @@ static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdestt &attest, &origid, &x5u, &keypath, 1); } +/** + * + */ +static int ki_secsipid_sign(sip_msg_t *msg, str *sheaders, str *spayload, + str *keypath) +{ + str ibody = STR_NULL; + + if(secsipid_libopt_list_used==0) { + str_list_t *sit; + for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) { + _secsipid_papi.SecSIPIDOptSetV(sit->s.s); + } + secsipid_libopt_list_used = 1; + } + + ibody.len = _secsipid_papi.SecSIPIDSignJSONHP(sheaders->s, spayload->s, + keypath->s, &ibody.s); + + _secsipid_data.ret = ibody.len; + + if(ibody.len<=0) { + LM_ERR("failed to get identity value (%d)\n", ibody.len); + goto error; + } + + LM_DBG("identity value: %.*s\n", ibody.len, ibody.s); + + if(_secsipid_data.value.s) { + free(_secsipid_data.value.s); + } + _secsipid_data.value = ibody; + + return 1; + +error: + if(ibody.s) { + free(ibody.s); + } + return -1; +} + +/** + * + */ +static int w_secsipid_sign(sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeypath) +{ + str shdrs = STR_NULL; + str spayload = STR_NULL; + str keypath = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)phdrs, &shdrs)<0) { + LM_ERR("failed to get JSON headers parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)ppayload, &spayload)<0) { + LM_ERR("failed to get JSON payload parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)pkeypath, &keypath)<0) { + LM_ERR("failed to get keypath parameter\n"); + return -1; + } + + return ki_secsipid_sign(msg, &shdrs, &spayload, &keypath); +} + /** * */

1 0

git:5.5:01d43e2d: pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: 01d43e2d6f78fff7fca8d6fc00adfab7f62a5320 URL: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:12+03:00 pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist (cherry picked from commit 03c2ea28767106333ee04c5e19ee490c010dfb58) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… Patch: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index cb70c1af90..28dc1c9720 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -46,6 +47,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_with lwsc %bcond_without kazoo %bcond_without memcached %bcond_with mongodb @@ -79,6 +81,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -122,6 +125,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -148,6 +152,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_with kazoo %bcond_without memcached %bcond_with mongodb @@ -611,6 +616,7 @@ Lua extensions for Kamailio. %endif +%if %{with lwsc} %package lwsc Summary: Websocket client implementation to interact with external systems, similar to http client Group: %{PKGGROUP} @@ -619,6 +625,7 @@ BuildRequires: libwebsockets-devel %description lwsc Websocket client implementation to interact with external systems, similar to http client. +%endif %if %{with memcached} @@ -1138,7 +1145,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1231,7 +1240,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1894,10 +1905,12 @@ fi %endif +%if %{with lwsc} %files lwsc %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lwsc %{_libdir}/kamailio/modules/lwsc.so +%endif %if %{with memcached} %files memcached

1 0

git:5.5:efe83bb8: pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 [skip ci]
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: efe83bb89e9582b5c58a85626cc45d87dc124205 URL: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:43+03:00 pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 [skip ci] (cherry picked from commit ecc2cc69b08e797ca954af233c229ed44475ce33) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… Patch: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 28dc1c9720..3ca6df74fc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -172,6 +172,11 @@ %define _rundir %{_localstatedir}/run %endif +# build with openssl 1.1.1 on RHEL 7 based dists +%if 0%{?rhel} == 7 +%bcond_with openssl11 +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib @@ -279,8 +284,13 @@ Account transaction information in a JSON dictionary. %package auth-ephemeral Summary: Functions for authentication using ephemeral credentials Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description auth-ephemeral Functions for authentication using ephemeral credentials. @@ -365,9 +375,14 @@ Requires: openssl BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 +%if %{with openssl11} +Requires: openssl11-libs +BuildRequires: openssl11-devel +%else Requires: openssl-libs BuildRequires: openssl-devel %endif +%endif %if 0%{?fedora} Requires: openssl-libs BuildRequires: openssl-devel @@ -673,8 +688,13 @@ MySQL database connectivity for Kamailio. %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description outbound RFC 5626, "Managing Client-Initiated Connections in the Session Initiation @@ -952,8 +972,13 @@ SQLite database connectivity for Kamailio. %package tls Summary: TLS transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description tls TLS transport for Kamailio. @@ -1008,8 +1033,13 @@ Non-SIP utitility functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: libunistring, openssl11, kamailio = %ver +BuildRequires: libunistring-devel, openssl11-devel +%else Requires: libunistring, openssl, kamailio = %ver BuildRequires: libunistring-devel, openssl-devel +%endif %description websocket WebSocket transport for Kamailio. @@ -1106,6 +1136,9 @@ make cfg prefix=/usr \ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif @@ -1201,6 +1234,9 @@ rm -rf %{buildroot} make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif

1 0

git:5.5:0f0e7e8f: pkg: add support for AlmaLinux and Rocky Linux
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: 0f0e7e8f139042e2dd03e01a6ac66d32727dc69a URL: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:20:34+03:00 pkg: add support for AlmaLinux and Rocky Linux (cherry picked from commit b3d3cb366b67941ecebd297038522580114e3a0b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… Patch: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e095ac9b5e..ce12e50579 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -81,10 +81,23 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 +%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 +%define rhel_rebuild 8 +% if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos +%endif +% if 0%{?almalinux_ver} +%define dist_name centos +%define dist_version %{?almalinux} +%define dist .el8.almalinux +%endif +% if 0%{?rocky_ver} +%define dist_name centos +%define dist_version %{?rocky} +%define dist .el8.rocky +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -186,7 +199,7 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 8 && 0%{?centos_ver} != 8 +%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 %define dist_name rhel %define dist_version %{?rhel} %bcond_without cnxcc

1 0

git:5.5:0e8bb2fc: pkg/kamailio/obs: simlifid module definition for RHEL dist
by Sergey Safarov 20 Jun '21

20 Jun '21

Module: kamailio Branch: 5.5 Commit: 0e8bb2fc46b74b5171edeb64776d280c35739ce9 URL: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:01+03:00 pkg/kamailio/obs: simlifid module definition for RHEL dist (cherry picked from commit e7a14f37c98e2bbfcf234165dc5dfd4121db5b5b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… Patch: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ce12e50579..cb70c1af90 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -28,9 +28,15 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 6 +%if 0%{?rhel} == 6 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_with cnxcc %bcond_without dnssec %bcond_without evapi @@ -54,10 +60,16 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 7 +%if 0%{?rhel} == 7 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el7.centos +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -81,23 +93,26 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 -%define rhel_rebuild 8 -% if 0%{?centos_ver} +%if 0%{?rhel} == 8 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos %endif -% if 0%{?almalinux_ver} +%if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} %define dist .el8.almalinux %endif -% if 0%{?rocky_ver} +%if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} %define dist .el8.rocky %endif +%if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -147,84 +162,6 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 6 && 0%{?centos_ver} != 6 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_with cnxcc -%bcond_without dnssec -%bcond_without evapi -%bcond_with geoip -%bcond_with http_async_client -%bcond_with ims -%bcond_with jansson -%bcond_with json -%bcond_with lua -%bcond_with kazoo -%bcond_with memcached -%bcond_with mongodb -%bcond_with perl -%bcond_with phonenum -%bcond_with python3 -%bcond_with rabbitmq -%bcond_with redis -%bcond_with ruby -%bcond_with sctp -%bcond_with websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - # Defining missing macros on RHEL/CentOS 6 %if 0%{?rhel} == 6 %define _rundir %{_localstatedir}/run

1 0

Interconnecting SIP servers without the PSTN
by Bill Neely 20 Jun '21

20 Jun '21

greetings all: I have long believed that VOIP and SIP will not reach their full potential until SIP servers can route calls to other SIP servers without having to go through the ancient telephone system, and pay their tolls. There is nothing of substance preventing any SIP server from calling numbers at any other SIP server. They just need to know which numbers are hosted on which servers. There have been several attempts to resolve this issue: freenum.org, e164,org, Dundi (for asterisk). All appear to be dead at this time. I think that one of the reasons for these failures was that all of these systems relied on the public DNS system to exchange server location info. Putting your SIP server address on a public system and advertising that this is the IP of a SIP server is simply begging for hackers to attempt to breach your SIP server. Its like painting a big target on your back. We at Xantek have been working on an alternate approach, using AGI calls and responses to identify routing info. This approach allows us to limit server identification to registered users of the system, and registered users will have to provide identification (something that hackers probably won't do). We also are incorporating a PIN number into the dial string, so that recipients are aware that the call is coming from a valid user. The PIN can be easily changed if fraudulent activity is suspected. We have a working model for Asterisk set up (see voipconnect.tel for details), but we would like to expand into the Kamailio-verse. What we need is a few Kamailio experts to help with the development of the system on Kamailio. If you have any interest in helping, please reply to this post. TIA, Bill

3 2

Re: [sr-dev] [kamailio/kamailio] secsipid: docs for secsipid_check(...) function (6822bde)
by David Villasmil 18 Jun '21

18 Jun '21

Nice! -- 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/commit/6822bde4dc4715043d3d416b710664e…

1 0

git:master:ecc2cc69: pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1
by sergey-safarov 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: ecc2cc69b08e797ca954af233c229ed44475ce33 URL: https://github.com/kamailio/kamailio/commit/ecc2cc69b08e797ca954af233c229ed… Author: SPChan <shihping.chan(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2021-06-18T15:56:41+03:00 pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ecc2cc69b08e797ca954af233c229ed… Patch: https://github.com/kamailio/kamailio/commit/ecc2cc69b08e797ca954af233c229ed… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8e9483bada..b68df0eef5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -172,6 +172,11 @@ %define _rundir %{_localstatedir}/run %endif +# build with openssl 1.1.1 on RHEL 7 based dists +%if 0%{?rhel} == 7 +%bcond_with openssl11 +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib @@ -279,8 +284,13 @@ Account transaction information in a JSON dictionary. %package auth-ephemeral Summary: Functions for authentication using ephemeral credentials Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description auth-ephemeral Functions for authentication using ephemeral credentials. @@ -365,9 +375,14 @@ Requires: openssl BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 +%if %{with openssl11} +Requires: openssl11-libs +BuildRequires: openssl11-devel +%else Requires: openssl-libs BuildRequires: openssl-devel %endif +%endif %if 0%{?fedora} Requires: openssl-libs BuildRequires: openssl-devel @@ -673,8 +688,13 @@ MySQL database connectivity for Kamailio. %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description outbound RFC 5626, "Managing Client-Initiated Connections in the Session Initiation @@ -952,8 +972,13 @@ SQLite database connectivity for Kamailio. %package tls Summary: TLS transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description tls TLS transport for Kamailio. @@ -1008,8 +1033,13 @@ Non-SIP utitility functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: libunistring, openssl11, kamailio = %ver +BuildRequires: libunistring-devel, openssl11-devel +%else Requires: libunistring, openssl, kamailio = %ver BuildRequires: libunistring-devel, openssl-devel +%endif %description websocket WebSocket transport for Kamailio. @@ -1106,6 +1136,9 @@ make cfg prefix=/usr \ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif @@ -1201,6 +1234,9 @@ rm -rf %{buildroot} make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif

1 0

git:master:e4527941: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: e4527941b9d16b476a60b19bd15307cdac4b530b URL: https://github.com/kamailio/kamailio/commit/e4527941b9d16b476a60b19bd15307c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-18T14:16:22+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/e4527941b9d16b476a60b19bd15307c… Patch: https://github.com/kamailio/kamailio/commit/e4527941b9d16b476a60b19bd15307c…

1 0

git:master:961ac613: secsipid: added secsipid_check(sidentity, keypath)
by Daniel-Constantin Mierla 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: 961ac61392fb3f916287e16380cd64b5ef499360 URL: https://github.com/kamailio/kamailio/commit/961ac61392fb3f916287e16380cd64b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-18T14:02:07+02:00 secsipid: added secsipid_check(sidentity, keypath) - check the identity value provided in the first parameter --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/961ac61392fb3f916287e16380cd64b… Patch: https://github.com/kamailio/kamailio/commit/961ac61392fb3f916287e16380cd64b… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 1f8bc7e72c..83a1f236dc 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -52,6 +52,7 @@ static int child_init(int); static void mod_destroy(void); static int w_secsipid_check_identity(sip_msg_t *msg, char *pkeypath, char *str2); +static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath); static int w_secsipid_check_identity_pubkey(sip_msg_t *msg, char *pkeyval, char *str2); static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); @@ -82,6 +83,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"secsipid_check_identity_pubkey", (cmd_function)w_secsipid_check_identity_pubkey, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"secsipid_check", (cmd_function)w_secsipid_check, 2, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"secsipid_add_identity", (cmd_function)w_secsipid_add_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_build_identity", (cmd_function)w_secsipid_build_identity, 6, @@ -325,6 +328,56 @@ static int w_secsipid_check_identity_pubkey(sip_msg_t *msg, char *pkeyval, char return ki_secsipid_check_identity_pubkey(msg, &keyval); } +/** + * + */ +static int ki_secsipid_check(sip_msg_t *msg, str *sidentity, str *keypath) +{ + int ret = 1; + + if(secsipid_cache_dir.len > 0) { + _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, + secsipid_cache_expire); + } + if(secsipid_libopt_list_used==0) { + str_list_t *sit; + for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) { + _secsipid_papi.SecSIPIDOptSetV(sit->s.s); + } + secsipid_libopt_list_used = 1; + } + ret = _secsipid_papi.SecSIPIDCheckFull(sidentity->s, sidentity->len, + secsipid_expire, keypath->s, secsipid_timeout); + + if(ret==0) { + LM_DBG("identity check: ok\n"); + return 1; + } + + LM_DBG("identity check: failed\n"); + return ret; +} + +/** + * + */ +static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) +{ + str sidentity = STR_NULL; + str keypath = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)pidentity, &sidentity)<0) { + LM_ERR("failed to get identity value parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)pkeypath, &keypath)<0) { + LM_ERR("failed to get keypath parameter\n"); + return -1; + } + + return ki_secsipid_check(msg, &sidentity, &keypath); +} /** * @@ -704,6 +757,11 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("secsipid"), str_init("secsipid_check"), + SR_KEMIP_INT, ki_secsipid_check, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("secsipid"), str_init("secsipid_add_identity"), SR_KEMIP_INT, ki_secsipid_add_identity, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

1 0

git:master:6822bde4: secsipid: docs for secsipid_check(...) function
by Daniel-Constantin Mierla 18 Jun '21

18 Jun '21

Module: kamailio Branch: master Commit: 6822bde4dc4715043d3d416b710664e5b14637b8 URL: https://github.com/kamailio/kamailio/commit/6822bde4dc4715043d3d416b710664e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-18T14:06:42+02:00 secsipid: docs for secsipid_check(...) function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6822bde4dc4715043d3d416b710664e… Patch: https://github.com/kamailio/kamailio/commit/6822bde4dc4715043d3d416b710664e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index bc1a8ac332..28f3dce68a 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -266,6 +266,45 @@ request_route { </programlisting> </example> </section> + <section id="secsipid.f.secsipid_check"> + <title> + <function moreinfo="none">secsipid_check(sIdentity, keyPath)</function> + </title> + <para> + Check the validity of the "sIdentity" parameter using the keys stored + in the file specified by "keyPath". If the keyPath parameter is empty, + the function is downloading the key using the URL from "info" + parameter of the sIdentity, using the value of "timeout" + parameter to limit the download time. The validity of the JWT + in the sIdentity value is also checked against the "expire" + parameter. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_check</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + ... + if(secsipid_check_identity("...", "")) { ... } + ... +} +... +</programlisting> + </example> + <para> + Further checks can be done with config operations, decoding the JWT header + and payload using {s.select} and {s.decode.base64t} transformations + together with jansson module. + </para> + </section> <section id="secsipid.f.secsipid_get_url"> <title> <function moreinfo="none">secsipid_get_url(url, ovar)</function>

1 0

[kamailio/kamailio] TLS: same TLSc is used for different outbound connection when it is switched with tls_set_connect_server_id() (#2760)
by arkadiam 18 Jun '21

18 Jun '21

### Description Thank you for implementing #2413, I'm looking forward to use it. I was trying it on a dev system. It works fine when the same TLS client needs to be selected for ALL connections. Having issue with it when connection expected to alternate between multiple configured TLS clients. When configured as bellow and event_route alternates between connections (like in logs bellow) connection is always using TLSc with one of the server-ids, e.g. "domain-02". It looks like it's a race between setting server id in event_route and a "thread" that starts TLS client. In my observations only one TLS client is used. Expecting: each outbound connection use TLSc as it was set by tls_set_connect_server_id(). ``` event_route[tm:local-request] { if (is_method("OPTIONS")) { $var(contact) = "Contact: <sip:" + $fd + ":5061;transport=tls>\r\n"; append_hf("$var(contact)"); if ($fd == "domain-01") { tls_set_connect_server_id("domain-01"); xlog("L_INFO", "ID=$ci|tls_set_connect_server_id(domain-01)\n"); } else if ($fd == "domain-02") { tls_set_connect_server_id("domain-02"); xlog("L_INFO", "ID=$ci|tls_set_connect_server_id(domain-02)\n"); } } } ``` Dispatcher configured as: ``` loadmodule "dispatcher.so" modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list") modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_ping_interval", 60) ``` With records like: ``` 1 sip:sip1.host.com;transport=tls 0 1 socket=tls:111.222.233.11:5061;ping_from=sip:my-domain-01.com 1 sip:sip2.host.com;transport=tls 0 2 socket=tls:111.222.233.12:5061;ping_from=sip:my-domain-01.com 1 sip:sip3.host.com;transport=tls 0 3 socket=tls:111.222.233.13:5061;ping_from=sip:my-domain-01.com 2 sip:sip1.host.com;transport=tls 0 1 socket=tls:111.222.233.21:5061;ping_from=sip:my-domain-02.com 2 sip:sip2.host.com;transport=tls 0 2 socket=tls:111.222.233.22:5061;ping_from=sip:my-domain-02.com 2 sip:sip3.host.com;transport=tls 0 3 socket=tls:111.222.233.23:5061;ping_from=sip:my-domain-02.com ``` #### Log Messages ``` Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb1-948(a)1.2.3.4|tls_set_connect_server_id(domain-02) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb2-948(a)1.2.3.4|tls_set_connect_server_id(domain-01) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb3-948(a)1.2.3.4|tls_set_connect_server_id(domain-02) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb4-948(a)1.2.3.4|tls_set_connect_server_id(domain-01) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb5-948(a)1.2.3.4|tls_set_connect_server_id(domain-02) Jun 3 11:57:44 INFO: <script>: ID=4eadda397f10fcb6-948(a)1.2.3.4|tls_set_connect_server_id(domain-01) ``` ### 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, TLS_PTHREAD_MUTEX_SHARED 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 7.5.0 ``` * **Operating System**: ``` Linux dev03 4.15.0-143-generic #147-Ubuntu SMP Wed Apr 14 16:10:11 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux Ubuntu 18.04.5 LTS ``` -- 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/2760

3 11

git:master:e87fd9ce: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: e87fd9ce381c73d3733c38812c86e467cf966089 URL: https://github.com/kamailio/kamailio/commit/e87fd9ce381c73d3733c38812c86e46… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-17T16:46:24+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/e87fd9ce381c73d3733c38812c86e46… Patch: https://github.com/kamailio/kamailio/commit/e87fd9ce381c73d3733c38812c86e46… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 004d376fb4..5e07580ddf 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -41,6 +41,9 @@ Daniel-Constantin Mierla 4.4. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.5. secsipid_build_identity(origTN, destTN, attest, origID, + x5u, keyPath) + 5. Installation List of Examples @@ -55,7 +58,8 @@ Daniel-Constantin Mierla 1.8. secsipid_check_identity_pubkey usage 1.9. secsipid_get_url usage 1.10. secsipid_add_identity usage - 1.11. Libsecsipid Usage + 1.11. secsipid_build_identity usage + 1.12. Libsecsipid Usage Chapter 1. Admin Guide @@ -84,6 +88,9 @@ Chapter 1. Admin Guide 4.4. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.5. secsipid_build_identity(origTN, destTN, attest, origID, x5u, + keyPath) + 5. Installation 1. Overview @@ -213,6 +220,9 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4.4. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.5. secsipid_build_identity(origTN, destTN, attest, origID, x5u, + keyPath) + 4.1. secsipid_check_identity(keyPath) Check the validity of the Identity header using the keys stored in the @@ -305,6 +315,35 @@ request_route { } ... +4.5. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + + Build Identity value using the key specified by "keyPath" to sign the + JWT body. If origID is empty, a UUID string is generated to fill the + field. The origTN represents the origination telephone number; destTN + represents the destination telephone number; x5u is the HTTP URL + referencing to the public key that should be used to verify the + signature; attest represents the attestation level (should be "A", "B" + or "C"). On success, the Indentity value is stored in variable + $secsipid(val). It also sets $secsipid(ret) to the return value of the + libsecsipid functions. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.11. secsipid_build_identity usage +... +request_route { + ... + if(secsipid_build_identity("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")) +{ + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + 5. Installation The module needs "secsipdi_proc.so" module that depends on @@ -319,7 +358,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.11. Libsecsipid Usage + Example 1.12. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

1 0

git:master:e6f4e929: dispatcher: print eol in some log messages
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: e6f4e929efb61a1a51aa1b4b5587999acc8dc55d URL: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T16:40:39+02:00 dispatcher: print eol in some log messages --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… Patch: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 78ece3fffe..674678417d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -325,7 +325,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.weight = tmp_ival; } else { dest->attrs.weight = 0; - LM_ERR("weight %d not in 1-100 range - ignoring destination", + LM_ERR("weight %d not in 1-100 range - ignoring destination\n", tmp_ival); } } else if(pit->name.len == 7 @@ -350,7 +350,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.rweight = tmp_ival; } else { dest->attrs.rweight = 0; - LM_WARN("rweight %d not in 1-100 range - ignoring", tmp_ival); + LM_WARN("rweight %d not in 1-100 range - ignoring\n", tmp_ival); } } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) {

1 0

git:master:6ebcd34b: secsipid: add function to build identity value and store in pv
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: 6ebcd34b74452642c44b296525766791bb33a7b0 URL: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T15:40:16+02:00 secsipid: add function to build identity value and store in pv - new function secsipid_build_identity(...) - if successful, identity value is available in $secsipid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679… Patch: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679…

1 0

git:master:cf828521: secsipid: docs for secsipid_build_identity(...) function
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: cf82852199f1fee7ee01e4a25d5e79a2ab1bbf8d URL: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T16:35:55+02:00 secsipid: docs for secsipid_build_identity(...) function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… Patch: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 527db1aecf..bc1a8ac332 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -322,6 +322,42 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_build_identity"> + <title> + <function moreinfo="none">secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath)</function> + </title> + <para> + Build Identity value using the key specified by "keyPath" to sign the JWT body. + If origID is empty, a UUID string is generated to fill the field. The origTN + represents the origination telephone number; destTN represents the destination + telephone number; x5u is the HTTP URL referencing to the public key that + should be used to verify the signature; attest represents the attestation + level (should be "A", "B" or "C"). On success, the Indentity value is + stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_build_identity</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_build_identity("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 0

git:master:abbe5187: pua_json: exported KSR.pua_json.publish() to kemi
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: abbe518724d645b6f977ca526011285bc03c581c URL: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:29:33+02:00 pua_json: exported KSR.pua_json.publish() to kemi - corresponding to config pua_json_publish() - use fixup_spve_null() and fixup_free_spve_null() for pua_json_publish() config export --- Modified: src/modules/pua_json/pua_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Patch: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… --- diff --git a/src/modules/pua_json/pua_json_mod.c b/src/modules/pua_json/pua_json_mod.c index 2c7e7f5513..2b51e5020e 100644 --- a/src/modules/pua_json/pua_json_mod.c +++ b/src/modules/pua_json/pua_json_mod.c @@ -27,31 +27,41 @@ #include "../json/api.h" #include "../presence/bind_presence.h" +#include "../../core/mod_fix.h" +#include "../../core/kemi.h" + #include "pua_json_mod.h" MODULE_VERSION +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2); + +/* clang-format off */ static param_export_t params[] = { - {"pua_include_entity", INT_PARAM, &pua_include_entity}, - {0, 0, 0}}; + {"pua_include_entity", PARAM_INT, &pua_include_entity}, + {0, 0, 0} +}; static cmd_export_t cmds[] = { - {"pua_json_publish", (cmd_function)pua_json_publish, 1, 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pua_json_publish", (cmd_function)w_pua_json_publish, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "pua_json", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_json", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) { @@ -66,3 +76,50 @@ static int mod_init(void) return 0; } + +/** + * + */ +static int ki_pua_json_publish(sip_msg_t* msg, str* pjson) +{ + return pua_json_publish(msg, pjson->s); +} + +/** + * + */ +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2) +{ + str pjson = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)p1pjson, &pjson)<0) { + LM_ERR("failed to get p1 value\n"); + return -1; + } + + return pua_json_publish(msg, pjson.s); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_json_exports[] = { + { str_init("pua_json"), str_init("publish"), + SR_KEMIP_INT, ki_pua_json_publish, + { 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 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_pua_json_exports); + return 0; +}

1 0

git:master:f34f9456: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: f34f9456c68d25bcdd49d670d95f16649e14e8d5 URL: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-16T12:16:28+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Patch: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 453179d5a1..411d7428cf 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -102,6 +102,7 @@ Gabriel Vasile 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -160,6 +161,7 @@ Gabriel Vasile 1.45. contact_param_decode usage 1.46. contact_param_decode_ruri usage 1.47. contact_param_rm usage + 1.48. hdr_date_check usage Chapter 1. Admin Guide @@ -223,6 +225,7 @@ Chapter 1. Admin Guide 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -444,6 +447,7 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 4.1. ring_insert_callid() @@ -1112,6 +1116,25 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { } ... +4.39. hdr_date_check(tdiff) + + Returns true if sip message has Date header and its value is lower than + 'NOW() - tdiff'. + + Meaning of the parameters is as follows: + * tdiff - time difference in seconds, it can be a variable or static + integer value. + + This function can be used from ANY_ROUTE. + + Example 1.48. hdr_date_check usage +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

1 0

git:master:6a2a1dfb: siputils: docs for hdr_date_check()
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 6a2a1dfb8a6718f7ecb7cc2f28cf471bdcf0fec3 URL: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:09:36+02:00 siputils: docs for hdr_date_check() --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Patch: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 8e7140385d..b1dffa1c3e 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1354,6 +1354,37 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { contact_param_rm("myparam"); } ... +</programlisting> + </example> + </section> + <section id="siputils.f.hdr_date_check"> + <title> + <function moreinfo="none">hdr_date_check(tdiff)</function> + </title> + <para> + Returns true if sip message has Date header and its value is lower + than 'NOW() - tdiff'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>tdiff</emphasis> - time difference in seconds, + it can be a variable or static integer value. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hdr_date_check</function> usage</title> + <programlisting format="linespecific"> +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:466e5f46: siputils: added hdr_date_check(tdiff)
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 466e5f469f5b6b9f5d1b30139c2b854e62f4f50b URL: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:03:38+02:00 siputils: added hdr_date_check(tdiff) - returns true if sip message has Date header and its value is lower than NOW() - tdiff --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Patch: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 57ae9fb262..3dc7188fa8 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -66,6 +66,7 @@ #include "../../core/kemi.h" #include "../../core/parser/parse_option_tags.h" #include "../../core/parser/parse_uri.h" +#include "../../core/parser/parse_date.h" #include "ring.h" #include "options.h" @@ -113,6 +114,8 @@ static int w_contact_param_decode(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_decode_ruri(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_rm(sip_msg_t *msg, char *pnparam, char *p2); +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2); + /* Fixup functions to be defined later */ static int fixup_set_uri(void** param, int param_no); static int fixup_free_set_uri(void** param, int param_no); @@ -205,6 +208,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"contact_param_rm", (cmd_function)w_contact_param_rm, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + {"hdr_date_check", (cmd_function)w_hdr_date_check, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 1, 0, 0, 0}, @@ -548,6 +553,66 @@ static int ki_is_uri(sip_msg_t* msg, str* suri) return 1; } +/* + * Check date header value with time difference + */ +static int ki_hdr_date_check(sip_msg_t* msg, int tdiff) +{ + time_t tnow, tmsg; + + if ((!msg->date) && (parse_headers(msg, HDR_DATE_F, 0) == -1)) { + LM_ERR("failed parsing Date header\n"); + return -1; + } + if (!msg->date) { + LM_ERR("Date header field is not found\n"); + return -1; + } + if ((!(msg->date)->parsed) && (parse_date_header(msg) < 0)) { + LM_ERR("failed parsing DATE body\n"); + return -1; + } + +#ifdef HAVE_TIMEGM + tmsg=timegm(&get_date(msg)->date); +#else + tmsg=_timegm(&get_date(msg)->date); +#endif + if (tmsg < 0) { + LM_ERR("timegm error\n"); + return -2; + } + + if ((tnow=time(0)) < 0) { + LM_ERR("time error %s\n", strerror(errno)); + return -3; + } + + if (tnow > tmsg + tdiff) { + LM_ERR("autdated date header value (%ld sec)\n", tnow - tmsg + tdiff); + return -4; + } else { + LM_ERR("Date header value OK\n"); + } + + return 1; + +} + +/** + * + */ +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2) +{ + int tdiff = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)ptdiff, &tdiff)<0) { + LM_ERR("failed to get time diff parameter\n"); + return -1; + } + return ki_hdr_date_check(msg, tdiff); +} + /** * */ @@ -668,6 +733,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("hdr_date_check"), + SR_KEMIP_INT, ki_hdr_date_check, + { SR_KEMIP_INT, 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

Kamailio v5.5.1 Released
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Hello, Kamailio SIP Server v5.5.1 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.1. For more details about version 5.5.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-5-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 3

[kamailio/kamailio] Typo in htable.seti example (#2782)
by arkadiam 16 Jun '21

16 Jun '21

https://github.com/kamailio/kamailio/blob/30467037a7d97def6fbb40cad14e6f101… It should be `htable.seti` to set as an integer -- 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/2782

3 2

git:master:f22a09da: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: f22a09dacf85e6489005a634eb6d907c4b8ef782 URL: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-15T19:16:14+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Patch: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 85f19c7102..25d6769065 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1065,7 +1065,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... 6.5. htable.dump htable

1 0

git:master:ee9c2bc2: htable: fix documentation
by Ovidiu Sas 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: ee9c2bc2046103f0f7888c078b1f88d0befd6f7d URL: https://github.com/kamailio/kamailio/commit/ee9c2bc2046103f0f7888c078b1f88d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-06-15T13:03:07-04:00 htable: fix documentation - reported by arkadiam on Github --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ee9c2bc2046103f0f7888c078b1f88d… Patch: https://github.com/kamailio/kamailio/commit/ee9c2bc2046103f0f7888c078b1f88d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 3a7f101bca..5ef04b2ee6 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1363,7 +1363,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... </programlisting> </section>

1 0

git:5.5:307af87b: topos: documentation fixed for contact_host xavu parameter
by Henning Westerholt 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 307af87b17fdadce2d38794b85933f6b202d1313 URL: https://github.com/kamailio/kamailio/commit/307af87b17fdadce2d38794b85933f6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-15T13:36:20Z topos: documentation fixed for contact_host xavu parameter (cherry picked from commit 40073c9975ee256cebbfe60f27d1b07c977395d0) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/307af87b17fdadce2d38794b85933f6… Patch: https://github.com/kamailio/kamailio/commit/307af87b17fdadce2d38794b85933f6… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b13902929f..4218dae3fe 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -453,7 +453,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") </programlisting> </example> </section> - <section id="topos.p.xavu_filed_contact_host"> + <section id="topos.p.xavu_field_contact_host"> <title><varname>xavu_field_contact_host</varname> (str)</title> <para> Control from where to take the host part of the Contact header added @@ -476,7 +476,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:master:30467037: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 30467037a7d97def6fbb40cad14e6f101178cb05 URL: https://github.com/kamailio/kamailio/commit/30467037a7d97def6fbb40cad14e6f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-15T12:01:24+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/30467037a7d97def6fbb40cad14e6f1… Patch: https://github.com/kamailio/kamailio/commit/30467037a7d97def6fbb40cad14e6f1… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 783b57ba57..49b786ac13 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -441,7 +441,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:master:40073c99: topos: documentation fixed for contact_host xavu parameter
by Henning Westerholt 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 40073c9975ee256cebbfe60f27d1b07c977395d0 URL: https://github.com/kamailio/kamailio/commit/40073c9975ee256cebbfe60f27d1b07… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-15T09:59:00Z topos: documentation fixed for contact_host xavu parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40073c9975ee256cebbfe60f27d1b07… Patch: https://github.com/kamailio/kamailio/commit/40073c9975ee256cebbfe60f27d1b07… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b13902929f..4218dae3fe 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -453,7 +453,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") </programlisting> </example> </section> - <section id="topos.p.xavu_filed_contact_host"> + <section id="topos.p.xavu_field_contact_host"> <title><varname>xavu_field_contact_host</varname> (str)</title> <para> Control from where to take the host part of the Contact header added @@ -476,7 +476,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:5.5:8aa8df7e: Makefile.defs: version set to 5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 8aa8df7e2c662a349150c4f4c9ea49d088f56254 URL: https://github.com/kamailio/kamailio/commit/8aa8df7e2c662a349150c4f4c9ea49d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T11:24:46+02:00 Makefile.defs: version set to 5.5.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8aa8df7e2c662a349150c4f4c9ea49d… Patch: https://github.com/kamailio/kamailio/commit/8aa8df7e2c662a349150c4f4c9ea49d… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 6b24118a9c..18afd9cf4c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:7abebb9f: ChangeLog: content updated for v5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 7abebb9fcbbad8d35a273e8a95d752397919455d URL: https://github.com/kamailio/kamailio/commit/7abebb9fcbbad8d35a273e8a95d7523… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T11:27:16+02:00 ChangeLog: content updated for v5.5.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/7abebb9fcbbad8d35a273e8a95d7523… Patch: https://github.com/kamailio/kamailio/commit/7abebb9fcbbad8d35a273e8a95d7523…

1 0

git:5.5:16f45aa4: pkg/kamailio/deb: version set 5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 16f45aa4a790be921abef7569e809b20ba295226 URL: https://github.com/kamailio/kamailio/commit/16f45aa4a790be921abef7569e809b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T11:19:59+02:00 pkg/kamailio/deb: version set 5.5.1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/16f45aa4a790be921abef7569e809b2… Patch: https://github.com/kamailio/kamailio/commit/16f45aa4a790be921abef7569e809b2…

1 0

git:5.5:98ce167b: pkg: version set to 5.5.1 for rpm and alpine specs
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 98ce167bcf88ad6bb16b8d52a5998546bfc47428 URL: https://github.com/kamailio/kamailio/commit/98ce167bcf88ad6bb16b8d52a599854… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:45:10+02:00 pkg: version set to 5.5.1 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/98ce167bcf88ad6bb16b8d52a599854… Patch: https://github.com/kamailio/kamailio/commit/98ce167bcf88ad6bb16b8d52a599854… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e5f39653d1..ee259927bf 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.0 +pkgver=5.5.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 3928c1c596..e095ac9b5e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.0 +%define ver 5.5.1 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:e9cdbdfa: textops: fixed condition on header parsing error for find_hdr_line_start()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: e9cdbdfa302940606295c3b79a671cf2f0d38fc5 URL: https://github.com/kamailio/kamailio/commit/e9cdbdfa302940606295c3b79a671cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:39:09+02:00 textops: fixed condition on header parsing error for find_hdr_line_start() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e9cdbdfa302940606295c3b79a671cf… Patch: https://github.com/kamailio/kamailio/commit/e9cdbdfa302940606295c3b79a671cf… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 75a00f16a8..b2ad856cfc 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1612,8 +1612,8 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, start = *buf; len = *buf_len; parse_hname2_str(&sname, &h1); - if(h1.type!=HDR_ERROR_T) { - LM_ERR("not a header name: %.*s\n", hname_len, hname); + if(h1.type==HDR_ERROR_T) { + LM_ERR("failed to parse header name: '%.*s'\n", hname_len, hname); return 0; }

1 0

[kamailio/kamailio] nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted (#2737)
by Dmitry Wagin 15 Jun '21

15 Jun '21

#### 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 - [x] Related to issue #2459 #### Description There's a small regression after #2497. If SDP didn't have an "a=rtcp" header (RFC1889 behavior), Kamailio had thrown an Error `can't extract 'a=rtcp' IP from the SDP` on every INVITE. After the PR Kamailio does not flood into log. Please take into account IPv6 address parser after the commit. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2737 -- Commit Summary -- * nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted -- File Changes -- M src/modules/nathelper/nathelper.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2737.patch https://github.com/kamailio/kamailio/pull/2737.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/2737

6 10

git:5.5:8bc4b122: nathelper: don't fail if 'a=rtcp' has no IP
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 8bc4b12270e932febcc77fab65546f534001cc30 URL: https://github.com/kamailio/kamailio/commit/8bc4b12270e932febcc77fab65546f5… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:00:00+02:00 nathelper: don't fail if 'a=rtcp' has no IP Examples from RFC3605: > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP4 126.16.64.4 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP6 2001:2345:6789:ABCD:EF01:2345:6789:ABCD fix #2768 (cherry picked from commit 71441c08970c307e2ce17b2dd292630ea615079c) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc4b12270e932febcc77fab65546f5… Patch: https://github.com/kamailio/kamailio/commit/8bc4b12270e932febcc77fab65546f5… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index baae1dbb6b..9512834d0e 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1655,7 +1655,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced) { + if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

git:5.5:ccd29983: nathelper: check length on new condition inside replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: ccd29983f538d13de3f5d07584d45020ca75f174 URL: https://github.com/kamailio/kamailio/commit/ccd29983f538d13de3f5d07584d4502… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:00:09+02:00 nathelper: check length on new condition inside replace_sdp_ip() (cherry picked from commit 521485c8f25f55cb3045ab2b33232c7026d8527d) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ccd29983f538d13de3f5d07584d4502… Patch: https://github.com/kamailio/kamailio/commit/ccd29983f538d13de3f5d07584d4502… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9512834d0e..1392a0af2a 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1655,7 +1655,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { + if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

git:5.5:e9484db6: rtpproxy: removed unused replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: e9484db689378fce6f52d8e796b22553c2a29eae URL: https://github.com/kamailio/kamailio/commit/e9484db689378fce6f52d8e796b2255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T10:00:19+02:00 rtpproxy: removed unused replace_sdp_ip() (cherry picked from commit b92f1ab7c711f7b61abadb706f9a4cfbb2cf0dd4) --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/e9484db689378fce6f52d8e796b2255… Patch: https://github.com/kamailio/kamailio/commit/e9484db689378fce6f52d8e796b2255… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 23c8357e4b..733ea3cec8 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -939,54 +939,6 @@ isnulladdr(str *sx, int pf) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) - static inline int -replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) -{ - str body1, oldip, newip; - str body = *org_body; - unsigned hasreplaced = 0; - int pf, pf1 = 0; - str body2; - char *bodylimit = body.s + body.len; - - /* Iterate all lines and replace ips in them. */ - if (!ip) { - newip.s = ip_addr2a(&msg->rcv.src_ip); - newip.len = strlen(newip.s); - } else { - newip = *ip; - } - body1 = body; - for(;;) { - if (rp_extract_mediaip(&body1, &oldip, &pf,line) == -1) - break; - if (pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n",line); - return -1; - } - if (!pf1) - pf1 = pf; - else if (pf != pf1) { - LM_ERR("mismatching address families in '%s' SDP\n",line); - return -1; - } - body2.s = oldip.s + oldip.len; - body2.len = bodylimit - body2.s; - if (alter_mediaip(msg, &body1, &oldip, pf, &newip, pf,1) == -1) { - LM_ERR("can't alter '%s' IP\n",line); - return -1; - } - hasreplaced = 1; - body1 = body2; - } - if (!hasreplaced) { - LM_ERR("can't extract '%s' IP from the SDP\n",line); - return -1; - } - - return 0; -} - static int rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) {

1 0

git:master:b92f1ab7: rtpproxy: removed unused replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: b92f1ab7c711f7b61abadb706f9a4cfbb2cf0dd4 URL: https://github.com/kamailio/kamailio/commit/b92f1ab7c711f7b61abadb706f9a4cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:58:31+02:00 rtpproxy: removed unused replace_sdp_ip() --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/b92f1ab7c711f7b61abadb706f9a4cf… Patch: https://github.com/kamailio/kamailio/commit/b92f1ab7c711f7b61abadb706f9a4cf… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 23c8357e4b..733ea3cec8 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -939,54 +939,6 @@ isnulladdr(str *sx, int pf) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) - static inline int -replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) -{ - str body1, oldip, newip; - str body = *org_body; - unsigned hasreplaced = 0; - int pf, pf1 = 0; - str body2; - char *bodylimit = body.s + body.len; - - /* Iterate all lines and replace ips in them. */ - if (!ip) { - newip.s = ip_addr2a(&msg->rcv.src_ip); - newip.len = strlen(newip.s); - } else { - newip = *ip; - } - body1 = body; - for(;;) { - if (rp_extract_mediaip(&body1, &oldip, &pf,line) == -1) - break; - if (pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n",line); - return -1; - } - if (!pf1) - pf1 = pf; - else if (pf != pf1) { - LM_ERR("mismatching address families in '%s' SDP\n",line); - return -1; - } - body2.s = oldip.s + oldip.len; - body2.len = bodylimit - body2.s; - if (alter_mediaip(msg, &body1, &oldip, pf, &newip, pf,1) == -1) { - LM_ERR("can't alter '%s' IP\n",line); - return -1; - } - hasreplaced = 1; - body1 = body2; - } - if (!hasreplaced) { - LM_ERR("can't extract '%s' IP from the SDP\n",line); - return -1; - } - - return 0; -} - static int rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) {

1 0

git:master:521485c8: nathelper: check length on new condition inside replace_sdp_ip()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 521485c8f25f55cb3045ab2b33232c7026d8527d URL: https://github.com/kamailio/kamailio/commit/521485c8f25f55cb3045ab2b33232c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:54:32+02:00 nathelper: check length on new condition inside replace_sdp_ip() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/521485c8f25f55cb3045ab2b33232c7… Patch: https://github.com/kamailio/kamailio/commit/521485c8f25f55cb3045ab2b33232c7… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 5fb83cea46..df9a5bce2c 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1696,7 +1696,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { + if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

[kamailio/kamailio] nathelper: 'a=rtcp' without IP generates an ERROR (#2768)
by Victor Seva 15 Jun '21

15 Jun '21

### Description As described at [RFC3605](https://datatracker.ietf.org/doc/html/rfc3605#section-2.1) ``` rtcp-attribute = "a=rtcp:" port [nettype space addrtype space connection-address] CRLF ``` So IP info is optional. ### Troubleshooting #### Log Messages ``` Jun 7 09:55:57 sp2 lb[46796]: ERROR: DEFAULT_ROUTE nathelper [nathelper.c:1796]: nh_extract_mediaip(): no `IP[4|6]' in `a=rtcp' field Jun 7 09:55:57 sp2 lb[46796]: ERROR: DEFAULT_ROUTE nathelper [nathelper.c:1617]: replace_sdp_ip(): can't extract 'a=rtcp' IP from the SDP ``` #### SIP Traffic ``` INVITE sip:jsung2@192.168.88.194;line=8c86b7427b1107f SIP/2.0 Via: SIP/2.0/UDP 192.168.88.194;branch=z9hG4bK4f82.52fb005dac4fe078dd5593a1bebfa33b.0 From: <sip:4316607564835@xxxx>;tag=40FED3EF-60BDED10000D2F23-71F92700 To: <sip:jsung2@xxxx> CSeq: 939 INVITE Call-ID: CDqyvKE3ryYIRkecp_7cXA.. Max-Forwards: 69 Allow: INVITE, ACK, CANCEL, BYE, NOTIFY, MESSAGE, OPTIONS, SUBSCRIBE P-Asserted-Identity: <sip:4316607564835@sip.lab.com> Diversion: <sip:4316607564835@xxxx>;privacy=off;counter=1 Supported: timer Session-Expires: 1800 Min-SE: 90 Content-Type: application/sdp Content-Length: 316 Contact: <sip:btpsh-60baedf4-645b-3@192.168.88.194> v=0 o=Z 1623059728682 1 IN IP4 192.168.88.194 s=Z c=IN IP4 192.168.88.194 t=0 0 m=audio 20252 RTP/AVP 8 0 9 98 101 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:9 G722/8000 a=rtpmap:98 telephone-event/48000 a=fmtp:98 0-16 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=sendrecv a=rtcp:20253 ``` ### Possible Solutions fix for nathelper will follow ### Additional Information ``` version: kamailio 5.5.0 (x86_64/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/2768

2 1

[kamailio/kamailio] nathelper: don't fail if 'a=rtcp' has no IP (#2769)
by Victor Seva 15 Jun '21

15 Jun '21

Examples from RFC3605: > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP4 126.16.64.4 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP6 2001:2345:6789:ABCD:EF01:2345:6789:ABCD fix #2768 #### 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 - [x] Related to issue #2768 (replace XXXX with an open issue number) #### Description  don't fail if there's no IP info if line is 'a=rtcp' You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2769 -- Commit Summary -- * nathelper: don't fail if 'a=rtcp' has no IP -- File Changes -- M src/modules/nathelper/nathelper.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2769.patch https://github.com/kamailio/kamailio/pull/2769.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/2769

3 7

git:master:71441c08: nathelper: don't fail if 'a=rtcp' has no IP
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 71441c08970c307e2ce17b2dd292630ea615079c URL: https://github.com/kamailio/kamailio/commit/71441c08970c307e2ce17b2dd292630… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:51:07+02:00 nathelper: don't fail if 'a=rtcp' has no IP Examples from RFC3605: > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP4 126.16.64.4 > > m=audio 49170 RTP/AVP 0 > a=rtcp:53020 IN IP6 2001:2345:6789:ABCD:EF01:2345:6789:ABCD fix #2768 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/71441c08970c307e2ce17b2dd292630… Patch: https://github.com/kamailio/kamailio/commit/71441c08970c307e2ce17b2dd292630… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index c3036d35bd..5fb83cea46 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1696,7 +1696,7 @@ static inline int replace_sdp_ip( hasreplaced = 1; body1 = body2; } - if(!hasreplaced) { + if(!hasreplaced && memcmp("a=rtcp", line, 6) != 0) { LM_ERR("can't extract '%s' IP from the SDP\n", line); return -1; }

1 0

git:5.5:3e0f634c: secsipid: explicit STIR/SHAKEN reference
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 3e0f634c1dd11702a97cc2fe2c3f70f1f933a4f3 URL: https://github.com/kamailio/kamailio/commit/3e0f634c1dd11702a97cc2fe2c3f70f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:28:41+02:00 secsipid: explicit STIR/SHAKEN reference - help matching on search terms (cherry picked from commit a59ea8920c17aca29ffa734ca0babb107a415fde) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3e0f634c1dd11702a97cc2fe2c3f70f… Patch: https://github.com/kamailio/kamailio/commit/3e0f634c1dd11702a97cc2fe2c3f70f… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 0d7147c35f..527db1aecf 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -19,7 +19,7 @@ The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) - IETF extensions for SIP (RFC8224, RFC8588). + IETF extensions for SIP (RFC8224, RFC8588), known together as STIR/SHAKEN. </para> <para> It exports the functions to check and generate SIP Identity header.

1 0

git:5.5:62320e6e: modules/mohqueue: force RTP to follow SDP
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 62320e6eaafb9870bb5911f5c3c9b7854baa739d URL: https://github.com/kamailio/kamailio/commit/62320e6eaafb9870bb5911f5c3c9b78… Author: Robert Boisvert <rdboisvert(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:29:22+02:00 modules/mohqueue: force RTP to follow SDP - version 1.8 - use rtpproxy r flag to force RTP to follow SDP - fixed compiler warnings (cherry picked from commit 0e51ce1075f206a4441333f72c69fcc56f8d6855) --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/62320e6eaafb9870bb5911f5c3c9b78… Patch: https://github.com/kamailio/kamailio/commit/62320e6eaafb9870bb5911f5c3c9b78… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 1f72c58c5a..c46cb51a75 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -32,7 +32,7 @@ #define ALLOWHDR "Allow: INVITE, ACK, BYE, CANCEL, NOTIFY, PRACK" #define CLENHDR "Content-Length" #define SIPEOL "\r\n" -#define USRAGNT "Kamailio MOH Queue v1.7" +#define USRAGNT "Kamailio MOH Queue v1.8" /********** * local constants @@ -1075,10 +1075,11 @@ if (pmsg->allow) * send RTP offer **********/ +fparam_t rflag = {.orig="", .type=FPARAM_STRING, {.asciiz="r"}, .fixed=0}; mohq_debug (pcall->pmohq, "%sMaking offer for RTP link for call (%s) from queue (%s)", pfncname, pcall->call_from, pcall->pmohq->mohq_name); -if (pmod_data->fn_rtp_offer (pmsg, 0, 0) != 1) +if (pmod_data->fn_rtp_offer (pmsg, (char *) &rflag, 0) != 1) { if (pmod_data->psl->freply (pmsg, 486, presp_busy) < 0) { @@ -2160,9 +2161,8 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = { - {"", FPARAM_STRING, {pflagbuf}, 0} -}; +fparam_t zflag = {.orig="", .type=FPARAM_STRING, {.asciiz=pflagbuf}, .fixed=0}; +fparam_t *pzflag = &zflag; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

1 0

git:5.5:4399fe52: rtpengine: ignore mos 0 when selecting min-mos (#2771)
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: 5.5 Commit: 4399fe52432f4a7c36ee161382bc4a0da3508c9b URL: https://github.com/kamailio/kamailio/commit/4399fe52432f4a7c36ee161382bc4a0… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:28:07+02:00 rtpengine: ignore mos 0 when selecting min-mos (#2771) and computing average mos (cherry picked from commit a378f97adac89077de2fb162ec20295f6e4352fe) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/4399fe52432f4a7c36ee161382bc4a0… Patch: https://github.com/kamailio/kamailio/commit/4399fe52432f4a7c36ee161382bc4a0… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6f91c222b2..6266520578 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3588,13 +3588,15 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, bencode_item continue; if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "average MOS")) { - average_vals.avg_samples++; - average_vals.mos += vals_decoded.mos; - average_vals.packetloss += vals_decoded.packetloss; - average_vals.jitter += vals_decoded.jitter; - average_vals.roundtrip += vals_decoded.roundtrip; - average_vals.roundtrip_leg += vals_decoded.roundtrip_leg; - average_vals.samples += vals_decoded.samples; + if (vals_decoded.mos > 0) { + average_vals.avg_samples++; + average_vals.mos += vals_decoded.mos; + average_vals.packetloss += vals_decoded.packetloss; + average_vals.jitter += vals_decoded.jitter; + average_vals.roundtrip += vals_decoded.roundtrip; + average_vals.roundtrip_leg += vals_decoded.roundtrip_leg; + average_vals.samples += vals_decoded.samples; + } } if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "highest MOS")) { @@ -3602,7 +3604,7 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, bencode_item max_vals = vals_decoded; } if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "lowest MOS")) { - if (vals_decoded.mos < min_vals.mos) + if (vals_decoded.mos > 0 && vals_decoded.mos < min_vals.mos) min_vals = vals_decoded; } }

1 0

git:master:2f933b39: core: kemi - added to_TCP/TLS/SCTP/WS/WSS/WSX()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 2f933b39410029a8dfd7ce7180a6c470e51b2452 URL: https://github.com/kamailio/kamailio/commit/2f933b39410029a8dfd7ce7180a6c47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:17:50+02:00 core: kemi - added to_TCP/TLS/SCTP/WS/WSS/WSX() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/2f933b39410029a8dfd7ce7180a6c47… Patch: https://github.com/kamailio/kamailio/commit/2f933b39410029a8dfd7ce7180a6c47… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 76bfdbcc29..63be6bb0fc 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1586,6 +1586,72 @@ static int sr_kemi_core_to_proto_udp(sip_msg_t *msg) return (proto == PROTO_UDP)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_to_proto_tcp(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_TCP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_tls(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_TLS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_sctp(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_SCTP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_ws(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_wss(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_WSS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_wsx(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + if (proto == PROTO_WSS) { return SR_KEMI_TRUE; } + return (proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} /** * @@ -1976,8 +2042,33 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("to_UDP"), - SR_KEMIP_BOOL, sr_kemi_core_to_proto_udp, + { str_init(""), str_init("to_TCP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_tcp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_TLS"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_tls, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_SCTP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_sctp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_WS"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_ws, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_WSS"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_wss, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_WSX"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_wsx, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:5fd35624: core: main - catch common mistakes for the arguments
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 5fd35624660cb46cd7894bfd43c7cb6259e451b3 URL: https://github.com/kamailio/kamailio/commit/5fd35624660cb46cd7894bfd43c7cb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:17:50+02:00 core: main - catch common mistakes for the arguments - print error and exit on 'kamailio start|stop|restart' --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5fd35624660cb46cd7894bfd43c7cb6… Patch: https://github.com/kamailio/kamailio/commit/5fd35624660cb46cd7894bfd43c7cb6… --- diff --git a/src/main.c b/src/main.c index a391f57afb..950bcd895a 100644 --- a/src/main.c +++ b/src/main.c @@ -2024,6 +2024,25 @@ int main(int argc, char** argv) {0, 0, 0, 0 } }; + if (argc > 1) { + /* checks for common wrong arguments */ + if(strcasecmp(argv[1], "start")==0) { + fprintf(stderr, "error: 'start' is not a supported argument\n"); + fprintf(stderr, "error: stopping " NAME " ...\n\n"); + exit(-1); + } + if(strcasecmp(argv[1], "stop")==0) { + fprintf(stderr, "error: 'stop' is not a supported argument\n"); + fprintf(stderr, "error: stopping " NAME " ...\n\n"); + exit(-1); + } + if(strcasecmp(argv[1], "restart")==0) { + fprintf(stderr, "error: 'restart' is not a supported argument\n"); + fprintf(stderr, "error: stopping " NAME " ...\n\n"); + exit(-1); + } + } + /*init*/ time(&up_since); creator_pid = getpid();

1 0

Releasing Kamailio v5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Hello, I am considering to release Kamailio v5.5.1 sometime next week, likely on Tuesday or Wednesday (June 15 or 16, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 1

git:master:03c2ea28: pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist
by Sergey Safarov 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 03c2ea28767106333ee04c5e19ee490c010dfb58 URL: https://github.com/kamailio/kamailio/commit/03c2ea28767106333ee04c5e19ee490… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-14T20:57:12+03:00 pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/03c2ea28767106333ee04c5e19ee490… Patch: https://github.com/kamailio/kamailio/commit/03c2ea28767106333ee04c5e19ee490… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 43ec4feb1a..8e9483bada 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -46,6 +47,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_with lwsc %bcond_without kazoo %bcond_without memcached %bcond_with mongodb @@ -79,6 +81,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -122,6 +125,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -148,6 +152,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_with kazoo %bcond_without memcached %bcond_with mongodb @@ -611,6 +616,7 @@ Lua extensions for Kamailio. %endif +%if %{with lwsc} %package lwsc Summary: Websocket client implementation to interact with external systems, similar to http client Group: %{PKGGROUP} @@ -619,6 +625,7 @@ BuildRequires: libwebsockets-devel %description lwsc Websocket client implementation to interact with external systems, similar to http client. +%endif %if %{with memcached} @@ -1138,7 +1145,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1231,7 +1240,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1894,10 +1905,12 @@ fi %endif +%if %{with lwsc} %files lwsc %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lwsc %{_libdir}/kamailio/modules/lwsc.so +%endif %if %{with memcached} %files memcached

1 0

git:master:e7a14f37: pkg/kamailio/obs: simlifid module definition for RHEL dist
by Sergey Safarov 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: e7a14f37c98e2bbfcf234165dc5dfd4121db5b5b URL: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-14T20:57:07+03:00 pkg/kamailio/obs: simlifid module definition for RHEL dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… Patch: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 74912950eb..43ec4feb1a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -28,9 +28,15 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 6 +%if 0%{?rhel} == 6 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_with cnxcc %bcond_without dnssec %bcond_without evapi @@ -54,10 +60,16 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 7 +%if 0%{?rhel} == 7 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el7.centos +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -81,23 +93,26 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 -%define rhel_rebuild 8 -% if 0%{?centos_ver} +%if 0%{?rhel} == 8 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos %endif -% if 0%{?almalinux_ver} +%if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} %define dist .el8.almalinux %endif -% if 0%{?rocky_ver} +%if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} %define dist .el8.rocky %endif +%if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -147,84 +162,6 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 6 && 0%{?centos_ver} != 6 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_with cnxcc -%bcond_without dnssec -%bcond_without evapi -%bcond_with geoip -%bcond_with http_async_client -%bcond_with ims -%bcond_with jansson -%bcond_with json -%bcond_with lua -%bcond_with kazoo -%bcond_with memcached -%bcond_with mongodb -%bcond_with perl -%bcond_with phonenum -%bcond_with python3 -%bcond_with rabbitmq -%bcond_with redis -%bcond_with ruby -%bcond_with sctp -%bcond_with websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - # Defining missing macros on RHEL/CentOS 6 %if 0%{?rhel} == 6 %define _rundir %{_localstatedir}/run

1 0

git:master:5c2890d9: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 5c2890d90297ef66b0216c46dd1fe12dae5ecd0e URL: https://github.com/kamailio/kamailio/commit/5c2890d90297ef66b0216c46dd1fe12… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-14T17:01:19+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/5c2890d90297ef66b0216c46dd1fe12… Patch: https://github.com/kamailio/kamailio/commit/5c2890d90297ef66b0216c46dd1fe12… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index f4a43fca91..004d376fb4 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -91,7 +91,7 @@ Chapter 1. Admin Guide The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) IETF extensions for SIP (RFC8224, - RFC8588). + RFC8588), known together as STIR/SHAKEN. It exports the functions to check and generate SIP Identity header.

1 0

git:master:a59ea892: secsipid: explicit STIR/SHAKEN reference
by Daniel-Constantin Mierla 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: a59ea8920c17aca29ffa734ca0babb107a415fde URL: https://github.com/kamailio/kamailio/commit/a59ea8920c17aca29ffa734ca0babb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-14T16:56:21+02:00 secsipid: explicit STIR/SHAKEN reference - help matching on search terms --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a59ea8920c17aca29ffa734ca0babb1… Patch: https://github.com/kamailio/kamailio/commit/a59ea8920c17aca29ffa734ca0babb1… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 0d7147c35f..527db1aecf 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -19,7 +19,7 @@ The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) - IETF extensions for SIP (RFC8224, RFC8588). + IETF extensions for SIP (RFC8224, RFC8588), known together as STIR/SHAKEN. </para> <para> It exports the functions to check and generate SIP Identity header.

1 0

[kamailio/kamailio] invalid json doc in command "kamctl ping" (#2781)
by Christoph Valentin 14 Jun '21

14 Jun '21

### Description Hello Daniel, https://lists.kamailio.org/pipermail/sr-users/2021-January/111628.html > On Mon, Jan 18, 2021 at 4:19 PM Julia Bo <juliabo at gmail.com> wrote: > > It's my mistake, I checked a different branch. Sorry. > Now I get the same result as yours. > But in jason we get the result of command execution only and no sip reply > result (that was in 4.4 : 200,408 etc..) > I see sent OPTIONS and received reply in debug, > Thank you, > Julia I have the same problem: I get no sip reply result. [root@vict2-ims3 scherney]# kamctl ping sip:node1.pcscf-1.vict-ims.net { "jsonrpc": "2.0", "result": { }, "id": 12213 } Hello, I implemented an alternative rpc command that blocks waiting for the response. Try again with latest master and let's see if works. It waits for max 80secs for the sip reply to come back (or the transaction to time out), checking every 0.1sec. Later I can make these values modparams, for now just to validate it works. Cheers, Daniel Can you please tell me, which commit it was, that I can test it at another version. Thanks! BR Theo  ### Troubleshooting #### Reproduction [root@vict2-ims3 scherney]# kamctl ping sip:node1.pcscf-1.vict-ims.net { "jsonrpc": "2.0", "result": { }, "id": 12213 }  #### Debugging Data  ```none``` #### Log Messages  ```none``` #### SIP Traffic  ```[pr0071_030.zip](https://github.com/kamailio/kamailio/files/6648588/pr0071_030.zip)``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ```version: kamailio 5.1.6 (x86_64/linux) 42b01a flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, 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: 42b01a compiled on 10:29:16 May 12 2021``` * **Operating System**:  ```Linux vict-ims3 3.10.0-327.10.1.el7.x86_64 #1 SMP Sat Jan 23 04:54:55 EST 2016 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/2781

2 3

git:master:13e876e4: core: kemi - added KSR.to_UDP() - return true if target is over UDP
by Daniel-Constantin Mierla 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 13e876e45ad34a9d567d41293450307816bdf107 URL: https://github.com/kamailio/kamailio/commit/13e876e45ad34a9d567d41293450307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-14T13:22:35+02:00 core: kemi - added KSR.to_UDP() - return true if target is over UDP - uses the R-URI/D-URI for requests (no DNS query done if transport is missing) and 2nd Via for replies --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/13e876e45ad34a9d567d41293450307… Patch: https://github.com/kamailio/kamailio/commit/13e876e45ad34a9d567d41293450307… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 065eba9c2c..76bfdbcc29 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1536,6 +1536,57 @@ static int sr_kemi_core_route(sip_msg_t *msg, str *route) return ret; } +/** + * + */ +static int sr_kemi_core_to_proto_helper(sip_msg_t *msg) +{ + sip_uri_t parsed_uri; + str uri; + + if(msg==NULL) { + return -1; + } + if(msg->first_line.type == SIP_REPLY) { + /* REPLY doesnt have r/d-uri - use second Via */ + if(parse_headers( msg, HDR_VIA2_F, 0)==-1) { + LM_DBG("no 2nd via parsed\n"); + return -1; + } + if((msg->via2==0) || (msg->via2->error!=PARSE_OK)) { + return -1; + } + return (int)msg->via2->proto; + } + if (msg->dst_uri.s != NULL && msg->dst_uri.len>0) { + uri = msg->dst_uri; + } else { + if (msg->new_uri.s!=NULL && msg->new_uri.len>0) + { + uri = msg->new_uri; + } else { + uri = msg->first_line.u.request.uri; + } + } + if(parse_uri(uri.s, uri.len, &parsed_uri)!=0) { + LM_ERR("failed to parse nh uri [%.*s]\n", uri.len, uri.s); + return -1; + } + return (int)parsed_uri.proto; +} + +/** + * + */ +static int sr_kemi_core_to_proto_udp(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_UDP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + + /** * */ @@ -1925,6 +1976,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("to_UDP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_udp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_src_port"), SR_KEMIP_BOOL, sr_kemi_core_is_src_port, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:856a8ff5: core: parse_via - padding field when USE_COMP is defined
by Daniel-Constantin Mierla 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 856a8ff51f329ba1fd7c2ab120349ee330aee0d2 URL: https://github.com/kamailio/kamailio/commit/856a8ff51f329ba1fd7c2ab120349ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-14T13:20:25+02:00 core: parse_via - padding field when USE_COMP is defined - align to 32bit to avoid sigbus on accessing fields by address on strict systems --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/856a8ff51f329ba1fd7c2ab120349ee… Patch: https://github.com/kamailio/kamailio/commit/856a8ff51f329ba1fd7c2ab120349ee… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index b4e99a09df..ec2b71247f 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -72,6 +72,7 @@ typedef struct via_body { unsigned short port; #ifdef USE_COMP short comp_no; + short comp_no_pad; /* padding to align to 32bit */ #endif str port_str; str params;

1 0

git:master:b49fa7b0: pv: $nh(i) returns ip address family version
by Daniel-Constantin Mierla 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: b49fa7b0b47f11264ec33ce9f94290713037fd5d URL: https://github.com/kamailio/kamailio/commit/b49fa7b0b47f11264ec33ce9f942907… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-14T10:44:58+02:00 pv: $nh(i) returns ip address family version - 4 for ipv4; 6 for ipv6; and 0 if next hop address is not an ip address --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/b49fa7b0b47f11264ec33ce9f942907… Patch: https://github.com/kamailio/kamailio/commit/b49fa7b0b47f11264ec33ce9f942907… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 594a88f1f5..475b1cdc3e 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -23,6 +23,7 @@ #include "../../core/dset.h" #include "../../core/onsend.h" #include "../../core/socket_info.h" +#include "../../core/resolve.h" #include "pv_core.h" #include "pv_branch.h" @@ -735,6 +736,14 @@ int pv_get_nh_reply(struct sip_msg *msg, pv_param_t *param, } return pv_get_strintval(msg, param, res, &sproto, (int)msg->via2->proto); + case 5: /* ip family */ + if(str2ip(&host)!=NULL) { + return pv_get_uintval(msg, param, res, 4); + } + if(str2ip6(&host)!=NULL) { + return pv_get_uintval(msg, param, res, 6); + } + return pv_get_uintval(msg, param, res, 0); } LM_ERR("unknown specifier\n"); @@ -797,6 +806,17 @@ int pv_get_nh(struct sip_msg *msg, pv_param_t *param, return pv_get_udp(msg, param, res); return pv_get_strintval(msg, param, res, &parsed_uri.transport_val, (int)parsed_uri.proto); + } else if(param->pvn.u.isname.name.n==5) /* ip family */ { + if(parsed_uri.host.s==NULL || parsed_uri.host.len<=0) { + return pv_get_uintval(msg, param, res, 0); + } + if(str2ip(&parsed_uri.host)!=NULL) { + return pv_get_uintval(msg, param, res, 4); + } + if(str2ip6(&parsed_uri.host)!=NULL) { + return pv_get_uintval(msg, param, res, 6); + } + return pv_get_uintval(msg, param, res, 0); } LM_ERR("unknown specifier\n"); return pv_get_null(msg, param, res); @@ -820,6 +840,8 @@ int pv_parse_nh_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 3; else if(strncmp(in->s, "P", 1)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "i", 1)==0) + sp->pvp.pvn.u.isname.name.n = 5; else goto error; break; default:

1 0

[kamailio/kamailio] pkg: add support for AlmaLinux and Rocky Linux (#2778)
by space88man 11 Jun '21

11 Jun '21

#### 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 For packaging, add support for the RHEL rebuilders: almalinux and rocky. Reusing the files in pkg/kamailio/centos for both almalinux and rocky — this can probably be duplicated when CentOS goes away. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2778 -- Commit Summary -- * pkg: add support for AlmaLinux and Rocky Linux -- File Changes -- M pkg/kamailio/obs/kamailio.spec (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2778.patch https://github.com/kamailio/kamailio/pull/2778.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/2778

3 3

git:master:b3d3cb36: pkg: add support for AlmaLinux and Rocky Linux
by sergey-safarov 11 Jun '21

11 Jun '21

Module: kamailio Branch: master Commit: b3d3cb366b67941ecebd297038522580114e3a0b URL: https://github.com/kamailio/kamailio/commit/b3d3cb366b67941ecebd29703852258… Author: SPChan <shihping.chan(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2021-06-11T14:41:12+03:00 pkg: add support for AlmaLinux and Rocky Linux --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b3d3cb366b67941ecebd29703852258… Patch: https://github.com/kamailio/kamailio/commit/b3d3cb366b67941ecebd29703852258… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 4f5a833a57..74912950eb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -81,10 +81,23 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 +%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 +%define rhel_rebuild 8 +% if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos +%endif +% if 0%{?almalinux_ver} +%define dist_name centos +%define dist_version %{?almalinux} +%define dist .el8.almalinux +%endif +% if 0%{?rocky_ver} +%define dist_name centos +%define dist_version %{?rocky} +%define dist .el8.rocky +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -186,7 +199,7 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 8 && 0%{?centos_ver} != 8 +%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 %define dist_name rhel %define dist_version %{?rhel} %bcond_without cnxcc

1 0

git:master:0198aa46: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 11 Jun '21

11 Jun '21

Module: kamailio Branch: master Commit: 0198aa4638e2a54e7bea91fcf87248e6e7b51113 URL: https://github.com/kamailio/kamailio/commit/0198aa4638e2a54e7bea91fcf87248e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-11T11:16:29+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/0198aa4638e2a54e7bea91fcf87248e… Patch: https://github.com/kamailio/kamailio/commit/0198aa4638e2a54e7bea91fcf87248e…

1 0

git:master:bc663d38: tls: remove obseleted connection related parameter docs (from before kamailio 3.0)
by Henning Westerholt 11 Jun '21

11 Jun '21

Module: kamailio Branch: master Commit: bc663d383c53abd36a282caf16569bf54a435312 URL: https://github.com/kamailio/kamailio/commit/bc663d383c53abd36a282caf16569bf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-11T09:14:50Z tls: remove obseleted connection related parameter docs (from before kamailio 3.0) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/bc663d383c53abd36a282caf16569bf… Patch: https://github.com/kamailio/kamailio/commit/bc663d383c53abd36a282caf16569bf… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 80dbe2f3cc..7c1203eac3 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -416,26 +416,6 @@ modparam("tls", "server_name", "kamailio.org") </example> </section> - <section id="tls.p.send_timeout"> - <title><varname>send_timeout</varname> (int)</title> - <para> - This parameter is <emphasis>obsolete</emphasis> and cannot be used - in newer TLS versions (> &kamailio; 3.0). In these versions the - send_timeout is replaced by <varname>tcp_send_timeout</varname> - (common with all the tcp connections). - </para> - </section> - - <section id="tls.p.handshake_timeout"> - <title><varname>handshake_timeout</varname> (int)</title> - <para> - This parameter is <emphasis>obsolete</emphasis> and cannot be used - in newer TLS versions (> &kamailio; 3.0). In these versions the - handshake_timeout is replaced by <varname>tcp_connect_timeout</varname> - (common with all the tcp connections). - </para> - </section> - <section id="tls.p.connection_timeout"> <title><varname>connection_timeout</varname> (int)</title> <para>

1 0

[kamailio/kamailio] kamailio 5.4.5 crash after dialog [dlg_hash.c:1182]: next_state_dlg(): bogus event 2 in state 5 for dlg (#2757)
by themsley-voiceflex 11 Jun '21

11 Jun '21

### Description kamailio 5.4.5 crashes with a segfault shortly after producing messages in the log like Jun 1 10:12:14 thissystem /usr/sbin/kamailio[20001]: CRITICAL: {2 1 INVITE 6787142-3831531134-1330894187(a)some.telco.domain} dialog [dlg_hash.c:1182]: next_state_dlg(): bogus event 2 in state 5 for dlg 0x7fae153d3cf0 [3973:6059] with clid '82608924-3831089984-1833452161(a)some.telco.domain' and tags '3831089984-684203260' '' Every time it crashes there is a corresponding "bogus event 2 in state 5" in the log and every time it issues that message it crashes. ### Troubleshooting Installed matching kamailio-debuginfo rpm and obtained a core dump. #### Reproduction Cannot reproduce on demand but happens frequently enough so it's just a matter of time. #### Debugging Data (gdb) bt full #0 0x00007f9c3a5da34b in update_dialog_dbinfo_unsafe (cell=0x7f9c30413998) at dlg_db_handler.c:879 i = 17 var = 0x0 jdoc = {root = 0x0, flags = 0, buf = {s = 0x0, len = 0}, malloc_fn = 0x41b550 <malloc@plt>, free_fn = 0x41aeb0 <free@plt>} values = {{type = DB1_INT, nul = 0, free = 0, val = {int_val = 579, ll_val = 579, double_val = 2.8606400894208175e-321, time_val = 579, string_val = 0x243 <Address 0x243 out of bounds>, str_val = {s = 0x243 <Address 0x243 out of bounds>, len = 7194536}, blob_val = { s = 0x243 <Address 0x243 out of bounds>, len = 7194536}, bitmap_val = 579, uint_val = 579, ull_val = 579}}, {type = DB1_INT, nul = 0, free = 1194072, val = {int_val = 8082, ll_val = 8082, double_val = 3.9930385496889546e-320, time_val = 8082, string_val = 0x1f92 <Address 0x1f92 out of bounds>, str_val = {s = 0x1f92 <Address 0x1f92 out of bounds>, len = 8}, blob_val = { s = 0x1f92 <Address 0x1f92 out of bounds>, len = 8}, bitmap_val = 8082, uint_val = 8082, ull_val = 8082}}, {type = DB1_STR, nul = 0, free = 8504131, val = {int_val = 809581320, ll_val = 140308801207048, double_val = 6.9321758485571243e-310, time_val = 140308801207048, string_val = 0x7f9c30413b08 "331873271-3831608037-62771434(a)sbc-uk-l-nws01a.uk.sdin.bt.net", str_val = { s = 0x7f9c30413b08 "331873271-3831608037-62771434(a)sbc-uk-l-nws01a.uk.sdin.bt.net", len = 60}, blob_val = { s = 0x7f9c30413b08 "331873271-3831608037-62771434(a)sbc-uk-l-nws01a.uk.sdin.bt.net", len = 60}, bitmap_val = 809581320, uint_val = 809581320, ull_val = 140308801207048}}, {type = DB1_STR, nul = 0, free = 1085088656, val = {int_val = 809581381, ll_val = 140308801207109, double_val = 6.9321758485601381e-310, time_val = 140308801207109, string_val = 0x7f9c30413b45 "sip:+442890793919@uk.sdin.bt.net;user=phone", str_val = { s = 0x7f9c30413b45 "sip:+442890793919@uk.sdin.bt.net;user=phone", len = 43}, blob_val = { s = 0x7f9c30413b45 "sip:+442890793919@uk.sdin.bt.net;user=phone", len = 43}, bitmap_val = 809581381, uint_val = 809581381, ull_val = 140308801207109}}, {type = DB1_STR, nul = 0, free = 7116492, val = {int_val = 826702352, ll_val = 140308818328080, double_val = 6.9321766944484975e-310, time_val = 140308818328080, string_val = 0x7f9c31467a10 "3831608037-1237727804\177", str_val = { s = 0x7f9c31467a10 "3831608037-1237727804\177", len = 21}, blob_val = {s = 0x7f9c31467a10 "3831608037-1237727804\177", len = 21}, bitmap_val = 826702352, uint_val = 826702352, ull_val = 140308818328080}}, {type = DB1_STR, nul = 0, free = 8504131, val = { int_val = 809581425, ll_val = 140308801207153, double_val = 6.932175848562312e-310, time_val = 140308801207153, string_val = 0x7f9c30413b71 "sip:+442890792214@inh.voiceflex.com;user=phone", str_val = { s = 0x7f9c30413b71 "sip:+442890792214@inh.voiceflex.com;user=phone", len = 46}, blob_val = { s = 0x7f9c30413b71 "sip:+442890792214@inh.voiceflex.com;user=phone", len = 46}, bitmap_val = 809581425, uint_val = 809581425, ull_val = 140308801207153}}, {type = DB1_STR, nul = 0, free = 7477445, val = {int_val = 809768592, ll_val = 140308801394320, double_val = 6.9321758578095904e-310, time_val = 140308801394320, string_val = 0x7f9c30441690 "as7527953a@172.16.128.200:5090", str_val = {s = 0x7f9c30441690 "as7527953a@172.16.128.200:5090", len = 10}, blob_val = { s = 0x7f9c30441690 "as7527953a@172.16.128.200:5090", len = 10}, bitmap_val = 809768592, uint_val = 809768592, ull_val = 140308801394320}}, {type = DB1_STR, nul = 0, free = 803684352, val = {int_val = 1086075056, ll_val = 140309077700784, double_val = 6.9321895091627491e-310, time_val = 140309077700784, string_val = 0x7f9c40bc30b0 "@", str_val = {s = 0x7f9c40bc30b0 "@", len = 815282368}, blob_val = {s = 0x7f9c40bc30b0 "@", len = 815282368}, bitmap_val = 1086075056, uint_val = 1086075056, ull_val = 140309077700784}}, {type = DB1_STR, nul = 0, free = 979051415, val = {int_val = 979748736, ll_val = 140308971374464, double_val = 6.932184255944553e-310, time_val = 140308971374464, string_val = 0x7f9c3a65c780 <__FUNCTION__.14488> "populate_leg_info", str_val = {s = 0x7f9c3a65c780 <__FUNCTION__.14488> "populate_leg_info", len = 979733912}, blob_val = { s = 0x7f9c3a65c780 <__FUNCTION__.14488> "populate_leg_info", len = 979733912}, bitmap_val = 979748736, uint_val = 979748736, ull_val = 140308971374464}}, {type = DB1_INT, nul = 0, free = 1085054992, val = {int_val = 1622619239, ll_val = 5917586535, double_val = 2.9236762132362393e-314, time_val = 5917586535, string_val = 0x160b73467 <Address 0x160b73467 out of bounds>, str_val = { s = 0x160b73467 <Address 0x160b73467 out of bounds>, len = -1417213536}, blob_val = { s = 0x160b73467 <Address 0x160b73467 out of bounds>, len = -1417213536}, bitmap_val = 1622619239, uint_val = 1622619239, ull_val = 5917586535}}, {type = DB1_INT, nul = 0, free = -1417213568, val = {int_val = 3, ll_val = 140720308486147, double_val = 6.9525070095187664e-310, time_val = 140720308486147, string_val = 0x7ffc00000003 <Address 0x7ffc00000003 out of bounds>, str_val = {s = 0x7ffc00000003 <Address 0x7ffc00000003 out of bounds>, len = 809580952}, blob_val = { s = 0x7ffc00000003 <Address 0x7ffc00000003 out of bounds>, len = 809580952}, bitmap_val = 3, uint_val = 3, ull_val = 140720308486147}}, {type = DB1_INT, nul = 0, free = 1086231760, val = {int_val = 1538940139, ll_val = 27308743915, double_val = 1.3492312199477687e-313, time_val = 27308743915, string_val = 0x65bba5ceb <Address 0x65bba5ceb out of bounds>, str_val = { s = 0x65bba5ceb <Address 0x65bba5ceb out of bounds>, len = 979706976}, blob_val = { s = 0x65bba5ceb <Address 0x65bba5ceb out of bounds>, len = 979706976}, bitmap_val = 1538940139, uint_val = 1538940139, ull_val = 27308743915}}, {type = DB1_STR, nul = 0, free = 1086248480, val = {int_val = 1, ll_val = 1, double_val = 4.9406564584124654e-324, time_val = 1, string_val = 0x1 <Address 0x1 out of bounds>, str_val = { s = 0x1 <Address 0x1 out of bounds>, len = 807487484}, blob_val = {s = 0x1 <Address 0x1 out of bounds>, len = 807487484}, bitmap_val = 1, uint_val = 1, ull_val = 1}}, {type = DB1_STR, nul = 0, free = 1085054992, val = {int_val = 2400, ll_val = 2400, double_val = 1.1857575500189917e-320, time_val = 2400, string_val = 0x960 <Address 0x960 out of bounds>, str_val = { s = 0x960 <Address 0x960 out of bounds>, len = 1086248656}, blob_val = {s = 0x960 <Address 0x960 out of bounds>, len = 1086248656}, bitmap_val = 2400, uint_val = 2400, ull_val = 2400}}, {type = DB1_STR, nul = 0, free = 0, val = {int_val = 8207672, ll_val = 8207672, double_val = 4.0551287675331157e-317, time_val = 8207672, string_val = 0x7d3d38 "", str_val = {s = 0x7d3d38 "", len = 30}, blob_val = { s = 0x7d3d38 "", len = 30}, bitmap_val = 8207672, uint_val = 8207672, ull_val = 8207672}}, {type = DB1_STR, nul = 0, free = 8504131, val = {int_val = -1417213408, ll_val = 140723186240032, double_val = 6.9526491894519429e-310, time_val = 140723186240032, string_val = 0x7ffcab870a20 "\360\v\207\253\374\177", str_val = {s = 0x7ffcab870a20 "\360\v\207\253\374\177", len = 979234888}, blob_val = {s = 0x7ffcab870a20 "\360\v\207\253\374\177", len = 979234888}, bitmap_val = 2877753888, uint_val = 2877753888, ull_val = 140723186240032}}, {type = DB1_STR, nul = 0, free = 0, val = {int_val = -1417213424, ll_val = 140723186240016, double_val = 6.9526491894511524e-310, time_val = 140723186240016, string_val = 0x7ffcab870a10 " :<A\234\177", str_val = { s = 0x7ffcab870a10 " :<A\234\177", len = 979084403}, blob_val = {s = 0x7ffcab870a10 " :<A\234\177", len = 979084403}, bitmap_val = 2877753872, uint_val = 2877753872, ull_val = 140723186240016}}, {type = DB1_STR, nul = 32668, free = 813201384, val = { int_val = 1, ll_val = 1, double_val = 4.9406564584124654e-324, time_val = 1, string_val = 0x1 <Address 0x1 out of bounds>, str_val = { s = 0x1 <Address 0x1 out of bounds>, len = 807487484}, blob_val = {s = 0x1 <Address 0x1 out of bounds>, len = 807487484}, bitmap_val = 1, uint_val = 1, ull_val = 1}}, {type = DB1_INT, nul = 0, free = 807487484, val = {int_val = -1417213680, ll_val = 7172720912, double_val = 3.5437949898262949e-314, time_val = 7172720912, string_val = 0x1ab870910 <Address 0x1ab870910 out of bounds>, str_val = {s = 0x1ab870910 <Address 0x1ab870910 out of bounds>, len = 807487484}, blob_val = {s = 0x1ab870910 <Address 0x1ab870910 out of bounds>, len = 807487484}, bitmap_val = 2877753616, uint_val = 2877753616, ull_val = 7172720912}}, {type = DB1_STR, nul = 32764, free = 979026405, val = {int_val = -1417213664, ll_val = 28647557408, double_val = 1.4153773952557707e-313, time_val = 28647557408, string_val = 0x6ab870920 <Address 0x6ab870920 out of bounds>, str_val = {s = 0x6ab870920 <Address 0x6ab870920 out of bounds>, len = 979706976}, blob_val = {s = 0x6ab870920 <Address 0x6ab870920 out of bounds>, len = 979706976}, bitmap_val = 2877753632, uint_val = 2877753632, ull_val = 28647557408}}, {type = DB1_STR, nul = 6, free = 0, val = {int_val = -1417213440, ll_val = 140723186240000, double_val = 6.9526491894503619e-310, time_val = 140723186240000, string_val = 0x7ffcab870a00 "8=}", str_val = {s = 0x7ffcab870a00 "8=}", len = -1417213104}, blob_val = {s = 0x7ffcab870a00 "8=}", len = -1417213104}, bitmap_val = 2877753856, uint_val = 2877753856, ull_val = 140723186240000}}, {type = DB1_STR, nul = 1, free = 829901784, val = { int_val = 1086063344, ll_val = 140309077689072, double_val = 6.9321895085840994e-310, time_val = 140309077689072, string_val = 0x7f9c40bc02f0 "m\002\005", str_val = {s = 0x7f9c40bc02f0 "m\002\005", len = 809580952}, blob_val = { s = 0x7f9c40bc02f0 "m\002\005", len = 809580952}, bitmap_val = 1086063344, uint_val = 1086063344, ull_val = 140309077689072}}, { type = DB1_INT, nul = 3, free = 3, val = {int_val = 1086063344, ll_val = 140309077689072, double_val = 6.9321895085840994e-310, time_val = 140309077689072, string_val = 0x7f9c40bc02f0 "m\002\005", str_val = {s = 0x7f9c40bc02f0 "m\002\005", len = 809580952}, blob_val = {s = 0x7f9c40bc02f0 "m\002\005", len = 809580952}, bitmap_val = 1086063344, uint_val = 1086063344, ull_val = 140309077689072}}} insert_keys = {0x7f9c3a86f8e0 <h_entry_column>, 0x7f9c3a86f8d0 <h_id_column>, 0x7f9c3a86f880 <call_id_column>, 0x7f9c3a86f890 <from_uri_column>, 0x7f9c3a86f8a0 <from_tag_column>, 0x7f9c3a86f8b0 <to_uri_column>, 0x7f9c3a86f8c0 <to_tag_column>, 0x7f9c3a86f990 <from_sock_column>, 0x7f9c3a86f980 <to_sock_column>, 0x7f9c3a86f900 <start_time_column>, 0x7f9c3a86f8f0 <state_column>, 0x7f9c3a86f910 <timeout_column>, 0x7f9c3a86f930 <from_cseq_column>, 0x7f9c3a86f920 <to_cseq_column>, 0x7f9c3a86f970 <from_contact_column>, 0x7f9c3a86f960 <to_contact_column>, 0x7f9c3a86f950 <from_route_column>, 0x7f9c3a86f940 <to_route_column>, 0x7f9c3a86f9a0 <sflags_column>, 0x7f9c3a86f9c0 <toroute_name_column>, 0x7f9c3a86f9d0 <req_uri_column>, 0x7f9c3a86f9e0 <xdata_column>, 0x7f9c3a86f9b0 <iflags_column>} __FUNCTION__ = "update_dialog_dbinfo_unsafe" #1 0x00007f9c3a5db0bf in update_dialog_dbinfo (cell=0x7f9c30413998) at dlg_db_handler.c:977 No locals. #2 0x00007f9c3a5e2d4d in dlg_onreply (t=0x7f9c31774bd8, type=1048576, param=0x7ffcab870d60) at dlg_handlers.c:546 dlg = 0x7f9c30413998 iuid = 0x7f9c3025faf0 new_state = 3 old_state = 5 unref = 0 event = 3 tag = { s = 0xad0d27 <buf.7141+391> "as7527953a\r\nCall-ID: 11481241-3831608038-1141932217(a)sbc-uk-l-far07b.uk.sdin.bt.net\r\nCSeq: 1 INVITE\r\nServer: Voiceflex\r\nAllow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH"..., len = 10} req = 0x7f9c307877e8 rpl = 0x7f9c40bc02f0 __FUNCTION__ = "dlg_onreply" #3 0x00007f9c3d4408a4 in run_trans_callbacks_internal (cb_lst=0x7f9c31774c50, type=1048576, trans=0x7f9c31774bd8, params=0x7ffcab870d60) at t_hooks.c:258 cbp = 0x7f9c30fce308 backup_from = 0xb879b0 <def_list+16> backup_to = 0xb879b8 <def_list+24> backup_dom_from = 0xb879c0 <def_list+32> backup_dom_to = 0xb879c8 <def_list+40> backup_uri_from = 0xb879a0 <def_list> backup_uri_to = 0xb879a8 <def_list+8> backup_xavps = 0xb2c988 <_xavp_list_head> backup_xavus = 0xb2c990 <_xavu_list_head> backup_xavis = 0xb2c998 <_xavi_list_head> __FUNCTION__ = "run_trans_callbacks_internal" #4 0x00007f9c3d440abc in run_trans_callbacks_with_buf (type=1048576, rbuf=0x7f9c31774ca8, req=0x7f9c307877e8, repl=0x7f9c40bc02f0, flags=0) at t_hooks.c:303 params = {req = 0x7f9c307877e8, rpl = 0x7f9c40bc02f0, param = 0x7f9c30fce318, code = 200, flags = 0, branch = 0, t_rbuf = 0x7f9c31774ca8, dst = 0x7f9c31774cf8, send_buf = { s = 0x7f9c302db310 "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 193.113.183.202:5060;branch=z9hG4bKdd6a6cbff3b1c256626bd914fd8db551\r\nRecord-Route: <sip:93.95.124.34;lr;did=342.29f1>\r\nFrom: <sip:anonymous@uk.sdin.bt.net;user=phone>;"..., len = 935}} trans = 0x7f9c31774bd8 #5 0x00007f9c3d3cc07d in relay_reply (t=0x7f9c31774bd8, p_msg=0x7f9c40bc02f0, branch=0, msg_status=200, cancel_data=0x7ffcab871250, do_put_on_wait=1) at t_reply.c:2096 relay = 0 save_clone = 0 buf = 0x7f9c40bed0f8 "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 193.113.183.202:5060;branch=z9hG4bKdd6a6cbff3b1c256626bd914fd8db551\r\nRecord-Route: <sip:93.95.124.34;lr;did=342.29f1>\r\nFrom: <sip:anonymous@uk.sdin.bt.net;user=phone>;"... res_len = 935 relayed_code = 200 relayed_msg = 0x7f9c40bc02f0 reply_bak = 0x7f9c31774e20 bm = {to_tag_val = {s = 0x7ffcab870fc0 "\200\023\207\253\374\177", len = 5217506}} totag_retr = 0 reply_status = RPS_COMPLETED uas_rb = 0x7f9c31774ca8 to_tag = 0x0 reason = {s = 0xbba28 <Address 0xbba28 out of bounds>, len = 0} onsend_params = {req = 0x7f9c40becdf0, rpl = 0x7ffcab871090, param = 0x7f9c40bc02f0, code = 1086072408, flags = 32668, branch = 0, t_rbuf = 0x7ffcab870f00, dst = 0x4f4ca1 <futex_release+29>, send_buf = {s = 0x800000 "<core> [core/tcp_main.c:2999]: ", len = 803921760}} ip = {af = 1094466080, len = 32668, u = {addrl = {8504131, 140723186241472}, addr32 = {8504131, 0, 2877755328, 32764}, addr16 = {49987, 129, 0, 0, 4032, 43911, 32764, 0}, addr = "CÁ\000\000\000\000\000\300\017\207\253\374\177\000"}} __FUNCTION__ = "relay_reply" #6 0x00007f9c3d3d1751 in reply_received (p_msg=0x7f9c40bc02f0) at t_reply.c:2682 msg_status = 200 last_uac_status = 180 ack = 0x81c343 "INFO" ack_len = 2877756064 branch = 0 reply_status = 1086230768 onreply_route = 1 cancel_data = {cancel_bitmap = 0, reason = {cause = 200, u = {text = {s = 0x0, len = 30}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 30}}}} uac = 0x7f9c31774e68 t = 0x7f9c31774bd8 lack_dst = {send_sock = 0xad0fb2 <buf.7141+1042>, to = {s = {sa_family = 0, sa_data = "\000\000\000\000\000\000\070=}\000\000\000\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "8=}\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "8=}\000\000\000\000\000\036\000\000\000\000\000\000", __u6_addr16 = {15672, 125, 0, 0, 30, 0, 0, 0}, __u6_addr32 = {8207672, 0, 30, 0}}}, sin6_scope_id = 1094466080}, sas = {ss_family = 0, __ss_padding = "\000\000\000\000\000\000\070=}\000\000\000\000\000\036\000\000\000\000\000\000\000 :<A\234\177\000\000CÁ\000\000\000\000\000 \023\207\253\374\177\000\000]\261\247<\234\177\000\000`\022\271", '\000' <repeats 13 times>, "\262\017\255\000\000\000\000\000\201\r\255", '\000' <repeats 13 times>, "\360\220\276@\234\177\000\000\262\017\255\000\000\000\000\000\260\024\207\253\374\177\000", __ss_align = 140309077856352}}, id = -1417210704, send_flags = {f = 32764, blst_imask = 0}, proto = 80 'P', proto_pad0 = 43 '+', proto_pad1 = 16572} backup_user_from = 0xb879b0 <def_list+16> backup_user_to = 0xb879b8 <def_list+24> backup_domain_from = 0xb879c0 <def_list+32> backup_domain_to = 0xb879c8 <def_list+40> backup_uri_from = 0xb879a0 <def_list> backup_uri_to = 0xb879a8 <def_list+8> backup_xavps = 0xb2c988 <_xavp_list_head> backup_xavus = 0xb2c990 <_xavu_list_head> backup_xavis = 0xb2c998 <_xavi_list_head> replies_locked = 1 branch_ret = 0 prev_branch = 0 blst_503_timeout = 7583887 hf = 0x859150 onsend_params = {req = 0x7ffcab8712b0, rpl = 0x6c72b3 <qm_malloc+2479>, param = 0xad0eb0 <buf.7141+784>, code = 7564075, flags = 0, branch = 0, t_rbuf = 0x7f9c40becd80, dst = 0xad0fb2 <buf.7141+1042>, send_buf = {s = 0x0, len = 11341488}} ctx = {rec_lev = 0, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {0, -4259732974664084315, 8207672, 30, 140309086091808, 8504131, -4259732974771039067, 4259056081323627685}, __mask_was_saved = 0, __saved_mask = {__val = {140309024319992, 140309076697584, 0, 8388608, 7653592, 18446744073709551615, 140309077689072, 1322664, 8, 140723186242212, 2877756072, 140307991625729, 140309077689072, 0, 21483478416, 1304}}}}} bctx = 0x7f9c40bc02f0 keng = 0x0 ret = 32764 evname = {s = 0x7f9c3d472dcc "on_sl_reply", len = 11} __FUNCTION__ = "reply_received" #7 0x000000000058c08b in do_forward_reply (msg=0x7f9c40bc02f0, mode=0) at core/forward.c:764 new_buf = 0x0 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = { s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = { __in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 0, __ss_padding = '\000' <repeats 117 times>, __ss_align = 0}}, id = 0, send_flags = {f = 0, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0} new_len = 0 r = 1 ip = {af = 8192053, len = 0, u = {addrl = {0, 8207672}, addr32 = {0, 0, 8207672, 0}, addr16 = {0, 0, 0, 0, 15672, 125, 0, 0}, addr = "\000\000\000\000\000\000\000\000\070=}\000\000\000\000"}} s = 0x7d3d38 "" len = 0 __FUNCTION__ = "do_forward_reply" #8 0x000000000058dd71 in forward_reply (msg=0x7f9c40bc02f0) at core/forward.c:865 No locals. #9 0x00000000005ef38f in receive_msg ( buf=0xad0ba0 <buf.7141> "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 93.95.124.34;branch=z9hG4bKa726.2c6f345ef9f158b5a47c15a263fb7d03.0;received=93.95.124.34\r\nVia: SIP/2.0/UDP 193.113.183.202:5060;branch=z9hG4bKdd6a6cbff3b1c256626bd914f"..., len=1042, rcv_info=0x7ffcab871b80) at core/receive.c:509 msg = 0x7f9c40bc02f0 ctx = {rec_lev = 0, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {0, -4259732975544888155, 8207672, 30, 140309086091808, 8504131, -4259732975383407451, 4259056081323627685}, __mask_was_saved = 0, __saved_mask = {__val = {0, 16797685758500035936, 2147483648, 0, 274877906944, 0, 0, 16789419411038535680, 2147483648, 219043332192, 0, 0, 0, 1065151889463, 459561500749, 8224}}}}} bctx = 0x0 ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} diff = 0 inb = { s = 0xad0ba0 <buf.7141> "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 93.95.124.34;branch=z9hG4bKa726.2c6f345ef9f158b5a47c15a263fb7d03.0;received=93.95.124.34\r\nVia: SIP/2.0/UDP 193.113.183.202:5060;branch=z9hG4bKdd6a6cbff3b1c256626bd914f"..., len = 1042} netinfo = {data = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0} keng = 0x0 evp = {data = 0x7ffcab8716b0, obuf = {s = 0x0, len = 0}, rcv = 0x7ffcab871b80, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} cidlockidx = 0 cidlockset = 0 errsipmsg = 0 exectime = 0 __FUNCTION__ = "receive_msg" #10 0x00000000004d144c in udp_rcv_loop () at core/udp_server.c:543 len = 1042 buf = "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 93.95.124.34;branch=z9hG4bKa726.2c6f345ef9f158b5a47c15a263fb7d03.0;received=93.95.124.34\r\nVia: SIP/2.0/UDP 193.113.183.202:5060;branch=z9hG4bKdd6a6cbff3b1c256626bd914f"... tmp = 0x7f9c2feadc88 "" fromaddr = 0x7f9c40bc3000 fromaddrlen = 16 rcvi = {src_ip = {af = 2, len = 4, u = {addrl = {1803312989, 0}, addr32 = {1803312989, 0, 0, 0}, addr16 = {24413, 27516, 0, 0, 0, 0, 0, 0}, addr = "]_|k", '\000' <repeats 11 times>}}, dst_ip = {af = 2, len = 4, u = {addrl = {578576221, 0}, addr32 = {578576221, 0, 0, 0}, addr16 = {24413, 8828, 0, 0, 0, 0, 0, 0}, addr = "]_|\"", '\000' <repeats 11 times>}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023\304]_|k\000\000\000\000\000\000\000"}, sin = { sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 1803312989}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 1803312989, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 2, __ss_padding = "\023\304]_|k", '\000' <repeats 111 times>, __ss_align = 0}}, bind_address = 0x7f9c40b5aa70, proto = 1 '\001', proto_pad0 = 0 '\000', proto_pad1 = 0} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} printbuf = "\000\000\000\000\003\000\000\000\220\062\267@\234\177", '\000' <repeats 90 times>, "\234Hc0\234\177\000\000\070=}\000\004\000\000\00 0\220\366\200\000\003\000\000\000 :<A\234\177\000\000CÁ\000\000\000\000\000\320\032\207\253\374\177\000\000\203\204Y", '\000' <repeats 93 times>... i = -1 j = 72960 l = 1 __FUNCTION__ = "udp_rcv_loop" #11 0x0000000000429f5b in main_loop () at main.c:1711 i = 2 pid = 0 si = 0x7f9c40b5aa70 si_desc = "udp receiver child=2 sock=93.95.124.34:5060\000\234\177\000\000\233\205\177", '\000' <repeats 13 times>, "\060#\207\253\374\177\000\000\070=}\000\000\000\000\000\036\000\000\000\000\000\000\000 :<A\234\177\000\000CÁ\000\000\000\000\000\257:<A\234\177\000\000\340\271A\000\000\000\000\000\220C\274@\234\177\000" nrprocs = 8 woneinit = 1 __FUNCTION__ = "main_loop" #12 0x000000000043423e in main (argc=10, argv=0x7ffcab872418) at main.c:2942 cfg_stream = 0x21e8040 c = -1 r = 0 tmp = 0x7ffcab872f05 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x7d69b8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 3932459496 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0xff00000000ff00 p = 0x0 st = {st_dev = 19, st_ino = 12063, st_nlink = 2, st_mode = 16832, st_uid = 996, st_gid = 993, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621869721, tv_nsec = 871018353}, st_mtim = {tv_sec = 1622542335, tv_nsec = 169887496}, st_ctim = {tv_sec = 1622542335, tv_nsec = 169887496}, __unused = {0, 0, 0}} tbuf = ".N=\366\000\000\000\000\273-\334A\234\177\000\000\000\000\000\000\000\000\000\000\300\037\207\253\374\177\000\000\210\353,A\234\177\000\000\350\263-A\234\177\000\000\320 \207\253\374\177\000\000\300 \207\253\374\177\000\000.", '\000' <repeats 23 times>, "\320\n\375A\234\177\000\000\310\004\375A\234\177\000\000\274\016A\000\000\000\000\000п-A\234\177\000\000\bA@\000\000\000\000\000\000\000\000\000\001\000\000\000D\b\000\000\001", '\000' <repeats 11 times>, "\210!\207\253\374\177\000\000`!\207\253\374\177\000\000\001\000\000\000\000\000\000\000\320\n\375A\234\177\000\000\250\304\375A\234\177\000\000P\301\375A\234\177\000\000\237"... option_index = 0 long_options = {{name = 0x7d8cef "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7d4194 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7d8cf4 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7d8cfa "subst", has_arg = 1, flag = 0x0, val = 1025}, { name = 0x7d8d00 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7d8d09 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7d8d13 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7d8d1d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, { name = 0x7d8d28 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7d8d31 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, { name = 0x7d8d3c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7d8d42 "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) (gdb) list 874 cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, 875 cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, 876 cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, 877 cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); 878 879 SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); 880 SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); 881 882 SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); 883 SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]); (gdb) info locals cfg_stream = 0x21e8040 c = -1 r = 0 tmp = 0x7ffcab872f05 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x7d69b8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 3932459496 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0xff00000000ff00 p = 0x0 st = {st_dev = 19, st_ino = 12063, st_nlink = 2, st_mode = 16832, st_uid = 996, st_gid = 993, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621869721, tv_nsec = 871018353}, st_mtim = {tv_sec = 1622542335, tv_nsec = 169887496}, st_ctim = {tv_sec = 1622542335, tv_nsec = 169887496}, __unused = {0, 0, 0}} tbuf = ".N=\366\000\000\000\000\273-\334A\234\177\000\000\000\000\000\000\000\000\000\000\300\037\207\253\374\177\000\000\210\353,A\234\177\000\000\350\263-A\234\177\000\000\320 \207\253\374\177\000\000\300 \207\253\374\177\000\000.", '\000' <repeats 23 times>, "\320\n\375A\234\177\000\000\310\004\375A\234\177\000\000\274\016A\000\000\000\000\000п-A\234\177\000\000\bA@\000\000\000\000\000\000\000\000\000\001\000\000\000D\b\000\000\001", '\000' <repeats 11 times>, "\210!\207\253\374\177\000\000`!\207\253\374\177\000\000\001\000\000\000\000\000\000\000\320\n\375A\234\177\000\000\250\304\375A\234\177\000\000P\301\375A\234\177\000\000\237"... option_index = 0 long_options = {{name = 0x7d8cef "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7d4194 "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x7d8cf4 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7d8cfa "subst", has_arg = 1, flag = 0x0, val = 1025}, { name = 0x7d8d00 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7d8d09 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7d8d13 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7d8d1d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, { name = 0x7d8d28 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7d8d31 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, { name = 0x7d8d3c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7d8d42 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) (gdb) p cell->callid $1 = {s = 0x7f9c30413b08 "331873271-3831608037-62771434(a)sbc-uk-l-nws01a.uk.sdin.bt.net", len = 60} (gdb) p cell->bind_addr[0] $2 = (struct socket_info *) 0x0 (gdb) p cell->bind_addr[1] $3 = (struct socket_info *) 0x7f9c40b5aa70 (gdb) p cell->cseq[0] $4 = {s = 0x7f9c30e50d78 "1%", len = 1} (gdb) p cell->contact[0] $5 = {s = 0x7f9c304b7368 "sip:+442890793919@62.239.9.26:5060F1\234\177", len = 34} (gdb) p cell->route_set[0] $6 = {s = 0x7f9c30c8c698 "", len = 0} (gdb) p cell->tag[0] $7 = {s = 0x7f9c31467a10 "3831608037-1237727804\177", len = 21} (gdb) p cell->bind_addr[1]->sock_str $8 = {s = 0x7f9c40bcd6a8 "udp:93.95.124.34:5060", len = 21} #### Log Messages see above #### SIP Traffic If you need this I will need to get one of our sip guys to provide it. It should all be logged in homer. ### Possible Solutions ### Additional Information version: kamailio 5.4.5 (x86_64/linux) c46342 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_BLACKLIST, 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: c46342 compiled on 23:39:39 Apr 25 2021 with gcc 4.8.5 * **Operating System**: CentOS 7.9 Linux kamibt01.voiceflex.com 3.10.0-1160.25.1.el7.x86_64 #1 SMP Wed Apr 28 21:49:45 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/2757

3 20

[kamailio/kamailio] [pv] tr_init_buffers() does malloc but memory is never freed (#2776)
by Andrey Volk 11 Jun '21

11 Jun '21

### Description tr_init_buffers() does malloc 512kb and this memory is never freed https://github.com/kamailio/kamailio/blob/master/src/modules/pv/pv_trans.c#… Compare with kazoo which does have `kz_tr_clear_buffers()` https://github.com/kamailio/kamailio/blob/master/src/modules/kazoo/kz_trans… Nothing like that in the pv mod. -- 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/2776

2 4

git:master:ffecc676: pv: support for Contact header in $hflc()
by Daniel-Constantin Mierla 11 Jun '21

11 Jun '21

Module: kamailio Branch: master Commit: ffecc676c4c5d947c9a3163570be1aaaf0e5e8d9 URL: https://github.com/kamailio/kamailio/commit/ffecc676c4c5d947c9a3163570be1aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-11T09:17:36+02:00 pv: support for Contact header in $hflc() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/ffecc676c4c5d947c9a3163570be1aa… Patch: https://github.com/kamailio/kamailio/commit/ffecc676c4c5d947c9a3163570be1aa… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 7c5743151d..04d7ef7013 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2429,6 +2429,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) pv_value_t tv = {0}; via_body_t *vb = NULL; rr_t *rrb = NULL; + contact_t *cb = NULL; hdr_field_t *hf = NULL; int n = 0; @@ -2499,6 +2500,28 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, n); } + if((tv.flags == 0) && (tv.ri==HDR_CONTACT_T)) { + if(msg->contact==NULL) { + LM_DBG("no Contact header\n"); + return pv_get_sintval(msg, param, res, 0); + } + if(parse_contact_headers(msg) < 0) { + LM_DBG("failed to parse Contact headers\n"); + return pv_get_sintval(msg, param, res, 0); + } + + /* count Contact header bodies */ + for(hf=msg->contact; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_CONTACT_T) { + for(cb=(((contact_body_t*)hf->parsed)->contacts); + cb!=NULL; cb=cb->next) { + n++; + } + } + } + return pv_get_sintval(msg, param, res, n); + } + for (hf=msg->headers; hf; hf=hf->next) { if(tv.flags == 0) { if (tv.ri==hf->type) {

1 0

strip [] from IPv6 address
by Sergey Safarov 10 Jun '21

10 Jun '21

I want call C function to strip IPv6 brackets. Which can be used?

2 1

git:master:20b39858: modules: readme files regenerated - statsd ... [skip ci]
by Kamailio Dev 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: 20b39858b6e2707b40dcf564eceef55241d800ca URL: https://github.com/kamailio/kamailio/commit/20b39858b6e2707b40dcf564eceef55… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-10T19:01:14+02:00 modules: readme files regenerated - statsd ... [skip ci] --- Modified: src/modules/statsd/README --- Diff: https://github.com/kamailio/kamailio/commit/20b39858b6e2707b40dcf564eceef55… Patch: https://github.com/kamailio/kamailio/commit/20b39858b6e2707b40dcf564eceef55…

1 0

[kamailio/kamailio] Jchavanton/statsd (#2774)
by Julien Chavanton 10 Jun '21

10 Jun '21

adding support for histograms  #### 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] New feature (non-breaking change which adds new functionality) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2774 -- Commit Summary -- * rtpengine: ignore mos 0 when selecting min-mos * stastd: adding histogram -- File Changes -- M src/modules/rtpengine/rtpengine.c (2) M src/modules/statsd/doc/statsd_admin.xml (25) M src/modules/statsd/lib_statsd.c (6) M src/modules/statsd/lib_statsd.h (1) M src/modules/statsd/statsd.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2774.patch https://github.com/kamailio/kamailio/pull/2774.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/2774

2 3

git:master:f2d1d644: stastd: adding histogram (#2774)
by GitHub 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: f2d1d64408ce3cc6e24e4709933990c8c80cf131 URL: https://github.com/kamailio/kamailio/commit/f2d1d64408ce3cc6e24e4709933990c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-10T09:49:47-07:00 stastd: adding histogram (#2774) --- Modified: src/modules/statsd/doc/statsd_admin.xml Modified: src/modules/statsd/lib_statsd.c Modified: src/modules/statsd/lib_statsd.h Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/f2d1d64408ce3cc6e24e4709933990c… Patch: https://github.com/kamailio/kamailio/commit/f2d1d64408ce3cc6e24e4709933990c…

1 0

[kamailio/kamailio] postrgresql: kamdbctl create issue (#2773)
by Ilya Demyanov 10 Jun '21

10 Jun '21

``` # kamdbctl create -e \E[37;33mINFO: creating database kamailio ... -e \E[37;33mINFO: Core Kamailio tables successfully created. Install presence related tables? (y/n): y -e \E[37;33mINFO: creating presence tables into kamailio ... -e \E[37;33mINFO: Presence tables successfully created. Install tables for imc cpl siptrace domainpolicy carrierroute drouting userblocklist htable purple uac pipelimit mtree sca mohqueue rtpproxy rtpengine secfilter? (y/n): y -e \E[37;33mINFO: creating extra tables into kamailio ... ERROR: relation "globalblacklist" does not exist ERROR: relation "globalblacklist" does not exist ERROR: relation "globalblacklist_id_seq" does not exist ERROR: relation "globalblacklist_id_seq" does not exist -e \E[37;31mERROR: Grant privileges to extra tables failed! ``` ``` # apt list --installed 'kamailio*' Listing... Done kamailio-postgres-modules/unknown,now 5.5.0+bpo10 amd64 [installed] kamailio/unknown,now 5.5.0+bpo10 amd64 [installed] # cat /etc/debian_version 10.9 ``` at version 5.4 from this repository is not reproduced -- 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/2773

2 4

[kamailio/kamailio] rtpengine: ignore mos 0 when selecting min-mos (#2771)
by Julien Chavanton 10 Jun '21

10 Jun '21

#### 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 - [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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description since mos 0 is unnitialized this can happen when RTP engine does not have a valid RTT (or missing one leg) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2771 -- Commit Summary -- * rtpengine: ignore mos 0 when selecting min-mos -- File Changes -- M src/modules/rtpengine/rtpengine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2771.patch https://github.com/kamailio/kamailio/pull/2771.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/2771

3 4

git:master:a378f97a: rtpengine: ignore mos 0 when selecting min-mos (#2771)
by GitHub 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: a378f97adac89077de2fb162ec20295f6e4352fe URL: https://github.com/kamailio/kamailio/commit/a378f97adac89077de2fb162ec20295… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-10T08:03:13-04:00 rtpengine: ignore mos 0 when selecting min-mos (#2771) and computing average mos --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a378f97adac89077de2fb162ec20295… Patch: https://github.com/kamailio/kamailio/commit/a378f97adac89077de2fb162ec20295… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6f91c222b2..6266520578 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3588,13 +3588,15 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, bencode_item continue; if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "average MOS")) { - average_vals.avg_samples++; - average_vals.mos += vals_decoded.mos; - average_vals.packetloss += vals_decoded.packetloss; - average_vals.jitter += vals_decoded.jitter; - average_vals.roundtrip += vals_decoded.roundtrip; - average_vals.roundtrip_leg += vals_decoded.roundtrip_leg; - average_vals.samples += vals_decoded.samples; + if (vals_decoded.mos > 0) { + average_vals.avg_samples++; + average_vals.mos += vals_decoded.mos; + average_vals.packetloss += vals_decoded.packetloss; + average_vals.jitter += vals_decoded.jitter; + average_vals.roundtrip += vals_decoded.roundtrip; + average_vals.roundtrip_leg += vals_decoded.roundtrip_leg; + average_vals.samples += vals_decoded.samples; + } } if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "highest MOS")) { @@ -3602,7 +3604,7 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, bencode_item max_vals = vals_decoded; } if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "lowest MOS")) { - if (vals_decoded.mos < min_vals.mos) + if (vals_decoded.mos > 0 && vals_decoded.mos < min_vals.mos) min_vals = vals_decoded; } }

1 0

[kamailio/kamailio] ERROR: <core> [core/resolve.c:941]: get_record(): unknown type 41 (#2758)
by Andrew Webster 10 Jun '21

10 Jun '21

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST , HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, 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 7.3.0 I check the source, type 41 isn't supported on the current source tree. ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2758

3 3

git:5.5:66370c47: kamctl: update name to globalblocklist in EXTRA_TABLES
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 66370c473967d567452a6cf26b8b3496cb1386be URL: https://github.com/kamailio/kamailio/commit/66370c473967d567452a6cf26b8b349… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:29:42+02:00 kamctl: update name to globalblocklist in EXTRA_TABLES - GH #2773 (cherry picked from commit 90fa160b5d4a7155fc3d82f39932ac0e9d74fae7) --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/66370c473967d567452a6cf26b8b349… Patch: https://github.com/kamailio/kamailio/commit/66370c473967d567452a6cf26b8b349… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 03232be783..db703c6ed8 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -123,7 +123,7 @@ # dialplan" ## Kamailio extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist htable purple sca" +# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblocklist htable purple sca" ## type of aliases used: DB - database aliases; UL - usrloc aliases diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4cfd11c4f9..093334c024 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -40,7 +40,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs acc_cdrs topos_d topos_t'} EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblocklist - globalblacklist htable purplemap uacreg pl_pipes mtree mtrees + globalblocklist htable purplemap uacreg pl_pipes mtree mtrees sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine dr_gateways dr_rules dr_gw_lists dr_groups secfilter'} PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap

1 0

git:5.5:7b89c5e6: pv: added missing WS and WSS to $K(key) variable
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 7b89c5e6abe5f4ae3ee55d9c938c865806f29dec URL: https://github.com/kamailio/kamailio/commit/7b89c5e6abe5f4ae3ee55d9c938c865… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:29:07+02:00 pv: added missing WS and WSS to $K(key) variable (cherry picked from commit a8c9d0ae4fbafba89ef12737419037d141eed1d3) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7b89c5e6abe5f4ae3ee55d9c938c865… Patch: https://github.com/kamailio/kamailio/commit/7b89c5e6abe5f4ae3ee55d9c938c865… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6ead708037..dd3d22e95a 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3329,6 +3329,10 @@ int pv_parse_K_name(pv_spec_p sp, str *in) switch(in->len) { + case 2: + if(strncmp(in->s, "WS", 2)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else goto error; case 3: if(strncmp(in->s, "UDP", 3)==0) sp->pvp.pvn.u.isname.name.n = 2; @@ -3336,6 +3340,8 @@ int pv_parse_K_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 3; else if(strncmp(in->s, "TLS", 3)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "WSS", 3)==0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 4: @@ -3407,6 +3413,10 @@ int pv_get_K(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, PROTO_TLS); case 5: return pv_get_uintval(msg, param, res, PROTO_SCTP); + case 6: + return pv_get_uintval(msg, param, res, PROTO_WS); + case 7: + return pv_get_uintval(msg, param, res, PROTO_WSS); default: return pv_get_uintval(msg, param, res, AF_INET); }

1 0

git:5.5:903e4146: siptrace: fixed IPv6 without brackets
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 903e41468a00edeff52cbf1e3c0053c82860c92c URL: https://github.com/kamailio/kamailio/commit/903e41468a00edeff52cbf1e3c0053c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:29:32+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 (cherry picked from commit 417eb2a7052a9354712663cca9e3bc075a3f69c0) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/903e41468a00edeff52cbf1e3c0053c… Patch: https://github.com/kamailio/kamailio/commit/903e41468a00edeff52cbf1e3c0053c… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 012644bfa0..102502105d 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2117,7 +2117,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", siptrace_proto_name(nd->rcv->proto), - ip_addr2a(&nd->rcv->src_ip), (int)nd->rcv->src_port); + ip_addr2strz(&nd->rcv->src_ip), (int)nd->rcv->src_port); if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); sto.fromip.s = SIPTRACE_ANYADDR; @@ -2127,7 +2127,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) } sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(nd->rcv->proto), ip_addr2a(&nd->rcv->dst_ip), + siptrace_proto_name(nd->rcv->proto), ip_addr2strz(&nd->rcv->dst_ip), (int)nd->rcv->dst_port); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len);

1 0

git:5.5:d1c83128: dmq: warning about protocol made info
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: d1c831288746bac7850343da10ae02099cb7c80d URL: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:42+02:00 dmq: warning about protocol made info (cherry picked from commit b775bbdff501de0ca1f1a0bc1ab39a3b790c166f) --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… Patch: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 1db7cdd1f4..817fc3f3bb 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -161,7 +161,7 @@ static int make_socket_str_from_uri(struct sip_uri *uri, str *socket) } if(get_valid_proto_string(uri->proto, 0, 0, &sproto)<0) { - LM_WARN("unknown transport protocol - fall back to udp\n"); + LM_INFO("unknown transport protocol - fall back to udp\n"); sproto.s = "udp"; sproto.len = 3; }

1 0

git:5.5:7192139d: app_perl change to ignore "die" signals from eval blocks
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 7192139d77f844cd927c326ce16cadfc63378b35 URL: https://github.com/kamailio/kamailio/commit/7192139d77f844cd927c326ce16cadf… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:28:17+02:00 app_perl change to ignore "die" signals from eval blocks (cherry picked from commit 50557b8433e137a9095b4d48df8ac9b8c3fd8807) --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/7192139d77f844cd927c326ce16cadf… Patch: https://github.com/kamailio/kamailio/commit/7192139d77f844cd927c326ce16cadf… --- diff --git a/src/modules/app_perl/lib/perl/Kamailio.pm b/src/modules/app_perl/lib/perl/Kamailio.pm index eda5ede8b7..aa587424e1 100644 --- a/src/modules/app_perl/lib/perl/Kamailio.pm +++ b/src/modules/app_perl/lib/perl/Kamailio.pm @@ -40,6 +40,7 @@ bootstrap Kamailio; BEGIN { $SIG{'__DIE__'} = sub { + die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; $SIG{'__WARN__'} = sub {

1 0

git:5.5:38459725: smsops: support for 7bit special chars
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 3845972598098add3996b19c6cedfbfb4d4d2ee6 URL: https://github.com/kamailio/kamailio/commit/3845972598098add3996b19c6cedfbf… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:28:34+02:00 smsops: support for 7bit special chars - Added support for 7bit special chars for MO/MT SMSs. (cherry picked from commit f82c4775efca0580401f4b1a48dcb4d2cf26814f) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/3845972598098add3996b19c6cedfbf… Patch: https://github.com/kamailio/kamailio/commit/3845972598098add3996b19c6cedfbf…

1 0

git:5.5:b6428ca8: dialog: safety checks for bind addr fields
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: b6428ca86c821ddf74fd4ea8a17aecdce39934f4 URL: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:02+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 (cherry picked from commit 490ae559d2b77b13b3f3831e7ff1aa58980e4086) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… Patch: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1bfcb2cad7..b6a49da2a4 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -802,6 +802,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int i; struct dlg_var *var; srjson_doc_t jdoc; + str sempty = str_init(""); db_val_t values[DIALOG_TABLE_COL_NO]; @@ -870,14 +871,25 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+6, cell->tag[DLG_CALLEE_LEG]); SET_PROPER_NULL_FLAG(cell->tag[DLG_CALLEE_LEG], values, 6); - LM_DBG("caller sock_info is %.*s, callee sock_info is %.*s\n", - cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); - SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); - SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + if(cell->bind_addr[DLG_CALLER_LEG]) { + LM_DBG("caller sock_info is %.*s\n", + cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLER_LEG]->sock_str.s); + SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); + } else { + LM_DBG("no caller sock_info\n"); + SET_STR_VALUE(values+7, sempty); + } + if(cell->bind_addr[DLG_CALLEE_LEG]) { + LM_DBG("callee sock_info is %.*s\n", + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); + SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + } else { + LM_DBG("no callee sock_info\n"); + SET_STR_VALUE(values+8, sempty); + } SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]);

1 0

git:5.5:18e85c98: pv: test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 18e85c98bb6eebf9afe83aaa0a832d1c4af46e62 URL: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:18+02:00 pv: test for HDR_ERROR_T after header name parsing (cherry picked from commit c264fbc66a4690b073c72ffa8fc095227ce0ae8b) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… Patch: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 103f9dd5ec..6ead708037 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3274,8 +3274,8 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) s.s = p; s.len = in->len+1; - if (parse_hname2_short(s.s, s.s + s.len, &hdr)==0) - { + parse_hname2_short(s.s, s.s + s.len, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); goto error; }

1 0

git:5.5:b5041e2c: core: kemi - check hdr type HDR_ERROR_T after parsing
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: b5041e2c4a44843318fcd69d092342e2b29532f4 URL: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:25:21+02:00 core: kemi - check hdr type HDR_ERROR_T after parsing (cherry picked from commit 785bbaa0f16f83353ad1d776816f439608a67858) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… Patch: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0932339996..64d23296dc 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1988,7 +1988,8 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2056,7 +2057,8 @@ int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2106,7 +2108,8 @@ static int sr_kemi_hdr_is_present(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2188,7 +2191,8 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2305,7 +2309,8 @@ static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - if (parse_hname2_str(hname, &shdr)==0) { + parse_hname2_str(hname, &shdr); + if(shdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; @@ -2426,7 +2431,8 @@ static int sr_kemi_hdr_match_content(sip_msg_t *msg, str *hname, str *op, return SR_KEMI_FALSE; } - if (parse_hname2_str(hname, &hfm)==0) { + parse_hname2_str(hname, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return SR_KEMI_FALSE; }

1 0

git:master:90fa160b: kamctl: update name to globalblocklist in EXTRA_TABLES
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: 90fa160b5d4a7155fc3d82f39932ac0e9d74fae7 URL: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:15:29+02:00 kamctl: update name to globalblocklist in EXTRA_TABLES - GH #2773 --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… Patch: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 03232be783..db703c6ed8 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -123,7 +123,7 @@ # dialplan" ## Kamailio extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist htable purple sca" +# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblocklist htable purple sca" ## type of aliases used: DB - database aliases; UL - usrloc aliases diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4cfd11c4f9..093334c024 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -40,7 +40,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs acc_cdrs topos_d topos_t'} EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblocklist - globalblacklist htable purplemap uacreg pl_pipes mtree mtrees + globalblocklist htable purplemap uacreg pl_pipes mtree mtrees sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine dr_gateways dr_rules dr_gw_lists dr_groups secfilter'} PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap

1 0

[kamailio/kamailio] siptrace: fixed IPv6 without brackets (#2775)
by sergey-safarov 10 Jun '21

10 Jun '21

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fixed socket addr like `udp:::1:2345` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2775 -- Commit Summary -- * siptrace: fixed IPv6 without brackets -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2775.patch https://github.com/kamailio/kamailio/pull/2775.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/2775

3 4

git:master:417eb2a7: siptrace: fixed IPv6 without brackets
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: 417eb2a7052a9354712663cca9e3bc075a3f69c0 URL: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:05:49+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… Patch: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 89a0618d02..13cc220457 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2133,7 +2133,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", siptrace_proto_name(nd->rcv->proto), - ip_addr2a(&nd->rcv->src_ip), (int)nd->rcv->src_port); + ip_addr2strz(&nd->rcv->src_ip), (int)nd->rcv->src_port); if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); sto.fromip.s = SIPTRACE_ANYADDR; @@ -2143,7 +2143,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) } sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(nd->rcv->proto), ip_addr2a(&nd->rcv->dst_ip), + siptrace_proto_name(nd->rcv->proto), ip_addr2strz(&nd->rcv->dst_ip), (int)nd->rcv->dst_port); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len);

1 0

Re: [sr-dev] [SR-Users] Releasing Kamailio v5.5.1
by RDB Programmer 10 Jun '21

10 Jun '21

Daniel, Will this release include the latest changes to mohqueue <https://github.com/kamailio/kamailio/tree/master/src/modules/mohqueue> that I pushed to the master on May 19? Bob > From: Daniel-Constantin Mierla <miconda(a)gmail.com> > Date: Wed, Jun 9, 2021 at 6:00 AM > Subject: [SR-Users] Releasing Kamailio v5.5.1 > To: Kamailio (SER) - Devel Mailing List <sr-dev(a)lists.kamailio.org>, > Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> > > > Hello, > > I am considering to release Kamailio v5.5.1 sometime next week, likely > on Tuesday or Wednesday (June 15 or 16, 2021). This is the usual heads up > notification to see if anyone is aware of issues not yet reported to bug > tracker and if yes, do it as soon as possible to give them a chance to > be fixed. > > Cheers, > Daniel > > -- > Daniel-Constantin Mierla -- www.asipto.com > www.twitter.com/miconda -- www.linkedin.com/in/miconda > > > > __________________________________________________________ > Kamailio - Users Mailing List - Non Commercial Discussions > * sr-users(a)lists.kamailio.org > Important: keep the mailing list in the recipients, do not reply only to > the sender! > Edit mailing list options or unsubscribe: > * https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >

2 1

[kamailio/kamailio] tcpops fixup failure (#2772)
by Julien Chavanton 09 Jun '21

09 Jun '21

### Description Kamailio does not start when doing fixup for tcpops. ``` tcp_keepalive_enable("$avp(caller_conid)", "60", "5", "2"); ``` ``` 0(1) ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:160 ``` ### Troubleshooting I will try reverting the following commits ``` commit 02240711239149e2f5c4890a70ab158d10fa8187 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 8 23:30:22 2021 +0200 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters commit 12fca1c369b6698cace66de171dcb166be8ae831 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 4 13:30:21 2021 +0200 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports ``` -- 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/2772

1 2

git:master:5d03c923: core: kemi - added KSR.is_WSX() - return true of proto is WS or WSS
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 5d03c9235f79ce4af35b6f79eddebae9f512f1d3 URL: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T14:48:19+02:00 core: kemi - added KSR.is_WSX() - return true of proto is WS or WSS --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… Patch: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index bee8a98f07..065eba9c2c 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1155,6 +1155,18 @@ static int sr_kemi_core_is_proto_wss(sip_msg_t *msg) return (msg->rcv.proto == PROTO_WSS)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_proto_wsx(sip_msg_t *msg) +{ + if (msg->rcv.proto == PROTO_WSS) return SR_KEMI_TRUE; + if (msg->rcv.proto == PROTO_WS) return SR_KEMI_TRUE; + + return SR_KEMI_FALSE; +} + + /** * */ @@ -1888,6 +1900,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_WSX"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_wsx, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_SCTP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_sctp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:5e06b6bc: pv: support Record/-Route headers for $hflc(...)
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 5e06b6bcaf0047e5bb22105e03331268cee8486f URL: https://github.com/kamailio/kamailio/commit/5e06b6bcaf0047e5bb22105e0333126… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T13:33:06+02:00 pv: support Record/-Route headers for $hflc(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/5e06b6bcaf0047e5bb22105e0333126… Patch: https://github.com/kamailio/kamailio/commit/5e06b6bcaf0047e5bb22105e0333126… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6e70010816..7c5743151d 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2428,6 +2428,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { pv_value_t tv = {0}; via_body_t *vb = NULL; + rr_t *rrb = NULL; hdr_field_t *hf = NULL; int n = 0; @@ -2471,6 +2472,33 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, n); } + if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T || tv.ri==HDR_ROUTE_T)) { + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + if(hf==NULL) { + LM_DBG("no %s header\n", (tv.ri==HDR_ROUTE_T)?"route":"record-route"); + return pv_get_sintval(msg, param, res, 0); + } + + /* count Record-Route/Route header bodies */ + for(; hf!=NULL; hf=hf->next) { + if(hf->type==tv.ri) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); + return pv_get_sintval(msg, param, res, 0); + } + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { + n++; + } + } + } + return pv_get_sintval(msg, param, res, n); + } + for (hf=msg->headers; hf; hf=hf->next) { if(tv.flags == 0) { if (tv.ri==hf->type) {

1 0

[kamailio/kamailio] siptrace: aadded siptrace pseudo var (#2752)
by sergey-safarov 09 Jun '21

09 Jun '21

#### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I want to get the source (destination) IP address of the message during `event_route[siptrace:msg]` route. I added the ability to get socket info in this route block. Now added ``` $siptrace(src_uri) $siptrace(dst_uri) ``` This pseudovars return string like ``` udp:8.8.8.8:5060 ``` I think `src_uri` and `dst_uri` is not correct here because this socket info, not SIP uri. I expecting suggestion on how to get these params and from current implementation: ``` src_ip src_port src_proto dst_ip dst_port dst_proto ``` As reference, I take `sipdump` pseudovariable You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2752 -- Commit Summary -- * siptrace: aadded siptrace pseudo var -- File Changes -- M src/modules/siptrace/siptrace.c (72) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2752.patch https://github.com/kamailio/kamailio/pull/2752.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/2752

2 6

git:master:7bf207bf: siptrace: use src/dst_addr instead src/dst_uri for $siptrace(...) vars
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 7bf207bf6bd60bd1c50fb9321d31c4d48562b5b7 URL: https://github.com/kamailio/kamailio/commit/7bf207bf6bd60bd1c50fb9321d31c4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:31:31+02:00 siptrace: use src/dst_addr instead src/dst_uri for $siptrace(...) vars - the format is proto:ip:proto, not a sip uri --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf207bf6bd60bd1c50fb9321d31c4d… Patch: https://github.com/kamailio/kamailio/commit/7bf207bf6bd60bd1c50fb9321d31c4d… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index b411886f54..89a0618d02 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2528,10 +2528,10 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) switch(in->len) { - case 7: - if(strncmp(in->s, "src_uri", 7)==0) + case 8: + if(strncmp(in->s, "src_addr", 8)==0) sp->pvp.pvn.u.isname.name.n = 0; - else if(strncmp(in->s, "dst_uri", 7)==0) + else if(strncmp(in->s, "dst_addr", 8)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break;

1 0

git:master:36817c3e: core: cfg.lex - accept IPv4/6 as alternative keywords for INET/6
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 36817c3ea53daae9706c1caa695af98f9ca987bd URL: https://github.com/kamailio/kamailio/commit/36817c3ea53daae9706c1caa695af98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:19:24+02:00 core: cfg.lex - accept IPv4/6 as alternative keywords for INET/6 --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/36817c3ea53daae9706c1caa695af98… Patch: https://github.com/kamailio/kamailio/commit/36817c3ea53daae9706c1caa695af98… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index ff8096d9f2..45d9114c05 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -512,8 +512,8 @@ TLS "tls"|"TLS" SCTP "sctp"|"SCTP" WS "ws"|"WS" WSS "wss"|"WSS" -INET "inet"|"INET" -INET6 "inet6"|"INET6" +INET "inet"|"INET"|"ipv4"|"IPv4"|"IPV4" +INET6 "inet6"|"INET6"|"ipv6"|"IPv6"|"IPV6" SSLv23 "sslv23"|"SSLv23"|"SSLV23" SSLv2 "sslv2"|"SSLv2"|"SSLV2" SSLv3 "sslv3"|"SSLv3"|"SSLV3"

1 0

git:master:e5f13086: pv: support INET/6 as alternative IPv4/6 for $K(key)
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: e5f130860d909e9a4348db170d4001332e90427e URL: https://github.com/kamailio/kamailio/commit/e5f130860d909e9a4348db170d40013… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:27:57+02:00 pv: support INET/6 as alternative IPv4/6 for $K(key) - these are the keywords in the config --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e5f130860d909e9a4348db170d40013… Patch: https://github.com/kamailio/kamailio/commit/e5f130860d909e9a4348db170d40013… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 0af3e640cd..6e70010816 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3632,6 +3632,7 @@ int pv_parse_K_name(pv_spec_p sp, str *in) if(strncmp(in->s, "WS", 2)==0) sp->pvp.pvn.u.isname.name.n = 6; else goto error; + break; case 3: if(strncmp(in->s, "UDP", 3)==0) sp->pvp.pvn.u.isname.name.n = 2; @@ -3646,12 +3647,19 @@ int pv_parse_K_name(pv_spec_p sp, str *in) case 4: if(strncmp(in->s, "IPv4", 4)==0) sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "INET", 4)==0) + sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "IPv6", 4)==0) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "SCTP", 4)==0) sp->pvp.pvn.u.isname.name.n = 5; else goto error; break; + case 5: + if(strncmp(in->s, "INET6", 5)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; default: goto error; }

1 0

git:master:a8c9d0ae: pv: added missing WS and WSS to $K(key) variable
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: a8c9d0ae4fbafba89ef12737419037d141eed1d3 URL: https://github.com/kamailio/kamailio/commit/a8c9d0ae4fbafba89ef12737419037d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:15:38+02:00 pv: added missing WS and WSS to $K(key) variable --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a8c9d0ae4fbafba89ef12737419037d… Patch: https://github.com/kamailio/kamailio/commit/a8c9d0ae4fbafba89ef12737419037d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index a4bfe21985..0af3e640cd 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3628,6 +3628,10 @@ int pv_parse_K_name(pv_spec_p sp, str *in) switch(in->len) { + case 2: + if(strncmp(in->s, "WS", 2)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else goto error; case 3: if(strncmp(in->s, "UDP", 3)==0) sp->pvp.pvn.u.isname.name.n = 2; @@ -3635,6 +3639,8 @@ int pv_parse_K_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 3; else if(strncmp(in->s, "TLS", 3)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "WSS", 3)==0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 4: @@ -3706,6 +3712,10 @@ int pv_get_K(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, PROTO_TLS); case 5: return pv_get_uintval(msg, param, res, PROTO_SCTP); + case 6: + return pv_get_uintval(msg, param, res, PROTO_WS); + case 7: + return pv_get_uintval(msg, param, res, PROTO_WSS); default: return pv_get_uintval(msg, param, res, AF_INET); }

1 0

git:master:11acfd85: pv: extended $nh(k) to work for replies using 2nd via
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 11acfd857d1b9c5e7e4c10efd8f1eb239c77e8a8 URL: https://github.com/kamailio/kamailio/commit/11acfd857d1b9c5e7e4c10efd8f1eb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:02:08+02:00 pv: extended $nh(k) to work for replies using 2nd via --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/11acfd857d1b9c5e7e4c10efd8f1eb2… Patch: https://github.com/kamailio/kamailio/commit/11acfd857d1b9c5e7e4c10efd8f1eb2… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index d3e34c681a..594a88f1f5 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -669,6 +669,81 @@ int pv_parse_rcv_name(pv_spec_p sp, str *in) return -1; } +/** + * + */ +int pv_get_nh_reply(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + static char rpluribuf[MAX_URI_SIZE]; + str suri = STR_NULL; + str host = STR_NULL; + str sproto = STR_NULL; + unsigned int port = 0; + + if(parse_headers( msg, HDR_VIA2_F, 0)==-1) { + LM_DBG("no 2nd via parsed\n"); + return pv_get_null(msg, param, res); + } + if((msg->via2==0) || (msg->via2->error!=PARSE_OK)) { + return pv_get_null(msg, param, res); + } + if(msg->via2->rport && msg->via2->rport->value.s) { + LM_DBG("using 'rport'\n"); + if(str2int(&msg->via2->rport->value, &port)<0) { + LM_ERR("invalid rport value\n"); + return pv_get_null(msg, param, res); + } + } + if(msg->via2->received) { + LM_DBG("using 'received'\n"); + host = msg->via2->received->value; + } else { + LM_DBG("using via host\n"); + host = msg->via2->host; + } + if(port==0) { + port = (msg->via2->port)?msg->via2->port:SIP_PORT; + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* uri */ + if(get_valid_proto_string(msg->via2->proto, 1, 0, &sproto)<0) { + sproto.s = "udp"; + sproto.len = 3; + } + suri.len = snprintf(rpluribuf, MAX_URI_SIZE, "sip:%.*s:%u;transport=%.*s", + host.len, host.s, port, sproto.len, sproto.s); + if(suri.len<=0 || suri.len>=MAX_URI_SIZE) { + LM_DBG("building the dst uri failed (%d)\n", suri.len); + return pv_get_null(msg, param, res); + } + suri.s = rpluribuf; + return pv_get_strval(msg, param, res, &suri); + case 1: /* user - not in Via */ + return pv_get_null(msg, param, res); + case 2: /* domain/host */ + return pv_get_strval(msg, param, res, &host); + case 3: /* port */ + return pv_get_uintval(msg, param, res, port); + case 4: /* proto */ + if(get_valid_proto_string(msg->via2->proto, 0, 0, &sproto)<0) { + /* default to udp */ + sproto.s = "udp"; + sproto.len = 3; + return pv_get_strintval(msg, param, res, &sproto, PROTO_UDP); + } + return pv_get_strintval(msg, param, res, &sproto, + (int)msg->via2->proto); + } + + LM_ERR("unknown specifier\n"); + return pv_get_null(msg, param, res); +} + +/** + * + */ int pv_get_nh(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -678,8 +753,10 @@ int pv_get_nh(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || res==NULL) return -1; - if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have r/d-uri */ - return pv_get_null(msg, param, res); + if(msg->first_line.type == SIP_REPLY) { + /* REPLY doesnt have r/d-uri - use second Via */ + return pv_get_nh_reply(msg, param, res); + } if (msg->dst_uri.s != NULL && msg->dst_uri.len>0) {

1 0

[kamailio/kamailio] app_perl: Ignore __DIE__ signals that come from eval blocks (#2745)
by rodolfojcj 09 Jun '21

09 Jun '21

### Description If possible, I would like that the `kamailio/src/modules/app_perl/lib/perl/Kamailio.pm` file does not generate error messages to the system log files, which are not actual errors and are caused by `eval` blocks of third-party Perl modules that my code depends on. To illustrate the current setup, let's consider the following: - In file `/etc/kamailio/kamailio_52.cfg` ```perl modparam( "app_perl", "filename", "/opt/myprogram/perllib/MyKamailio.pm" ) ``` - In file `/opt/myprogram/perllib/MyKamailio.pm`: ```perl use Crypt::JWT qw( decode_jwt encode_jwt ); ``` - It happens that `Crypt::JWT` depends on `CryptX`, which in turn needs a `JSON::XS` implementation, which could be either `Cpanel::JSON::XS` or `JSON::XS`or `JSON::PP`, in that order of preference. That need is resolved at runtime, as we can see in the following code fragment taken from the file at https://github.com/DCIT/perl-CryptX/blob/master/lib/CryptX.pm: ```perl BEGIN { if (eval { require Cpanel::JSON::XS }) { Cpanel::JSON::XS->import(qw(encode_json decode_json)); $has_json = 1; } elsif (eval { require JSON::XS }) { JSON::XS->import(qw(encode_json decode_json)); $has_json = 2; } elsif (eval { require JSON::PP }) { JSON::PP->import(qw(encode_json decode_json)); $has_json = 3; } else { $has_json = 0; } } ``` - In my system, `Cpanel::JSON::XS` is not installed because it is not needed. I could install it, but unfortunately that module intermittently causes a segmentation fault, as described in the issue report at https://github.com/rurban/Cpanel-JSON-XS/issues/179. ### Expected behavior I would expect two things: - The operating system log files, like `/var/log/syslog`, adds only entries like the following ones after restarting Kamailio: May 25 14:30:06 myserver systemd[1]: kamailio.service: Succeeded. May 25 14:30:06 myserver systemd[1]: Stopped Kamailio server. May 25 14:30:06 myserver systemd[1]: Starting Kamailio server... May 25 14:30:06 myserver systemd[1]: Started Kamailio server. - The output of commands like `systemctl status kamailio.service` only shows informational messages of success. ### Actual observed behavior - The operating system log files, like `/var/log/syslog`, also adds error messages like the following one after restarting Kamailio: May 25 14:30:06 myserver /sbin/kamailio[1827476]: ERROR: app_perl [kamailioxs.xs:1041]: XS_Kamailio__Message_log(): perl error: Can't locate Cpanel/JSON/XS.pm in @INC (you may need to install the Cpanel::JSON::XS module) (@INC contains: /opt/myprogram/perllib /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.30.0 /usr/local/share/perl/5.30.0 /usr/lib/x86_64-linux-gnu/perl5/5.30 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.30 /usr/share/perl/5.30 /usr/local/lib/site_perl) at /usr/local/lib/x86_64-linux-gnu/perl/5.30.0/CryptX.pm line 14. - The output of commands like `systemctl status kamailio.service` adds that same error message at its end. ### What could be changed in Kamailio? The `kamailio/src/modules/app_perl/lib/perl/Kamailio.pm` file could ignore, or bypass, the `__DIE__` signals coming from `eval` blocks, like this changed code fragment shows: ```perl $SIG{'__DIE__'} = sub { die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; ``` That changed is based on the following references: - The [Override die with END or CORE::GLOBAL::die](https://www.effectiveperlprogramming.com/2011/05/overrid… article, which says: > There’s a Perl special variable that can help. The documentation for die recommends that you start your `__DIE__` handler by checking `$^S` before you continue. Inside the handler, the special handler is turned off so `die` inside `$SIG{__DIE__}` is the real `die`. The value of `$^S` will be true if it came from within an `eval`, so this just re-throws the exception without handling it. - The [Perl documentation for the `$^S` variable](https://perldoc.perl.org/perlvar#%24%5ES), which says: > Current state of the interpreter. $^S State --------- ------------------------------------- undef Parsing module, eval, or main program true (1) Executing an eval false (0) Otherwise > The first state may happen in `$SIG{__DIE__}` and `$SIG{__WARN__}` handlers. - The [Perl documentation for the `die` function](https://perldoc.perl.org/functions/die), which says: > You can arrange for a callback to be run just before the `die` does its deed, by setting the `$SIG{__DIE__}` hook. The associated handler is called with the exception as an argument, and can change the exception, if it sees fit, by calling `die` again. See `"%SIG"` in perlvar for details on setting `%SIG` entries, and `eval` for some examples. Although this feature was to be run only right before your program was to exit, this is not currently so: the `$SIG{__DIE__}` hook is currently called even inside `eval`ed blocks/strings! If one wants the hook to do nothing in such situations, put ```perl die @_ if $^S; ``` > as the first line of the handler (see "`$^S`" in perlvar). Because this promotes strange action at a distance, this counterintuitive behavior may be fixed in a future release. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ```bash root@myserver:~# kamailio -V version: kamailio 5.4.3 (x86_64/linux) e19ae3 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_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: e19ae3 compiled on 17:51:35 Feb 14 2021 with gcc 9.3.0 ``` * **Operating System**: ```bash root@myserver:~# uname -a Linux myserver 5.4.0-54-generic #60-Ubuntu SMP Fri Nov 6 10:37:59 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` ```bash root@myserver:~# cat /etc/os-release NAME="Ubuntu" VERSION="20.04.1 LTS (Focal Fossa)" ID=ubuntu ID_LIKE=debian PRETTY_NAME="Ubuntu 20.04.1 LTS" VERSION_ID="20.04" HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" VERSION_CODENAME=focal UBUNTU_CODENAME=focal ``` * **Perl version**: ```bash root@myserver:~# perl -V Summary of my perl5 (revision 5 version 30 subversion 0) configuration: Platform: osname=linux osvers=4.19.0 archname=x86_64-linux-gnu-thread-multi uname='linux localhost 4.19.0 #1 smp debian 4.19.0 x86_64 gnulinux ' config_args='-Dmksymlinks -Dusethreads -Duselargefiles -Dcc=x86_64-linux-gnu-gcc -Dcpp=x86_64-linux-gnu-cpp -Dld=x86_64-linux-gnu-gcc -Dccflags=-DDEBIAN -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fdebug-prefix-map=/build/perl-Wfb2Cd/perl-5.30.0=. -fstack-protector-strong -Wformat -Werror=format-security -Dldflags= -Wl,-Bsymbolic-functions -Wl,-z,relro -Dlddlflags=-shared -Wl,-Bsymbolic-functions -Wl,-z,relro -Dcccdlflags=-fPIC -Darchname=x86_64-linux-gnu -Dprefix=/usr -Dprivlib=/usr/share/perl/5.30 -Darchlib=/usr/lib/x86_64-linux-gnu/perl/5.30 -Dvendorprefix=/usr -Dvendorlib=/usr/share/perl5 -Dvendorarch=/usr/lib/x86_64-linux-gnu/perl5/5.30 -Dsiteprefix=/usr/local -Dsitelib=/usr/local/share/perl/5.30.0 -Dsitearch=/usr/local/lib/x86_64-linux-gnu/perl/5.30.0 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 -Dsiteman1dir=/usr/local/man/man1 -Dsiteman3dir=/usr/local/man/man3 -Duse64bitint -Dman1ext=1 -Dman3ext=3perl -Dpager=/usr/bin/sensible-pager -Uafs -Ud_csh -Ud_ualarm -Uusesfio -Uusenm -Ui_libutil -Ui_xlocale -Uversiononly -DDEBUGGING=-g -Doptimize=-O2 -dEs -Duseshrplib -Dlibperl=libperl.so.5.30.0' hint=recommended useposix=true d_sigaction=define useithreads=define usemultiplicity=define use64bitint=define use64bitall=define uselongdouble=undef usemymalloc=n default_inc_excludes_dot=define bincompat5005=undef Compiler: cc='x86_64-linux-gnu-gcc' ccflags ='-D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' optimize='-O2 -g' cppflags='-D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include' ccversion='' gccversion='9.3.0' gccosandvers='' intsize=4 longsize=8 ptrsize=8 doublesize=8 byteorder=12345678 doublekind=3 d_longlong=define longlongsize=8 d_longdbl=define longdblsize=16 longdblkind=3 ivtype='long' ivsize=8 nvtype='double' nvsize=8 Off_t='off_t' lseeksize=8 alignbytes=8 prototype=define Linker and Libraries: ld='x86_64-linux-gnu-gcc' ldflags =' -fstack-protector-strong -L/usr/local/lib' libpth=/usr/local/lib /usr/include/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /lib libs=-lgdbm -lgdbm_compat -ldb -ldl -lm -lpthread -lc -lcrypt perllibs=-ldl -lm -lpthread -lc -lcrypt libc=libc-2.31.so so=so useshrplib=true libperl=libperl.so.5.30 gnulibc_version='2.31' Dynamic Linking: dlsrc=dl_dlopen.xs dlext=so d_dlsymun=undef ccdlflags='-Wl,-E' cccdlflags='-fPIC' lddlflags='-shared -L/usr/local/lib -fstack-protector-strong' Characteristics of this binary (from libperl): Compile-time options: HAS_TIMES MULTIPLICITY PERLIO_LAYERS PERL_COPY_ON_WRITE PERL_DONT_CREATE_GVSV PERL_IMPLICIT_CONTEXT PERL_MALLOC_WRAP PERL_OP_PARENT PERL_PRESERVE_IVUV USE_64_BIT_ALL USE_64_BIT_INT USE_ITHREADS USE_LARGE_FILES USE_LOCALE USE_LOCALE_COLLATE USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LOCALE_TIME USE_PERLIO USE_PERL_ATOF USE_REENTRANT_API USE_THREAD_SAFE_LOCALE Locally applied patches: DEBPKG:debian/cpan_definstalldirs - Provide a sensible INSTALLDIRS default for modules installed from CPAN. DEBPKG:debian/db_file_ver - https://bugs.debian.org/340047 Remove overly restrictive DB_File version check. DEBPKG:debian/doc_info - Replace generic man(1) instructions with Debian-specific information. DEBPKG:debian/enc2xs_inc - https://bugs.debian.org/290336 Tweak enc2xs to follow symlinks and ignore missing @INC directories. DEBPKG:debian/errno_ver - https://bugs.debian.org/343351 Remove Errno version check due to upgrade problems with long-running processes. DEBPKG:debian/libperl_embed_doc - https://bugs.debian.org/186778 Note that libperl-dev package is required for embedded linking DEBPKG:fixes/respect_umask - Respect umask during installation DEBPKG:debian/writable_site_dirs - Set umask approproately for site install directories DEBPKG:debian/extutils_set_libperl_path - EU:MM: set location of libperl.a under /usr/lib DEBPKG:debian/no_packlist_perllocal - Don't install .packlist or perllocal.pod for perl or vendor DEBPKG:debian/fakeroot - Postpone LD_LIBRARY_PATH evaluation to the binary targets. DEBPKG:debian/instmodsh_doc - Debian policy doesn't install .packlist files for core or vendor. DEBPKG:debian/ld_run_path - Remove standard libs from LD_RUN_PATH as per Debian policy. DEBPKG:debian/libnet_config_path - Set location of libnet.cfg to /etc/perl/Net as /usr may not be writable. DEBPKG:debian/perlivp - https://bugs.debian.org/510895 Make perlivp skip include directories in /usr/local DEBPKG:debian/squelch-locale-warnings - https://bugs.debian.org/508764 Squelch locale warnings in Debian package maintainer scripts DEBPKG:debian/patchlevel - https://bugs.debian.org/567489 List packaged patches for 5.30.0-9ubuntu0.2 in patchlevel.h DEBPKG:fixes/document_makemaker_ccflags - https://bugs.debian.org/628522 [rt.cpan.org #68613] Document that CCFLAGS should include $Config{ccflags} DEBPKG:debian/find_html2text - https://bugs.debian.org/640479 Configure CPAN::Distribution with correct name of html2text DEBPKG:debian/perl5db-x-terminal-emulator.patch - https://bugs.debian.org/668490 Invoke x-terminal-emulator rather than xterm in perl5db.pl DEBPKG:debian/cpan-missing-site-dirs - https://bugs.debian.org/688842 Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent is writable DEBPKG:fixes/memoize_storable_nstore - [rt.cpan.org #77790] https://bugs.debian.org/587650 Memoize::Storable: respect 'nstore' option not respected DEBPKG:debian/makemaker-pasthru - https://bugs.debian.org/758471 Pass LD settings through to subdirectories DEBPKG:debian/makemaker-manext - https://bugs.debian.org/247370 Make EU::MakeMaker honour MANnEXT settings in generated manpage headers DEBPKG:debian/kfreebsd-softupdates - https://bugs.debian.org/796798 Work around Debian Bug#796798 DEBPKG:fixes/autodie-scope - https://bugs.debian.org/798096 Fix a scoping issue with "no autodie" and the "system" sub DEBPKG:fixes/memoize-pod - [rt.cpan.org #89441] Fix POD errors in Memoize DEBPKG:debian/hurd-softupdates - https://bugs.debian.org/822735 Fix t/op/stat.t failures on hurd DEBPKG:fixes/math_complex_doc_great_circle - https://bugs.debian.org/697567 [rt.cpan.org #114104] Math::Trig: clarify definition of great_circle_midpoint DEBPKG:fixes/math_complex_doc_see_also - https://bugs.debian.org/697568 [rt.cpan.org #114105] Math::Trig: add missing SEE ALSO DEBPKG:fixes/math_complex_doc_angle_units - https://bugs.debian.org/731505 [rt.cpan.org #114106] Math::Trig: document angle units DEBPKG:fixes/cpan_web_link - https://bugs.debian.org/367291 CPAN: Add link to main CPAN web site DEBPKG:debian/hppa_op_optimize_workaround - https://bugs.debian.org/838613 Temporarily lower the optimization of op.c on hppa due to gcc-6 problems DEBPKG:debian/installman-utf8 - https://bugs.debian.org/840211 Generate man pages with UTF-8 characters DEBPKG:fixes/getopt-long-4 - https://bugs.debian.org/864544 [rt.cpan.org #122068] Fix issue #122068. DEBPKG:debian/hppa_opmini_optimize_workaround - https://bugs.debian.org/869122 Lower the optimization level of opmini.c on hppa DEBPKG:debian/sh4_op_optimize_workaround - https://bugs.debian.org/869373 Also lower the optimization level of op.c and opmini.c on sh4 DEBPKG:debian/perldoc-pager - https://bugs.debian.org/870340 [rt.cpan.org #120229] Fix perldoc terminal escapes when sensible-pager is less DEBPKG:debian/prune_libs - https://bugs.debian.org/128355 Prune the list of libraries wanted to what we actually need. DEBPKG:debian/mod_paths - Tweak @INC ordering for Debian DEBPKG:debian/configure-regen - https://bugs.debian.org/762638 Regenerate Configure et al. after probe unit changes DEBPKG:debian/deprecate-with-apt - https://bugs.debian.org/747628 Point users to Debian packages of deprecated core modules DEBPKG:debian/disable-stack-check - https://bugs.debian.org/902779 [perl #133327] Disable debugperl stack extension checks for binary compatibility with perl DEBPKG:fixes/eumm-usrmerge - https://bugs.debian.org/913637 Avoid mangling /bin non-perl shebangs on merged-/usr systems DEBPKG:debian/perlbug-editor - https://bugs.debian.org/922609 Use "editor" as the default perlbug editor, as per Debian policy DEBPKG:fixes/gid-parsing - [79e302e] https://bugs.debian.org/941985 [perl #134169] (perl #134169) mg.c reset endptr after use DEBPKG:fixes/CVE-2020-10543.patch - [PATCH v530 1/4] regcomp.c: Prevent integer overflow from nested regex quantifiers. DEBPKG:fixes/CVE-2020-10878-1.patch - [PATCH v530 2/4] study_chunk: extract rck_elide_nothing DEBPKG:fixes/CVE-2020-10878-2.patch - [PATCH v530 3/4] regcomp: use long jumps if there is any possibility of overflow DEBPKG:fixes/CVE-2020-12723.patch - [PATCH v530 4/4] study_chunk: avoid mutating regexp program within GOSUB Built under linux Compiled at Oct 19 2020 10:56:54 @INC: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.30.0 /usr/local/share/perl/5.30.0 /usr/lib/x86_64-linux-gnu/perl5/5.30 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.30 /usr/share/perl/5.30 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base ``` Please evaluate the situation and let me know your feedback and what I could help with. Thanks in advance for your time and attention. -- 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/2745

3 3

git:master:8275046a: siptrace: aadded siptrace pseudo var
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 8275046a250a80018f42f8dbadaa245094c6f5ff URL: https://github.com/kamailio/kamailio/commit/8275046a250a80018f42f8dbadaa245… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T09:21:16+02:00 siptrace: aadded siptrace pseudo var --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8275046a250a80018f42f8dbadaa245… Patch: https://github.com/kamailio/kamailio/commit/8275046a250a80018f42f8dbadaa245… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 012644bfa0..b411886f54 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -195,6 +195,10 @@ static str trace_local_ip = {NULL, 0}; static db1_con_t *db_con = NULL; /*!< database connection */ static db_func_t db_funcs; /*!< Database functions */ +int pv_parse_siptrace_name(pv_spec_t *sp, str *in); +int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + /*! \brief * Exported functions */ @@ -276,6 +280,14 @@ stat_export_t siptrace_stats[] = { /* clang-format on */ #endif +static pv_export_t mod_pvs[] = { + + { {"siptrace", (sizeof("siptrace")-1)}, PVT_OTHER, pv_get_siptrace, 0, + pv_parse_siptrace_name, 0, 0, 0 }, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + /*! \brief module exports */ /* clang-format off */ struct module_exports exports = { @@ -283,9 +295,9 @@ struct module_exports exports = { DEFAULT_DLFLAGS, /*!< dlopen flags */ cmds, /*!< exported functions */ params, /*!< exported parameters */ - 0, /*!< exported rpc functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response function */ + 0, /*!< exported rpc functions */ + mod_pvs, /*!< exported pseudo-variables */ + 0, /*!< response function */ mod_init, /*!< module initialization function */ child_init, /*!< child initialization function */ destroy /*!< destroy function */ @@ -2039,6 +2051,8 @@ static void trace_free_info(void* trace_info) shm_free(trace_info); } +static siptrace_data_t* siptrace_event_data = NULL; + static int siptrace_exec_evcb_msg(siptrace_data_t *sto) { int backup_rt; @@ -2068,6 +2082,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); + siptrace_event_data = sto; if(_siptrace_evrt_msg_idx>=0) { run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, &ctx); } else { @@ -2080,6 +2095,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) sr_kemi_act_ctx_set(bctx); } } + siptrace_event_data = NULL; free_sip_msg(&msg); set_route_type(backup_rt); @@ -2482,6 +2498,56 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; + +/** + * + */ +int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res) +{ + if (siptrace_event_data==NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 1: /* dst_uri*/ + return pv_get_strval(msg, param, res, &siptrace_event_data->toip); + default: + /* 0 - src_uri */ + return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + } +} + +/** + * + */ +int pv_parse_siptrace_name(pv_spec_t *sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 7: + if(strncmp(in->s, "src_uri", 7)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "dst_uri", 7)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV snd name %.*s\n", in->len, in->s); + return -1; +} + /* clang-format on */ /**

1 0

git:master:10bc5b24: pv: new variable $hflc(hname)
by Daniel-Constantin Mierla 08 Jun '21

08 Jun '21

Module: kamailio Branch: master Commit: 10bc5b244db34e57beb9e5b4ec546396fb12a76b URL: https://github.com/kamailio/kamailio/commit/10bc5b244db34e57beb9e5b4ec54639… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-08T13:25:54+02:00 pv: new variable $hflc(hname) - return the number of bodies for known headers that can also be as a comma separated list - supported now is Via header --- 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/10bc5b244db34e57beb9e5b4ec54639… Patch: https://github.com/kamailio/kamailio/commit/10bc5b244db34e57beb9e5b4ec54639… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 2738a8b7a2..3a904e3161 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -110,6 +110,8 @@ static pv_export_t mod_pvs[] = { 0, 0, 0}, {{"hfl", (sizeof("hfl")-1)}, PVT_HDR, pv_get_hfl, 0, pv_parse_hfl_name, pv_parse_index, 0, 0}, + {{"hflc", (sizeof("hflc")-1)}, PVT_HDRC, pv_get_hflc, 0, pv_parse_hfl_name, + 0, 0, 0}, {{"var", (sizeof("var")-1)}, PVT_SCRIPTVAR, pv_get_scriptvar, pv_set_scriptvar, pv_parse_scriptvar_name, 0, 0, 0}, {{"vz", (sizeof("vz")-1)}, PVT_SCRIPTVAR, pv_get_scriptvar, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1b39ef3fb8..a4bfe21985 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2421,6 +2421,70 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_hdr_helper(msg, param, res, &tv, idx, idxf); } +/** + * + */ +int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + pv_value_t tv = {0}; + via_body_t *vb = NULL; + hdr_field_t *hf = NULL; + int n = 0; + + if(msg==NULL || res==NULL || param==NULL) + return -1; + + /* get the name */ + if(param->pvn.type == PV_NAME_PVAR) { + if(pv_get_spec_name(msg, param, &tv)!=0 || (!(tv.flags&PV_VAL_STR))) { + LM_ERR("invalid name\n"); + return pv_get_sintval(msg, param, res, 0); + } + } else { + if(param->pvn.u.isname.type == AVP_NAME_STR) { + tv.flags = PV_VAL_STR; + tv.rs = param->pvn.u.isname.name.s; + } else { + tv.flags = 0; + tv.ri = param->pvn.u.isname.name.n; + } + } + + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_sintval(msg, param, res, 0); + } + + if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { + if(msg->h_via1==NULL) { + LM_WARN("no Via header\n"); + return pv_get_sintval(msg, param, res, 0); + } + /* count Via header bodies */ + for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_VIA_T) { + for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { + n++; + } + } + } + return pv_get_sintval(msg, param, res, n); + } + + for (hf=msg->headers; hf; hf=hf->next) { + if(tv.flags == 0) { + if (tv.ri==hf->type) { + n++; + } + } else { + if (cmp_hdrname_str(&hf->name, &tv.rs)==0) { + n++; + } + } + } + return pv_get_sintval(msg, param, res, n); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 179df8fd0b..d001104647 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -255,6 +255,8 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_get_hflc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + int pv_get_scriptvar(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

[kamailio/kamailio] tm: prevent t_suspend memory leak (#2763)
by Julien Chavanton 07 Jun '21

07 Jun '21

When suspending while already in t_continue when processing a reply / suspending twice in a reply. Thanks to @giavac https://github.com/kamailio/kamailio/pull/2721 we can now suspend more then once in a reply route. This is working well, however a memory leak was detected. This modification is proposing a solution that will prevent calling `sip_msg_cloner` over an already twice over the same pointer, creating the memory leak.   #### 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) I assume this is a non "breaking change" since it can only trigger in a very the specific case that was not supported anyway. Conditions when this alternate behavior can trigger: 1- must be in t_suspend 2- must be in a reply `if (msg->first_line.type == SIP_REPLY) {` 3- must have an already cloned `if (t->uac[branch].reply) {` An alternate solution would be to free everything in the cloned message and recreate it. #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) load test done that included connections, failures and timeouts while suspending multiple times. ``` 6(31) INFO: tm [t_suspend.c:126]: t_suspend(): [>>>SUSPEND<<<] cloning message ! 53(78) INFO: tm [t_suspend.c:136]: t_suspend(): [>>>SUSPEND<<<] message already cloned, re-using ! ``` ``` Total 100000 INVITE calls sent in 1710825 ms at rate of 58/sec Total 100000 connection responses received in 1714999 ms at rate of 58/sec: >> Detailed connection responses received: - 200 connection responses: 24924 (OK) - 404 connection responses: 25145 (Not Found) - 408 connection responses: 24912 (Request Timeout) - 500 connection responses: 25019 (Internal Server Error) >> Detailed disconnection responses received: - 200 disconnection responses: 24924 (OK) ------ TOTAL responses: 24924 (rate=14/sec) ``` #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2763 -- Commit Summary -- * tm: prevent t_suspend memory leak -- File Changes -- M src/modules/tm/t_suspend.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2763.patch https://github.com/kamailio/kamailio/pull/2763.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/2763

2 4

git:master:09218156: tm: prevent t_suspend memory leak (#2763)
by GitHub 07 Jun '21

07 Jun '21

Module: kamailio Branch: master Commit: 09218156f3831ec9642d9ebf20d8668229ab16d6 URL: https://github.com/kamailio/kamailio/commit/09218156f3831ec9642d9ebf20d8668… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-07T08:13:36-07:00 tm: prevent t_suspend memory leak (#2763) When suspending while already in t_continue when processing a reply / suspending twice in a reply. Co-authored-by: Julien Chavanton <jchavanton(a)subspace.com> --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/09218156f3831ec9642d9ebf20d8668… Patch: https://github.com/kamailio/kamailio/commit/09218156f3831ec9642d9ebf20d8668… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 04f906f53c..826307d20a 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -118,18 +118,23 @@ int t_suspend(struct sip_msg *msg, LM_ERR("failed find UAC branch\n"); return -1; } - LM_DBG("found a a match with branch id [%d] - " - "cloning reply message to t->uac[branch].reply\n", branch); - sip_msg_len = 0; - t->uac[branch].reply = sip_msg_cloner( msg, &sip_msg_len ); + if (!t->uac[branch].reply) { + sip_msg_len = 0; + LM_DBG("found a match with branch id [%d] - " + "cloning reply message to t->uac[branch].reply\n", branch); + t->uac[branch].reply = sip_msg_cloner( msg, &sip_msg_len ); - if (! t->uac[branch].reply ) { - LM_ERR("can't alloc' clone memory\n"); - return -1; + if (! t->uac[branch].reply ) { + LM_ERR("can't alloc' clone memory\n"); + return -1; + } + t->uac[branch].end_reply = ((char*)t->uac[branch].reply) + sip_msg_len; + } else { + LM_DBG("found a match with branch id [%d] - " + "message already cloned to t->uac[branch].reply\n", branch); + // This can happen when suspending more than once in a reply. } - t->uac[branch].end_reply = ((char*)t->uac[branch].reply) + sip_msg_len; - LM_DBG("saving transaction data\n"); t->uac[branch].reply->flags = msg->flags; t->flags |= T_ASYNC_SUSPENDED;

1 0

git:master:7747872f: mtree: docs - section id for mt_match() function
by Daniel-Constantin Mierla 07 Jun '21

07 Jun '21

Module: kamailio Branch: master Commit: 7747872f066ead3488cbfc854873506bda4f7390 URL: https://github.com/kamailio/kamailio/commit/7747872f066ead3488cbfc854873506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:23:50+02:00 mtree: docs - section id for mt_match() function --- Modified: src/modules/mtree/doc/mtree_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7747872f066ead3488cbfc854873506… Patch: https://github.com/kamailio/kamailio/commit/7747872f066ead3488cbfc854873506… --- diff --git a/src/modules/mtree/doc/mtree_admin.xml b/src/modules/mtree/doc/mtree_admin.xml index 09eb86092c..2416d8fb8d 100644 --- a/src/modules/mtree/doc/mtree_admin.xml +++ b/src/modules/mtree/doc/mtree_admin.xml @@ -454,7 +454,7 @@ modparam("mtree", "mt_allow_duplicates", 1) <section> <title>Functions</title> <section> - <title> + <title id="mtree.f.mt_match"> <function moreinfo="none">mt_match(mtree, pv, mode)</function> </title> <para>

1 0

[kamailio/kamailio] Sl (#2767)
by sergey-safarov 07 Jun '21

07 Jun '21

#### 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 HTTP request do not trigger `SREV_NET_DATA_RECV` (please check [`receive_msg`](https://github.com/kamailio/kamailio/blob/0e806316b84be8388dad670e964e54011000b4a4/src/core/receive.c#L321)) This PR adds the same behavior for HTTP responces. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2767 -- Commit Summary -- * core: published sip_check_fline function in .h file * sl: disabled SREV_NET_DATA_SENT for HTTP respones -- File Changes -- M src/core/receive.h (1) M src/modules/sl/sl_funcs.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2767.patch https://github.com/kamailio/kamailio/pull/2767.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/2767

2 1

git:master:4168d7c5: sl: disabled SREV_NET_DATA_SENT for HTTP respones
by Daniel-Constantin Mierla 07 Jun '21

07 Jun '21

Module: kamailio Branch: master Commit: 4168d7c55955a01c3a30c67d5e8a510be52120ff URL: https://github.com/kamailio/kamailio/commit/4168d7c55955a01c3a30c67d5e8a510… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:17:32+02:00 sl: disabled SREV_NET_DATA_SENT for HTTP respones more details at GH #2767 --- Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/4168d7c55955a01c3a30c67d5e8a510… Patch: https://github.com/kamailio/kamailio/commit/4168d7c55955a01c3a30c67d5e8a510… --- diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 86ad65c5e8..e80259d61d 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -210,7 +210,11 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) dst.comp=msg->via1->comp_no; #endif dst.send_flags=msg->rpl_send_flags; - ret = msg_send(&dst, buf.s, buf.len); + if(sip_check_fline(buf.s, buf.len) == 0) + ret = msg_send_buffer(&dst, buf.s, buf.len, 0); + else + ret = msg_send_buffer(&dst, buf.s, buf.len, 1); + mhomed=backup_mhomed; keng = sr_kemi_eng_get();

1 0

git:master:c336eed3: core: published sip_check_fline function in .h file
by Daniel-Constantin Mierla 07 Jun '21

07 Jun '21

Module: kamailio Branch: master Commit: c336eed393f2fedae16dbcf004e143fdd38c46e2 URL: https://github.com/kamailio/kamailio/commit/c336eed393f2fedae16dbcf004e143f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:17:32+02:00 core: published sip_check_fline function in .h file --- Modified: src/core/receive.h --- Diff: https://github.com/kamailio/kamailio/commit/c336eed393f2fedae16dbcf004e143f… Patch: https://github.com/kamailio/kamailio/commit/c336eed393f2fedae16dbcf004e143f… --- diff --git a/src/core/receive.h b/src/core/receive.h index d4ce7895a8..433bf6a72e 100644 --- a/src/core/receive.h +++ b/src/core/receive.h @@ -32,6 +32,7 @@ #include "ip_addr.h" int receive_msg(char* buf, unsigned int len, struct receive_info *ri); +int sip_check_fline(char *buf, unsigned int len); unsigned int inc_msg_no(void); void ksr_msg_env_reset(void);

1 0

[kamailio/kamailio] Smsops 7bit support special chars (#2756)
by alexyosifov 07 Jun '21

07 Jun '21

#### 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) - [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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2756 -- Commit Summary -- * Add README.md * Merge branch 'master' of github.com:alexyosifov/kamailio * Merge remote-tracking branch 'remote_yosifov/master' * Merge branch 'master' of github.com:alexyosifov/kamailio * smsops: support for 7bit special chars -- File Changes -- M src/modules/smsops/smsops_impl.c (256) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2756.patch https://github.com/kamailio/kamailio/pull/2756.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/2756

3 4

git:master:f82c4775: smsops: support for 7bit special chars
by Daniel-Constantin Mierla 07 Jun '21

07 Jun '21

Module: kamailio Branch: master Commit: f82c4775efca0580401f4b1a48dcb4d2cf26814f URL: https://github.com/kamailio/kamailio/commit/f82c4775efca0580401f4b1a48dcb4d… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:13:17+02:00 smsops: support for 7bit special chars - Added support for 7bit special chars for MO/MT SMSs. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/f82c4775efca0580401f4b1a48dcb4d… Patch: https://github.com/kamailio/kamailio/commit/f82c4775efca0580401f4b1a48dcb4d…

1 0

[kamailio/kamailio] app_perl change to ignore "die" signals from eval blocks (#2754)
by rodolfojcj 07 Jun '21

07 Jun '21

Proposed fix for issue #2745. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2754 -- Commit Summary -- * app_perl change to ignore "die" signals from eval blocks -- File Changes -- M src/modules/app_perl/lib/perl/Kamailio.pm (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2754.patch https://github.com/kamailio/kamailio/pull/2754.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/2754

2 2

git:master:50557b84: app_perl change to ignore "die" signals from eval blocks
by Daniel-Constantin Mierla 07 Jun '21

07 Jun '21

Module: kamailio Branch: master Commit: 50557b8433e137a9095b4d48df8ac9b8c3fd8807 URL: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:11:27+02:00 app_perl change to ignore "die" signals from eval blocks --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… Patch: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… --- diff --git a/src/modules/app_perl/lib/perl/Kamailio.pm b/src/modules/app_perl/lib/perl/Kamailio.pm index eda5ede8b7..aa587424e1 100644 --- a/src/modules/app_perl/lib/perl/Kamailio.pm +++ b/src/modules/app_perl/lib/perl/Kamailio.pm @@ -40,6 +40,7 @@ bootstrap Kamailio; BEGIN { $SIG{'__DIE__'} = sub { + die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; $SIG{'__WARN__'} = sub {

1 0

git:master:0e806316: mtree: docs - added section ids for parameters
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: 0e806316b84be8388dad670e964e54011000b4a4 URL: https://github.com/kamailio/kamailio/commit/0e806316b84be8388dad670e964e540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-04T17:59:58+02:00 mtree: docs - added section ids for parameters --- Modified: src/modules/mtree/doc/mtree_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0e806316b84be8388dad670e964e540… Patch: https://github.com/kamailio/kamailio/commit/0e806316b84be8388dad670e964e540…

1 0

[kamailio/kamailio] evapi: Evapi MAX clients set to 8 can it be made configurable parameter? (#2762)
by Balajee 04 Jun '21

04 Jun '21

### Description Evapi max client is set to 8 in [evapi module](https://github.com/kamailio/kamailio/blob/master/src/modules/evapi/… Can this be increased or can be made as configuration parameter?  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2762

2 2

[kamailio/kamailio] pv: fixed error "pv_get_method(): no CSEQ header" (#2761)
by sergey-safarov 04 Jun '21

04 Jun '21

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description pv: fixed error "pv_get_method(): no CSEQ header" when sent HTTP request like ``` HTTP/1.1 200 OK Sia: SIP/2.0/TCP 8.8.8.8:39813 Content-Type: application/json Server: kamailio Content-Length: 49 {"data":{"status-code":200,"reason-phrase":"OK"}} ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2761 -- Commit Summary -- * pv: fixed error "pv_get_method(): no CSEQ header" -- File Changes -- M src/modules/pv/pv_core.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2761.patch https://github.com/kamailio/kamailio/pull/2761.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/2761

2 7

git:master:de8c85ce: pv: pv_get_method fixed error "pv_get_method(): no CSEQ header"
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: de8c85ceae93779cdf7d6aea2eabb7567d69d7ce URL: https://github.com/kamailio/kamailio/commit/de8c85ceae93779cdf7d6aea2eabb75… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-04T16:22:49+02:00 pv: pv_get_method fixed error "pv_get_method(): no CSEQ header" GH #2761: Error obeserver when sent HTTP reply like HTTP/1.1 200 OK Sia: SIP/2.0/TCP 8.8.8.8:39813 Content-Type: application/json Server: kamailio Content-Length: 49 {"data":{"status-code":200,"reason-phrase":"OK"}} --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/de8c85ceae93779cdf7d6aea2eabb75… Patch: https://github.com/kamailio/kamailio/commit/de8c85ceae93779cdf7d6aea2eabb75… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5b011ea248..1b39ef3fb8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -147,6 +147,9 @@ int pv_get_method(struct sip_msg *msg, pv_param_t *param, (int)msg->first_line.u.request.method_value); } + if (IS_HTTP_REPLY(msg)) + return pv_get_null(msg, param, res); + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || (msg->cseq==NULL))) {

1 0

git:master:c264fbc6: pv: test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: c264fbc66a4690b073c72ffa8fc095227ce0ae8b URL: https://github.com/kamailio/kamailio/commit/c264fbc66a4690b073c72ffa8fc0952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T15:29:50+02:00 pv: test for HDR_ERROR_T after header name parsing --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/c264fbc66a4690b073c72ffa8fc0952… Patch: https://github.com/kamailio/kamailio/commit/c264fbc66a4690b073c72ffa8fc0952… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8f398cdf43..5b011ea248 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3501,8 +3501,8 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) s.s = p; s.len = in->len+1; - if (parse_hname2_short(s.s, s.s + s.len, &hdr)==0) - { + parse_hname2_short(s.s, s.s + s.len, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); goto error; }

1 0

git:master:b775bbdf: dmq: warning about protocol made info
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: b775bbdff501de0ca1f1a0bc1ab39a3b790c166f URL: https://github.com/kamailio/kamailio/commit/b775bbdff501de0ca1f1a0bc1ab39a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-04T09:08:06+02:00 dmq: warning about protocol made info --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b775bbdff501de0ca1f1a0bc1ab39a3… Patch: https://github.com/kamailio/kamailio/commit/b775bbdff501de0ca1f1a0bc1ab39a3… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 1db7cdd1f4..817fc3f3bb 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -161,7 +161,7 @@ static int make_socket_str_from_uri(struct sip_uri *uri, str *socket) } if(get_valid_proto_string(uri->proto, 0, 0, &sproto)<0) { - LM_WARN("unknown transport protocol - fall back to udp\n"); + LM_INFO("unknown transport protocol - fall back to udp\n"); sproto.s = "udp"; sproto.len = 3; }

1 0

git:master:490ae559: dialog: safety checks for bind addr fields
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: 490ae559d2b77b13b3f3831e7ff1aa58980e4086 URL: https://github.com/kamailio/kamailio/commit/490ae559d2b77b13b3f3831e7ff1aa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T15:28:31+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/490ae559d2b77b13b3f3831e7ff1aa5… Patch: https://github.com/kamailio/kamailio/commit/490ae559d2b77b13b3f3831e7ff1aa5… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1bfcb2cad7..b6a49da2a4 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -802,6 +802,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int i; struct dlg_var *var; srjson_doc_t jdoc; + str sempty = str_init(""); db_val_t values[DIALOG_TABLE_COL_NO]; @@ -870,14 +871,25 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+6, cell->tag[DLG_CALLEE_LEG]); SET_PROPER_NULL_FLAG(cell->tag[DLG_CALLEE_LEG], values, 6); - LM_DBG("caller sock_info is %.*s, callee sock_info is %.*s\n", - cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); - SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); - SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + if(cell->bind_addr[DLG_CALLER_LEG]) { + LM_DBG("caller sock_info is %.*s\n", + cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLER_LEG]->sock_str.s); + SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); + } else { + LM_DBG("no caller sock_info\n"); + SET_STR_VALUE(values+7, sempty); + } + if(cell->bind_addr[DLG_CALLEE_LEG]) { + LM_DBG("callee sock_info is %.*s\n", + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); + SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + } else { + LM_DBG("no callee sock_info\n"); + SET_STR_VALUE(values+8, sempty); + } SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]);

1 0

git:master:e8fa2b3e: pv: support Contact header in $hfl(...)
by Daniel-Constantin Mierla 03 Jun '21

03 Jun '21

Module: kamailio Branch: master Commit: e8fa2b3e8e5a789ac6d6d35f75ec61d09f487d6c URL: https://github.com/kamailio/kamailio/commit/e8fa2b3e8e5a789ac6d6d35f75ec61d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T11:11:50+02:00 pv: support Contact header in $hfl(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e8fa2b3e8e5a789ac6d6d35f75ec61d… Patch: https://github.com/kamailio/kamailio/commit/e8fa2b3e8e5a789ac6d6d35f75ec61d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 073d0dccb8..8f398cdf43 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2191,6 +2191,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) pv_value_t tv = {0}; via_body_t *vb = NULL; rr_t *rrb = NULL; + contact_t *cb = NULL; hdr_field_t *hf = NULL; int n = 0; str sval = STR_NULL; @@ -2358,6 +2359,62 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri==HDR_CONTACT_T)) { + if(msg->contact==NULL) { + LM_DBG("no Contact header\n"); + return pv_get_null(msg, param, res); + } + if(parse_contact_headers(msg) < 0) { + LM_DBG("failed to parse Contact headers\n"); + return pv_get_null(msg, param, res); + } + if(idx<0) { + n = 1; + /* count Contact header bodies */ + for(hf=msg->contact; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_CONTACT_T) { + for(cb=(((contact_body_t*)hf->parsed)->contacts); + cb!=NULL; cb=cb->next) { + n++; + } + } + } + + idx = -idx; + if(idx>n) { + LM_DBG("index out of range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + if(idx==0) { + cb = ((contact_body_t*)msg->contact->parsed)->contacts; + sval.s = cb->name.s; + sval.len = cb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n=0; + for(hf=msg->contact; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_CONTACT_T) { + for(cb=(((contact_body_t*)hf->parsed)->contacts); + cb!=NULL; cb=cb->next) { + if(n==idx) { + sval.s = cb->name.s; + sval.len = cb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n++; + } + } + } + LM_DBG("unexpected contact index out of range\n"); + return pv_get_null(msg, param, res); + } + return pv_get_hdr_helper(msg, param, res, &tv, idx, idxf); }

1 0

git:master:25834469: core: select - test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 03 Jun '21

03 Jun '21

Module: kamailio Branch: master Commit: 2583446968d81a9351caab1cfdd2cc86434850f3 URL: https://github.com/kamailio/kamailio/commit/2583446968d81a9351caab1cfdd2cc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T10:55:22+02:00 core: select - test for HDR_ERROR_T after header name parsing --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/2583446968d81a9351caab1cfdd2cc8… Patch: https://github.com/kamailio/kamailio/commit/2583446968d81a9351caab1cfdd2cc8… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index 029f880a48..02d393a6ba 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -595,7 +595,7 @@ int select_msg_header(str* res, select_t* s, struct sip_msg* msg) { /* get all headers */ char *c; - res->s = SIP_MSG_START(msg) + msg->first_line.len; + res->s = SIP_MSG_START(msg) + msg->first_line.len; c = get_body(msg); res->len = c - res->s; return 0; @@ -607,7 +607,7 @@ int select_anyheader(str* res, select_t* s, struct sip_msg* msg) int hi; char c; struct hdr_field hdr; - + if(msg==NULL) { if (res!=NULL) return -1; @@ -622,13 +622,15 @@ int select_anyheader(str* res, select_t* s, struct sip_msg* msg) /* if header name is parseable, parse it and set SEL_PARAM_DIV */ c=s->params[2].v.s.s[s->params[2].v.s.len]; s->params[2].v.s.s[s->params[2].v.s.len]=':'; - if (parse_hname2_short(s->params[2].v.s.s,s->params[2].v.s.s+(s->params[2].v.s.len<3?4:s->params[2].v.s.len+1), - &hdr)==0) { + parse_hname2_short(s->params[2].v.s.s,s->params[2].v.s.s + +(s->params[2].v.s.len<3?4:s->params[2].v.s.len+1), + &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("fixup_call:parse error\n"); return -1; } s->params[2].v.s.s[s->params[2].v.s.len]=c; - + if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) { /* pkg_free(s->params[1].v.s.s); */ /* don't free it (the mem can leak only once at startup)

1 0

[kamailio/kamailio] Update resolve.c handle type 41 (#2759)
by Andrew Webster 03 Jun '21

03 Jun '21

Possible solution to https://github.com/kamailio/kamailio/issues/2758   #### 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/2759 -- Commit Summary -- * Update resolve.c handle type 41 -- File Changes -- M src/core/resolve.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2759.patch https://github.com/kamailio/kamailio/pull/2759.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/2759

2 2

git:master:cb2705f2: textops: check for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: cb2705f21e56f884e733febc2362055da3ef2693 URL: https://github.com/kamailio/kamailio/commit/cb2705f21e56f884e733febc2362055… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T21:21:59+02:00 textops: check for HDR_ERROR_T after header name parsing --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/cb2705f21e56f884e733febc2362055… Patch: https://github.com/kamailio/kamailio/commit/cb2705f21e56f884e733febc2362055… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 40ea02c273..e93bc82bf2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1816,7 +1816,8 @@ static int ki_remove_hf_idx(sip_msg_t* msg, str* hname, int idx) return -1; } - if(parse_hname2_str(hname, &hfm)==NULL) { + parse_hname2_str(hname, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("failed to parse header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2098,12 +2099,13 @@ static int ki_hname_gparam(str *hname, gparam_t *gp) gp->v.str = *hname; - if (parse_hname2_short(hbuf, hbuf + gp->v.str.len + 1, &hdr)==0) { + parse_hname2_short(hbuf, hbuf + gp->v.str.len + 1, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name: %.*s\n", hname->len, hname->s); return -1; } - if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) { + if (hdr.type!=HDR_OTHER_T) { LM_DBG("using hdr type (%d) instead of <%.*s>\n", hdr.type, gp->v.str.len, gp->v.str.s); gp->v.str.s = NULL; @@ -3713,17 +3715,19 @@ static int hname_fixup(void** param, int param_no) gp->v.str.s[gp->v.str.len] = ':'; gp->v.str.len++; - if (parse_hname2_short(gp->v.str.s, gp->v.str.s + gp->v.str.len, &hdr)==0) + parse_hname2_short(gp->v.str.s, gp->v.str.s + gp->v.str.len, &hdr); + + gp->v.str.len--; + gp->v.str.s[gp->v.str.len] = c; + + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name\n"); pkg_free(gp); return E_UNSPEC; } - gp->v.str.len--; - gp->v.str.s[gp->v.str.len] = c; - - if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) + if (hdr.type!=HDR_OTHER_T) { LM_DBG("using hdr type (%d) instead of <%.*s>\n", hdr.type, gp->v.str.len, gp->v.str.s);

1 0

git:master:4cd55a86: textops: find_hdr_line_start() - search for header name with colon
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 4cd55a86cdc3477da0ca4c384227833ec404bfa2 URL: https://github.com/kamailio/kamailio/commit/4cd55a86cdc3477da0ca4c384227833… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T21:22:48+02:00 textops: find_hdr_line_start() - search for header name with colon --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4cd55a86cdc3477da0ca4c384227833… Patch: https://github.com/kamailio/kamailio/commit/4cd55a86cdc3477da0ca4c384227833… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e93bc82bf2..75a00f16a8 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1619,7 +1619,7 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, while (hname_len <= len) { /* attempt to find a header name */ - parse_sip_header_name(start, start + hname_len, &h2, 1, 0); + parse_sip_header_name(start, start + hname_len, &h2, 0, 0); if(h2.type!=HDR_ERROR_T) { if(h1.type>0 && h1.type==h2.type) { *buf = start;

1 0

git:master:785bbaa0: core: kemi - check hdr type HDR_ERROR_T after parsing
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 785bbaa0f16f83353ad1d776816f439608a67858 URL: https://github.com/kamailio/kamailio/commit/785bbaa0f16f83353ad1d776816f439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:57:53+02:00 core: kemi - check hdr type HDR_ERROR_T after parsing --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/785bbaa0f16f83353ad1d776816f439… Patch: https://github.com/kamailio/kamailio/commit/785bbaa0f16f83353ad1d776816f439… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 324e7cd6cf..bee8a98f07 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1988,7 +1988,8 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2056,7 +2057,8 @@ int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2106,7 +2108,8 @@ static int sr_kemi_hdr_is_present(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2188,7 +2191,8 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2305,7 +2309,8 @@ static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - if (parse_hname2_str(hname, &shdr)==0) { + parse_hname2_str(hname, &shdr); + if(shdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; @@ -2426,7 +2431,8 @@ static int sr_kemi_hdr_match_content(sip_msg_t *msg, str *hname, str *op, return SR_KEMI_FALSE; } - if (parse_hname2_str(hname, &hfm)==0) { + parse_hname2_str(hname, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return SR_KEMI_FALSE; }

1 0

git:master:95034f62: xprint: check hdr type HDR_ERROR_T after parsing
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 95034f62d4a0cf536da1c5c26c748c1cf8ccb280 URL: https://github.com/kamailio/kamailio/commit/95034f62d4a0cf536da1c5c26c748c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:48:50+02:00 xprint: check hdr type HDR_ERROR_T after parsing --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/95034f62d4a0cf536da1c5c26c748c1… Patch: https://github.com/kamailio/kamailio/commit/95034f62d4a0cf536da1c5c26c748c1… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index b2bcc077b7..4adb5c31c6 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1481,16 +1481,17 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c /* ugly hack for compact header names -- !!fake length!! * -- parse_hname2 expects name buffer length >= 4 */ - if (parse_hname2(e->hparam.s, + parse_hname2(e->hparam.s, e->hparam.s + ((e->hparam.len<4)?4:e->hparam.len), - &hdr)==0) + &hdr); + if(hdr.type==HDR_ERROR_T) { - LOG(L_ERR,"xprint: xl_parse_format: strange error\n"); + LOG(L_ERR,"xprint: xl_parse_format: header parsing error\n"); goto error; } e->hparam.len--; e->hparam.s[e->hparam.len] = c; - if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) + if (hdr.type!=HDR_OTHER_T) { LOG(L_INFO,"INFO:xprint: xl_parse_format: using " "hdr type (%d) instead of <%.*s>\n",

1 0

git:master:d3b693fa: xprint: remove history and svn id
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: d3b693fa5725b45f24d68956658800de7b9ec19c URL: https://github.com/kamailio/kamailio/commit/d3b693fa5725b45f24d68956658800d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:45:22+02:00 xprint: remove history and svn id --- Modified: src/modules/xprint/xp_lib.c Modified: src/modules/xprint/xp_lib.h --- Diff: https://github.com/kamailio/kamailio/commit/d3b693fa5725b45f24d68956658800d… Patch: https://github.com/kamailio/kamailio/commit/d3b693fa5725b45f24d68956658800d… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 5771b77399..b2bcc077b7 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1,7 +1,5 @@ /** - * $Id$ - * - * XLOG module + * XPRINT module * * Copyright (C) 2001-2003 FhG Fokus * @@ -27,15 +25,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* History: - * -------- - * 2004-10-20 - added header name specifier (ramona) - * 2005-07-04 - added color printing support via escape sequesnces - * contributed by Ingo Wolfsberger (ramona) - * 2005-12-23 - parts from private branch merged (mma) - * - */ - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/modules/xprint/xp_lib.h b/src/modules/xprint/xp_lib.h index 9c8812029a..fb429dec9b 100644 --- a/src/modules/xprint/xp_lib.h +++ b/src/modules/xprint/xp_lib.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. @@ -20,8 +18,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */

1 0

git:master:260a825a: core: parser/parse_hname2 - option to skip printing logs on parse failure
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 260a825a48ac6f8b845a4b934f86ea3e04c120d4 URL: https://github.com/kamailio/kamailio/commit/260a825a48ac6f8b845a4b934f86ea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:00:35+02:00 core: parser/parse_hname2 - option to skip printing logs on parse failure --- Modified: src/core/parser/parse_hname2.c Modified: src/core/parser/parse_hname2.h --- Diff: https://github.com/kamailio/kamailio/commit/260a825a48ac6f8b845a4b934f86ea3… Patch: https://github.com/kamailio/kamailio/commit/260a825a48ac6f8b845a4b934f86ea3… --- diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index ab56fa4ea5..20398a9595 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -219,21 +219,25 @@ int ksr_hname_init_config(void) * - fills hdr structure (must not be null) * - set hdr->type=HDR_ERROR_T in case of parsing error * - if emode==1, then parsing does not expect : after header name + * - if logmode==1, then print error log messages on parsing failure * - returns pointer after : if emode==0 or after header name if emode==1 + * in case of parsing error, returns begin and sets hdr->type to HDR_ERROR_T */ char *parse_sip_header_name(char* const begin, const char* const end, - hdr_field_t* const hdr, int emode) + hdr_field_t* const hdr, int emode, int logmode) { char *p; int i; - if (end <= begin) { + if (begin == NULL || end == NULL || end <= begin) { hdr->type = HDR_ERROR_T; return begin; } if(_ksr_hname_chars_idx[(unsigned char)(*begin)] == 0) { - LM_ERR("invalid start of header name for [%.*s]\n", - (int)(end-begin), begin); + if(likely(logmode)) { + LM_ERR("invalid start of header name for [%.*s]\n", + (int)(end-begin), begin); + } hdr->type = HDR_ERROR_T; return begin; } @@ -262,8 +266,10 @@ char *parse_sip_header_name(char* const begin, const char* const end, } if(*p != ' ' && *p != '\t') { /* no white space - bad header name format */ - LM_ERR("invalid header name for [%.*s]\n", - (int)(end-begin), begin); + if(likely(logmode)) { + LM_ERR("invalid header name for [%.*s]\n", + (int)(end-begin), begin); + } hdr->type = HDR_ERROR_T; return begin; } @@ -271,8 +277,10 @@ char *parse_sip_header_name(char* const begin, const char* const end, if(p == end) { /* no : found - emode==0 */ - LM_ERR("invalid end of header name for [%.*s]\n", - (int)(end-begin), begin); + if(likely(logmode)) { + LM_ERR("invalid end of header name for [%.*s]\n", + (int)(end-begin), begin); + } hdr->type = HDR_ERROR_T; return begin; } @@ -298,7 +306,7 @@ char *parse_sip_header_name(char* const begin, const char* const end, char* parse_hname2(char* const begin, const char* const end, struct hdr_field* const hdr) { - return parse_sip_header_name(begin, end, hdr, 0); + return parse_sip_header_name(begin, end, hdr, 0, 1); } /** @@ -307,11 +315,11 @@ char* parse_hname2(char* const begin, const char* const end, struct hdr_field* c */ char* parse_hname2_short(char* const begin, const char* const end, struct hdr_field* const hdr) { - return parse_sip_header_name(begin, end, hdr, 0); + return parse_sip_header_name(begin, end, hdr, 0, 1); } char* parse_hname2_str (str* const hbuf, hdr_field_t* const hdr) { - return parse_sip_header_name(hbuf->s, hbuf->s + hbuf->len, hdr, 1); + return parse_sip_header_name(hbuf->s, hbuf->s + hbuf->len, hdr, 1, 1); } diff --git a/src/core/parser/parse_hname2.h b/src/core/parser/parse_hname2.h index 2c864857d6..fc52c1c802 100644 --- a/src/core/parser/parse_hname2.h +++ b/src/core/parser/parse_hname2.h @@ -35,6 +35,15 @@ /** Fast 32-bit header field name parser. * @file */ + +char *parse_sip_header_name(char* const begin, const char* const end, + hdr_field_t* const hdr, int emode, int logmode); + +/* macro to find header name without printing errors in failure case */ +#define find_hname2_str(hbuf, hdr) \ + parse_sip_header_name((hbuf)->s, (hbuf)->s + (hbuf)->len, hdr, 1, 0) + + char* parse_hname2(char* const begin, const char* const end, struct hdr_field* const hdr); char* parse_hname2_short(char* const begin, const char* const end, struct hdr_field* const hdr); char* parse_hname2_str (str* const hbuf, hdr_field_t* const hdr);

1 0

git:master:a4d94268: textops: find_hdr_line_start() - locate header name without error logs
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: a4d94268c7cf5d31e3660b543b10ef6e7ca891ab URL: https://github.com/kamailio/kamailio/commit/a4d94268c7cf5d31e3660b543b10ef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:02:24+02:00 textops: find_hdr_line_start() - locate header name without error logs --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/a4d94268c7cf5d31e3660b543b10ef6… Patch: https://github.com/kamailio/kamailio/commit/a4d94268c7cf5d31e3660b543b10ef6… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cbc2309cfe..40ea02c273 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1611,13 +1611,16 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, start = *buf; len = *buf_len; - if(parse_hname2_str(&sname, &h1)==NULL) { + parse_hname2_str(&sname, &h1); + if(h1.type!=HDR_ERROR_T) { LM_ERR("not a header name: %.*s\n", hname_len, hname); return 0; } while (hname_len <= len) { - if(parse_hname2(start, start + hname_len, &h2)!=NULL) { + /* attempt to find a header name */ + parse_sip_header_name(start, start + hname_len, &h2, 1, 0); + if(h2.type!=HDR_ERROR_T) { if(h1.type>0 && h1.type==h2.type) { *buf = start; *buf_len = len; @@ -1628,6 +1631,7 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, return 1; } } + /* jump to next line */ if ((ch = memchr(start, 13, len - 1))) { if (*(ch + 1) != 10) { LM_ERR("No LF after CR\n");

1 0

[kamailio/kamailio] core kamailio 5.4 (#2740)
by descartin 02 Jun '21

02 Jun '21

Dear all we have seen a core in a running production kamailio instance today, i attach you the bt in dropbox version: kamailio 5.4.4 (x86_64/linux) 0ddb01-dirty centos7 3.10.0-693.17.1.el7.x86_64 #1 SMP Thu Jan 25 20:13:58 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux https://www.dropbox.com/s/3dg72cbuz7nvx5b/core_kamailio_21mayo?dl=0 https://www.dropbox.com/s/iyko32fwfxj8aam/core_kamailio_21mayo_2?dl=0 seems there might be a relation async module when delaying a request after communicating with the rtpengine ?¿ could you please take a look? thanks a lot and regards david -- 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/2740

3 10

git:master:f3332c7d: pv: suport also Route headers in $hfl(...)
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: f3332c7dddda83d18ea1b1dc86fea5ad3886e010 URL: https://github.com/kamailio/kamailio/commit/f3332c7dddda83d18ea1b1dc86fea5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T16:57:05+02:00 pv: suport also Route headers in $hfl(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/f3332c7dddda83d18ea1b1dc86fea5a… Patch: https://github.com/kamailio/kamailio/commit/f3332c7dddda83d18ea1b1dc86fea5a… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 65afab14e9..073d0dccb8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2227,6 +2227,10 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { + if(msg->h_via1==NULL) { + LM_WARN("no Via header\n"); + return pv_get_null(msg, param, res); + } if(idx<0) { n = 1; /* count Via header bodies */ @@ -2271,17 +2275,28 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_DBG("unexpected via index out of range\n"); return pv_get_null(msg, param, res); } - if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T)) { + if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T || tv.ri==HDR_ROUTE_T)) { + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + if(hf==NULL) { + LM_DBG("no %s header\n", (tv.ri==HDR_ROUTE_T)?"route":"record-route"); + return pv_get_null(msg, param, res); + } + if(idx<0) { n = 1; - /* count Record-Route header bodies */ - for(hf=msg->record_route; hf!=NULL; hf=hf->next) { - if(hf->type==HDR_RECORDROUTE_T) { + /* count Record-Route/Route header bodies */ + for(; hf!=NULL; hf=hf->next) { + if(hf->type==tv.ri) { if(parse_rr(hf) == -1) { - LM_ERR("failed parsing rr header\n"); + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } - for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { n++; } } @@ -2289,17 +2304,24 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) idx = -idx; if(idx>n) { - LM_DBG("index out of rr headers range\n"); + LM_DBG("index out of %s headers range\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } idx = n - idx; } if(idx==0) { - if(parse_rr(msg->record_route) == -1) { - LM_ERR("failed parsing rr header\n"); + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } - rrb = (rr_t*)(msg->record_route->parsed); + rrb = (rr_t*)(hf->parsed); sval.s = rrb->nameaddr.name.s; sval.len = rrb->len; trim(&sval); @@ -2307,13 +2329,19 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return 0; } n=0; - for(hf=msg->record_route; hf!=NULL; hf=hf->next) { - if(hf->type==HDR_RECORDROUTE_T) { + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + for(; hf!=NULL; hf=hf->next) { + if(hf->type==tv.ri) { if(parse_rr(hf) == -1) { - LM_ERR("failed parsing rr header\n"); + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } - for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { if(n==idx) { sval.s = rrb->nameaddr.name.s; sval.len = rrb->len; @@ -2325,7 +2353,8 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } - LM_DBG("unexpected record-route index out of range\n"); + LM_DBG("unexpected %s index out of range\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); }

1 0

Kamailio v5.4.6 Released
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Hello, Kamailio SIP Server v5.4.6 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.5. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.6. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.0 being release out of it. For more details about version 5.4.6 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-4-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

Kamailio v5.4.5 Released
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Hello, Kamailio SIP Server v5.4.6 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.5. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.6. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.0 being release out of it. For more details about version 5.4.6 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-4-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:7d1e1a34: pv: support for Record-Route in $hfl(...)
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 7d1e1a349d5590f3754976b2e169fd30795c7f1b URL: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T12:23:40+02:00 pv: support for Record-Route in $hfl(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… Patch: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 4dc6d56882..65afab14e9 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2190,6 +2190,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int idxf = 0; pv_value_t tv = {0}; via_body_t *vb = NULL; + rr_t *rrb = NULL; hdr_field_t *hf = NULL; int n = 0; str sval = STR_NULL; @@ -2228,7 +2229,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { if(idx<0) { n = 1; - /* count Vua header bodies */ + /* count Via header bodies */ for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { if(hf->type==HDR_VIA_T) { for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { @@ -2270,6 +2271,64 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_DBG("unexpected via index out of range\n"); return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T)) { + if(idx<0) { + n = 1; + /* count Record-Route header bodies */ + for(hf=msg->record_route; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_RECORDROUTE_T) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + n++; + } + } + } + + idx = -idx; + if(idx>n) { + LM_DBG("index out of rr headers range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + if(idx==0) { + if(parse_rr(msg->record_route) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + rrb = (rr_t*)(msg->record_route->parsed); + sval.s = rrb->nameaddr.name.s; + sval.len = rrb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n=0; + for(hf=msg->record_route; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_RECORDROUTE_T) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + if(n==idx) { + sval.s = rrb->nameaddr.name.s; + sval.len = rrb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n++; + } + } + } + LM_DBG("unexpected record-route index out of range\n"); + return pv_get_null(msg, param, res); + } + return pv_get_hdr_helper(msg, param, res, &tv, idx, idxf); }

1 0

git:5.4:be668987: ChangeLog: content updated for v5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: be668987e9296232a00fa7bba82bc72abd72a743 URL: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T11:27:34+02:00 ChangeLog: content updated for v5.4.6 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72… Patch: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72…

1 0

git:5.4:0546511e: pkg/kamailio/deb: version set 5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: 0546511ed7eb47004c2df2f0806dff413468a1c4 URL: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T11:23:35+02:00 pkg/kamailio/deb: version set 5.4.6 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4… Patch: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4…

1 0

git:5.4:a2b34363: Makefile.defs: version set to 5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: a2b34363aa5e97f171d933b08dc57f8e7a1b3d58 URL: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T10:44:48+02:00 Makefile.defs: version set to 5.4.6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… Patch: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 621f646b23..40bbef82bc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:aaa556f2: pkg: version set to 5.4.6 for rpms and apline
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: aaa556f2d5a80e7a0bfa609d2478a9b75a530d0b URL: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T10:12:15+02:00 pkg: version set to 5.4.6 for rpms and apline --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… Patch: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e6576c616a..f4ff87ce2d 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.5 +pkgver=5.4.6 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba4cb80618..e73c048b22 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.5 +%define ver 5.4.6 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Hello, I am considering to release Kamailio v5.4.6 sometime next week, likely on Wednesday or Thursday (June 2 or 3, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

param.count broken in latest master?
by Juha Heinanen 01 Jun '21

01 Jun '21

This used to work: $var(count) = $(var(servers){param.count,%}); but latest master gives: Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) INFO: pv [pv_shv.c:60]: shvar_init_locks(): locks array size 16 Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: pv [pv_trans.c:3254]: tr_parse_paramlist(): invalid count transformation: count,%}! Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1799]: tr_lookup(): error parsing [{param.count,%}] Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1106]: pv_parse_spec2(): bad tr in pvar name "var" Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1131]: pv_parse_spec2(): invalid parsing in [$(var(servers){param.count,%})] at (4) Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 7591, column 19-48: Can't get from cache: $(var(servers){param.count,%}) -- Juha

2 3

git:master:6e8e5ed1: pv: fix {param.count} transformation broken by previous commit
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 6e8e5ed121028bd851d7de214271881a0bb1e4d3 URL: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T19:45:16+02:00 pv: fix {param.count} transformation broken by previous commit --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… Patch: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 6ad760f19a..98cce7caa8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -3203,6 +3203,28 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto unknown; } + if(t->subtype == TR_PL_COUNT) { + if(*p==TR_PARAM_MARKER) { + start_pos = ++p; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + if (t->params->type != TR_PARAM_SPEC && p - start_pos != 1) { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) { + LM_ERR("invalid name transformation: %.*s!\n", + in->len, in->s); + goto error; + } + } + goto done; + } + + /* now transformations with mandatory parameters */ if(*p!=TR_PARAM_MARKER) { LM_ERR("invalid %.*s transformation: %.*s\n", @@ -3223,29 +3245,15 @@ char* tr_parse_paramlist(str* in, trans_t *t) while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; } - if(t->subtype == TR_PL_COUNT) { - if(*p==TR_PARAM_MARKER) { - start_pos = ++p; - _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); - t->params = tp; - tp = 0; - if (tp->type != TR_PARAM_SPEC && p - start_pos != 1) { - LM_ERR("invalid separator in transformation: " - "%.*s\n", in->len, in->s); - goto error; - } - } - } else { - if(*p==TR_PARAM_MARKER) { - start_pos = ++p; - _tr_parse_sparam(p, p0, tp, spec, ps, in, s); - t->params->next = tp; - tp = 0; - if (p - start_pos != 1) { - LM_ERR("invalid separator in transformation: " - "%.*s\n", in->len, in->s); - goto error; - } + if(*p==TR_PARAM_MARKER) { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; } } @@ -3256,6 +3264,7 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto error; } +done: t->name = name; return p;

1 0

git:5.4:df8fb404: mtree: check if pv_count var is r/w
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: df8fb404c1f3d016f97872d78fe07d604de6ef8b URL: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:13+02:00 mtree: check if pv_count var is r/w - reported by GH #2750 (cherry picked from commit 63b0345207ba67fcc6290d6dfc55f99ba58b13c9) (cherry picked from commit 7323d812dc4a39c0e60f11668e09a50ef586a8f7) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… Patch: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index c04f031cfd..63180bbfb7 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -203,7 +203,7 @@ static int mod_init(void) } if(pv_parse_spec(&count_param, &pv_count) < 0 - || !(pv_is_w(&pv_weight))) + || !(pv_is_w(&pv_count))) { LM_ERR("cannot parse count pv or pv is read-only\n"); return -1;

1 0

git:5.4:b5ae51af: core: parse via - fixed whitespacing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: b5ae51af479d4e54e5d8c3f5e85908e68183e9d4 URL: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:22+02:00 core: parse via - fixed whitespacing (cherry picked from commit 01664d1d82dcfe952fce29033b4fcd5e44cf2319) (cherry picked from commit 19901d0cdb6cf06a84315c19a27986bca7a05025) --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Patch: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index fca486e358..e4957961f1 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -32,11 +32,11 @@ struct sip_msg; /* via param types - * WARNING: keep in sync with parse_via.c FIN_HIDDEN... + * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner */ enum { - PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, + PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, PARAM_MADDR, PARAM_RECEIVED, PARAM_RPORT, PARAM_I, PARAM_ALIAS, #ifdef USE_COMP PARAM_COMP, @@ -60,12 +60,12 @@ typedef struct via_param { /* Format: name/version/transport host:port;params comment */ - /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -typedef struct via_body { +/* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; - str version; + str version; str transport; str host; short proto; /* transport */ @@ -80,7 +80,7 @@ typedef struct via_body { struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ - /* shortcuts to "important" params*/ + /* shortcuts to "important" params*/ struct via_param* branch; str tid; /* transaction id, part of branch */ struct via_param* received; @@ -90,8 +90,8 @@ typedef struct via_body { #ifdef USE_COMP struct via_param* comp; /* see rfc3486 */ #endif - struct via_body* next; /* pointer to next via body string if - compact via or null */ + struct via_body* next; /* pointer to next via body string + if compact via or null */ } via_body_t;

1 0

git:5.4:30b33f77: async: safety check for async ms list
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 30b33f772739c593f1b58a2b871e127effd12f58 URL: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:37+02:00 async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) (cherry picked from commit 93dc038f3f1f854b1e0987ec28e49d8a70293e19) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Patch: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

1 0

git:5.4:34ee120a: pv: more details in err log message for s.select parsing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 34ee120ab555b9aab364af4570033c3a08451fda URL: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:28+02:00 pv: more details in err log message for s.select parsing (cherry picked from commit 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64) (cherry picked from commit 2273d7d856b5c1fca1ec24fbb6ee249793ea6719) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Patch: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0ce73c4542..2f5c2cd48d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2532,8 +2532,8 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid select transformation: %.*s!!\n", - in->len, in->s); + LM_ERR("invalid select transformation: %.*s (c:%c/%d - p:%d)!!\n", + in->len, in->s, *p, *p, (int)(p - in->s)); goto error; } goto done;

1 0

git:5.4:2c501f4d: snmpstats: Fix typo in MIB
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 2c501f4d7b9678f0cfad3afec5e3095fd61e1763 URL: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:43+02:00 snmpstats: Fix typo in MIB Reported by arkadiam on Github (cherry picked from commit 7f017707c91659641ce9ca87ee4149b2e39379f7) (cherry picked from commit dbd8e3899335eb8795763fd52b1f91aebfad1c92) --- Modified: src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB --- Diff: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Patch: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… --- diff --git a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB index 3351a9e424..2aaddf01ca 100644 --- a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB +++ b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB @@ -562,7 +562,7 @@ KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN set the row-status to createAndGo. Then the client can do an SNMP GET on this table with the - aquired index. If the row-status is 'active', then the + acquired index. If the row-status is 'active', then the kamailioSIPRegUserIndex is the index into the kamailioSIPRegUserTable that has the specified URI (0 zero indicates no such URI). The client should then set the

1 0

git:5.4:00d71875: mtree: Fix some typos, adjust some formatting
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 00d7187532b87507367b00110f22bd8e0e14db7c URL: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:11:43+02:00 mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) (cherry picked from commit 3bfb1773c01731177824b907180a7eeb7e43d3af) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Patch: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

1 0

git:5.5:97f9ede8: secsipid: note about libsecsipid location and failure return codes
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 97f9ede8b82cff8063c3fd1908d3c323997e9566 URL: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:32+02:00 secsipid: note about libsecsipid location and failure return codes (cherry picked from commit 59719a1ac97337ca7f8b83b0e8a9d63bf6ec0c7e) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Patch: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1e22e371fb..0d7147c35f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -30,6 +30,17 @@ loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. </para> + <para> + The libsecsipid is provided by secsipidx project: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> + <para> + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much + at the top of: + <ulink url="https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go" + >https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go</ulink>. + </para> </section> <section> <title>Dependencies</title>

1 0

git:5.5:84c87444: ldap: several functions exported to kemi framework
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 84c87444a50c4e46c3786904378e980f0262309f URL: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:58:29+02:00 ldap: several functions exported to kemi framework (cherry picked from commit 2d4b4939d1845fffdc3fa3ced9889720d0213d47) --- Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980… Patch: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980…

1 0

git:5.5:45310834: secsipid: log message on identity generation failure
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 45310834376d9eee2778e16c5fdc706ab1e6f97b URL: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:04+02:00 secsipid: log message on identity generation failure (cherry picked from commit 4b7eedf5af9a461d5a1de1148c814faa5db8cbaa) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… Patch: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 30357a235e..18f962d362 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -327,6 +327,7 @@ static int ki_secsipid_add_identity(sip_msg_t *msg, str *origtn, str *desttn, attest->s, origid->s, x5u->s, keypath->s, &ibody.s); if(ibody.len<=0) { + LM_ERR("failed to get identity header body (%d)\n", ibody.len); goto error; } @@ -526,9 +527,7 @@ static int secsipid_libopt_param(modparam_t type, void *val) return -1; } sit->s = *((str*)val); - if(secsipid_libopt_list!=NULL) { - sit->next = secsipid_libopt_list; - } + sit->next = secsipid_libopt_list; secsipid_libopt_list = sit; return 0;

1 0

git:5.5:93dc038f: async: safety check for async ms list
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 93dc038f3f1f854b1e0987ec28e49d8a70293e19 URL: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:16+02:00 async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… Patch: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

1 0

git:5.5:7323d812: mtree: check if pv_count var is r/w
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 7323d812dc4a39c0e60f11668e09a50ef586a8f7 URL: https://github.com/kamailio/kamailio/commit/7323d812dc4a39c0e60f11668e09a50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:57:54+02:00 mtree: check if pv_count var is r/w - reported by GH #2750 (cherry picked from commit 63b0345207ba67fcc6290d6dfc55f99ba58b13c9) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7323d812dc4a39c0e60f11668e09a50… Patch: https://github.com/kamailio/kamailio/commit/7323d812dc4a39c0e60f11668e09a50… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index c04f031cfd..63180bbfb7 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -203,7 +203,7 @@ static int mod_init(void) } if(pv_parse_spec(&count_param, &pv_count) < 0 - || !(pv_is_w(&pv_weight))) + || !(pv_is_w(&pv_count))) { LM_ERR("cannot parse count pv or pv is read-only\n"); return -1;

1 0

git:5.5:19901d0c: core: parse via - fixed whitespacing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 19901d0cdb6cf06a84315c19a27986bca7a05025 URL: https://github.com/kamailio/kamailio/commit/19901d0cdb6cf06a84315c19a27986b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:58:18+02:00 core: parse via - fixed whitespacing (cherry picked from commit 01664d1d82dcfe952fce29033b4fcd5e44cf2319) --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/19901d0cdb6cf06a84315c19a27986b… Patch: https://github.com/kamailio/kamailio/commit/19901d0cdb6cf06a84315c19a27986b… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index fca486e358..e4957961f1 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -32,11 +32,11 @@ struct sip_msg; /* via param types - * WARNING: keep in sync with parse_via.c FIN_HIDDEN... + * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner */ enum { - PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, + PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, PARAM_MADDR, PARAM_RECEIVED, PARAM_RPORT, PARAM_I, PARAM_ALIAS, #ifdef USE_COMP PARAM_COMP, @@ -60,12 +60,12 @@ typedef struct via_param { /* Format: name/version/transport host:port;params comment */ - /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -typedef struct via_body { +/* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; - str version; + str version; str transport; str host; short proto; /* transport */ @@ -80,7 +80,7 @@ typedef struct via_body { struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ - /* shortcuts to "important" params*/ + /* shortcuts to "important" params*/ struct via_param* branch; str tid; /* transaction id, part of branch */ struct via_param* received; @@ -90,8 +90,8 @@ typedef struct via_body { #ifdef USE_COMP struct via_param* comp; /* see rfc3486 */ #endif - struct via_body* next; /* pointer to next via body string if - compact via or null */ + struct via_body* next; /* pointer to next via body string + if compact via or null */ } via_body_t;

1 0

git:5.5:3bfb1773: mtree: Fix some typos, adjust some formatting
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 3bfb1773c01731177824b907180a7eeb7e43d3af URL: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:57:45+02:00 mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… Patch: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

1 0

git:master:fa7328ae: pv: added {param.in,name[,sep]}
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: fa7328ae48e9596ec30c48f17f353ba10369fb87 URL: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:37:38+02:00 pv: added {param.in,name[,sep]} - return 1 if param name is found in the list, 0 if not found --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba… Patch: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba…

1 0

git:5.5:f481071a: sipdump: fixed typo
by Henning Westerholt 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: f481071a671009f1dcc9fe5d36870e06edc2ec4b URL: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T06:32:25Z sipdump: fixed typo (cherry picked from commit 7f226f5b08c93ed0a43113d7947730329ff7db38) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… Patch: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 54b5c47484..0384458639 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -575,7 +575,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

2 2

git:master:758c85a0: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 758c85a09ebb2848d0fd2ee82c48784b8544501a URL: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-01T10:01:13+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… Patch: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index b42915943b..f4a43fca91 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -100,6 +100,14 @@ Chapter 1. Admin Guide module loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. + The libsecsipid is provided by secsipidx project: + https://github.com/asipto/secsipidx. + + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much at + the top of: + https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go. + 2. Dependencies 2.1. Kamailio Modules

1 0

git:master:59719a1a: secsipid: note about libsecsipid location and failure return codes
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 59719a1ac97337ca7f8b83b0e8a9d63bf6ec0c7e URL: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:51:04+02:00 secsipid: note about libsecsipid location and failure return codes --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… Patch: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1e22e371fb..0d7147c35f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -30,6 +30,17 @@ loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. </para> + <para> + The libsecsipid is provided by secsipidx project: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> + <para> + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much + at the top of: + <ulink url="https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go" + >https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go</ulink>. + </para> </section> <section> <title>Dependencies</title>

1 0

git:master:bf4ae4b5: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: bf4ae4b5f4f4b75c534681c520fa1060f234a18e URL: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-01T09:31:20+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… Patch: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 0fa395da20..8e5c790d58 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -66,7 +66,7 @@ Ovidiu Sas 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -157,7 +157,7 @@ Chapter 1. Admin Guide 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -497,7 +497,7 @@ modparam("nathelper", "nat_addr_mode", 0) 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -668,7 +668,7 @@ if(is_rfc1918("$rd")) { }; ... -5.8. handle_ruri_alias() +5.8. handle_ruri_alias([mode]) Checks if the Request URI has an “alias” parameter and if so, removes it and sets the “$du” based on its value. Note that this means that @@ -677,6 +677,10 @@ if(is_rfc1918("$rd")) { on a request, make sure that you screen the alias parameter value of Request URI the same way as you would screen the Request URI itself. + The optional parameter mode can be 0 to consume first alias parameter, + otherwise it consumes the last alias parameter. If the parameter mode + is not provided, it consumes the first parameter. + Returns 1 if “;alias” parameter was found and “$du” was set and the “$ru” rewritten, 2 if the alias parameter was not found and nothing was done, or -1 in case of error.

1 0

git:master:48520609: nathelper: optional parameter mode for handle_ruri_alias()
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 48520609d25dfee6987b16223ed20da507274fdf URL: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:29:33+02:00 nathelper: optional parameter mode for handle_ruri_alias() - if not 0, then consume the last alias parameter instead of the first one --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da… Patch: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da…

1 0

git:master:9c060a66: nathelper: docs for mode parameter for handle_ruri_alias()
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 9c060a66f83a42c46767f5b28b6a3640764ebb87 URL: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:29:33+02:00 nathelper: docs for mode parameter for handle_ruri_alias() --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… Patch: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 5096a676d4..39e61e6856 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -794,17 +794,21 @@ if(is_rfc1918("$rd")) { <section id="nathelper.f.handle_ruri_alias"> <title> - <function moreinfo="none">handle_ruri_alias()</function> + <function moreinfo="none">handle_ruri_alias([mode])</function> </title> <para> Checks if the Request URI has an <quote>alias</quote> parameter and if so, removes it and sets the <quote>$du</quote> based - on its value. Note that this means that routing of request is based on - <quote>;alias</quote> parameter value of the Request URI rather than + on its value. Note that this means that routing of request is based on + <quote>;alias</quote> parameter value of the Request URI rather than the Request URI itself. If you call <function>handle_ruri_alias()</function> on a request, make sure that you screen the alias parameter value of - Request URI the same way as you would screen the - Request URI itself. + Request URI the same way as you would screen the Request URI itself. + </para> + <para> + The optional parameter mode can be 0 to consume first alias parameter, + otherwise it consumes the last alias parameter. If the parameter mode is + not provided, it consumes the first parameter. </para> <para> Returns <emphasis>1</emphasis> if <quote>;alias</quote> parameter was

1 0

git:5.4:affe55c2: sipdump: fixed typo
by Henning Westerholt 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: affe55c269f77e280f8400fc6c2a5dee61a2b877 URL: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T06:32:05Z sipdump: fixed typo (cherry picked from commit 7f226f5b08c93ed0a43113d7947730329ff7db38) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… Patch: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 41550e78f2..553daa01df 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -629,7 +629,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

1 0

[kamailio/kamailio] sipdump: fixed typo (#2753)
by sergey-safarov 01 Jun '21

01 Jun '21

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description fixed `4sipdump(src_port)` handling You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2753 -- Commit Summary -- * sipdump: fixed typo -- File Changes -- M src/modules/sipdump/sipdump_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2753.patch https://github.com/kamailio/kamailio/pull/2753.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/2753

2 2

git:master:7f226f5b: sipdump: fixed typo
by Henning Westerholt 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 7f226f5b08c93ed0a43113d7947730329ff7db38 URL: https://github.com/kamailio/kamailio/commit/7f226f5b08c93ed0a43113d79477303… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T08:31:15+02:00 sipdump: fixed typo --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f226f5b08c93ed0a43113d79477303… Patch: https://github.com/kamailio/kamailio/commit/7f226f5b08c93ed0a43113d79477303… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 9b733dad66..77c7c8606f 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -662,7 +662,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

1 0

[kamailio/kamailio] Error loading globalblacklist on startup Kamailio 5.4.1 (#2480)
by Earn330 31 May '21

31 May '21

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data #### Log Messages ``` Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: <core> [core/route.c:885]: fix_actions(): fixing check_blacklist() Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: userblacklist [userblacklist.c:472]: add_source(): add table globalblacklist Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: <core> [dtrie.c:57]: dtrie_init(): allocate 16 bytes for root at 0x7fc29efa4ab0 Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: <core> [dtrie.c:67]: dtrie_init(): allocate 80 bytes for 10 root children pointer at 0x7fc29efa4b28 Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: ERROR: <core> [db.c:481]: db_use_table(): invalid parameter value Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: ERROR: userblacklist [db.c:123]: db_reload_source(): cannot use db table 'globalblacklist' Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: ERROR: userblacklist [userblacklist.c:425]: load_source(): cannot load source from 'globalblacklist' ``` ### Additional Information ``` Kamailio 5.4.1 ``` * **Operating System**: ``` PRETTY_NAME="Debian GNU/Linux 10 (buster)" NAME="Debian GNU/Linux" VERSION_ID="10" VERSION="10 (buster)" VERSION_CODENAME=buster ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" Linux voip-lab-proxy03 4.19.0-10-amd64 #1 SMP Debian 4.19.132-1 (2020-07-24) 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/2480

3 9

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev