- sr-dev - kamailio.org

git:master:921b5cbc: textops: find start of header body for filter functions
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 921b5cbcda4637393af386219cbdf4a0f9b3d3a8 URL: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T16:09:34+02:00 textops: find start of header body for filter functions - GH #2748 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… Patch: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index b2ad856cfc..05491ab184 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1598,7 +1598,7 @@ static inline int find_line_start(char *text, unsigned int text_len, } static inline int find_hdr_line_start(char *hname, unsigned int hname_len, - char **buf, unsigned int *buf_len) + char **buf, unsigned int *buf_len, char **bstart) { hdr_field_t h1; hdr_field_t h2; @@ -1624,11 +1624,11 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, if(h1.type>0 && h1.type==h2.type) { *buf = start; *buf_len = len; - return 1; - } else if(cmp_hdrname_str(&h1.name, &h2.name)==0) { + goto found; + } else if(cmpi_str(&h1.name, &h2.name)==0) { *buf = start; *buf_len = len; - return 1; + goto found; } } /* jump to next line */ @@ -1645,6 +1645,21 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, } } return 0; + +found: + ch = memchr(start, ':', len - 1); + if(ch==NULL) { + LM_ERR("weird - no ':' found\n"); + return 0; + } + ch++; + while((ch < start + len) && (*ch==' ' || *ch=='\t')) ch++; + if(ch==start + len) { + LM_ERR("no header body content\n"); + return 0; + } + *bstart = ch; + return 1; } /** @@ -1670,6 +1685,7 @@ static int check_multipart(struct sip_msg *msg) static int ki_filter_body(struct sip_msg* msg, str *content_type) { char *start; + char *end; unsigned int len; str body; str boundary = {0,0}; @@ -1695,11 +1711,11 @@ static int ki_filter_body(struct sip_msg* msg, str *content_type) start = body.s; len = body.len; - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - start = start + 14; - len = len - 14; + len = len - (end - start); LM_DBG("line: [%.*s]\n", len, start); + start = end; if (len > content_type->len + 2) { if (strncasecmp(start, content_type->s, content_type->len)== 0) { @@ -3239,10 +3255,9 @@ static int ki_remove_multibody(sip_msg_t* msg, str* content_type) start = body.s; len = body.len; - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - end = start + 14; - len = len - 14; + len = len - (end - start); if (len > (content_type->len + 2)) { if (strncasecmp(end, content_type->s, content_type->len)== 0) { @@ -3345,10 +3360,9 @@ static int ki_get_body_part_helper(sip_msg_t* msg, str* ctype, pv_spec_t *dst, len = body.len; /* note: header body can follow just after name: - fixit */ - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - end = start + 14; - len = len - 14; + len = len - (end - start); if (len > (ctype->len + 2)) { if (strncasecmp(end, ctype->s, ctype->len)== 0) {

1 0

[kamailio/kamailio] db_redis connection broken after idle serveral minutes if redis server with timeout setting (#2764)
by FredWH 02 Aug '21

02 Aug '21

### Description db_redis connection broken after idle several minutes if redis server with timeout setting ### Troubleshooting #### Reproduction 1. configure Redis server with timeout 600. (10 minutes) 2. configure Kamailio with db_redis module and usrloc module modparam("usrloc", "db_url", "REDIS_CONNECT") 3. at client side, try to register, then close client tool. 4. after idle for 10+ minutes, no any registion, reopen client tool and try to register, <- register failed. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  db_redis [redis_dbase.c:2504]: db_redis_insert(): Failed to fetch type entry: Broken pipe db_redis [redis_dbase.c:2568]: db_redis_insert(): failed to do the insert usrloc [ucontact.c:687]: db_insert_ucontact(): inserting contact in db failed 1001 (uloc-60b45e88-1c5d-d) usrloc [urecord.c:601]: insert_ucontact(): failed to insert in database registrar [save.c:537]: insert_contacts(): failed to insert contact sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### 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 8.3.0 PS: 5.4.5 has the same issue. * **Operating System**:  Debian 10.9 Linux test1 4.19.0-16-cloud-amd64 #1 SMP Debian 4.19.181-1 (2021-03-19) 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/2764

2 2

[kamailio/kamailio] db_redis: fix broken pipe issue, if redis server with timeout setting. (#2791)
by FredWH 02 Aug '21

02 Aug '21

- issue #2764   #### 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/2791 -- Commit Summary -- * db_redis: fix broken pipe issue, if redis server with timeout setting. -- File Changes -- M src/modules/db_redis/redis_connection.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2791.patch https://github.com/kamailio/kamailio/pull/2791.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/2791

3 5

git:master:7cec977f: db_redis: fix broken pipe issue, if redis server with timeout setting.
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 7cec977f8e12bbeb0309d903e02461d1ccbf41a8 URL: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Author: FredWH <wh720(a)139.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T15:00:18+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Patch: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index ad2921f1d5..dd421a7844 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -305,7 +305,8 @@ void *db_redis_command_argv(km_redis_con_t *con, redis_key_t *query) { LM_DBG("query has %d args\n", argc); redisReply *reply = redisCommandArgv(con->con, argc, (const char**)argv, NULL); - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -344,7 +345,8 @@ int db_redis_append_command_argv(km_redis_con_t *con, redis_key_t *query, int qu // this should actually never happen, because if all replies // are properly consumed for the previous command, it won't send // out a new query until redisGetReply is called - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -374,8 +376,8 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { *reply = NULL; ret = redisGetReply(con->con, reply); - if (con->con->err == REDIS_ERR_EOF) { - LM_DBG("redis connection is gone, try reconnect\n"); + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); con->append_counter = 0; if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); @@ -396,7 +398,7 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { db_redis_key_free(&query); } ret = redisGetReply(con->con, reply); - if (con->con->err != REDIS_ERR_EOF) { + if (con->con->err == REDIS_OK) { con->append_counter--; } } else {

1 0

git:master:14bcf765: tlsa: new (pseudo) module to compile tls module linked statically with libssl
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 14bcf765a945d0f7e2e39d538724fe4c247615b4 URL: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:30:21+02:00 tlsa: new (pseudo) module to compile tls module linked statically with libssl --- Added: src/modules/tlsa/Makefile Added: src/modules/tlsa/doc/Makefile Added: src/modules/tlsa/doc/tlsa.xml Added: src/modules/tlsa/fixed_c_zlib.h Added: src/modules/tlsa/sbufq.h Added: src/modules/tlsa/tls_bio.c Added: src/modules/tlsa/tls_bio.h Added: src/modules/tlsa/tls_cfg.c Added: src/modules/tlsa/tls_cfg.h Added: src/modules/tlsa/tls_config.c Added: src/modules/tlsa/tls_config.h Added: src/modules/tlsa/tls_ct_q.h Added: src/modules/tlsa/tls_ct_wrq.c Added: src/modules/tlsa/tls_ct_wrq.h Added: src/modules/tlsa/tls_domain.c Added: src/modules/tlsa/tls_domain.h Added: src/modules/tlsa/tls_dump_vf.c Added: src/modules/tlsa/tls_dump_vf.h Added: src/modules/tlsa/tls_init.c Added: src/modules/tlsa/tls_init.h Added: src/modules/tlsa/tls_locking.c Added: src/modules/tlsa/tls_locking.h Added: src/modules/tlsa/tls_map.c Added: src/modules/tlsa/tls_map.h Added: src/modules/tlsa/tls_mod.h Added: src/modules/tlsa/tls_rand.c Added: src/modules/tlsa/tls_rand.h Added: src/modules/tlsa/tls_rpc.c Added: src/modules/tlsa/tls_rpc.h Added: src/modules/tlsa/tls_select.c Added: src/modules/tlsa/tls_select.h Added: src/modules/tlsa/tls_server.c Added: src/modules/tlsa/tls_server.h Added: src/modules/tlsa/tls_util.c Added: src/modules/tlsa/tls_util.h Added: src/modules/tlsa/tls_verify.c Added: src/modules/tlsa/tls_verify.h Added: src/modules/tlsa/tlsa_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4… Patch: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4…

1 0

git:master:2b9e2f55: Makefile.groups: group for tlsa module
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 2b9e2f553284b985afb01b5b78a800b10f691c6f URL: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:33:43+02:00 Makefile.groups: group for tlsa module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… Patch: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 99a990ad83..aa709375bc 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -91,6 +91,9 @@ mod_list_tlsdeps=crypto tls # - modules depending on openssl (+curl) library mod_list_tlsdeps_curl=auth_identity +# - modules depending on static openssl library +mod_list_tlsa=tlsa + # - modules depending on openssl library mod_list_outbound=outbound @@ -276,6 +279,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ $(mod_list_stirshaken) \ + $(mod_list_tlsa) \ $(mod_list_rtp_media_server) @@ -394,6 +398,9 @@ module_group_ktls_basic=$(mod_list_tlsdeps) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) +# pkg tlsa module +module_group_ktlsa=$(mod_list_tlsa) + # pkg websocket module module_group_kwebsocket=$(mod_list_websocket)

1 0

git:master:19d0a2a2: tlsa: imported README file
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 19d0a2a2177ca206de417fc1cb412c5b6dd0f393 URL: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:38:49+02:00 tlsa: imported README file --- Added: src/modules/tlsa/README Modified: src/modules/tlsa/doc/tlsa.xml --- Diff: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… Patch: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… --- diff --git a/src/modules/tlsa/README b/src/modules/tlsa/README new file mode 100644 index 0000000000..100da0fed4 --- /dev/null +++ b/src/modules/tlsa/README @@ -0,0 +1,55 @@ +TLSA Module + +Daniel-Constantin Mierla + + kamailio.org + + Copyright © 2021 kamailio.org + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + +1. Overview + + This is a pseudo module that builds TLS module compiled statically + against libssl and libcrypto (from OpenSSL project). Its C code files + simply include the files from TLS module, setting a different module + name. + + It is a replacement for tls module, with the same modparams and + functions. Just replace ' loadmodule "tls.so" ' with ' loadmodule + "tlsa.so" ' and ' modparam("tls", ...) ' with ' modparam("tlsa", ...) + '. See the docs of TLS module for all the details related to its + parameters, functions, rpc commands, variables, ... + + The benefit of this module is having the libssl and libcrypto embedded + in the module object file, thus not sharing the SSL/TLS context with + any other modules that may link indirectly to libssl (e.g., like + http_client that links against libcurl, which uses libssl). In this + way, the initialization of SSL context (e.g., setting shared memory + management functions) by tlsa module does not impact the other modules. + + Another benefit could be the ability to link a specific libssl version + (e.g., using source build), not being bound to the version shipped with + the operating system. + + The drawback is that updates to the libssl done via operating system + upgrades are not reflected in the tlsa module. It has to be recompiled + every time a new libssl version is installed and it is wanted to be + used by tlsa module. + + NOTE: the module is known to work to be compiled with GCC on Linux + (tested on Debian Stable 10.x). Other compilers (e.g., clang, icc) may + not support same static linking options. Also, some operating systems + may provide only dynamic libssl and libcrypto libraries via their + packages. diff --git a/src/modules/tlsa/doc/tlsa.xml b/src/modules/tlsa/doc/tlsa.xml index 75da4b765c..eecc5f9ab1 100644 --- a/src/modules/tlsa/doc/tlsa.xml +++ b/src/modules/tlsa/doc/tlsa.xml @@ -65,6 +65,13 @@ be recompiled every time a new libssl version is installed and it is wanted to be used by tlsa module. </para> + <para> + NOTE: the module is known to work to be compiled with GCC on Linux + (tested on Debian Stable 10.x). Other compilers (e.g., clang, icc) + may not support same static linking options. Also, some operating + systems may provide only dynamic libssl and libcrypto libraries + via their packages. + </para> </section> </chapter> </book>

1 0

git:master:2fe5a0d1: tls: set module name using MOD_NAME define
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 2fe5a0d165082d7acde4695bffeb2d194e4bab58 URL: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:29:25+02:00 tls: set module name using MOD_NAME define --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Patch: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 30a533994d..6e421635cb 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -256,12 +256,15 @@ static param_export_t params[] = { {0, 0, 0} }; +#ifndef MOD_NAME +#define MOD_NAME "tls" +#endif /* * Module interface */ struct module_exports exports = { - "tls", /* module name */ + MOD_NAME, /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ params, /* exported parameters */

1 0

git:master:f614c39a: siputils: functions to compare uri and aor exported to kemi
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: f614c39a693cea39e3d96920fda3aa7a111c1d67 URL: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 siputils: functions to compare uri and aor exported to kemi --- Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Patch: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… --- diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index 4cba3c3181..5aba445b02 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -40,6 +40,18 @@ #include "sipops.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_uri_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) { str s1; @@ -64,6 +76,18 @@ int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) return -2; } +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_aor_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) { str s1; diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 9926358e0a..7cbe77bd98 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -34,7 +34,9 @@ #include "../../core/parser/msg_parser.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2); +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2); int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2); int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index a23408ab79..747bf408fa 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -740,6 +740,16 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("cmp_uri"), + SR_KEMIP_INT, ki_cmp_uri, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("siputils"), str_init("cmp_aor"), + SR_KEMIP_INT, ki_cmp_aor, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("cmp_hdr_name"), SR_KEMIP_INT, ki_cmp_hdr_name, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:fa6245ce: core: cmp hdrname fix on checking type of second header
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: fa6245ce33602eeff1d776b921fd41400ae5bb48 URL: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 core: cmp hdrname fix on checking type of second header --- Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Patch: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 7b6a40ee3e..25d58747d9 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -477,7 +477,7 @@ int cmp_hdrname_str(str *s1, str *s2) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2); @@ -508,7 +508,7 @@ int cmp_hdrname_strzn(str *s1, char *s2, size_t len) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2);

1 0

[kamailio/kamailio] add debuginfo on dist other then x86 (#2789)
by sergey-safarov 01 Aug '21

01 Aug '21

### Description I want to debug `Kamailio` using `GDB` and compiled sources on `aarch64` architecture (`t4g` AWS instance). But produces object files do not contain debug info. Then executed ``` make -n ``` And found that no `-g` options used during compilation. I have specified `CFLAGS` and `CPPFLAGS` but with wont help. ### Expected behavior On all dist used `-g` compilation flag by default. If I have specified `CFLAGS` and `CPPFLAGS` as environment variables, then these flags used by GCC during compilation. #### Actual observed behavior `-g` flag do not used by default on `aarch64` architecture. `CFLAGS` and `CPPFLAGS` as environment variables do not used during compilation time. ### Additional info as hotfix I have used this patch ```diff diff --git a/src/Makefile.defs b/src/Makefile.defs index 027c985798..c91c34a7bb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -885,7 +885,7 @@ endif ifeq ($(ARCH), aarch64) use_fast_lock=yes - C_DEFS+=-DNOSMP # memory barriers not implemented for arm + C_DEFS+= -g -DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), ppc) ``` -- 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/2789

3 7

[kamailio/kamailio] core: enabled compilation with debug symbols by default (#2811)
by sergey-safarov 01 Aug '21

01 Aug '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: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description closes GH #2789 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2811 -- Commit Summary -- * core: enabled compilation with debug symbols by default -- File Changes -- M src/Makefile.defs (66) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2811.patch https://github.com/kamailio/kamailio/pull/2811.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/2811

2 4

git:master:ed46adad: core: enables compilation with debug symbols by default for other architectures
by Henning Westerholt 01 Aug '21

01 Aug '21

Module: kamailio Branch: master Commit: ed46adad82e7b6569eb42704c5460263d2af75f7 URL: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-01T11:40:26Z core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026… Patch: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026…

1 0

git:master:c503d2bd: core: parse to compare header names
by Daniel-Constantin Mierla 31 Jul '21

31 Jul '21

Module: kamailio Branch: master Commit: c503d2bd31a580138a67f1d4a265ccde5791d271 URL: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-31T12:04:24+02:00 core: parse to compare header names --- Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… Patch: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index ff394e5470..7b6a40ee3e 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -25,6 +25,7 @@ #include "parser/parse_uri.h" #include "parser/parse_param.h" +#include "parser/parse_hname2.h" #include "dprint.h" #include "ut.h" @@ -455,22 +456,61 @@ int cmpi_str(str *s1, str *s2) int cmp_hdrname_str(str *s1, str *s2) { str n1, n2; + hdr_field_t hf1, hf2; + n1 = *s1; n2 = *s2; trim_trailing(&n1); trim_trailing(&n2); - /* todo: parse hdr name and compare with short/long alternative */ + + parse_hname2_str(&n1, &hf1); + parse_hname2_str(&n2, &hf2); + if(hf1.type==HDR_ERROR_T || hf2.type==HDR_ERROR_T) { + LM_ERR("error parsing header names [%.*s] [%.*s]\n", n1.len, n1.s, + n2.len, n2.s); + return -4; + } + + if(hf1.type!=HDR_OTHER_T) { + if(hf1.type==hf2.type) { + return 0; + } else { + return 2; + } + } else if(hf1.type!=HDR_OTHER_T) { + return 2; + } return cmpi_str(&n1, &n2); } int cmp_hdrname_strzn(str *s1, char *s2, size_t len) { str n1, n2; + hdr_field_t hf1, hf2; + n1 = *s1; n2.s = s2; n2.len = len; trim_trailing(&n1); trim_trailing(&n2); + + parse_hname2_str(&n1, &hf1); + parse_hname2_str(&n2, &hf2); + if(hf1.type==HDR_ERROR_T || hf2.type==HDR_ERROR_T) { + LM_ERR("error parsing header names [%.*s] [%.*s]\n", n1.len, n1.s, + n2.len, n2.s); + return -4; + } + + if(hf1.type!=HDR_OTHER_T) { + if(hf1.type==hf2.type) { + return 0; + } else { + return 2; + } + } else if(hf1.type!=HDR_OTHER_T) { + return 2; + } return cmpi_str(&n1, &n2); }

1 0

git:master:2c3df626: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 2c3df6265314bc7728c151d0d7353d8162b26a58 URL: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T20:31:13+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8… Patch: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8…

1 0

git:master:988b70c6: siputils: added cmp_hdr_name(hname1, hname2)
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 988b70c6a8653b39753f09e8003477eadae36740 URL: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T16:04:30+02:00 siputils: added cmp_hdr_name(hname1, hname2) --- Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… Patch: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index b1dffa1c3e..2b7ac27951 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -921,7 +921,7 @@ if(cmp_uri("$ru", "sip:kamailio@kamailio.org")) <function moreinfo="none">cmp_aor(str1, str2)</function> </title> <para> - The function returns <emphasis>true</emphasis> if + The function returns <emphasis>true</emphasis> if the two parameters matches as AoR. The parameters have to be SIP URIs. </para> @@ -937,6 +937,29 @@ if(cmp_aor("$rU(a)KaMaIlIo.org", "sip:kamailio@$fd")) # do interesting stuff here } ... +</programlisting> + </example> + </section> + <section id="siputils.f.cmp_hdr_name"> + <title> + <function moreinfo="none">cmp_hdr_name(str1, str2)</function> + </title> + <para> + The function returns <emphasis>true</emphasis> (return code 1) if + the two parameters matches as header names. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>cmp_hdr_name</function> usage</title> + <programlisting format="linespecific"> +... +if(cmp_hdr_name("$var(hname)", "From")) +{ + # do interesting stuff here +} +... </programlisting> </example> </section> diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index fb1040c6ba..4cba3c3181 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -88,6 +88,34 @@ int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) return -2; } +int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2) +{ + int ret; + + ret = cmp_hdrname_str(shname1, shname2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + +int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2) +{ + str shname1; + str shname2; + + if(fixup_get_svalue(msg, (gparam_p)hname1, &shname1)!=0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)hname2, &shname2)!=0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + return ki_cmp_hdr_name(msg, &shname1, &shname2); +} + int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2) { str s1, *s2; diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 97d885c71c..9926358e0a 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -36,6 +36,8 @@ int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2); int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2); +int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2); +int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2); int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2); int w_is_supported(sip_msg_t *msg, char *_option, char *p2); int w_is_first_hop(sip_msg_t *msg, char *p1, char *p2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 3dc7188fa8..a23408ab79 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -166,6 +166,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"cmp_hdr_name", (cmd_function)w_cmp_hdr_name, 2, fixup_spve_spve, + 0, ANY_ROUTE}, {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, 0, REQUEST_ROUTE}, {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0, @@ -738,6 +740,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("cmp_hdr_name"), + SR_KEMIP_INT, ki_cmp_hdr_name, + { SR_KEMIP_STR, SR_KEMIP_STR, 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:5.5:5ecf17bc: sworker: KSR.sworker.active() exported to kemi
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: 5.5 Commit: 5ecf17bc2d308141534bdaf3a312704daf0db850 URL: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T13:33:06+02:00 sworker: KSR.sworker.active() exported to kemi - equivalent to existing sworker_active() config function (cherry picked from commit 9f140ce93b1f6db649cd0e8eda26444d6b186231) --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… Patch: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 33ee3361bd..e6dce05c9b 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -196,6 +196,17 @@ static int w_sworker_task(sip_msg_t *msg, char *pgname, char *p2) return ki_sworker_task(msg, &gname); } +/** + * + */ +static int ki_sworker_active(sip_msg_t *msg) +{ + if(_sworker_active==0) { + return -1; + } + return 1; +} + /** * */ @@ -217,6 +228,11 @@ static sr_kemi_t sr_kemi_sworker_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sworker"), str_init("active"), + SR_KEMIP_INT, ki_sworker_active, + { SR_KEMIP_NONE, 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:9f140ce9: sworker: KSR.sworker.active() exported to kemi
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 9f140ce93b1f6db649cd0e8eda26444d6b186231 URL: https://github.com/kamailio/kamailio/commit/9f140ce93b1f6db649cd0e8eda26444… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T13:31:30+02:00 sworker: KSR.sworker.active() exported to kemi - equivalent to existing sworker_active() config function --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9f140ce93b1f6db649cd0e8eda26444… Patch: https://github.com/kamailio/kamailio/commit/9f140ce93b1f6db649cd0e8eda26444… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 33ee3361bd..e6dce05c9b 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -196,6 +196,17 @@ static int w_sworker_task(sip_msg_t *msg, char *pgname, char *p2) return ki_sworker_task(msg, &gname); } +/** + * + */ +static int ki_sworker_active(sip_msg_t *msg) +{ + if(_sworker_active==0) { + return -1; + } + return 1; +} + /** * */ @@ -217,6 +228,11 @@ static sr_kemi_t sr_kemi_sworker_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sworker"), str_init("active"), + SR_KEMIP_INT, ki_sworker_active, + { SR_KEMIP_NONE, 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:6a61ed5c: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 6a61ed5c963b3db81607b71d106fc615349ec466 URL: https://github.com/kamailio/kamailio/commit/6a61ed5c963b3db81607b71d106fc61… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T12:46:13+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/6a61ed5c963b3db81607b71d106fc61… Patch: https://github.com/kamailio/kamailio/commit/6a61ed5c963b3db81607b71d106fc61… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 1464f8da01..a805644ef1 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -628,8 +628,8 @@ bl_iterator_end("b1"); Example 1.25. bl_iterator_next usage ... bl_iterator_start("b1"); - while(hf_iterator_next("b1")) { - xlog("body line: hdr[$hfitname(b1)]\n"); + while(bl_iterator_next("b1")) { + xlog("body line: $blitval(b1)"); } bl_iterator_end("b1"); ...

1 0

git:master:0b718d39: textopsx: docs - fix example for body line iterator
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 0b718d39a5e85e52e5fcff4ab6ed0774b4d9eb62 URL: https://github.com/kamailio/kamailio/commit/0b718d39a5e85e52e5fcff4ab6ed077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T12:39:32+02:00 textopsx: docs - fix example for body line iterator --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/0b718d39a5e85e52e5fcff4ab6ed077… Patch: https://github.com/kamailio/kamailio/commit/0b718d39a5e85e52e5fcff4ab6ed077… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 86b6668080..5f644316ed 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -754,8 +754,8 @@ bl_iterator_end("b1"); <programlisting format="linespecific"> ... bl_iterator_start("b1"); - while(hf_iterator_next("b1")) { - xlog("body line: hdr[$hfitname(b1)]\n"); + while(bl_iterator_next("b1")) { + xlog("body line: $blitval(b1)"); } bl_iterator_end("b1"); ...

1 0

git:master:9e039f5e: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 9e039f5eb383a181ef21386668261f3eb9d30168 URL: https://github.com/kamailio/kamailio/commit/9e039f5eb383a181ef21386668261f3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T12:31:15+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9e039f5eb383a181ef21386668261f3… Patch: https://github.com/kamailio/kamailio/commit/9e039f5eb383a181ef21386668261f3…

1 0

git:master:0a13b912: textopsx: added body line iterator functions
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 0a13b91206e75c3bbdd70d44fa9ad98a705a549a URL: https://github.com/kamailio/kamailio/commit/0a13b91206e75c3bbdd70d44fa9ad98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T12:25:04+02:00 textopsx: added body line iterator functions - iterate through lines of message body, get the value via $blitval(iname) --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/0a13b91206e75c3bbdd70d44fa9ad98… Patch: https://github.com/kamailio/kamailio/commit/0a13b91206e75c3bbdd70d44fa9ad98…

1 0

git:master:9e9ce94d: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 9e9ce94d808003209e0686e1374b48ef721723dc URL: https://github.com/kamailio/kamailio/commit/9e9ce94d808003209e0686e1374b48e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T09:31:22+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9e9ce94d808003209e0686e1374b48e… Patch: https://github.com/kamailio/kamailio/commit/9e9ce94d808003209e0686e1374b48e…

1 0

git:master:24172c08: textopsx: added hf_iterator_prev() function
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 24172c089cecaed7e03fe482946f0126fd2c6915 URL: https://github.com/kamailio/kamailio/commit/24172c089cecaed7e03fe482946f012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T09:10:16+02:00 textopsx: added hf_iterator_prev() function --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/24172c089cecaed7e03fe482946f012… Patch: https://github.com/kamailio/kamailio/commit/24172c089cecaed7e03fe482946f012…

1 0

git:master:017ffdf7: core: main - remove commented debug function
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: 017ffdf7e9067d6e7b51e4911104c314c9f8f26a URL: https://github.com/kamailio/kamailio/commit/017ffdf7e9067d6e7b51e4911104c31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T14:18:05+02:00 core: main - remove commented debug function --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/017ffdf7e9067d6e7b51e4911104c31… Patch: https://github.com/kamailio/kamailio/commit/017ffdf7e9067d6e7b51e4911104c31… --- diff --git a/src/main.c b/src/main.c index c1bf2c864f..d3a7c0353d 100644 --- a/src/main.c +++ b/src/main.c @@ -293,22 +293,6 @@ void print_internals(void) printf("Thank you for flying %s!\n", NAME); } -/* debugging function */ -/* -void receive_stdin_loop(void) -{ - #define BSIZE 1024 - char buf[BSIZE+1]; - int len; - - while(1){ - len=fread(buf,1,BSIZE,stdin); - buf[len+1]=0; - receive_msg(buf, len); - printf("-------------------------\n"); - } -} -*/ /* global vars */ @@ -323,7 +307,7 @@ unsigned int maxbuffer = MAX_RECV_BUFFER_SIZE; /* maximum buffer size we do not want to exceed during the auto-probing procedure; may be re-configured */ -unsigned int sql_buffer_size = 65535; /* Size for the SQL buffer. Defaults to 64k. +unsigned int sql_buffer_size = 65535; /* Size for the SQL buffer. Defaults to 64k. This may be re-configured */ int socket_workers = 0; /* number of workers processing requests for a socket - it's reset everytime with a new listen socket */

1 0

git:master:7179d4ce: modules: readme files regenerated - debugger ... [skip ci]
by Kamailio Dev 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: 7179d4ce0a26c2c21cac87ba55dcfb8129da0db8 URL: https://github.com/kamailio/kamailio/commit/7179d4ce0a26c2c21cac87ba55dcfb8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-29T13:46:17+02:00 modules: readme files regenerated - debugger ... [skip ci] --- Modified: src/modules/debugger/README --- Diff: https://github.com/kamailio/kamailio/commit/7179d4ce0a26c2c21cac87ba55dcfb8… Patch: https://github.com/kamailio/kamailio/commit/7179d4ce0a26c2c21cac87ba55dcfb8…

1 0

git:master:86d0aaff: debugger: added cfgtrace_format parameter
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: 86d0aaffd6c86c7c78e40b1e40ba37c17db44b22 URL: https://github.com/kamailio/kamailio/commit/86d0aaffd6c86c7c78e40b1e40ba37c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T13:00:09+02:00 debugger: added cfgtrace_format parameter - control what is printed in the cfgtrace log message (e.g., do not print config file path) --- Modified: src/modules/debugger/debugger_api.c Modified: src/modules/debugger/debugger_mod.c Modified: src/modules/debugger/doc/debugger_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/86d0aaffd6c86c7c78e40b1e40ba37c… Patch: https://github.com/kamailio/kamailio/commit/86d0aaffd6c86c7c78e40b1e40ba37c… --- diff --git a/src/modules/debugger/debugger_api.c b/src/modules/debugger/debugger_api.c index e9dd4c8fd7..dce2fbb19c 100644 --- a/src/modules/debugger/debugger_api.c +++ b/src/modules/debugger/debugger_api.c @@ -149,6 +149,13 @@ str *dbg_get_cmd_name(int t) */ int _dbg_cfgtrace = 0; +#define DBG_CFGTRACE_NOCFGFILE (1<<0) +/** + * + */ +int _dbg_cfgtrace_format = 0; + + /** * */ @@ -359,13 +366,23 @@ int dbg_cfg_trace(sr_event_param_t *evp) { if(is_printable(_dbg_cfgtrace_level)) { - LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, - _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, - "%s=[%s] c=[%s] l=%d a=%d n=%.*s\n", - get_current_route_type_name(), ZSW(a->rname), - ZSW(a->cfile), a->cline, - a->type, an->len, ZSW(an->s) - ); + if(unlikely(_dbg_cfgtrace_format & DBG_CFGTRACE_NOCFGFILE)) { + LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, + _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, + "%s=[%s] l=%d a=%d n=%.*s\n", + get_current_route_type_name(), ZSW(a->rname), + a->cline, + a->type, an->len, ZSW(an->s) + ); + } else { + LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, + _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, + "%s=[%s] c=[%s] l=%d a=%d n=%.*s\n", + get_current_route_type_name(), ZSW(a->rname), + ZSW(a->cfile), a->cline, + a->type, an->len, ZSW(an->s) + ); + } } } if(_dbg_pid_list[process_no].set&DBG_CFGTEST_ON) diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 5ea494f0c4..3c35a5b033 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -62,6 +62,7 @@ extern char* dump_lump_list(struct lump *list, int s_offset, char *s_buf); /* parameters */ extern int _dbg_cfgtrace; +extern int _dbg_cfgtrace_format; extern int _dbg_cfgpkgcheck; extern int _dbg_breakpoint; extern int _dbg_cfgtrace_level; @@ -100,6 +101,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"cfgtrace", INT_PARAM, &_dbg_cfgtrace}, + {"cfgtrace_format", INT_PARAM, &_dbg_cfgtrace_format}, {"breakpoint", INT_PARAM, &_dbg_breakpoint}, {"log_level", INT_PARAM, &_dbg_cfgtrace_level}, {"log_facility", PARAM_STRING, &_dbg_cfgtrace_facility_str}, diff --git a/src/modules/debugger/doc/debugger_admin.xml b/src/modules/debugger/doc/debugger_admin.xml index 5757381a6d..9f39883bdc 100644 --- a/src/modules/debugger/doc/debugger_admin.xml +++ b/src/modules/debugger/doc/debugger_admin.xml @@ -101,6 +101,29 @@ modparam("debugger", "cfgtrace", 1) </example> </section> + <section id="dbg.p.cfgtrace_format"> + <title><varname>cfgtrace_format</varname> (int)</title> + <para> + Control what is printer in the cfgtrace log message. If it is set + to 1, then the configuration file path is not printed, making + the log messages shorter when not including other configuration + files in the main one. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>cfgtrace_format</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "cfgtrace_format", 1) +... +</programlisting> + </example> + </section> + <section id="dbg.p.breakpoint"> <title><varname>breakpoint</varname> (int)</title> <para>

1 0

git:5.4:2fac539f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 2fac539faf29184597e645c4a8b8bfe2f3bc3e9e URL: https://github.com/kamailio/kamailio/commit/2fac539faf29184597e645c4a8b8bfe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-29T11:02:15+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_client/README Modified: src/modules/secsipid/README Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/2fac539faf29184597e645c4a8b8bfe… Patch: https://github.com/kamailio/kamailio/commit/2fac539faf29184597e645c4a8b8bfe… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 6724cc5716..48b07699c3 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -500,7 +500,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). diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index d822544ba2..83bee30b2a 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -73,7 +73,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. 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

[kamailio/kamailio] crush: anot alliged memory access (#2798)
by sergey-safarov 29 Jul '21

29 Jul '21

### Description I still have core generation with not alleged memory access (Related #2788 and #2736). ### Troubleshooting I have prepared minimal kamailio config that allow reproduce issue on master branch (tested 8762c56a1c78e4ba151ef9fb4290b3938c0c984f). #### Reproduction Required start Kamailio with config below: ``` ################ pv_buffer_slots = 30 loadmodule "ipops.so" loadmodule "pv.so" loadmodule "textops.so" loadmodule "outbound.so" loadmodule "corex.so" loadmodule "kex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "uac.so" loadmodule "usrloc.so" loadmodule "registrar.so" #!substdef "!DEF01!$(version(num))!g" #!substdef "!DEF02!$HN(f)!g" #!substdef "!DEF03!$HN(d)!g" #!substdef "!DEF04!$HN(i)!g" # access to not existen default value #!substdef "!DEF05!$def(NULL)!g" #!substdef "!DEF06!$def(NULL)!g" ### SQL substdef #!substdef "!DEF07!insert into dispatcher (setid, destination) select \$var(SetId), \"\$var(MediaUrl)\" from DUAL where not exists(select * from dispatcher where destination = \"\$var(MediaUrl)\")!g" #!substdef "!DEF08!select a.event, count(distinct watcher_username || \"@\" || watcher_domain) count_unique, count(*) count from event_list a, active_watchers b where b.event = a.event group by a.event!g" #!substdef "!DEF09!select event, (select count(*) from presentity b where username = \"\$var(SetId)\" and domain = \"\$var(SetId)\" and b.event = a.event) count from event_list a!g" #!substdef "!DEF10!select event, (select count(*) from active_watchers b where presentity_uri = \"\$var(presentity)\" and b.event = a.event) count from event_list a!g" #!substdef "!DEF11!delete from presentity where domain=\"\$var(SetId)\" and username = \"\$var(SetId)\"!g" #!substdef "!DEF12!delete from active_watchers where callid = \"\$ci\"!g" #!substdef "!DEF13!delete from active_watchers where watcher_username=\"\$fU\" and presentity_uri=\"\$var(presentity_uri)\" and to_user=\"\$tU\" and watcher_domain=\"\$fd\" and event=\"\$hdr(Event)\"!g" #!substdef "!DEF14!delete from presentity where domain=\"\$var(SetId)\"!g" #!substdef "!DEF15!update active_watchers set expires = \$TS where watcher_domain=\"\$var(SetId)\"!g" #!substdef "!DEF16!update active_watchers set expires = \$TS where id in (select * from (select b.id from presentity a inner join active_watchers b on a.username = b.to_user and a.domain = b.to_domain and a.event = b.event where a.sender = \"\$var(MediaUrl)\") AS presentity_temp)!g" #!substdef "!DEF17!select * from active_watchers_log where presentity_uri = \"\$var(presentity_uri)\"!g" #!substdef "!DEF18!select * from active_watchers where watcher_domain = \"\$var(Domain)\"!g" #!substdef "!DEF19!select count(*) as count from presentity where username = \"\$var(SetId)\" and domain = \"\$var(SetId)\" and event = \"\$var(SetId)\"!g" #!substdef "!DEF20!delete from presentity where sender = \"\$var(MediaUrl)\"!g" ####### Routing Logic ######## route { $var(tmp) = $hdr(X-hdr1); $var(tmp) = $hdr(X-hdr2); $var(tmp) = $hdr(X-hdr3); $var(tmp) = $hdr(X-hdr4); $var(tmp) = $hdr(X-hdr5); $var(tmp) = $hdr(X-hdr6); $var(tmp) = $hdr(X-hdr7); $var(tmp) = $hdr(X-hdr8); $var(tmp) = $hdr(X-hdr9); $var(tmp) = $hdr(X-hdr10); $var(tmp) = $hdr(X-hdr11); $var(tmp) = $hdr(X-hdr12); $var(tmp) = $hdr(X-hdr13); $var(tmp) = $hdr(X-hdr14); $var(tmp) = $hdr(X-hdr15); if (reg_fetch_contacts("location", "$hdr(X-hdr16)", "callee")) { return; } } ``` #### Debugging Data ``` Program received signal SIGSEGV, Segmentation fault. 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 Missing separate debuginfos, use: dnf debuginfo-install libgcc-10.2.1-9.fc33.x86_64 openssl-libs-1.1.1k-1.fc33.x86_64 systemd-libs-246.13-1.fc33.x86_64 zlib-1.2.11-23.fc33.x86_64 (gdb) bt #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 #1 0x00007ffff6391fd4 in pv_parse_hdr_name (sp=0x7ffff652c0d8, in=0x7fffffffd560) at pv_core.c:3617 #2 0x0000000000568916 in pv_parse_spec2 (in=0x7ffff652c0c0, e=0x7ffff652c0d8, silent=0) at core/pvapi.c:969 #3 0x0000000000563ffd in pv_cache_add (name=0x7fffffffd750) at core/pvapi.c:359 #4 0x00000000005658c8 in pv_spec_lookup (name=0x7fffffffd810, len=0x7fffffffd80c) at core/pvapi.c:498 #5 0x000000000056c06c in pv_parse_format (in=0x7fffffffd910, el=0x7ffff652bfa8) at core/pvapi.c:1194 #6 0x0000000000631b16 in fix_param (type=256, param=0x7ffff65224f0) at core/sr_module.c:1223 #7 0x000000000063218e in fix_param_types (types=256, param=0x7ffff65224f0) at core/sr_module.c:1345 #8 0x000000000050f721 in fixup_spve_null (param=0x7ffff65224f0, param_no=1) at core/mod_fix.c:564 #9 0x00007ffff5b97cbb in fetchc_fixup (param=0x7ffff65224f0, param_no=2) at registrar.c:808 #10 0x00000000005a6aed in fix_actions (a=0x7ffff6522478) at core/route.c:932 #11 0x00000000005def48 in fix_rval (rv=0x7ffff65237d8, rve=0x7ffff65237d0) at core/rvalue.c:2992 #12 0x00000000005f0a90 in fix_rval_expr (p=0x7ffff65237d0) at core/rvalue.c:3919 #13 0x00000000005a210b in fix_actions (a=0x7ffff6517ce0) at core/route.c:719 #14 0x00000000005b3e03 in fix_rl (rt=0x91f140 <main_rt>) at core/route.c:2102 #15 0x00000000005b3e3a in fix_rls () at core/route.c:2118 #16 0x00000000004381c0 in main (argc=12, argv=0x7fffffffe5f8) at main.c:3066 (gdb) bt full #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 No symbol table info available. #1 0x00007ffff6391fd4 in pv_parse_hdr_name (sp=0x7ffff652c0d8, in=0x7fffffffd560) at pv_core.c:3617 s = {s = 0x7ffff1d72f60 "`.\327\361\377\177", len = 4312016} p = 0x0 nsp = 0x0 hdr = {type = HDR_PAI_T, name = {s = 0x41cbd0 <_start> "\363\017\036\372\061\355I\211\321^H\211\342H\203\344\360PTI\307\300@\330\177", len = -11088}, body = {s = 0x566521 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -162348840}, len = -10928, parsed = 0x80d116, next = 0x7ffff652bf07} __func__ = "pv_parse_hdr_name" #2 0x0000000000568916 in pv_parse_spec2 (in=0x7ffff652c0c0, e=0x7ffff652c0d8, silent=0) at core/pvapi.c:969 p = 0x7ffff652c144 ")" s = {s = 0x7ffff652c13d "X-hdr16)", len = 7} pvname = {s = 0x7ffff652c139 "hdr(X-hdr16)", len = 3} pvstate = 5 tr = 0x0 pte = 0x7ffff64fef70 n = 0 __func__ = "pv_parse_spec2" #3 0x0000000000563ffd in pv_cache_add (name=0x7fffffffd750) at core/pvapi.c:359 pvn = 0x7ffff652c0c0 pvid = 3075582644 p = 0x0 __func__ = "pv_cache_add" #4 0x00000000005658c8 in pv_spec_lookup (name=0x7fffffffd810, len=0x7fffffffd80c) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7ffff65226b0 "$hdr(X-hdr16)", len = 13} __func__ = "pv_spec_lookup" #5 0x000000000056c06c in pv_parse_format (in=0x7fffffffd910, el=0x7ffff652bfa8) at core/pvapi.c:1194 p = 0x7ffff65226b0 "$hdr(X-hdr16)" p0 = 0x80b00000001 <error: Cannot access memory at address 0x80b00000001> n = 1 e = 0x7ffff652c038 e0 = 0x0 s = {s = 0x7ffff65226b0 "$hdr(X-hdr16)", len = 13} len = 13 __func__ = "pv_parse_format" #6 0x0000000000631b16 in fix_param (type=256, param=0x7ffff65224f0) at core/sr_module.c:1223 p = 0x7ffff652bf98 name = {s = 0x7ffff65226b0 "$hdr(X-hdr16)", len = 13} s = {s = 0x80d116 "core: core/counters.c", len = -163113056} num = 32767 err = 0 __func__ = "fix_param" #7 0x000000000063218e in fix_param_types (types=256, param=0x7ffff65224f0) at core/sr_module.c:1345 ret = 0 t = 256 #8 0x000000000050f721 in fixup_spve_null (param=0x7ffff65224f0, param_no=1) at core/mod_fix.c:564 ret = 32767 fp = 0x7ffff1d72f60 __func__ = "fixup_spve_null" #9 0x00007ffff5b97cbb in fetchc_fixup (param=0x7ffff65224f0, param_no=2) at registrar.c:808 No locals. #10 0x00000000005a6aed in fix_actions (a=0x7ffff6522478) at core/route.c:932 t = 0x7ffff6522478 p = 0x4f0086e1b9 tmp = 0x89a29f "core: core/cfg/cfg_struct.c" tmp_p = 0x7ffff65226b0 ret = 0 i = 1 cmd = 0x7ffff650dde0 s = {s = 0x7fffffffdc30 "", len = 7295555} he = 0x41cbd0 <_start> ip = {af = 0, len = 0, u = {addrl = {21483676084, 140737488346160}, addr32 = {8839604, 5, 4294958128, 32767}, addr16 = {57780, 134, 5, 0, 56368, 65535, 32767, 0}, addr = "\264\341\206\000\005\000\000\000\060\334\377\377\377\177\000"}} si = 0x33 lval = 0x0 rve = 0x90000000c err_rve = 0x4bc015 <sr_event_exec+415> rve_type = 32767 err_type = 4294957888 expected_type = 32767 rv = 0x7ffff5bc5360 <default_registrar_cfg> rve_param_no = 0 __func__ = "fix_actions" #11 0x00000000005def48 in fix_rval (rv=0x7ffff65237d8, rve=0x7ffff65237d0) at core/rvalue.c:2992 __func__ = "fix_rval" #12 0x00000000005f0a90 in fix_rval_expr (p=0x7ffff65237d0) at core/rvalue.c:3919 rve = 0x7ffff65237d0 ret = 0 __func__ = "fix_rval_expr" #13 0x00000000005a210b in fix_actions (a=0x7ffff6517ce0) at core/route.c:719 t = 0x7ffff65228e8 p = 0x7ffff1adb000 tmp = 0xffffffff006f4dd9 <error: Cannot access memory at address 0xffffffff006f4dd9> tmp_p = 0x4 ret = 0 i = 8566243 cmd = 0x41cbd0 <_start> s = {s = 0x82b4d8 "core", len = -163131376} he = 0x7fffffffe010 ip = {af = 4294959040, len = 32767, u = {addrl = {7294619, 8694965}, addr32 = {7294619, 0, 8694965, 0}, addr16 = {20123, 111, 0, 0, 44213, 132, 0, 0}, addr = "\233No\000\000\000\000\000\265\254\204\000\000\000\000"}} si = 0x100000000 lval = 0x7ffff65218a8 rve = 0x7ffff65237d0 err_rve = 0x0 rve_type = RV_INT err_type = 4294959040 expected_type = RV_NONE rv = 0x41cbd0 <_start> rve_param_no = -8016 __func__ = "fix_actions" #14 0x00000000005b3e03 in fix_rl (rt=0x91f140 <main_rt>) at core/route.c:2102 i = 0 ret = 51 #15 0x00000000005b3e3a in fix_rls () at core/route.c:2118 ret = 0 #16 0x00000000004381c0 in main (argc=12, argv=0x7fffffffe5f8) at main.c:3066 cfg_stream = 0x9c32d0 c = -1 r = 0 tmp = 0x7fffffffe8b6 "" tmp_len = 896 port = 896 proto = 896 ahost = 0x0 aport = 0 options = 0x801218 ":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 = 2632239041 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xc2 <error: Cannot access memory at address 0xc2> st = {st_dev = 47, st_ino = 279340502, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 120, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1622741422, tv_nsec = 474562221}, st_mtim = {tv_sec = 1625629861, tv_nsec = 261687069}, st_ctim = {tv_sec = 1625629861, tv_nsec = 261687069}, __glibc_reserved = {0, 0, 0}} tbuf = "\360\341\377\377\377\177\000\000\000\000\000\000\000\000\000\000\360\341\377\377\377\177", '\000' <repeats 18 times>, "\260\027\375\367\377\177\000\000\350\317\377\367\377\177\000\000\b\345\377\367\377\177\000\000\340\031\375\367\377\177\000\000\025\217\376\367\377\177\000\000$f\307\367\377\177\000\000\354K\377\367\377\177\000\000\336K\377\367\377\177\000\000\205\317c\t\000\000\000\000\300S\374\367\377\177\000\000ߏ\376\367\377\177\000\000\000\000\000\000\254\202\226\006\334P\307\367\377\177\000\000\000\000\000\000\000\000\000\000\300S\374\367\377\177\000\000\001\000\000\000\000\000\000\000\"\247\177\336s\027\000\000\240\341\377\367\377\177\000\000\370\377\377\377\377\377\377\377\240\341\377\367\377\177\000\000R"... option_index = 12 long_options = {{name = 0x8038f6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7fe521 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8038fb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x803901 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x803907 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x803910 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x80391a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x803924 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x80392f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x803938 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x803943 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x803949 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x803953 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals No symbol table info available. (gdb) list 1976 +((!sctp_disable)?sctp_listeners:0) 1977 #endif 1978 ; 1979 } 1980 1981 int main(int argc, char** argv) 1982 { 1983 1984 FILE* cfg_stream; 1985 int c,r; (gdb) f 1 #1 0x00007ffff6391fd4 in pv_parse_hdr_name (sp=0x7ffff652c0d8, in=0x7fffffffd560) at pv_core.c:3617 3617 memcpy(p, in->s, in->len); (gdb) info locals s = {s = 0x7ffff1d72f60 "`.\327\361\377\177", len = 4312016} p = 0x0 nsp = 0x0 hdr = {type = HDR_PAI_T, name = {s = 0x41cbd0 <_start> "\363\017\036\372\061\355I\211\321^H\211\342H\203\344\360PTI\307\300@\330\177", len = -11088}, body = {s = 0x566521 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -162348840}, len = -10928, parsed = 0x80d116, next = 0x7ffff652bf07} __func__ = "pv_parse_hdr_name" (gdb) list 3612 { 3613 LM_ERR("name too long\n"); 3614 return -1; 3615 } 3616 p = pv_get_buffer(); 3617 memcpy(p, in->s, in->len); 3618 p[in->len] = ':'; 3619 s.s = p; 3620 s.len = in->len+1; 3621 (gdb) f 2 #2 0x0000000000568916 in pv_parse_spec2 (in=0x7ffff652c0c0, e=0x7ffff652c0d8, silent=0) at core/pvapi.c:969 969 if(pte->parse_name(e, &s)!=0) (gdb) info locals p = 0x7ffff652c144 ")" s = {s = 0x7ffff652c13d "X-hdr16)", len = 7} pvname = {s = 0x7ffff652c139 "hdr(X-hdr16)", len = 3} pvstate = 5 tr = 0x0 pte = 0x7ffff64fef70 n = 0 __func__ = "pv_parse_spec2" (gdb) list 964 LM_ERR("pvar \"%.*s\" does not get empty name param\n", 965 pvname.len, pvname.s); 966 goto error; 967 } 968 s.len = p - s.s; 969 if(pte->parse_name(e, &s)!=0) 970 { 971 if (!silent) 972 LM_ERR("pvar \"%.*s\" has an invalid name param [%.*s]\n", 973 pvname.len, pvname.s, s.len, s.s); (gdb) f 3 #3 0x0000000000563ffd in pv_cache_add (name=0x7fffffffd750) at core/pvapi.c:359 359 p = pv_parse_spec(&pvn->pvname, &pvn->spec); (gdb) info locals pvn = 0x7ffff652c0c0 pvid = 3075582644 p = 0x0 __func__ = "pv_cache_add" (gdb) list 354 } 355 memset(pvn, 0, sizeof(pv_cache_t) + name->len + 1); 356 pvn->pvname.len = name->len; 357 pvn->pvname.s = (char*)pvn + sizeof(pv_cache_t); 358 memcpy(pvn->pvname.s, name->s, name->len); 359 p = pv_parse_spec(&pvn->pvname, &pvn->spec); 360 361 if(p==NULL) 362 { 363 pkg_free(pvn); ``` #### Log Messages ``` [root@safarov-dell kamailio]# gdb --args kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 24 -E GNU gdb (GDB) Fedora 10.1-2.fc33 Copyright (C) 2020 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from kamailio... (gdb) set pagination off (gdb) r Starting program: /usr/local/sbin/kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 24 -E ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@safarov-dell kamailio]# kamailio -v version: kamailio 5.6.0-dev0 (x86_64/linux) 8762c5 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: 8762c5 compiled on 17:11:19 Jul 6 2021 with gcc 10.2.1 ``` * **Operating System**: ``` [root@safarov-dell kamailio]# cat /etc/os-release NAME=Fedora VERSION="33 (Container Image)" ID=fedora VERSION_ID=33 VERSION_CODENAME="" PLATFORM_ID="platform:f33" PRETTY_NAME="Fedora 33 (Container Image)" ANSI_COLOR="0;38;2;60;110;180" LOGO=fedora-logo-icon CPE_NAME="cpe:/o:fedoraproject:fedora:33" HOME_URL="https://fedoraproject.org/" DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f33/system-administrators-guide/" SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Fedora" REDHAT_BUGZILLA_PRODUCT_VERSION=33 REDHAT_SUPPORT_PRODUCT="Fedora" REDHAT_SUPPORT_PRODUCT_VERSION=33 PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" VARIANT="Container Image" VARIANT_ID=container ``` -- 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/2798

2 9

git:5.4:f5c81022: core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: f5c81022fdc769f306cf720bece29f1d265bfe61 URL: https://github.com/kamailio/kamailio/commit/f5c81022fdc769f306cf720bece29f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:49:56+02:00 core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots - GH #2798 (cherry picked from commit 61cbb5e861aeb9b7f69ebb8d284e3ded0ede9cd8) (cherry picked from commit 75571e1739470877365e7c25548ef282e81283a1) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/f5c81022fdc769f306cf720bece29f1… Patch: https://github.com/kamailio/kamailio/commit/f5c81022fdc769f306cf720bece29f1… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 30b2a7cdfe..a018646e48 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2147,6 +2147,7 @@ int pv_init_buffer(void) _pv_print_buffer_slots, _pv_print_buffer_size); _pv_print_buffer_slots_active = _pv_print_buffer_slots; _pv_print_buffer_size_active = _pv_print_buffer_size; + _pv_print_buffer_index = 0; return 0; } @@ -2168,6 +2169,7 @@ void pv_destroy_buffer(void) pkg_free(_pv_print_buffer); _pv_print_buffer_slots_active = 0; _pv_print_buffer_size_active = 0; + _pv_print_buffer_index = 0; _pv_print_buffer = NULL; } @@ -2177,8 +2179,9 @@ void pv_destroy_buffer(void) int pv_reinit_buffer(void) { if(_pv_print_buffer_size==_pv_print_buffer_size_active - && _pv_print_buffer_slots==_pv_print_buffer_slots_active) + && _pv_print_buffer_slots==_pv_print_buffer_slots_active) { return 0; + } pv_destroy_buffer(); return pv_init_buffer(); }

1 0

git:5.4:be8bb14a: http_client: removed function names from logs
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: be8bb14a48c3797d4884c7f8a33fa3edf172942a URL: https://github.com/kamailio/kamailio/commit/be8bb14a48c3797d4884c7f8a33fa3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:49:07+02:00 http_client: removed function names from logs (cherry picked from commit 84d245fb4eda7690a89b4057301f81685a9452d8) (cherry picked from commit 2dbf48822451433f4ee8863a954a4c40da0eb2bf) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/be8bb14a48c3797d4884c7f8a33fa3e… Patch: https://github.com/kamailio/kamailio/commit/be8bb14a48c3797d4884c7f8a33fa3e… --- 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:5.4:5d30b911: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 5d30b9111e1e80553ba260767521b9132b82d6a7 URL: https://github.com/kamailio/kamailio/commit/5d30b9111e1e80553ba260767521b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:49:37+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 (cherry picked from commit 0d06e164efa720d91d49995585e80c9082ce3b21) (cherry picked from commit 1f9f6fff6e0ab21e460538ffd1e54b6c60f54f7e) --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/5d30b9111e1e80553ba260767521b91… Patch: https://github.com/kamailio/kamailio/commit/5d30b9111e1e80553ba260767521b91… --- diff --git a/src/core/config.h b/src/core/config.h index 81fe101fe1..d8a85e9e6e 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -90,7 +90,7 @@ #define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) -#define MAX_WARNING_LEN 256 +#define MAX_WARNING_LEN 1024 #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1)

1 0

git:5.4:e9e19030: http_client: docs - fixed small typo
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: e9e190302f397b4d133fc5ca3a20168e93e51cd0 URL: https://github.com/kamailio/kamailio/commit/e9e190302f397b4d133fc5ca3a20168… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:48:05+02:00 http_client: docs - fixed small typo (cherry picked from commit 1f67ac5a62b58b35df52aedbd1a3d2234a72817e) (cherry picked from commit 6a527503a653d554ffb38f8bd7a40fd75441ff4d) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e9e190302f397b4d133fc5ca3a20168… Patch: https://github.com/kamailio/kamailio/commit/e9e190302f397b4d133fc5ca3a20168… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6f1c897690..906ec2eb25 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.4:2ab8cb38: http_client: check if shm is initialized in curl_parse_param()
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 2ab8cb38f9ddf01e174c3525ebdec35d6c83406e URL: https://github.com/kamailio/kamailio/commit/2ab8cb38f9ddf01e174c3525ebdec35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:48:41+02:00 http_client: check if shm is initialized in curl_parse_param() (cherry picked from commit 7741ad7979d54fb4ee1247760d8d5c3666353a96) (cherry picked from commit b27dc141ccddfb3e0f77399ead8b2b158942de69) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/2ab8cb38f9ddf01e174c3525ebdec35… Patch: https://github.com/kamailio/kamailio/commit/2ab8cb38f9ddf01e174c3525ebdec35… --- 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:5.4:810ea55b: http_client: clone name in http connection structures
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 810ea55bcbd557f4544dd1a1ee21bcff558ae553 URL: https://github.com/kamailio/kamailio/commit/810ea55bcbd557f4544dd1a1ee21bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:48:56+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 (cherry picked from commit 9429083c87b1323e31983cc71551676c199bf640) (cherry picked from commit 459f40b52a8a6f8b2ef70a6986c686448ea572a8) --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/810ea55bcbd557f4544dd1a1ee21bcf… Patch: https://github.com/kamailio/kamailio/commit/810ea55bcbd557f4544dd1a1ee21bcf… --- 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:5.4:ca97ee94: websocket: docs - added tcp_accept_no_cl=yes to example
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: ca97ee946df51fe8b2ceff5ea0ec890ebbdfac0c URL: https://github.com/kamailio/kamailio/commit/ca97ee946df51fe8b2ceff5ea0ec890… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:47:39+02:00 websocket: docs - added tcp_accept_no_cl=yes to example (cherry picked from commit a05b4d7c2e413032b1a63f3d017243446a0bc6ec) (cherry picked from commit 9d7301652ca7f051df4a23b6be3a83d3f21baa5d) --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ca97ee946df51fe8b2ceff5ea0ec890… Patch: https://github.com/kamailio/kamailio/commit/ca97ee946df51fe8b2ceff5ea0ec890… --- 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.4:9979ae48: xhttp: warning log if tcp_accept_no_cl is not set
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 9979ae4889ccb2c18b3f10f45625679bb8c2c4b2 URL: https://github.com/kamailio/kamailio/commit/9979ae4889ccb2c18b3f10f45625679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:47:51+02:00 xhttp: warning log if tcp_accept_no_cl is not set (cherry picked from commit b8fbf5e8c199b8277053f9c15231695a16058d6e) (cherry picked from commit cf6c70f00fda196ac9eba4a2ccd24b382d41b240) --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9979ae4889ccb2c18b3f10f45625679… Patch: https://github.com/kamailio/kamailio/commit/9979ae4889ccb2c18b3f10f45625679… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index ba57066849..440577bde2 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.4:4f02ec38: siptrace: fixed IPv6 without brackets
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 4f02ec387cf9f46cc83ec6fea0df0a17ab7f08a5 URL: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:46:07+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 (cherry picked from commit 417eb2a7052a9354712663cca9e3bc075a3f69c0) (cherry picked from commit 903e41468a00edeff52cbf1e3c0053c82860c92c) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… Patch: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fbeb3fb764..afd8bfef24 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2061,7 +2061,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; @@ -2071,7 +2071,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.4:2dc8fa86: secsipid: explicit STIR/SHAKEN reference
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 2dc8fa863c48465051bde2383acbad753583a2b2 URL: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:46:27+02:00 secsipid: explicit STIR/SHAKEN reference - help matching on search terms (cherry picked from commit a59ea8920c17aca29ffa734ca0babb107a415fde) (cherry picked from commit 3e0f634c1dd11702a97cc2fe2c3f70f1f933a4f3) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… Patch: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1b057696f6..e22d8f9aff 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.4:198753a4: xhttp: extended example for event_route[xhttp:request]
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 198753a49da7ff81965d4eeac1d96e53dbe901a6 URL: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:47:28+02:00 xhttp: extended example for event_route[xhttp:request] (cherry picked from commit 195de260f102f1a016ad7bd1021571c1dd8a983f) (cherry picked from commit 42df0f0b58a2b5780a9bf613a5a29d4af27b4f67) --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… Patch: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… --- 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.4:5e390618: pv: test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 5e39061818a0d52ac3a692c6357a497a09207e87 URL: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:44:42+02:00 pv: test for HDR_ERROR_T after header name parsing (cherry picked from commit c264fbc66a4690b073c72ffa8fc095227ce0ae8b) (cherry picked from commit 18e85c98bb6eebf9afe83aaa0a832d1c4af46e62) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… Patch: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6d793185dc..c07096c240 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3248,8 +3248,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.4:5b849659: app_perl change to ignore "die" signals from eval blocks
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 5b849659b23c1fad9161d51c1e7aac5a96d8850c URL: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:45:02+02:00 app_perl change to ignore "die" signals from eval blocks (cherry picked from commit 50557b8433e137a9095b4d48df8ac9b8c3fd8807) (cherry picked from commit 7192139d77f844cd927c326ce16cadfc63378b35) --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… Patch: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… --- 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.4:e1fb94f5: pv: added missing WS and WSS to $K(key) variable
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: e1fb94f5c258038527f8f8df90135d6a4c2a4391 URL: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:45:28+02:00 pv: added missing WS and WSS to $K(key) variable (cherry picked from commit a8c9d0ae4fbafba89ef12737419037d141eed1d3) (cherry picked from commit 7b89c5e6abe5f4ae3ee55d9c938c865806f29dec) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… Patch: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index c07096c240..9bbce87c26 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3303,6 +3303,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; @@ -3310,6 +3314,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: @@ -3381,6 +3387,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.4:465fbace: dialog: safety checks for bind addr fields
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 465fbace1586874b60b98ab04caddd1c76b2810c URL: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:44:19+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 (cherry picked from commit 490ae559d2b77b13b3f3831e7ff1aa58980e4086) (cherry picked from commit b6428ca86c821ddf74fd4ea8a17aecdce39934f4) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… Patch: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… --- 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:044a2e66: sworker: docs - fixed small typo
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.5 Commit: 044a2e665ce5612980b203c705f75ee786be5316 URL: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:40:06+02:00 sworker: docs - fixed small typo (cherry picked from commit fc62ceeb6d625acda6952486031efa1fe2945768) --- Modified: src/modules/sworker/doc/sworker_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… Patch: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… --- diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml index 9656ff1071..2110998f2f 100644 --- a/src/modules/sworker/doc/sworker_admin.xml +++ b/src/modules/sworker/doc/sworker_admin.xml @@ -109,7 +109,7 @@ request_route { 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 (false) in case there - was a proble delegating the processing. + was a problem delegating the processing. </para> <para> This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

git:5.5:75571e17: core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

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

1 0

git:master:b4e94080: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: b4e94080987a4f8e2b04ac5c8ef7ce89ad4246ee URL: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-29T09:16:28+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… Patch: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 3824577860..ad9277ce37 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -39,6 +39,7 @@ Daniel-Constantin Mierla 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 3. Selects @@ -68,7 +69,8 @@ Daniel-Constantin Mierla 1.18. hf_iterator_next usage 1.19. hf_iterator_rm usage 1.20. hf_iterator_append usage - 1.21. @hf_value select usage + 1.21. hf_iterator_insert usage + 1.22. @hf_value select usage Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 3. Selects @@ -136,6 +139,7 @@ Chapter 1. Admin Guide 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 2.1. msg_apply_changes() @@ -517,6 +521,26 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.21. hf_iterator_insert(iname, htext) + + Add headers before the one at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.21. hf_iterator_insert usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_insert("i1", "My-New-Header: abc\r\n"); + break; + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -552,7 +576,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.21. @hf_value select usage + Example 1.22. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:d65adfb7: textopsx: added hf_iterator_insert() function
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: d65adfb7531d8032cb4839341f7787d7877e572e URL: https://github.com/kamailio/kamailio/commit/d65adfb7531d8032cb4839341f7787d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T09:01:25+02:00 textopsx: added hf_iterator_insert() function --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/d65adfb7531d8032cb4839341f7787d… Patch: https://github.com/kamailio/kamailio/commit/d65adfb7531d8032cb4839341f7787d…

1 0

[kamailio/kamailio] make ruxc build optional (#2808)
by sergey-safarov 28 Jul '21

28 Jul '21

### Description I during master compilation I see an error ``` [root@safarov-dell kamailio]# make -C src/modules/ruxc/ make: Entering directory '/tmp/kamailio/src/modules/ruxc' CC (gcc) [M ruxc.so] ruxc_mod.o ruxc_mod.c:28:10: fatal error: ruxc.h: No such file or directory 28 | #include <ruxc.h> | ^~~~~~~~ compilation terminated. ``` I was not able to figure out how to install the required dependency on CentOS dist and Fedora. Could you make build this module build optional -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2808

2 3

git:master:61cbb5e8: core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots
by Daniel-Constantin Mierla 27 Jul '21

27 Jul '21

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

1 0

git:master:4e239991: modules: readme files regenerated - outbound ... [skip ci]
by Kamailio Dev 27 Jul '21

27 Jul '21

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

1 0

[kamailio/kamailio] outbound: add flow_token_secret param (#2801)
by Michael Furmur 27 Jul '21

27 Jul '21

- calculate ob_key as SHA1(flow_token_secret) if specified - keep old behavior with randomly generated ob_key if not specified   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Adds ``flow_token_secret``(string) parameter for **outbound** module to give the ability to use persistent ob_key which is used for flow tokens validation. Useful for cluster configurations with floating IP and ensures successful validation of the previously generated flow tokens after the **kamailio** restart. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2801 -- Commit Summary -- * outbound: add flow_token_secret param -- File Changes -- M src/modules/outbound/doc/outbound_admin.xml (22) M src/modules/outbound/outbound_mod.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2801.patch https://github.com/kamailio/kamailio/pull/2801.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2801

3 3

git:master:cc32abd9: outbound: add flow_token_secret param
by Daniel-Constantin Mierla 27 Jul '21

27 Jul '21

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

1 0

git:master:3c9037e9: pv: added variable $msgbuf(index)
by Daniel-Constantin Mierla 27 Jul '21

27 Jul '21

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

1 0

git:5.4:17fab5e2: pv_headers: pvh_set_header, remove values to set null when necessary
by Victor Seva 27 Jul '21

27 Jul '21

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

1 0

git:5.5:d20841db: pv_headers: pvh_set_header, remove values to set null when necessary
by Victor Seva 27 Jul '21

27 Jul '21

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

1 0

git:master:af926514: pv_headers: pvh_set_header, remove values to set null when necessary
by Victor Seva 27 Jul '21

27 Jul '21

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

1 0

[kamailio/kamailio] Wrong return code used by sl_reply_error() (#2802)
by Norbixin 26 Jul '21

26 Jul '21

### Description I wanted to change 478 response to 503 in case of t_relay() failure, but leave default behavior in rest error cases. I used part of code from "Example 1.1." inside https://www.kamailio.org/docs/modules/devel/modules/outbound.html. When I get -478 from t_relay() it works fine, but when this code is different sl_reply_erorr() don't use it as it should be. This is my part of kamailio.cfg: ``` route[RELAY] { if (!t_relay()) { switch($rc) { case -478: xlog("L_WARN","T_Relay returned 478, sending back 503.\n"); sl_send_reply("503", "Service Unavailable"); exit; default: sl_reply_error(); exit; } } exit; } ``` When I log $rc value before sl_reply_error() it is valid, but not used by sl_reply_error() as SIP error value, it sends 500 instead. ### Troubleshooting #### Reproduction I've added incorrect hostnames with flag 16 to set where the message should be sent and t_relay() returns -478. To check the default case inside switch I changed case -478 to -479. #### Log Messages  ``` 1(8) ERROR: <core> [core/resolve.c:1731]: sip_hostport2su(): could not resolve hostname: "va4brhino" 1(8) ERROR: tm [ut.h:309]: uri2dst2(): failed to resolve "va4brhino" 1(8) ERROR: tm [t_fwd.c:1759]: t_forward_nonack(): failure to add branches 1(8) ERROR: sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) ``` Logs with different route relay ``` route[RELAY] { if (!t_relay()) { switch($rc) { case -479: xlog("L_WARN","T_Relay returned 479, sending back 503.\n"); sl_send_reply("503", "Service Unavailable"); exit; default: xlog("L_WARN","Return code: $rc\n"); sl_reply_error(); exit; } } exit; } ``` ``` 1(8) ERROR: <core> [core/resolve.c:1731]: sip_hostport2su(): could not resolve hostname: "va4brhino" 1(8) ERROR: tm [ut.h:309]: uri2dst2(): failed to resolve "va4brhino" 1(8) ERROR: tm [t_fwd.c:1759]: t_forward_nonack(): failure to add branches 1(8) WARNING: <script>: Return code: -478 1(8) ERROR: sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_ DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.8.4 ``` * **Operating System**:  ``` Linux v4bkamailio 5.10.25-linuxkit #1 SMP Tue Mar 23 09:27:39 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2802

3 5

git:master:40b1d627: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 26 Jul '21

26 Jul '21

Module: kamailio Branch: master Commit: 40b1d627d8f81235814ccee64c562a425f382648 URL: https://github.com/kamailio/kamailio/commit/40b1d627d8f81235814ccee64c562a4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-26T17:31:24+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/40b1d627d8f81235814ccee64c562a4… Patch: https://github.com/kamailio/kamailio/commit/40b1d627d8f81235814ccee64c562a4… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index a72249f1be..3824577860 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -38,6 +38,7 @@ Daniel-Constantin Mierla 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) + 2.20. hf_iterator_append(iname, htext) 3. Selects @@ -66,7 +67,8 @@ Daniel-Constantin Mierla 1.17. hf_iterator_end usage 1.18. hf_iterator_next usage 1.19. hf_iterator_rm usage - 1.20. @hf_value select usage + 1.20. hf_iterator_append usage + 1.21. @hf_value select usage Chapter 1. Admin Guide @@ -94,6 +96,7 @@ Chapter 1. Admin Guide 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) + 2.20. hf_iterator_append(iname, htext) 3. Selects @@ -132,6 +135,7 @@ Chapter 1. Admin Guide 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) + 2.20. hf_iterator_append(iname, htext) 2.1. msg_apply_changes() @@ -493,6 +497,26 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.20. hf_iterator_append(iname, htext) + + Add headers after the one at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.20. hf_iterator_append usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_append("i1", "My-New-Header: abc\r\n"); + break; + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -528,7 +552,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.20. @hf_value select usage + Example 1.21. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

[kamailio/kamailio] RTPEngine: Async connection/communication between Kamailio and RTPEngine (#2807)
by Miteshkumar Thakkar 26 Jul '21

26 Jul '21

### Description Can we have async connection/communication between Kamailio and RTPEngine #### Actual observed behavior Currently, if there is a network latency or unstable network between Kamailio and RTPEngine, the Kamailio is keep waiting/polling on RTPEngine. That can be overcome if we have async connection. -Miteshkumar -- 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/2807

3 3

git:master:001e07dd: textopsx: docs for hf_iterator_append()
by Daniel-Constantin Mierla 26 Jul '21

26 Jul '21

Module: kamailio Branch: master Commit: 001e07ddaff30153ee9bc9beb5cb2430007173e5 URL: https://github.com/kamailio/kamailio/commit/001e07ddaff30153ee9bc9beb5cb243… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-26T17:15:38+02:00 textopsx: docs for hf_iterator_append() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/001e07ddaff30153ee9bc9beb5cb243… Patch: https://github.com/kamailio/kamailio/commit/001e07ddaff30153ee9bc9beb5cb243… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index c1c5fd5f64..b43a0d4bb8 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -589,6 +589,35 @@ hf_iterator_end("i1"); } hf_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_append"> + <title> + <function moreinfo="none">hf_iterator_append(iname, htext)</function> + </title> + <para> + Add headers after the one at the current iterator possition. + </para> + <para> + The parameters can be dynamic strings with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_append</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_append("i1", "My-New-Header: abc\r\n"); + break; + } + } + hf_iterator_end("i1"); +... </programlisting> </example> </section>

1 0

git:master:3f3fb6ad: textopsx: added hf_iterator_append(iname, htext) function
by Daniel-Constantin Mierla 26 Jul '21

26 Jul '21

Module: kamailio Branch: master Commit: 3f3fb6ad94805407b316eb0ec4883631ac1df604 URL: https://github.com/kamailio/kamailio/commit/3f3fb6ad94805407b316eb0ec488363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-26T17:02:01+02:00 textopsx: added hf_iterator_append(iname, htext) function --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/3f3fb6ad94805407b316eb0ec488363… Patch: https://github.com/kamailio/kamailio/commit/3f3fb6ad94805407b316eb0ec488363… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index ec3e1afb75..297ff1098e 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -77,6 +77,7 @@ static int w_hf_iterator_start(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_next(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2); +static int w_hf_iterator_append(sip_msg_t *msg, char *piname, char *phtext); static int bind_textopsx(textopsx_api_t *tob); @@ -139,6 +140,8 @@ static cmd_export_t cmds[] = { fixup_free_spve_null, ANY_ROUTE}, {"hf_iterator_rm", w_hf_iterator_rm, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"hf_iterator_append", w_hf_iterator_append, 2, fixup_spve_spve, + fixup_free_spve_spve, ANY_ROUTE}, {"bind_textopsx", (cmd_function)bind_textopsx, 1, 0, 0, ANY_ROUTE}, @@ -2057,6 +2060,63 @@ static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2) return ki_hf_iterator_rm(msg, &iname); } +/** + * + */ +static int ki_hf_iterator_append(sip_msg_t *msg, str *iname, str *htext) +{ + int k; + sr_lump_t *anchor; + str sval = STR_NULL; + + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + return -1; + } + anchor = anchor_lump(msg, _hf_iterators[k].it->name.s + + _hf_iterators[k].it->len - msg->buf, 0, 0); + if (anchor==0) { + LM_ERR("cannot append hdr after %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + sval.s = (char*)pkg_malloc(htext->len + 1); + if(sval.s==NULL) { + LM_ERR("failed append hdr after %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + memcpy(sval.s, htext->s, htext->len); + sval.len = htext->len; + sval.s[sval.len] = '\0'; + + if (insert_new_lump_before(anchor, sval.s, sval.len, 0) == 0) { + LM_ERR("cannot insert lump\n"); + pkg_free(sval.s); + return -1; + } + return 1; +} + +/** + * + */ +static int w_hf_iterator_append(sip_msg_t *msg, char *piname, char *phtext) +{ + str iname = STR_NULL; + str htext = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)piname, &iname)<0) { + LM_ERR("failed to get iterator name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)phtext, &htext)<0) { + LM_ERR("failed to get header text\n"); + return -1; + } + + return ki_hf_iterator_append(msg, &iname, &htext); +} + /** * */

1 0

Info: Kamailio World Online - Sep 1-2, 2021 - Celebrating 20 Years Of Development
by Daniel-Constantin Mierla 26 Jul '21

26 Jul '21

Hello, given the current situation across the world, no physical Kamailio World Conference is planned in 2021. However, this year the project celebrates 20 years of development -- according to commit history, the first one was done on the 3rd of September, 2021: > ❯ git log --reverse > commit 512dcd9838f5aeb0bfccd02cfc156067b7f02b71 > Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> > Date: Mon Sep 3 21:27:11 2001 +0000 > Initial revision To mark this notable milestone, we are going to organize an online event during Sep 1-2, 2021, similar to the one from 2020 -- the website for the event is available at: * https://www.kamailioworld.com/k09-online/ Mark the date in your calendar, more details about the content of the event will be published in the near future! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

kamailio trouble
by 崔群 25 Jul '21

25 Jul '21

Dear sir: I have some problems。the kamailio version is 5.3.0. My linux version is centos 7. the kamailio log: ERROR: <core> [core/tcp_main.c:3508]: send_fd_queue_run(): send_fd failed on socket 63 , queue entry 1, retries 90, connection 0x7ff46e6b1b60, tcp socket 218, errno=11 (Resource temporarily unavailable) ERROR: {1 12529 MESSAGE 359bf0410a7e471c950623e3f7a3b17b} <core> [core/kemi.c:94]: sr_kemi_core_err(): 202->408 CRITICAL: <core> [core/tcp_main.c:4218]: send2child(): tcp child 6, socket 65: queue full, 291 requests queued (total handled 10665748) This problem does not happen every time。When the number of user registrations increases significantly, errors will appear。I tried to set the parameter tcp_children is adjusted to 8, it will not appear frequently, but when the number of user registrations increases to about 5000, errors will still appear. My kamailio.cfg global parameters are set as follows：tls_max_connections=65536,tcp_max_connections=65536,open_max_files=65536。 I hope you can reply to me，thanks.

2 1

git:master:6ec588a7: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 24 Jul '21

24 Jul '21

Module: kamailio Branch: master Commit: 6ec588a71e49c88ac0b62f3385cb6e7744fc13f9 URL: https://github.com/kamailio/kamailio/commit/6ec588a71e49c88ac0b62f3385cb6e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-24T08:31:20+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/6ec588a71e49c88ac0b62f3385cb6e7… Patch: https://github.com/kamailio/kamailio/commit/6ec588a71e49c88ac0b62f3385cb6e7… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index 6fb238e3b7..e437234139 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. http_timeout (int) 3.2. http_tlsmode (int) + 3.3. http_reuse (int) 4. Functions @@ -40,9 +41,10 @@ Daniel-Constantin Mierla 1.1. Set http_timeout parameter 1.2. Set http_tlsmode parameter - 1.3. ruxc_http_get() usage - 1.4. ruxc_http_post() usage - 1.5. Libruxc Usage + 1.3. Set http_reuse parameter + 1.4. ruxc_http_get() usage + 1.5. ruxc_http_post() usage + 1.6. Libruxc Usage Chapter 1. Admin Guide @@ -58,6 +60,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) + 3.3. http_reuse (int) 4. Functions @@ -95,6 +98,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) + 3.3. http_reuse (int) 3.1. http_timeout (int) @@ -120,6 +124,20 @@ modparam("ruxc", "http_timeout", 2000) modparam("ruxc", "http_tlsmode", 1) ... +3.3. http_reuse (int) + + Set to 1 in order to reuse the connection for all requests (each + Kamailio process has its own connection). Useful to avoid TCP connect + (and TLS handshake) when all requests are performed against the same + HTTP/S server. + + Default value is 0 (new connection for each request). + + Example 1.3. Set http_reuse parameter +... +modparam("ruxc", "http_reuse", 1) +... + 4. Functions 4.1. ruxc_http_get(url, hdrs, respv) @@ -137,7 +155,7 @@ modparam("ruxc", "http_tlsmode", 1) This function can be used from ANY_ROUTE. - Example 1.3. ruxc_http_get() usage + Example 1.4. ruxc_http_get() usage ... ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s .escape.param})", @@ -160,7 +178,7 @@ switch ($rc) { This function can be used from ANY_ROUTE. - Example 1.4. ruxc_http_post() usage + Example 1.5. ruxc_http_post() usage ... ruxc_http_post("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{ s.escape.param})", @@ -183,7 +201,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.5. Libruxc Usage + Example 1.6. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:600d0e8f: ruxc: added http_reuse modparam
by Daniel-Constantin Mierla 24 Jul '21

24 Jul '21

Module: kamailio Branch: master Commit: 600d0e8fb7f24e424873e4ad24beb077d2b45ee4 URL: https://github.com/kamailio/kamailio/commit/600d0e8fb7f24e424873e4ad24beb07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-24T08:16:49+02:00 ruxc: added http_reuse modparam - enable connection reuse --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/600d0e8fb7f24e424873e4ad24beb07… Patch: https://github.com/kamailio/kamailio/commit/600d0e8fb7f24e424873e4ad24beb07… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index e4b0384ea4..e07c05c9f1 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -95,6 +95,27 @@ modparam("ruxc", "http_timeout", 2000) ... modparam("ruxc", "http_tlsmode", 1) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_reuse"> + <title><varname>http_reuse</varname> (int)</title> + <para> + Set to 1 in order to reuse the connection for all requests (each &kamailio; + process has its own connection). Useful to avoid TCP connect (and TLS + handshake) when all requests are performed against the same HTTP/S server. + </para> + <para> + <emphasis> + Default value is 0 (new connection for each request). + </emphasis> + </para> + <example> + <title>Set <varname>http_reuse</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_reuse", 1) +... </programlisting> </example> </section> diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 2cd1cd27d0..02fa278859 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -40,6 +40,7 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; static int _ruxc_http_tlsmode = 0; +static int _ruxc_http_reuse = 0; static int mod_init(void); static int child_init(int); @@ -73,6 +74,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, + {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, {0, 0, 0} }; @@ -132,6 +134,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; + v_http_request.reuse = _ruxc_http_reuse; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -229,6 +232,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; + v_http_request.reuse = _ruxc_http_reuse; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

git:master:2042432b: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 23 Jul '21

23 Jul '21

Module: kamailio Branch: master Commit: 2042432b598fcceb9de7cf8a659498e99aec9f05 URL: https://github.com/kamailio/kamailio/commit/2042432b598fcceb9de7cf8a659498e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-23T19:46:14+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/2042432b598fcceb9de7cf8a659498e… Patch: https://github.com/kamailio/kamailio/commit/2042432b598fcceb9de7cf8a659498e…

1 0

git:master:12470055: rtpengine: add un/silence_media() methods
by Richard Fuchs 23 Jul '21

23 Jul '21

Module: kamailio Branch: master Commit: 12470055fddc1dd93e2295fcfb5119cf5340d722 URL: https://github.com/kamailio/kamailio/commit/12470055fddc1dd93e2295fcfb5119c… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2021-07-23T13:34:33-04:00 rtpengine: add un/silence_media() methods --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/12470055fddc1dd93e2295fcfb5119c… Patch: https://github.com/kamailio/kamailio/commit/12470055fddc1dd93e2295fcfb5119c…

1 0

git:5.4:447e25a0: pv_headers: fix removal of all values when using PV_IDX_ALL
by Victor Seva 23 Jul '21

23 Jul '21

Module: kamailio Branch: 5.4 Commit: 447e25a0d1bf7eadb045a79bff7bfa50b0dca71c URL: https://github.com/kamailio/kamailio/commit/447e25a0d1bf7eadb045a79bff7bfa5… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-23T17:12:14+02:00 pv_headers: fix removal of all values when using PV_IDX_ALL $(x_hdr(whatever)[*]) = "hello" was just removing the first value (cherry picked from commit 9ad96c08e0deb759297b2d402295691d8dd657d5) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/447e25a0d1bf7eadb045a79bff7bfa5… Patch: https://github.com/kamailio/kamailio/commit/447e25a0d1bf7eadb045a79bff7bfa5… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 7cba757456..96fdc292b0 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -618,7 +618,7 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) @@ -649,7 +649,7 @@ int pvh_set_header( goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); }

1 0

git:5.5:e18c24b8: pv_headers: fix removal of all values when using PV_IDX_ALL
by Victor Seva 23 Jul '21

23 Jul '21

Module: kamailio Branch: 5.5 Commit: e18c24b88403e61461feace3b13fa59f948f1082 URL: https://github.com/kamailio/kamailio/commit/e18c24b88403e61461feace3b13fa59… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-23T17:11:45+02:00 pv_headers: fix removal of all values when using PV_IDX_ALL $(x_hdr(whatever)[*]) = "hello" was just removing the first value (cherry picked from commit 9ad96c08e0deb759297b2d402295691d8dd657d5) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/e18c24b88403e61461feace3b13fa59… Patch: https://github.com/kamailio/kamailio/commit/e18c24b88403e61461feace3b13fa59… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 7cba757456..96fdc292b0 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -618,7 +618,7 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) @@ -649,7 +649,7 @@ int pvh_set_header( goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); }

1 0

git:master:9ad96c08: pv_headers: fix removal of all values when using PV_IDX_ALL
by Victor Seva 23 Jul '21

23 Jul '21

Module: kamailio Branch: master Commit: 9ad96c08e0deb759297b2d402295691d8dd657d5 URL: https://github.com/kamailio/kamailio/commit/9ad96c08e0deb759297b2d402295691… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-23T17:11:03+02:00 pv_headers: fix removal of all values when using PV_IDX_ALL $(x_hdr(whatever)[*]) = "hello" was just removing the first value --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/9ad96c08e0deb759297b2d402295691… Patch: https://github.com/kamailio/kamailio/commit/9ad96c08e0deb759297b2d402295691… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 7cba757456..96fdc292b0 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -618,7 +618,7 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) @@ -649,7 +649,7 @@ int pvh_set_header( goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); }

1 0

git:master:b31efd55: modules: readme files regenerated - sworker ... [skip ci]
by Kamailio Dev 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: b31efd5526cf11eded7823c6e93370024f5d2863 URL: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-22T15:46:15+02:00 modules: readme files regenerated - sworker ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700… Patch: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index 241b077ab6..c5d571a179 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -115,7 +115,7 @@ request_route { that, 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 - (false) in case there was a proble delegating the processing. + (false) in case there was a problem delegating the processing. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

[kamailio/kamailio] rr: all "record_route_...()" functions consider custom user AVP (#2804)
by annema-Kontron 22 Jul '21

22 Jul '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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally, testet against local branch of 5.1.6 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Until this fix, only the function record_route() considered the value of the custom user AVP (if present). The functions record_route_preset() and record_route_advertised_address(), on the other hand, ignored the value of the custom user AVP, even if it was presnt. Now all three functions, record_route(), record_route_preset() and record_route_advertised_address(), consider the value of the custom user VP, if it is present. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2804 -- Commit Summary -- * rr: all "record_route_...()" functions consider custom user AVP -- File Changes -- M src/modules/rr/record.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2804.patch https://github.com/kamailio/kamailio/pull/2804.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/2804

2 3

git:master:fc62ceeb: sworker: docs - fixed small typo
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: fc62ceeb6d625acda6952486031efa1fe2945768 URL: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T15:34:48+02:00 sworker: docs - fixed small typo --- Modified: src/modules/sworker/doc/sworker_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1… Patch: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1… --- diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml index 9656ff1071..2110998f2f 100644 --- a/src/modules/sworker/doc/sworker_admin.xml +++ b/src/modules/sworker/doc/sworker_admin.xml @@ -109,7 +109,7 @@ request_route { 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 (false) in case there - was a proble delegating the processing. + was a problem delegating the processing. </para> <para> This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

git:master:f3a031a5: rr: all "record_route_...()" functions consider custom user AVP
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: f3a031a53fb413369ddf96de74ac43cd6831db5a URL: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c… Author: valentin <christoph.valentin(a)kontron.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T15:32:21+02:00 rr: all "record_route_...()" functions consider custom user AVP Until this fix, only the function record_route() considered the value of the custom user AVP (if present). The functions record_route_preset() and record_route_advertised_address(), on the other hand, ignored the value of the custom user AVP, even if it was presnt. Now all three functions, record_route(), record_route_preset() and record_route_advertised_address(), consider the value of the custom user VP, if it is present. --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c… Patch: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 8624ee5e13..b6178cade3 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -527,9 +527,12 @@ int record_route_preset(struct sip_msg* _m, str* _data) } if (add_username) { - if (get_username(_m, &user) < 0) { - LM_ERR("failed to extract username\n"); - return -1; + /* check if there is a custom user set */ + if (get_custom_user(_m, &user) < 0) { + if (get_username(_m, &user) < 0) { + LM_ERR("failed to extract username\n"); + return -1; + } } } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { @@ -814,9 +817,12 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) user.s = 0; if (add_username) { - if (get_username(_m, &user) < 0) { - LM_ERR("failed to extract username\n"); - return -1; + /* check if there is a custom user set */ + if (get_custom_user(_m, &user) < 0) { + if (get_username(_m, &user) < 0) { + LM_ERR("failed to extract username\n"); + return -1; + } } } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) {

1 0

git:master:a5821343: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: a5821343b044dfabff5fab57fc01e1d23f7d69de URL: https://github.com/kamailio/kamailio/commit/a5821343b044dfabff5fab57fc01e1d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-22T10:01:23+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/a5821343b044dfabff5fab57fc01e1d… Patch: https://github.com/kamailio/kamailio/commit/a5821343b044dfabff5fab57fc01e1d… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e3c9dae852..6fb238e3b7 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -27,6 +27,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. http_timeout (int) + 3.2. http_tlsmode (int) 4. Functions @@ -38,9 +39,10 @@ Daniel-Constantin Mierla List of Examples 1.1. Set http_timeout parameter - 1.2. ruxc_http_get() usage - 1.3. ruxc_http_post() usage - 1.4. Libruxc Usage + 1.2. Set http_tlsmode parameter + 1.3. ruxc_http_get() usage + 1.4. ruxc_http_post() usage + 1.5. Libruxc Usage Chapter 1. Admin Guide @@ -55,6 +57,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. http_timeout (int) + 3.2. http_tlsmode (int) 4. Functions @@ -91,6 +94,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. http_timeout (int) + 3.2. http_tlsmode (int) 3.1. http_timeout (int) @@ -104,6 +108,18 @@ Chapter 1. Admin Guide modparam("ruxc", "http_timeout", 2000) ... +3.2. http_tlsmode (int) + + The mode to connect over TLS to HTTPS sites: 0 accept all certificates; + 1 - accept trusted certificates. + + Default value is 0 (accept all certificates). + + Example 1.2. Set http_tlsmode parameter +... +modparam("ruxc", "http_tlsmode", 1) +... + 4. Functions 4.1. ruxc_http_get(url, hdrs, respv) @@ -121,7 +137,7 @@ modparam("ruxc", "http_timeout", 2000) This function can be used from ANY_ROUTE. - Example 1.2. ruxc_http_get() usage + Example 1.3. ruxc_http_get() usage ... ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s .escape.param})", @@ -144,7 +160,7 @@ switch ($rc) { This function can be used from ANY_ROUTE. - Example 1.3. ruxc_http_post() usage + Example 1.4. ruxc_http_post() usage ... ruxc_http_post("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{ s.escape.param})", @@ -167,7 +183,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.4. Libruxc Usage + Example 1.5. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:8f340839: ruxc: added http_tlsmode parameter
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: 8f34083999a379db0c5c24b6e2739f9a413ea86b URL: https://github.com/kamailio/kamailio/commit/8f34083999a379db0c5c24b6e2739f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T09:22:42+02:00 ruxc: added http_tlsmode parameter - if set to 1, it connects only to trusted https websites - default 0 - accept all certificates --- Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8f34083999a379db0c5c24b6e2739f9… Patch: https://github.com/kamailio/kamailio/commit/8f34083999a379db0c5c24b6e2739f9… --- diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 2d100d373c..2cd1cd27d0 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -39,6 +39,7 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; +static int _ruxc_http_tlsmode = 0; static int mod_init(void); static int child_init(int); @@ -71,6 +72,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, + {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, {0, 0, 0} }; @@ -129,6 +131,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.timeout_connect = _ruxc_http_timeout; v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; + v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -225,6 +228,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.timeout_connect = _ruxc_http_timeout; v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; + v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

git:master:03a74e45: ruxc: docs for http_tlsmode parameter
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: 03a74e4519d5de90512ac5f196640eb6cf405bfc URL: https://github.com/kamailio/kamailio/commit/03a74e4519d5de90512ac5f196640eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T09:52:48+02:00 ruxc: docs for http_tlsmode parameter --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/03a74e4519d5de90512ac5f196640eb… Patch: https://github.com/kamailio/kamailio/commit/03a74e4519d5de90512ac5f196640eb… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index 059b64854a..e4b0384ea4 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -75,6 +75,26 @@ ... modparam("ruxc", "http_timeout", 2000) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_tlsmode"> + <title><varname>http_tlsmode</varname> (int)</title> + <para> + The mode to connect over TLS to HTTPS sites: 0 accept all certificates; + 1 - accept trusted certificates. + </para> + <para> + <emphasis> + Default value is 0 (accept all certificates). + </emphasis> + </para> + <example> + <title>Set <varname>http_tlsmode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_tlsmode", 1) +... </programlisting> </example> </section>

1 0

git:master:126f89e7: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: 126f89e72212cee96d0ef3e7b43c249ab9c4429c URL: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-19T17:31:13+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… Patch: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e950003124..e3c9dae852 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2021 http://www.asipto.com + Copyright Â© 2021 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -109,7 +109,7 @@ modparam("ruxc", "http_timeout", 2000) 4.1. ruxc_http_get(url, hdrs, respv) 4.2. ruxc_http_post(url, body, hdrs, respv) -4.1. ruxc_http_get(url, hdrs, respv) +4.1. ruxc_http_get(url, hdrs, respv) Perform a HTTP GET request to "url", storing the response body in the "respv" variable. The "hdrs" can be empty string to skip setting them. @@ -123,15 +123,15 @@ modparam("ruxc", "http_timeout", 2000) Example 1.2. ruxc_http_get() usage ... -http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu -{s.escape.param})", +ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s +.escape.param})", "", "X-Token: abc", "$var(result)"); switch ($rc) { ... } ... -4.2. ruxc_http_post(url, body, hdrs, respv) +4.2. ruxc_http_post(url, body, hdrs, respv) Perform a HTTP POST request to "url", storing the response body in the "respv" variable. The "body" and "hdrs" can be empty strings to skip

1 0

git:master:cbc38427: ruxc: docs - fixed typo in function name
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: cbc3842771393c71fe81f8eae87c1a7dbfd38974 URL: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T16:35:36+02:00 ruxc: docs - fixed typo in function name --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… Patch: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index af6ac8a0de..059b64854a 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -104,7 +104,7 @@ modparam("ruxc", "http_timeout", 2000) <title><function>ruxc_http_get()</function> usage</title> <programlisting format="linespecific"> ... -http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", +ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "", "X-Token: abc", "$var(result)"); switch ($rc) { ...

1 0

Why sip_msg_apply_changes can't be executed from BRANCH_FAILURE_ROUTE?
by Ivan Ribakov 19 Jul '21

19 Jul '21

Hi all, I need to modify headers and body of the ingress INVITE in the BRANCH_FAILURE_ROUTE block to reflect failure to deliver message to the first destination and include some additional information. However checking the documentation of the “sip_msg_apply_changes” (https://github.com/kamailio/kamailio/blob/master/src/core/msg_translator.c#…) I can see that it can only be executed from request and reply routes. That seems overly restrictive. Can someone shine some light on why is that and whether it’s safe to patch this part of the code to allow function execution from BRANCH_FAILURE_ROUTE as well? Thanks in advance, Ivan

3 5

git:master:abba6969: ruxc: set response variable
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: abba69691efad80d208aeb000bf0382f94dfec71 URL: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T10:19:14+02:00 ruxc: set response variable --- Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… Patch: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… --- diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 2f5e6ae86a..2d100d373c 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -122,6 +122,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, { RuxcHTTPRequest v_http_request = {0}; RuxcHTTPResponse v_http_response = {0}; + pv_value_t val = {0}; int ret; v_http_request.timeout = _ruxc_http_timeout; @@ -147,6 +148,14 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, LM_DBG("response code: %d - data len: %d - data: [%.*s]\n", v_http_response.rescode, v_http_response.resdata_len, v_http_response.resdata_len, v_http_response.resdata); + val.rs.s = v_http_response.resdata; + val.rs.len = v_http_response.resdata_len; + val.flags = PV_VAL_STR; + if(dst->setf) { + dst->setf(_msg, &dst->pvp, (int)EQ_T, &val); + } else { + LM_WARN("target pv is not writable\n"); + } } ret = v_http_response.rescode; } @@ -209,6 +218,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h { RuxcHTTPRequest v_http_request = {0}; RuxcHTTPResponse v_http_response = {0}; + pv_value_t val = {0}; int ret; v_http_request.timeout = _ruxc_http_timeout; @@ -239,6 +249,14 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h LM_DBG("response code: %d - data len: %d - data: [%.*s]\n", v_http_response.rescode, v_http_response.resdata_len, v_http_response.resdata_len, v_http_response.resdata); + val.rs.s = v_http_response.resdata; + val.rs.len = v_http_response.resdata_len; + val.flags = PV_VAL_STR; + if(dst->setf) { + dst->setf(_msg, &dst->pvp, (int)EQ_T, &val); + } else { + LM_WARN("target pv is not writable\n"); + } } ret = v_http_response.rescode; }

1 0

git:master:6be39f68: Makefile.groups: added group for ruxc module
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: 6be39f6864a56a5ff56dab3be1bb5fd749df387e URL: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T08:38:55+02:00 Makefile.groups: added group for ruxc module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… Patch: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 4eea749671..99a990ad83 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -226,6 +226,9 @@ mod_list_mqtt=mqtt # - modules depending on nats and ev library mod_list_nats=nats +# - modules depending on ruxc library +mod_list_ruxc=ruxc + # - modules depending on secsipid library mod_list_secsipid=secsipid secsipid_proc @@ -268,6 +271,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_kafka) \ $(mod_list_mqtt) \ $(mod_list_nats) \ + $(mod_list_ruxc) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ @@ -504,6 +508,9 @@ module_group_kmqtt=$(mod_list_mqtt) # K nats modules module_group_knats=$(mod_list_nats) +# K ruxc modules +module_group_kruxc=$(mod_list_ruxc) + # K secsipid modules module_group_ksecsipid=$(mod_list_secsipid)

1 0

git:master:81de7878: ruxc: new module with utility functions from libruxc
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: 81de7878ff4706ba331fa787cc63dea562e6a814 URL: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T08:32:48+02:00 ruxc: new module with utility functions from libruxc - first target is to provide http get/post functions that do not depend on libcurl+libssl --- Added: src/modules/ruxc/Makefile Added: src/modules/ruxc/README Added: src/modules/ruxc/doc/Makefile Added: src/modules/ruxc/doc/ruxc.xml Added: src/modules/ruxc/doc/ruxc_admin.xml Added: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea… Patch: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea…

1 0

git:master:851a8c0f: kemix: added KSR.kx.ifdef() and KSR.kx.ifndef()
by Daniel-Constantin Mierla 14 Jul '21

14 Jul '21

Module: kamailio Branch: master Commit: 851a8c0f0c8f7cc7ab22cb905bdb3987e9fa461b URL: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-14T10:08:50+02:00 kemix: added KSR.kx.ifdef() and KSR.kx.ifndef() - return true/false if a specified id is defined or not --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… Patch: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 1633188089..2b6f6ec9c2 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1138,6 +1138,36 @@ static int ki_kx_get_defn(sip_msg_t *msg, str *dname) return n; } +/** + * + */ +static int ki_kx_ifdef(sip_msg_t *msg, str *dname) +{ + str *val; + + val = pp_define_get(dname->len, dname->s); + + if (val!=NULL) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + +/** + * + */ +static int ki_kx_ifndef(sip_msg_t *msg, str *dname) +{ + str *val; + + val = pp_define_get(dname->len, dname->s); + + if (val==NULL) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + /** * */ @@ -1505,6 +1535,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("ifdef"), + SR_KEMIP_BOOL, ki_kx_ifdef, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("ifndef"), + SR_KEMIP_BOOL, ki_kx_ifndef, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_env"), SR_KEMIP_XVAL, ki_kx_get_env, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:ed518fd6: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: ed518fd6fa4652e2a06a09e6d54ce5b19d0b9493 URL: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-13T15:16:15+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… Patch: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 24d02d1c5d..8a1abb2643 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -648,9 +648,11 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) 4.5. rtpengine_allow_op (integer) Enable this setting to allow finishing the current sessions while - denying new sessions for the manually deactivated nodes via kamctl - command i.e. "disabled(permanent)" nodes. Probably the manually - deactivated machine is still running(did not crash). + denying new sessions for deactivated nodes. + + Nodes can be manually deactivated via kamctl command i.e. + "disabled(permanent)" nodes. Probably the manually deactivated machine + is still running(did not crash). This is useful when deactivating a node for maintenance and reject new sessions but allow current ones to finish. @@ -664,6 +666,12 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) Default value is “0” to keep the current behaviour. + If value set to “1” it will send commands to all disabled nodes for the + existing call. + + If value set to “2” it will send commands only to manually disabled + nodes. (Not when timeout is disabled or node broken) + Example 1.5. Set rtpengine_allow_op parameter ... modparam("rtpengine", "rtpengine_allow_op", 1)

1 0

[kamailio/kamailio] rtpengine: rtpengine_allow_op return node logic (#2800)
by descartin 13 Jul '21

13 Jul '21

When using rtpengine_allow_op param, return node for ongoing calls only if rtpengine is manually disabled. When a rtpengine instance is disabled, rtpengine_allow_op will allow the indialog requests to be processed through that rtpengine. But it's not desirable to return the node when the rtpengine has unexpectedly crashed or has any undesired issues, because the rtp commands attempted cause congestion problem in the kamailio. So with this patch we only return the node if the rtpengine has been manually disabled and it's still supposed to be working.   #### 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:  - [x ] 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/2800 -- Commit Summary -- * rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled -- File Changes -- M src/modules/rtpengine/rtpengine.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2800.patch https://github.com/kamailio/kamailio/pull/2800.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/2800

3 10

git:master:3f7a6240: rtpengine: small debug log fix after merge of #2800
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 3f7a6240215a76e9584e34459a1fcfe78a794611 URL: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T13:04:10Z rtpengine: small debug log fix after merge of #2800 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… Patch: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 28c058c2ee..86b5dc484c 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3345,9 +3345,10 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); return node; } else { - LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", + LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled!\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); if (rtpengine_allow_op == 1) { + LM_DBG("Return it\n"); return node; } }

1 0

git:master:f653ea8c: rtpengine: add mode 2 for rtpengine_allow_op to return only manually disabled nodes
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: f653ea8c05e6916ff14e7da491bcd68f928b97af URL: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… Author: david <you(a)example.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T15:01:15+02:00 rtpengine: add mode 2 for rtpengine_allow_op to return only manually disabled nodes --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… Patch: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index ef7d5a4fd7..731e4c6d56 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -259,8 +259,9 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) <section id="rtpengine.p.rtpengine_allow_op"> <title><varname>rtpengine_allow_op</varname> (integer)</title> <para> - Enable this setting to allow finishing the current sessions while denying new sessions for the - <emphasis>manually deactivated nodes </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. + Enable this setting to allow finishing the current sessions while denying new sessions for deactivated nodes. + </para> + <para>Nodes can be <emphasis>manually deactivated </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. Probably the manually deactivated machine is still running(did not crash). </para> <para> @@ -279,6 +280,18 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) Default value is <quote>0</quote> to keep the current behaviour. </emphasis> </para> + <para> + <emphasis> + If value set to <quote>1</quote> it will send commands to all disabled nodes for the + existing call. + </emphasis> + </para> + <para> + <emphasis> + If value set to <quote>2</quote> it will send commands only to manually disabled + nodes. (Not when timeout is disabled or node broken) + </emphasis> + </para> <example> <title>Set <varname>rtpengine_allow_op</varname> parameter</title> <programlisting format="linespecific"> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 1777ebc98f..28c058c2ee 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3347,8 +3347,10 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer } else { LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); + if (rtpengine_allow_op == 1) { + return node; + } } - /*return node;*/ } return NULL;

1 0

git:master:97620f9e: rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 97620f9ed633e8e5e9d719cb023e60a890ebb3f8 URL: https://github.com/kamailio/kamailio/commit/97620f9ed633e8e5e9d719cb023e60a… Author: david <you(a)example.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T15:01:15+02:00 rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/97620f9ed633e8e5e9d719cb023e60a… Patch: https://github.com/kamailio/kamailio/commit/97620f9ed633e8e5e9d719cb023e60a… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6266520578..1777ebc98f 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3343,11 +3343,12 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer if (node->rn_recheck_ticks == RTPENGINE_MAX_RECHECK_TICKS) { LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return it\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); + return node; } else { LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); } - return node; + /*return node;*/ } return NULL;

1 0

git:master:84e3191c: pv: added $via1(...) - return attributes of 2nd via
by Daniel-Constantin Mierla 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 84e3191c165f00aaba61174dd627d7e67b57f8c7 URL: https://github.com/kamailio/kamailio/commit/84e3191c165f00aaba61174dd627d7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-13T09:12:17+02:00 pv: added $via1(...) - return attributes of 2nd via --- 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/84e3191c165f00aaba61174dd627d7e… Patch: https://github.com/kamailio/kamailio/commit/84e3191c165f00aaba61174dd627d7e… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 41c53eaa3f..cc976c86c0 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -548,6 +548,8 @@ static pv_export_t mod_pvs[] = { pv_parse_ccp_attrs_name, 0, 0, 0}, {{"via0", (sizeof("via0")-1)}, PVT_OTHER, pv_get_via0, 0, pv_parse_via_name, 0, 0, 0}, + {{"via1", (sizeof("via1")-1)}, PVT_OTHER, pv_get_via1, 0, + pv_parse_via_name, 0, 0, 0}, {{"viaZ", (sizeof("viaZ")-1)}, PVT_OTHER, pv_get_viaZ, 0, pv_parse_via_name, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 34998b9882..292c96758c 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4595,6 +4595,19 @@ int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_via_attr(msg, msg->via1, param, res); } +/** + * + */ +int pv_get_via1(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_null(msg, param, res); + } + + return pv_get_via_attr(msg, msg->via2, param, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 19222bc63e..14c79ce86c 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -413,6 +413,7 @@ int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, int pv_parse_via_name(pv_spec_p sp, str *in); int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_get_via1(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); #endif

1 0

[kamailio/kamailio] warning_builder(): buffer size exceeded (probably too long URI) (#2799)
by Andrew Webster 13 Jul '21

13 Jul '21

Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: ALERT: <script>: ALERT: route failure INVITE from sip:anonymous@anonymous.invalid (IP:52.114.148.0:6529) : <null> Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: NOTICE: <core> [core/msg_translator.c:314]: warning_builder(): buffer size exceeded (probably too long URI) Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: WARNING: <core> [core/msg_translator.c:2483]: build_res_buf_from_sip_req(): warning skipped -- too big Any idea why I am gettign this during Microsoft Teams integration? Freshly complied. root@host-sbc:/etc/kamailio/git# kamailio -v version: kamailio 5.5.1 (x86_64/linux) 6751cc 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: 6751cc compiled on 18:04:44 Jul 10 2021 with gcc 7.5.0 root@host-sbc:/etc/kamailio/git# -- 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/2799

2 4

git:5.5:304ac124: topos: fix missing xavu_field_contact_host evaluation for contact_mode 0
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 304ac124e6ad86b60071b6c5ecf861e03b7e492b URL: https://github.com/kamailio/kamailio/commit/304ac124e6ad86b60071b6c5ecf861e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:36:10+02:00 topos: fix missing xavu_field_contact_host evaluation for contact_mode 0 - fix missing xavu_field_contact_host evaluation for contact_mode 0 - it works currently only for contact_mode 1 and 2, but not for default mode (cherry picked from commit 4c6abaf9066aebbd304391dd6730cad7ee592611) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/304ac124e6ad86b60071b6c5ecf861e… Patch: https://github.com/kamailio/kamailio/commit/304ac124e6ad86b60071b6c5ecf861e… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6e88b35af3..b94a960340 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -411,13 +411,23 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, *td->cp = '@'; td->cp++; - if (_tps_contact_host.len) { - /* using configured hostname in the contact header */ - memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); - td->cp += _tps_contact_host.len; + /* contact_host xavu takes preference */ + if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { + vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, + &_tps_xavu_field_contact_host); + } + if(vavu!=NULL && vavu->val.v.s.len>0) { + memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); + td->cp += vavu->val.v.s.len; } else { - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + if (_tps_contact_host.len) { + /* using configured hostname in the contact header */ + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } } if(puri.port.len>0) { *td->cp = ':';

1 0

git:5.5:1f9f6fff: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 1f9f6fff6e0ab21e460538ffd1e54b6c60f54f7e URL: https://github.com/kamailio/kamailio/commit/1f9f6fff6e0ab21e460538ffd1e54b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:36:24+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 (cherry picked from commit 0d06e164efa720d91d49995585e80c9082ce3b21) --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/1f9f6fff6e0ab21e460538ffd1e54b6… Patch: https://github.com/kamailio/kamailio/commit/1f9f6fff6e0ab21e460538ffd1e54b6… --- diff --git a/src/core/config.h b/src/core/config.h index e012e98edf..b71a15e7a8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -91,7 +91,7 @@ #define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) -#define MAX_WARNING_LEN 256 +#define MAX_WARNING_LEN 1024 #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1)

1 0

git:5.5:6bf1c6af: core: ppcfg - clone value for substdef
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 6bf1c6af774f6b26597e639e90ce7cb584b626a3 URL: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:30+02:00 core: ppcfg - clone value for substdef - GH #2788 (cherry picked from commit 56d41f6238f39d0046c97527abcb23b8dd7924be) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… Patch: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a5aa1d3e28..73c0a2ef3c 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "str_list.h" #include "dprint.h" #include "ppcfg.h" @@ -44,6 +45,7 @@ typedef struct _pp_subst_rule { static pp_subst_rule_t *pp_subst_rules_head = NULL; static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; +static str_list_t *_ksr_substdef_strlist = NULL; int pp_subst_add(char *data) { @@ -94,6 +96,7 @@ int pp_substdef_add(char *data, int mode) str defvalue; str newval; sip_msg_t *fmsg; + str_list_t *sb; if(pp_subst_add(data)<0) { LM_ERR("subst rule cannot be added\n"); @@ -146,7 +149,12 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - defvalue = newval; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; } } if(pp_define_set(defvalue.len, defvalue.s,

1 0

git:5.5:65249c18: core: fix building quoted value for #!subsdefs
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 65249c184f5fd54b3ea16edbda518ac7ff442d86 URL: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:42+02:00 core: fix building quoted value for #!subsdefs (cherry picked from commit 879f8c4e52ab7f7f489107f18e2c80795c788bdd) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Patch: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index ff8096d9f2..a6115a7599 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2049,11 +2049,12 @@ int pp_define_set(int len, char *text, int mode) pp_defines[ppos].value.len = len; pp_defines[ppos].value.s = text; - LM_DBG("### setting define ID [%.*s] value [%.*s]\n", + LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s, pp_defines[ppos].value.len, - pp_defines[ppos].value.s); + pp_defines[ppos].value.s, + mode); return 0; } diff --git a/src/core/cfg.y b/src/core/cfg.y index be0a664dce..5b205fd230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2213,9 +2213,9 @@ event_route_stm: preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, KSR_PPDEF_NORMAL)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } - | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS STRING { if(pp_substdef_add($2, KSR_PPDEF_QUOTED)<0) YYERROR; } | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 73c0a2ef3c..67391557f8 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "pvapi.h" #include "str_list.h" #include "dprint.h" @@ -149,25 +150,40 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); - return -1; + if(mode!=KSR_PPDEF_QUOTED) { + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } else { + defvalue = newval; } - defvalue = sb->s; } } - if(pp_define_set(defvalue.len, defvalue.s, - (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { + if(mode==KSR_PPDEF_QUOTED) { + if(pv_get_buffer_size() < defvalue.len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defvalue.s, defvalue.len); + newval.s[defvalue.len + 1] = '"'; + newval.s[defvalue.len + 2] = '\0'; + newval.len = defvalue.len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); goto error; } - if(mode==1) { - defvalue.s++; - defvalue.len -= 2; - *(defvalue.s-1) = c; - defvalue.s[defvalue.len] = c; - } LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, defvalue.len, defvalue.s, mode); diff --git a/src/main.c b/src/main.c index a391f57afb..7630fcfeff 100644 --- a/src/main.c +++ b/src/main.c @@ -2330,7 +2330,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdef parameter\n"); goto error; } - if(pp_substdef_add(optarg, 0)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_NORMAL)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } @@ -2340,7 +2340,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdefs parameter\n"); goto error; } - if(pp_substdef_add(optarg, 1)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_QUOTED)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; }

1 0

git:master:0d06e164: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 0d06e164efa720d91d49995585e80c9082ce3b21 URL: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T14:02:28+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… Patch: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… --- diff --git a/src/core/config.h b/src/core/config.h index e012e98edf..b71a15e7a8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -91,7 +91,7 @@ #define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) -#define MAX_WARNING_LEN 256 +#define MAX_WARNING_LEN 1024 #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1)

1 0

git:master:9ec9d9ce: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 9ec9d9ceb0b69d46d5a4d90a86b1185951feb9d4 URL: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-12T08:16:23+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Patch: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index e290fc172f..a72249f1be 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -37,6 +37,7 @@ Daniel-Constantin Mierla 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -64,7 +65,8 @@ Daniel-Constantin Mierla 1.16. hf_iterator_start usage 1.17. hf_iterator_end usage 1.18. hf_iterator_next usage - 1.19. @hf_value select usage + 1.19. hf_iterator_rm usage + 1.20. @hf_value select usage Chapter 1. Admin Guide @@ -91,6 +93,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -128,6 +131,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 2.1. msg_apply_changes() @@ -470,6 +474,25 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.19. hf_iterator_rm(iname) + + Remove the header at the current iterator position. + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.19. hf_iterator_rm usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -505,7 +528,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.19. @hf_value select usage + Example 1.20. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:4a4b8047: textopsx: docs for hf_iterator_rm()
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 4a4b8047b4b46b003bc0b12b737ca956658d18cb URL: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:06:07+02:00 textopsx: docs for hf_iterator_rm() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Patch: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index f9c388016e..c1c5fd5f64 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -561,6 +561,34 @@ hf_iterator_end("i1"); } hf_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_rm"> + <title> + <function moreinfo="none">hf_iterator_rm(iname)</function> + </title> + <para> + Remove the header at the current iterator position. + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_rm</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... </programlisting> </example> </section>

1 0

git:master:adc3bc18: textopsx: added hf_iterator_rm()
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: adc3bc18477108fc976182a2efe5d1e314bac795 URL: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:02:07+02:00 textopsx: added hf_iterator_rm() - remove the header at the current iterator position --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Patch: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 362cbee0e1..ec3e1afb75 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -76,6 +76,7 @@ static int assign_hf_value2_fixup(void **param, int param_no); static int w_hf_iterator_start(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_next(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2); +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2); static int bind_textopsx(textopsx_api_t *tob); @@ -136,6 +137,8 @@ static cmd_export_t cmds[] = { fixup_free_spve_null, ANY_ROUTE}, {"hf_iterator_end", w_hf_iterator_end, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"hf_iterator_rm", w_hf_iterator_rm, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"bind_textopsx", (cmd_function)bind_textopsx, 1, 0, 0, ANY_ROUTE}, @@ -1993,6 +1996,67 @@ static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2) return ki_hf_iterator_end(msg, &iname); } +/** + * + */ +static int ki_hf_iterator_index(sip_msg_t *msg, str *iname) +{ + int i; + int k; + + k = -1; + for(i=0; i<HF_ITERATOR_SIZE; i++) { + if(_hf_iterators[i].name.len>0) { + if(_hf_iterators[i].name.len==iname->len + && strncmp(_hf_iterators[i].name.s, iname->s, iname->len)==0) { + k = i; + break; + } + } + } + if(k==-1) { + LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); + return -1; + } + + return k; +} + +/** + * + */ +static int ki_hf_iterator_rm(sip_msg_t *msg, str *iname) +{ + int k; + sr_lump_t *anchor; + + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + return -1; + } + anchor = del_lump(msg, _hf_iterators[k].it->name.s - msg->buf, + _hf_iterators[k].it->len, 0); + if (anchor==0) { + LM_ERR("cannot remove hdr %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + return 1; +} + +/** + * + */ +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2) +{ + str iname = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)piname, &iname)<0) { + LM_ERR("failed to get iterator name\n"); + return -1; + } + return ki_hf_iterator_rm(msg, &iname); +} + /** * */ @@ -2606,6 +2670,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_rm"), + SR_KEMIP_INT, ki_hf_iterator_rm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

range transformation or var
by Brandon Armstead 11 Jul '21

11 Jul '21

Is there a way to generate a random number between min and max currently? i.e. $var(rand) = $rand(0, 5) // generates a random int between 0 and 5? This could be useful for in configuration weighting / load distribution without a dispatcher module. Thanks!

2 2

git:master:56e93559: textopsx: hf iterator functions exported to kemi
by Daniel-Constantin Mierla 10 Jul '21

10 Jul '21

Module: kamailio Branch: master Commit: 56e935595a60e2c7c5c92fa8438941ea68436c23 URL: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-10T06:47:19+02:00 textopsx: hf iterator functions exported to kemi --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Patch: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index d3295bf02c..362cbee0e1 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2591,6 +2591,21 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_start"), + SR_KEMIP_INT, ki_hf_iterator_start, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_end"), + SR_KEMIP_INT, ki_hf_iterator_end, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_next"), + SR_KEMIP_INT, ki_hf_iterator_next, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

Kamailio websocket state FINWAIT1 after switchover
by Shahid Hussain 09 Jul '21

09 Jul '21

Hi !., Kamailio websocket state is going into FINWAIT1 without sending FIN message out when we do service kamailio restart. I have a Primary and Secondary node configured. When I perform switchover socket status is going into FINWAIT1 state without sending FIN to the client hence client status is showing established, This is happening 90+% of times but does work sometimes. AT Kamailio: [root@localhost ~]# netstat -tunelap | grep 41034 tcp 0 1 172.27.45.198:9040 172.27.6.98:41034 FIN_WAIT1 0 0 - [root@localhost ~]# AT Nginx (client): root@meet:~# netstat -tunelap | grep 9040 tcp 0 0 172.27.6.98:41034 172.27.45.198:9040 ESTABLISHED 33 763106 1322/nginx: worker root@meet:~# Thanks, Shahid

2 2

git:master:4c6abaf9: topos: fix missing xavu_field_contact_host evaluation for contact_mode 0
by Henning Westerholt 08 Jul '21

08 Jul '21

Module: kamailio Branch: master Commit: 4c6abaf9066aebbd304391dd6730cad7ee592611 URL: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-08T14:57:27Z topos: fix missing xavu_field_contact_host evaluation for contact_mode 0 - fix missing xavu_field_contact_host evaluation for contact_mode 0 - it works currently only for contact_mode 1 and 2, but not for default mode --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Patch: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6e88b35af3..b94a960340 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -411,13 +411,23 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, *td->cp = '@'; td->cp++; - if (_tps_contact_host.len) { - /* using configured hostname in the contact header */ - memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); - td->cp += _tps_contact_host.len; + /* contact_host xavu takes preference */ + if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { + vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, + &_tps_xavu_field_contact_host); + } + if(vavu!=NULL && vavu->val.v.s.len>0) { + memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); + td->cp += vavu->val.v.s.len; } else { - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + if (_tps_contact_host.len) { + /* using configured hostname in the contact header */ + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } } if(puri.port.len>0) { *td->cp = ':';

1 0

git:5.5:557ac56a: core: str list - added function to insert a block string in list
by Daniel-Constantin Mierla 08 Jul '21

08 Jul '21

Module: kamailio Branch: 5.5 Commit: 557ac56a6ec6b4ca3d76a57ff8b21c64027791f2 URL: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:12+02:00 core: str list - added function to insert a block string in list (cherry picked from commit b92b931c26c199b756fd08e9c80cc9305469fd2b) --- Modified: src/core/str_list.c Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Patch: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… --- 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

2 3

git:master:3a0a9292: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 3a0a9292ec40d25f5246573d4a2a51838819d930 URL: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-07T12:46:15+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Patch: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index dbb27653a0..e290fc172f 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -34,6 +34,9 @@ Daniel-Constantin Mierla 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -58,7 +61,10 @@ Daniel-Constantin Mierla 1.13. include_hf_value usage 1.14. exclude_hf_value usage 1.15. hf_value_exists usage - 1.16. @hf_value select usage + 1.16. hf_iterator_start usage + 1.17. hf_iterator_end usage + 1.18. hf_iterator_next usage + 1.19. @hf_value select usage Chapter 1. Admin Guide @@ -82,6 +88,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -116,6 +125,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 2.1. msg_apply_changes() @@ -406,6 +418,58 @@ if (@hf_value_exists.supported.path == "1") { } ... +2.16. hf_iterator_start(iname) + + Start an iterator for headers in the current SIP message. The parameter + iname is used to identify the iterator. There can be up to 4 iterators + at the same time, with different name. + + The parameter can be a dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.16. hf_iterator_start usage +... +hf_iterator_start("i1"); +... + +2.17. hf_iterator_end(iname) + + Close the iterator identified by iname parameter. The iname value must + be the same used for sht_iterator_start(). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.17. hf_iterator_end usage +... +hf_iterator_end("i1"); +... + +2.18. textopsx.f.hf_iterator_next(iname) + + Move the iterator to the next header. It must be called also after + sht_iterator_start() to get the first header. + + The return code is false when there is no other header in the list. + + The item name and value are accessible via variables: $hfitname(iname) + and $hfitbody(iname). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.18. hf_iterator_next usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + xlog("hdr[$hfitname(i1)] is: $hfitbody(i1)\n"); + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -441,7 +505,7 @@ if (@hf_value_exists.supported.path == "1") { * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.16. @hf_value select usage + Example 1.19. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:89d5a275: textopsx: docs for hdr iterator functions
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 89d5a2754e962c0f0bec59591b327d356999efbc URL: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:06+02:00 textopsx: docs for hdr iterator functions --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… Patch: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 0980e4060b..f9c388016e 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -482,5 +482,87 @@ if (@hf_value_exists.supported.path == "1") { </programlisting> </example> </section> + <section id="textopsx.f.hf_iterator_start"> + <title> + <function moreinfo="none">hf_iterator_start(iname)</function> + </title> + <para> + Start an iterator for headers in the current SIP message. + The parameter iname is used to identify the iterator. There + can be up to 4 iterators at the same time, with different name. + </para> + <para> + The parameter can be a dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_start</function> usage</title> + <programlisting format="linespecific"> +... +hf_iterator_start("i1"); +... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_end"> + <title> + <function moreinfo="none">hf_iterator_end(iname)</function> + </title> + <para> + Close the iterator identified by iname parameter. The iname value + must be the same used for sht_iterator_start(). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_end</function> usage</title> + <programlisting format="linespecific"> +... +hf_iterator_end("i1"); +... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_next"> + <title> + <function moreinfo="none">textopsx.f.hf_iterator_next(iname)</function> + </title> + <para> + Move the iterator to the next header. It must + be called also after sht_iterator_start() to get the first + header. + </para> + <para> + The return code is false when there is no other header in the list. + </para> + <para> + The item name and value are accessible via variables: + $hfitname(iname) and $hfitbody(iname). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_next</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + xlog("hdr[$hfitname(i1)] is: $hfitbody(i1)\n"); + } + hf_iterator_end("i1"); +... +</programlisting> + </example> + </section> </section>

1 0

git:master:7f4d7725: textopsx: return false on iterator end of headers
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 7f4d7725a55379ef0e7ee5c5a2050d3b1d4565bc URL: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:06+02:00 textopsx: return false on iterator end of headers --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Patch: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index ee220fbb82..d3295bf02c 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -93,7 +93,7 @@ static int pv_get_hf_iterator_hbody(sip_msg_t *msg, pv_param_t *param, static pv_export_t mod_pvs[] = { { {"hfitname", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hname, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, - { {"hfitbody", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, + { {"hfitbody", sizeof("hfitbody")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -1924,6 +1924,10 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); return -1; } + if(_hf_iterators[k].eoh == 1) { + return -1; + } + if(_hf_iterators[k].it == NULL) { _hf_iterators[k].it = msg->headers; } else { @@ -1931,6 +1935,7 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) } if(_hf_iterators[k].it == NULL) { _hf_iterators[k].eoh = 1; + return -1; } return 1; }

1 0

git:master:ba3ce508: textopsx: added functions and variables to iterate headers list
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: ba3ce5081bc31019bec6de8aecffc1b5a601c308 URL: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:05+02:00 textopsx: added functions and variables to iterate headers list --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b… Patch: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b…

1 0

Build kamailio 5.3.1 db_mysql module with percona.
by Andrey Deykunov 07 Jul '21

07 Jul '21

Hi, We have kamailio server v. 5.3.1 with db_mysql.so built with our old mysql library 5.1.41. Now I'm trying to build it with libperconaclient20. I've tried many variants of build configuration, but every time I got errors when kamailio stops or starts, such: *2021-07-06T06:01:20.943809-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'reading authorization packet', system error: 112021-07-06T06:01:20.946591-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool2021-07-06T06:01:20.947224-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: auth_db [auth_db_mod.c:159]: child_init(): unable to connect to the database2021-07-06T06:01:20.947592-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [core/sr_module.c:806]: init_mod_child(): error while initializing module auth_db (/var/lib/ums/lib64/kamailio/modules/auth_db.so) (idx: 5 rank: 5 desc: [udpreceiver child=4 sock=64.78.52.86:5060 <http://64.78.52.86:5060>])* or *2021-07-06T06:18:43.159744-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[30954]: CRITICAL: <core> [core/mem/q_malloc.c:150]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(0, 0)[0x7fd5c6c85bc8:0x7fd5c6c85c00]! Memory allocator was calledfrom core: db_res.c:114. Fragment marked by db_mysql: km_my_con.c:75. Exec from core/mem/q_malloc.c:391.* Is there some specific way to build kamailio with percona? Thanks, Andrey

2 1

git:master:c950c401: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: c950c40119ff81a8dacec2f4ba697ce080459a7f URL: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-07T08:01:20+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce… Patch: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce…

1 0

git:master:5a473493: nathelper: docs - fixed copy/paste extra tags
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 5a473493189acc93705c78c1966a9eae0e80fef0 URL: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T07:51:31+02:00 nathelper: docs - fixed copy/paste extra tags --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… Patch: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c6d398b218..832e324819 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -723,7 +723,6 @@ fix_nated_register(); and D-URI ($du). For replies, it compares host and port in 2nd Via with received and rport parameters. </para></listitem> - <listitem><para> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of

1 0

git:master:77071eb1: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 77071eb11c735cb04b4adf084808c5d46bdca20d URL: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-06T20:46:19+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d… Patch: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d…

1 0

git:master:fb0bb3f4: nathelper: docs for nat uac test 512
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: fb0bb3f49efe51bbab03911923b737f037b9cd44 URL: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:53:39+02:00 nathelper: docs for nat uac test 512 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… Patch: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 39e61e6856..c6d398b218 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -717,6 +717,13 @@ fix_nated_register(); from source IP address. It will work also with multiple connection address lines. </para></listitem> + <listitem><para> + <emphasis>512</emphasis> - Test if the target addresses are different + or over websocket. For requests, it compares host and port in R-URI ($rU) + and D-URI ($du). For replies, it compares host and port in 2nd Via + with received and rport parameters. + </para></listitem> + <listitem><para> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of

1 0

git:master:23589c70: pv: use macro to get port based on proto
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 23589c70353af794e83d9a7a6070ba3cc1666811 URL: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:08:00+02:00 pv: use macro to get port based on proto --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… Patch: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 475b1cdc3e..ecce3156e7 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -704,7 +704,7 @@ int pv_get_nh_reply(struct sip_msg *msg, pv_param_t *param, host = msg->via2->host; } if(port==0) { - port = (msg->via2->port)?msg->via2->port:SIP_PORT; + port = GET_SIP_PORT(msg->via2->port, msg->via2->proto); } switch(param->pvn.u.isname.name.n) {

1 0

git:master:ce95734c: nathelper: new nat test (512) based on target addresses
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: ce95734c97e8443facf224a1833f67a78ab67d21 URL: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:08:50+02:00 nathelper: new nat test (512) based on target addresses - return true if the target proto is ws or wss - return true if the target addresses are different - for requests it compares r-uri with d-uri - for replies compares 2nd Via host and port with received and rport --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… Patch: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index df9a5bce2c..bdf1b7777a 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -101,6 +101,7 @@ MODULE_VERSION #define NAT_UAC_TEST_WS 0x40 #define NAT_UAC_TEST_C_PORT 0x80 #define NAT_UAC_TEST_SDP_CLINE 0x100 +#define NAT_UAC_TEST_DEST 0x200 #define DEFAULT_NATPING_STATE 1 @@ -1540,6 +1541,125 @@ static int via_1918(struct sip_msg *msg) return (is1918addr(&(msg->via1->host)) == 1) ? 1 : 0; } +/* + * test if destination address is different than R-URI/2nd Via + * - ws/wss target is true + */ +static int nh_test_destination(sip_msg_t *msg) +{ + str rhost = STR_NULL; + int rport = 0; + str dhost = STR_NULL; + int dport = 0; + sip_uri_t pduri; + ip_addr_t *rhostip = NULL; + ip_addr_t *dhostip = NULL; + + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) { + if(parse_headers(msg, HDR_VIA2_F, 0)==-1) { + LM_DBG("no 2nd via parsed\n"); + return 0; + } + if((msg->via2==0) || (msg->via2->error!=PARSE_OK)) { + return -1; + } + if(msg->via2->proto==PROTO_WSS || msg->via2->proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + if(msg->via2->rport && msg->via2->rport->value.s + && msg->via2->rport->value.len>0) { + if(str2sint(&msg->via2->rport->value, &dport)<0) { + LM_ERR("invalid rport value\n"); + return -1; + } + } + if(dport!=0) { + rport = GET_SIP_PORT(msg->via2->port, msg->via2->proto); + if(dport != rport) { + /* ports are different */ + return 1; + } + } + if(!msg->via2->received) { + /* no received param - going to Via host */ + return 0; + } + dhost = msg->via2->received->value; + rhost = msg->via2->host; + } else { + if(msg->dst_uri.s==NULL || msg->dst_uri.len<=0) { + /* no destination uri - target is r-uri */ + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ + && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + if(msg->parsed_uri.proto==PROTO_WSS + || msg->parsed_uri.proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + return 0; + } + if(parse_uri(msg->dst_uri.s, msg->dst_uri.len, &pduri)!=0) { + LM_ERR("failed to parse dst uri [%.*s]\n", + msg->dst_uri.len, msg->dst_uri.s); + return -1; + } + if(pduri.proto==PROTO_WSS || pduri.proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ + && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + dport = GET_SIP_PORT(pduri.port_no, pduri.proto); + rport = GET_SIP_PORT(msg->parsed_uri.port_no, msg->parsed_uri.proto); + if(dport != rport) { + /* ports are different */ + return 1; + } + dhost = pduri.host; + rhost = msg->parsed_uri.host; + } + if(dhost.s==NULL || dhost.len<=0) { + return 0; + } + dhostip = str2ipx(&dhost); + rhostip = str2ipx(&rhost); + if(dhostip==NULL && rhostip==NULL) { + /* both are hostnames - do str comparison */ + if(rhost.s==NULL || rhost.len<=0) { + return 0; + } + if(rhost.len != dhost.len) { + /* different in length */ + return 1; + } + if(memcmp(rhost.s, dhost.s, dhost.len)!=0) { + /* different in content */ + return 1; + } + return 0; + } + if(dhostip==NULL || rhostip==NULL) { + /* different in content */ + return 1; + } + if(ip_addr_cmp(dhostip, rhostip)) { + /* same ip addresses */ + return 0; + } + /* different ip addresses */ + return 1; +} + static int nat_uac_test(struct sip_msg *msg, int tests) { /* return true if any of the NAT-UAC tests holds */ @@ -1599,6 +1719,13 @@ static int nat_uac_test(struct sip_msg *msg, int tests) if((tests & NAT_UAC_TEST_SDP_CLINE) && (test_sdp_cline(msg) > 0)) return 1; + /** + * test if destination address is different than R-URI/2ndVia + * - ws/wss target is true + */ + if((tests & NAT_UAC_TEST_DEST) && (nh_test_destination(msg) > 0)) + return 1; + /* no test succeeded */ return -1; }

1 0

git:master:b874f56b: core: parser - macro to get sip port based on proto
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: b874f56bcea104ce328e0cea19bc78cbf79749d6 URL: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:07:32+02:00 core: parser - macro to get sip port based on proto --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… Patch: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 61d9ac6185..1ff73a0b98 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -184,6 +184,15 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ (((m)->new_uri.s && (m)->new_uri.len) ? (&(m)->new_uri) : (&(m)->first_line.u.request.uri)) +/*! \brief + * Return the SIP port. + * - _port if _port!=0 + * - 5061 for _proto == TLS or WSS + * - 5060 for the other _proto + */ +#define GET_SIP_PORT(_port, _proto) ((_port==0)?((_proto==PROTO_TLS \ + || _proto==PROTO_WSS)?5061:5060):_port) + enum _uri_type{ERROR_URI_T=0, SIP_URI_T, SIPS_URI_T, TEL_URI_T, TELS_URI_T, URN_URI_T}; typedef enum _uri_type uri_type; enum _uri_flags{

1 0

[kamailio/kamailio] dead lock and 100% CPU ussage on shutdown (#2795)
by sergey-safarov 06 Jul '21

06 Jul '21

### Description When Kamailio child core generated, then Kamailio goes to shutdown. I observed a case when the Kamailio process shutdown process a deadlocked and not able to shutdown for a long time. #### Debugging Data ``` (gdb) bt #0 0x0000ffff8645b648 in sched_yield () from /lib64/libc.so.6 #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 #2 0x0000ffff80121630 in unlink_timers (t=0xffff84196738) at timer.h:363 #3 0x0000ffff80122488 in free_cell_helper (dead_cell=0xffff84196738, silent=1, fname=0xffff8022be70 "h_table.c", fline=466) at h_table.c:150 #4 0x0000ffff80124bac in free_hash_table () at h_table.c:466 #5 0x0000ffff801da5c0 in tm_shutdown () at t_funcs.c:88 #6 0x00000000005c8e08 in destroy_modules () at core/sr_module.c:830 #7 0x000000000041df3c in cleanup (show_status=1) at main.c:575 #8 0x000000000041ffd4 in shutdown_children (sig=15, show_status=1) at main.c:718 #9 0x0000000000423a90 in handle_sigs () at main.c:816 #10 0x0000000000433018 in main_loop () at main.c:1903 #11 0x000000000043de90 in main (argc=11, argv=0xfffffac1fb18) at main.c:3053 (gdb) f 1 #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 718 sched_yield(); /* wait for it to complete */ (gdb) list 713 tl->add_line, tl->del_calls, tl->del_func, 714 tl->del_file, tl->del_line, tl->init, tl->expires_no); 715 #endif 716 return -2; /* do nothing */ 717 } 718 sched_yield(); /* wait for it to complete */ 719 goto again; 720 } 721 if ((tl->next!=0)&&(tl->prev!=0)){ 722 _timer_rm_list(tl); /* detach */ (gdb) bt full #0 0x0000ffff8645b648 in sched_yield () from /lib64/libc.so.6 No symbol table info available. #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 ret = -1 __func__ = "timer_del_safe" #2 0x0000ffff80121630 in unlink_timers (t=0xffff84196738) at timer.h:363 i = 0 #3 0x0000ffff80122488 in free_cell_helper (dead_cell=0xffff84196738, silent=1, fname=0xffff8022be70 "h_table.c", fline=466) at h_table.c:150 b = 0x0 i = 65535 rpl = 0x0 tt = 0x0 foo = 0xffff80089b00 <__func__.11765> cbs = 0x0 cbs_tmp = 0xffff83817f88 __func__ = "free_cell_helper" #4 0x0000ffff80124bac in free_hash_table () at h_table.c:466 p_cell = 0xffff84196738 tmp_cell = 0xffff80606630 i = 33128 __func__ = "free_hash_table" #5 0x0000ffff801da5c0 in tm_shutdown () at t_funcs.c:88 __func__ = "tm_shutdown" #6 0x00000000005c8e08 in destroy_modules () at core/sr_module.c:830 t = 0xffff84c44808 foo = 0xffff84c44038 __func__ = "destroy_modules" #7 0x000000000041df3c in cleanup (show_status=1) at main.c:575 memlog = 435649383 __func__ = "cleanup" #8 0x000000000041ffd4 in shutdown_children (sig=15, show_status=1) at main.c:718 __func__ = "shutdown_children" #9 0x0000000000423a90 in handle_sigs () at main.c:816 chld = 0 chld_status = 139 any_chld_stopped = 1 memlog = 4403228 __func__ = "handle_sigs" #10 0x0000000000433018 in main_loop () at main.c:1903 i = 8 pid = 175104 si = 0x0 si_desc = "udp receiver child=7 sock=[2600:1f18:578:5703::c6]:5080\000\220\352Ą\377\377\000\000@\365\301\372\377\377\000\000\360\004)\205\377\377\000\000`\365\301\372\377\377\000\000p\365\301\372\377\377\000\000p\365\301\372\377\377\000\000@\365\301\372\377\377\000\000\320\377\377\377\200\377\377\377\000l\377\362g{\367\031" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #11 0x000000000043de90 in main (argc=11, argv=0xfffffac1fb18) at main.c:3053 cfg_stream = 0x177f02d0 c = -1 r = 0 tmp = 0xfffffac1fee1 "" tmp_len = 65535 port = 1 proto = 0 ahost = 0x0 aport = 0 options = 0x8ae128 ":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 = 4190370820 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xffff863c0da8 <__libc_start_main+168> "" st = {st_dev = 25, st_ino = 18103, st_mode = 16832, st_nlink = 2, st_uid = 991, st_gid = 986, st_rdev = 0, __pad1 = 0, st_size = 60, st_blksize = 65536, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1624774599, tv_nsec = 29999981}, st_mtim = {tv_sec = 1625138047, tv_nsec = 607511242}, st_ctim = {tv_sec = 1625138047, tv_nsec = 607511242}, __glibc_reserved = {0, 0}} tbuf = "\000\000\000\000\000\000\000\000\000\000n\206\377\377\000\000\000\000\000\000\000\000\000\000\330\375q\206\377\377", '\000' <repeats 58 times>, "x\376q\206\377\377\000\000h\376q\206\377\377\000\000\b\376q\206\377\377\000\000(\376q\206\377\377\000\000\070\376q\206\377\377\000\000\250\376q\206\377\377\000\000\270\376q\206\377\377\000\000\310\376q\206\377\377\000\000H\376q\206\377\377\000\000X\376q\206\377\377", '\000' <repeats 18 times>, "\330\375q\206\377\377", '\000' <repeats 42 times>... option_index = 12 long_options = {{name = 0x8b04e8 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8ab520 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8b04f0 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8b04f8 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8b0500 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8b0510 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8b0520 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8b0530 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8b0540 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8b0550 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8b0560 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x8b0568 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8b0578 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals ret = -1 __func__ = "timer_del_safe" ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@bcf-e-3 ~]# kamailio -v version: kamailio 5.6.0-dev0 (aarch64/linux) f03900 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-NOSMP, 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: f03900 compiled on 17:17:36 Jun 26 2021 with gcc 8.4.1 ``` Used master branch with customization. * **Operating System**: ``` [root@bcf-e-3 ~]# uname -a Linux bcf-e-3.la.cal911.net 4.18.0-305.3.1.el8.aarch64 #1 SMP Tue Jun 1 16:22:50 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@bcf-e-3 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/2795

2 6

git:master:8762c56a: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 8762c56a1c78e4ba151ef9fb4290b3938c0c984f URL: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-06T10:01:24+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… Patch: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index baff8e8b32..da1da0331c 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -131,7 +131,6 @@ Sven Knoblich 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 2. Frequently Asked Questions @@ -188,7 +187,6 @@ Sven Knoblich 1.49. acc_log_request usage 1.50. acc_db_request usage 1.51. acc_db_request usage - 1.52. acc_diam_request usage Chapter 1. Admin Guide @@ -287,7 +285,6 @@ Chapter 1. Admin Guide 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 1. Overview @@ -298,9 +295,9 @@ Chapter 1. Admin Guide support for radius is enabled. There is some very early support of the Diameter protocol in the - “acc_diameter” module which will be deleted in coming releases. This - support is not up to date with the current Diameter protocols. If you - need Diameter support, please use the ims_charging module. + “acc_diameter” module, but is not up to date with the current Diameter + protocols. If you need Diameter support, please use the ims_charging + module. To account a transaction and to choose which set of backends to be used, the script writer just has to set some flags (see the module @@ -1326,7 +1323,6 @@ modparam("acc", "cdr_on_failed", 0) 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 7.1. acc_log_request(comment) @@ -1394,23 +1390,6 @@ acc_request("100 Received", "acc_$time(year)_$time(mon)"); acc_db_request("$var(code) $avp(reason)", "acc"); ... -7.4. acc_diam_request(comment) - - Like acc_log_request, acc_diam_request reports on a request. It reports - to the configured Diameter server. - - Meaning of the parameters is as follows: - * comment - Comment to be appended. The string can contain any number - of pseudo-variables. - - This function can be used from ANY_ROUTE. - - Example 1.52. acc_diam_request usage -... -acc_diam_request("Some comment"); -acc_diam_request("$var(code) Error: $avp(reason)"); -... - Chapter 2. Frequently Asked Questions 2.1. What happened with old log_fmt parameter

1 0

git:master:402515c9: acc: docs - removed acc_diam_request() section
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 402515c92238c3628c78a2b44ac0a05130897207 URL: https://github.com/kamailio/kamailio/commit/402515c92238c3628c78a2b44ac0a05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T09:59:57+02:00 acc: docs - removed acc_diam_request() section - it is now exported by acc_diameter --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/402515c92238c3628c78a2b44ac0a05… Patch: https://github.com/kamailio/kamailio/commit/402515c92238c3628c78a2b44ac0a05… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index f88d403d2b..41935c8dae 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -23,10 +23,9 @@ </para> <para> There is some very early support of the <acronym>Diameter</acronym> - protocol in the <quote>acc_diameter</quote> module which will be deleted - in coming releases. This support is not up to date with the current - Diameter protocols. If you need Diameter support, please use the - <acronym>ims_charging</acronym> module. + protocol in the <quote>acc_diameter</quote> module, but is not up to date + with the current Diameter protocols. If you need Diameter support, + please use the <acronym>ims_charging</acronym> module. </para> <para> To account a transaction and to choose which set of backends to be @@ -1555,37 +1554,6 @@ acc_request("100 Received", "acc"); acc_request("100 Received", "acc_$time(year)_$time(mon)"); acc_db_request("$var(code) $avp(reason)", "acc"); ... -</programlisting> - </example> - </section> - <section id="acc.f.acc_diam_request"> - <title> - <function moreinfo="none">acc_diam_request(comment)</function> - </title> - <para> - Like <function moreinfo="none">acc_log_request</function>, - <function moreinfo="none">acc_diam_request</function> reports on - a request. It reports to the configured Diameter server. - </para> - <para> - Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para><emphasis>comment</emphasis> - Comment to be appended. - The string can contain any number of pseudo-variables. - </para> - </listitem> - </itemizedlist> - <para> - This function can be used from ANY_ROUTE. - </para> - <example> - <title>acc_diam_request usage</title> - <programlisting format="linespecific"> -... -acc_diam_request("Some comment"); -acc_diam_request("$var(code) Error: $avp(reason)"); -... </programlisting> </example> </section>

1 0

systemd watchdog
by Sergey Safarov 06 Jul '21

06 Jul '21

I have observed a case when Kamaili debug module try to grab the lock on shutdown and not able to do it. As a result, the Kamailio process is stuck and not able to restart (dead lock). To resolve such a case i want to utilize systemd watchdog feature https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.html# To use this feature I need send sd_notify(3) with a message string of "WATCHDOG=1" from main process https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.html# According to systemd doc only one process to send watchdog If the $WATCHDOG_USEC environment variable is set, and the $WATCHDOG_PID variable is unset or set to the PID of the current process, the service manager expects notifications from this process. https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.html# Additional info at https://lists.freedesktop.org/archives/systemd-devel/2018-January/040185.ht… Could you suggest how to embed this systemd call to the main process? Sergey

2 1

git:master:2df00287: core: kemi - exported KSR.to_IPv4() and KSR.to_IPv6()
by Daniel-Constantin Mierla 05 Jul '21

05 Jul '21

Module: kamailio Branch: master Commit: 2df002876fc8eb9f2b97c669469ea8a686323dfd URL: https://github.com/kamailio/kamailio/commit/2df002876fc8eb9f2b97c669469ea8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-05T11:28:39+02:00 core: kemi - exported KSR.to_IPv4() and KSR.to_IPv6() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/2df002876fc8eb9f2b97c669469ea8a… Patch: https://github.com/kamailio/kamailio/commit/2df002876fc8eb9f2b97c669469ea8a… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 76ace9c3d2..13428d4a43 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -34,6 +34,7 @@ #include "select_buf.h" #include "pvar.h" #include "trim.h" +#include "resolve.h" #include "mem/shm.h" #include "parser/parse_uri.h" #include "parser/parse_from.h" @@ -1653,6 +1654,88 @@ static int sr_kemi_core_to_proto_wsx(sip_msg_t *msg) return (proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_to_af_helper(sip_msg_t *msg) +{ + sip_uri_t parsed_uri; + str uri; + str host; + + 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; + } + 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; + } + } else { + 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; + } + host = parsed_uri.host; + } + + if(host.len<=0) { + return 0; + } + if(str2ip(&host)!=NULL) { + return 4; + } + if(str2ip6(&host)!=NULL) { + return 6; + } + return 0; +} + +/** + * + */ +static int sr_kemi_core_to_af_ipv4(sip_msg_t *msg) +{ + int af; + + af = sr_kemi_core_to_af_helper(msg); + if (af == 4) { return SR_KEMI_TRUE; } + return SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_af_ipv6(sip_msg_t *msg) +{ + int af; + + af = sr_kemi_core_to_af_helper(msg); + if (af == 6) { return SR_KEMI_TRUE; } + return SR_KEMI_FALSE; +} + /** * */ @@ -2077,6 +2160,16 @@ 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_IPv4"), + SR_KEMIP_BOOL, sr_kemi_core_to_af_ipv4, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_IPv6"), + SR_KEMIP_BOOL, sr_kemi_core_to_af_ipv6, + { 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

[kamailio/kamailio] tls: allow export session keys (#2785)
by sergey-safarov 05 Jul '21

05 Jul '21

#### Pre-Submission Checklist - [x] 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) - [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 Wireshark project allows embedding session encryption keys into PCAP files. So it allows parsing encrypted packets as it was unencrypted. [More info](https://blog.didierstevens.com/2021/01/11/decrypting-tls-streams-with… I prepared a change that allows export session encryption keys. Please review PR. If ok, then I add commits with DocBook info. Kyys may be emeberd using command ``` editcap --inject-secrets tls,/var/lib/kamailio/session_keylog encrypted.pcap with_keys.pcapng ``` As prototype used https://github.com/openssl/openssl/blob/master/apps/lib/s_cb.c#L1480-L1525 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2785 -- Commit Summary -- * tls: added new session_keylog_enable and session_keylog_filename configuration params * tls: first interation of session key logger * tls: added logs output -- File Changes -- M src/modules/tls/tls_cfg.c (6) M src/modules/tls/tls_cfg.h (2) M src/modules/tls/tls_init.c (79) M src/modules/tls/tls_init.h (2) M src/modules/tls/tls_mod.c (2) M src/modules/tls/tls_rpc.c (2) M src/modules/tls/tls_server.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2785.patch https://github.com/kamailio/kamailio/pull/2785.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/2785

3 14

git:master:273c6241: pv: added $viaZ(attr) - get the attributes of last via header
by Daniel-Constantin Mierla 03 Jul '21

03 Jul '21

Module: kamailio Branch: master Commit: 273c6241637f663784695b073ac9e342d243b8bd URL: https://github.com/kamailio/kamailio/commit/273c6241637f663784695b073ac9e34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-03T10:54:10+02:00 pv: added $viaZ(attr) - get the attributes of last 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/273c6241637f663784695b073ac9e34… Patch: https://github.com/kamailio/kamailio/commit/273c6241637f663784695b073ac9e34… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 532d5209d9..41c53eaa3f 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -548,6 +548,8 @@ static pv_export_t mod_pvs[] = { pv_parse_ccp_attrs_name, 0, 0, 0}, {{"via0", (sizeof("via0")-1)}, PVT_OTHER, pv_get_via0, 0, pv_parse_via_name, 0, 0, 0}, + {{"viaZ", (sizeof("viaZ")-1)}, PVT_OTHER, pv_get_viaZ, 0, + pv_parse_via_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index d361d23781..34998b9882 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4537,7 +4537,7 @@ int pv_get_via_attr(sip_msg_t *msg, via_body_t *vb, pv_param_t *param, pv_value_t *res) { if(vb==NULL) { - LM_DBG("invalid via header\n"); + LM_DBG("null via header\n"); return pv_get_null(msg, param, res); } @@ -4594,3 +4594,29 @@ int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_via_attr(msg, msg->via1, param, res); } + +/** + * + */ +int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + hdr_field_t *hf = NULL; + via_body_t *vb = NULL; + via_body_t *vbZ = NULL; + + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_null(msg, param, res); + } + + vbZ = msg->via1; + 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) { + vbZ = vb; + } + } + } + + return pv_get_via_attr(msg, vbZ, param, res); +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 26a278c0e7..19222bc63e 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -413,6 +413,7 @@ int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, int pv_parse_via_name(pv_spec_p sp, str *in); int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); #endif

1 0

git:master:524d96c0: nats: added README file
by Daniel-Constantin Mierla 03 Jul '21

03 Jul '21

Module: kamailio Branch: master Commit: 524d96c050150dcb46dcf83a79dd6f2655383dff URL: https://github.com/kamailio/kamailio/commit/524d96c050150dcb46dcf83a79dd6f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-03T11:15:38+02:00 nats: added README file --- Added: src/modules/nats/README --- Diff: https://github.com/kamailio/kamailio/commit/524d96c050150dcb46dcf83a79dd6f2… Patch: https://github.com/kamailio/kamailio/commit/524d96c050150dcb46dcf83a79dd6f2…

1 0

git:master:0a3479f7: vp: new variable $via0(attr)
by Daniel-Constantin Mierla 02 Jul '21

02 Jul '21

Module: kamailio Branch: master Commit: 0a3479f77b8dc30f872961f066188d7284415484 URL: https://github.com/kamailio/kamailio/commit/0a3479f77b8dc30f872961f066188d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-02T18:15:28+02:00 vp: new variable $via0(attr) - get the attributes of first Via --- 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/0a3479f77b8dc30f872961f066188d7… Patch: https://github.com/kamailio/kamailio/commit/0a3479f77b8dc30f872961f066188d7…

1 0

[kamailio/kamailio] Implementation of ios/android push notifications module or similar (#2793)
by droopy 02 Jul '21

02 Jul '21

Hello, As mobile applications based on kamailio are growing exponentially on Play Store and App Store, i would suggest if you could add by default the code for ios/android push notifications. I have problems mainly for incoming call (phone wakeup) on linphone iphone app, as kamailio is missing the push solution. On Android i am using Baresip and works perfect without push. Navigating on the web, i found some uncomplete or minimum tutorials to implement this. Like: https://denys-pozniak.medium.com/apple-push-notification-with-kamailio-eeca… And also some code snippets of a modification of "kamailio.cfg" to add support for ios push notifications. (see below). Could someone have this already working? Or kamailio official developers could add this by default inside source code? `# keep a record of an IPhone for 4 hours modparam("htable", "htable", "iphone_remote=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_voip=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_check=>size=10;autoexpire=14400;") modparam("htable", "htable", "vtp=>size=10;autoexpire=120;") route[REGISTRAR] { ... ... if (save("location")) { # user registered, now look at the useragent header for iPhone string if ($hdr(User-Agent)=~"LinphoneiOS.*") { $var(uri) = @contact.uri; # select the uri from contact header $var(pn-prid) = $(var(uri){uri.param,pn-prid}); # get the uri param pn-prid from the uri, i.e. 1DF26BC10F597676B xlog("!!!! - $var(pn-prid)"); $var(i) = 0; $var(n) = $(var(pn-prid){s.count,&}); while( $var(i) <= $var(n)) { $var(pn-prid_item) = $(var(pn-prid){s.select,$var(i),&}); $var(pn-prid_type) = $(var(pn-prid_item){s.select,1,:}); $var(pn-prid_token) = $(var(pn-prid_item){s.select,0,:}); if ( $var(pn-prid_type) == "remote" ) { $var(pn-prid_remote) = $(var(pn-prid_item){s.select,0,:}) ; } if ( $var(pn-prid_type) == "voip" ) { $var(pn-prid_voip) = $(var(pn-prid_item){s.select,0,:}) ; } $var(i) = $var(i) + 1; } xlog("L_INFO","iPhone PUSH tokens for user $fU - remote: $var(pn-prid_remote), voip: $var(pn-prid_voip)"); # store the values of tokens to htable with fromUser as key $sht(iphone_remote=>$fU) = $var(pn-prid_remote); $sht(iphone_voip=>$fU) = $var(pn-prid_voip); $sht(iphone_check=>$fU) = 1; if ( $sht(vtp=>id_index::$tU) != $null ) { xlog("L_INFO", "New $rm ru=$ru tu=$tu \n"); route(JOIN); } } else { # no iphone $sht(iphone_check=>$fU) = 0; } ... ... } route[LOCATION] { ... ... if (!lookup("location")) { $var(rc) = $rc; # handle PUSH notifications for iPhone # iphones should not be registered and contacts stored in database # hence lookup should fail and we need to try to push iphone first if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); route(RELAY); exit; } ... ... if (is_method("INVITE")) { setflag(FLT_ACCMISSED); # handle PUSH notifications for iPhone # in some cases, iphone does not send de-register when going to background # for these circumstances, push iphone even if it has an active registration if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); } } route(RELAY); exit; } route[SUSPEND] { if ( !t_suspend() ) { xlog("L_ERROR","[SUSPEND] failed suspending trasaction [$T(id_index):$T(id_label)]\n"); send_reply("501", "Suspending error"); exit; } else { xlog("L_INFO","[SUSPEND] suspended transaction [$T(id_index):$T(id_label)] $fU=> $rU\n"); $sht(vtp=>id_index::$rU) = $T(id_index); $sht(vtp=>id_label::$rU) = $T(id_label); xlog("L_INFO","[SUSPEND] htable key value [$sht(vtp=>id_index::$rU) -- $sht(vtp=>id_label::$rU)]\n"); route(SENDPUSH); exit; } } route[SENDPUSH] { #http_client_query("http://url/push.php"<http://url/push.php>, "user=$rU\r\npn-tok=$sht(tokens=>$rU)\r\n","Content-Type: text/plain", "$var(result)"); xlog("!!!!!!!!!!!!!!!!!!!!!! PUSH !!!!!!!!!!!!!!!!!!!"); xlog("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); exec_avp("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); xlog("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); sl_send_reply("100", "Pushing"); } route[JOIN] { xlog("L_WARN","[JOIN] htable key value [$sht(vtp=>id_index::$tU) -- $sht(vtp=>id_label::$tU)]\n"); t_continue("$sht(vtp=>id_index::$tU)", "$sht(vtp=>id_label::$tU)", "RESUME"); $sht(vtp=>joined::$tU) = 1; } route[RESUME] { lookup("location"); xlog("L_INFO","[RESUME] rm=$rm ru=$ru du=$du \n"); t_relay(); $sht(vtp=>id_index::$tU) = $null; $sht(vtp=>id_label::$tU) = $null; exit; } ` -- 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/2793

2 2

git:master:63f6b5a2: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 63f6b5a2c9bc86446feb3852b91384839bb701e6 URL: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-01T16:16:19+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… Patch: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 87a33aebfd..945143421c 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -36,7 +36,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, @@ -88,7 +88,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, x5u, @@ -223,7 +223,7 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, x5u, @@ -262,7 +262,7 @@ request_route { header and payload using {s.select} and {s.decode.base64t} transformations together with jansson module. -4.2. secsipid_check_identity(pubkeyVal) +4.2. secsipid_check_identity_pubkey(pubkeyVal) Similar to secsipid_check_identity() with the public key value provided in the parameter. @@ -300,9 +300,9 @@ request_route { ... request_route { ... - if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + if(secsipid_check("...", "/secsipid/$si/cert.pem")) { ... } ... - if(secsipid_check_identity("...", "")) { ... } + if(secsipid_check("...", "")) { ... } ... } ...

1 0

git:master:22476389: secsipid: fix documentation example for secsipid_check() function
by Ovidiu Sas 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 224763898a9a6c1d3214129ecf0b4bf07baf62f3 URL: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:09:24-04:00 secsipid: fix documentation example for secsipid_check() function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… Patch: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 4588868d2c..88c4e761db 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -291,9 +291,9 @@ request_route { ... request_route { ... - if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + if(secsipid_check("...", "/secsipid/$si/cert.pem")) { ... } ... - if(secsipid_check_identity("...", "")) { ... } + if(secsipid_check("...", "")) { ... } ... } ...

1 0

git:5.5:6751ccf1: secsipid: fix documentation for secsipid_check_identity_pubkey
by Ovidiu Sas 01 Jul '21

01 Jul '21

Module: kamailio Branch: 5.5 Commit: 6751ccf10f7860098cfc080e492aa2e35107fdf2 URL: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:06:33-04:00 secsipid: fix documentation for secsipid_check_identity_pubkey (cherry picked from commit 1e4911d8a92e9e2ff25457d76d47bee111433947) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… Patch: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 527db1aecf..52a0dfeb35 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -239,7 +239,7 @@ request_route { </section> <section id="secsipid.f.secsipid_check_identity_pubkey"> <title> - <function moreinfo="none">secsipid_check_identity(pubkeyVal)</function> + <function moreinfo="none">secsipid_check_identity_pubkey(pubkeyVal)</function> </title> <para> Similar to secsipid_check_identity() with the public key value

1 0

git:master:1e4911d8: secsipid: fix documentation for secsipid_check_identity_pubkey
by Ovidiu Sas 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 1e4911d8a92e9e2ff25457d76d47bee111433947 URL: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:04:10-04:00 secsipid: fix documentation for secsipid_check_identity_pubkey --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… Patch: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index cc9c6c9fdf..4588868d2c 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -239,7 +239,7 @@ request_route { </section> <section id="secsipid.f.secsipid_check_identity_pubkey"> <title> - <function moreinfo="none">secsipid_check_identity(pubkeyVal)</function> + <function moreinfo="none">secsipid_check_identity_pubkey(pubkeyVal)</function> </title> <para> Similar to secsipid_check_identity() with the public key value

1 0

git:master:879f8c4e: core: fix building quoted value for #!subsdefs
by Daniel-Constantin Mierla 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 879f8c4e52ab7f7f489107f18e2c80795c788bdd URL: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-01T11:17:56+02:00 core: fix building quoted value for #!subsdefs --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… Patch: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 45d9114c05..aabd724032 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2049,11 +2049,12 @@ int pp_define_set(int len, char *text, int mode) pp_defines[ppos].value.len = len; pp_defines[ppos].value.s = text; - LM_DBG("### setting define ID [%.*s] value [%.*s]\n", + LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s, pp_defines[ppos].value.len, - pp_defines[ppos].value.s); + pp_defines[ppos].value.s, + mode); return 0; } diff --git a/src/core/cfg.y b/src/core/cfg.y index be0a664dce..5b205fd230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2213,9 +2213,9 @@ event_route_stm: preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, KSR_PPDEF_NORMAL)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } - | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS STRING { if(pp_substdef_add($2, KSR_PPDEF_QUOTED)<0) YYERROR; } | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 73c0a2ef3c..67391557f8 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "pvapi.h" #include "str_list.h" #include "dprint.h" @@ -149,25 +150,40 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); - return -1; + if(mode!=KSR_PPDEF_QUOTED) { + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } else { + defvalue = newval; } - defvalue = sb->s; } } - if(pp_define_set(defvalue.len, defvalue.s, - (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { + if(mode==KSR_PPDEF_QUOTED) { + if(pv_get_buffer_size() < defvalue.len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defvalue.s, defvalue.len); + newval.s[defvalue.len + 1] = '"'; + newval.s[defvalue.len + 2] = '\0'; + newval.len = defvalue.len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); goto error; } - if(mode==1) { - defvalue.s++; - defvalue.len -= 2; - *(defvalue.s-1) = c; - defvalue.s[defvalue.len] = c; - } LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, defvalue.len, defvalue.s, mode); diff --git a/src/main.c b/src/main.c index 950bcd895a..c1bf2c864f 100644 --- a/src/main.c +++ b/src/main.c @@ -2349,7 +2349,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdef parameter\n"); goto error; } - if(pp_substdef_add(optarg, 0)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_NORMAL)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } @@ -2359,7 +2359,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdefs parameter\n"); goto error; } - if(pp_substdef_add(optarg, 1)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_QUOTED)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; }

1 0

[kamailio/kamailio] core on start (#2788)
by sergey-safarov 01 Jul '21

01 Jul '21

### Description coredump kamailio start ### Troubleshooting #### Debugging Data ``` (gdb) bt #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 #4 0x0000000000562898 in pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 (gdb) bt full #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 No symbol table info available. #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 s = {s = 0x7ffff6af9178 "\001", len = -156263992} p = 0x82be18 <__func__.9> "pv_init_buffer" nsp = 0x0 hdr = {type = 8368264, name = {s = 0x85 <error: Cannot access memory at address 0x85>, len = -10896}, body = {s = 0x5634f1 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -156349208}, len = -10736, parsed = 0x1, next = 0x0} __func__ = "pv_parse_hdr_name" #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 p = 0x7ffff6ae4d53 ")[0])" s = {s = 0x7ffff6ae4d4e "X-CID)[0])", len = 5} pvname = {s = 0x7ffff6ae4d4a "hdr(X-CID)[0])", len = 3} pvstate = 2 tr = 0x0 pte = 0x7ffff6500c38 n = 0 __func__ = "pv_parse_spec2" #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 pvn = 0x7ffff6ae4cd0 pvid = 949637875 p = 0x0 __func__ = "pv_cache_add" #4 0x0000000000562898 in pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} __func__ = "pv_spec_lookup" #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 p = 0x7ffff6afc668 "$(hdr(X-CID)[0])" p0 = 0xc600000001 <error: Cannot access memory at address 0xc600000001> n = 1 e = 0x7ffff6ae4c48 e0 = 0x0 s = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} len = 16 __func__ = "pv_parse_format" #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 p = 0x7ffff6ae4ba8 name = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} s = {s = 0x1800000 <error: Cannot access memory at address 0x1800000>, len = 0} num = 32767 err = -156291736 __func__ = "fix_param" #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 ret = -156248399 t = 256 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 ret = 0 fp = 0x0 __func__ = "fixup_spve_null" #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 No locals. #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 No locals. #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 res = 0 __func__ = "append_hf_value_fixup" #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 t = 0x7ffff6afc430 p = 0x7ffff6af8730 tmp = 0x4bbed9 <sr_event_exec+415> "\211E\374\213E\374\351/\003" tmp_p = 0x7ffff6afc668 ret = 0 i = 1 cmd = 0x7ffff6528150 s = {s = 0x7ffff6af99c8 "\001", len = -8700} he = 0x7fffffffded0 ip = {af = 25165824, len = 0, u = {addrl = {0, 140737488346496}, addr32 = {0, 0, 4294958464, 32767}, addr16 = {0, 0, 0, 0, 56704, 65535, 32767, 0}, addr = "\000\000\000\000\000\000\000\000\200\335\377\377\377\177\000"}} si = 0x7fffffffdecc lval = 0x7fffffffded4 rve = 0x7ffff6af8398 err_rve = 0x4000000 rve_type = RV_NONE err_type = 133 expected_type = RV_NONE rv = 0x7ffff6af8448 rve_param_no = 0 __func__ = "fix_actions" #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 t = 0x7ffff6afc6e8 p = 0x0 tmp = 0x6f16b7 <qm_malloc+1321> "H\203\304\020H\213E\310H\213P\030H\213E\270H\213" tmp_p = 0x7ffff6af88f0 ret = 0 i = 2 cmd = 0x7ffff652bab8 s = {s = 0x7ffff6ac87f8 "LIS_REPLY", len = 9} he = 0x7fffffffe020 ip = {af = 0, len = 0, u = {addrl = {140737274206128, 140737488347056}, addr32 = {4080818096, 32767, 4294959024, 32767}, addr16 = {22448, 62268, 32767, 0, 57264, 65535, 32767, 0}, addr = "\260W<\363\377\177\000\000\260\337\377\377\377\177\000"}} si = 0xaab32f7585fd7500 lval = 0x7ffff6ac7520 rve = 0x7ffff6afbc18 err_rve = 0x0 rve_type = RV_INT err_type = 32 expected_type = RV_NONE rv = 0x7ffff6ac91e0 rve_param_no = 0 __func__ = "fix_actions" #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 i = 97 ret = 0 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 ret = 0 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 cfg_stream = 0x9c02d0 c = -1 r = 0 tmp = 0x7fffffffe8bb "" tmp_len = 896 port = 896 proto = 896 ahost = 0x0 aport = 0 options = 0x7fe158 ":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 = 4231472377 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xc2 <error: Cannot access memory at address 0xc2> st = {st_dev = 56, st_ino = 279340502, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 120, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1622741422, tv_nsec = 474562221}, st_mtim = {tv_sec = 1624650702, tv_nsec = 443892052}, st_ctim = {tv_sec = 1624650702, tv_nsec = 443892052}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\342\377\377\377\177", '\000' <repeats 11 times>, "\342\377\377\377\177", '\000' <repeats 18 times>, "\260\027\375\367\377\177\000\000\350\317\377\367\377\177\000\000\b\345\377\367\377\177\000\000\340\031\375\367\377\177\000\000\025\217\376\367\377\177\000\000$f\307\367\377\177\000\000\354K\377\367\377\177\000\000\336K\377\367\377\177\000\000\205\317c\t\000\000\000\000\300S\374\367\377\177\000\000ߏ\376\367\377\177\000\000\000\000\000\000\254\202\226\006\334P\307\367\377\177\000\000\000\000\000\000\000\000\000\000\300S\374\367\377\177\000\000\001\000\000\000\000\000\000\000@\347N\360\356\"\000\000\240\341\377\367\377\177\000\000\370\377\377\377\377\377\377\377\240\341\377\367\377\177\000\000R"... option_index = 12 long_options = {{name = 0x800836 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7fb521 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x80083b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x800841 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x800847 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x800850 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x80085a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x800864 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x80086f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x800878 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x800883 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x800889 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x800893 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` ### Additional Information master on CentOS8 -- 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/2788

2 12

git:master:56d41f62: core: ppcfg - clone value for substdef
by Daniel-Constantin Mierla 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 56d41f6238f39d0046c97527abcb23b8dd7924be URL: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-01T10:19:08+02:00 core: ppcfg - clone value for substdef - GH #2788 --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… Patch: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a5aa1d3e28..73c0a2ef3c 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "str_list.h" #include "dprint.h" #include "ppcfg.h" @@ -44,6 +45,7 @@ typedef struct _pp_subst_rule { static pp_subst_rule_t *pp_subst_rules_head = NULL; static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; +static str_list_t *_ksr_substdef_strlist = NULL; int pp_subst_add(char *data) { @@ -94,6 +96,7 @@ int pp_substdef_add(char *data, int mode) str defvalue; str newval; sip_msg_t *fmsg; + str_list_t *sb; if(pp_subst_add(data)<0) { LM_ERR("subst rule cannot be added\n"); @@ -146,7 +149,12 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - defvalue = newval; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; } } if(pp_define_set(defvalue.len, defvalue.s,

1 0

[kamailio/kamailio] nats: make sure pkg & shm memory is allocated; check pointers before freeing memory (#2792)
by Emmanuel Schmidbauer 30 Jun '21

30 Jun '21

…freeing memory   #### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  as per @miconda's suggestion, added memory checks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2792 -- Commit Summary -- * nats: make sure pkg & shm memory is allocated; check pointers before freeing memory -- File Changes -- M src/modules/nats/nats_mod.c (69) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2792.patch https://github.com/kamailio/kamailio/pull/2792.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/2792

2 3

git:master:5980ca59: Merge pull request #2792 from kamailio/nats-memory-checks
by GitHub 30 Jun '21

30 Jun '21

Module: kamailio Branch: master Commit: 5980ca59189c01a57b6765eaaf7d883f0541590b URL: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-30T06:22:49-04:00 Merge pull request #2792 from kamailio/nats-memory-checks nats: make sure pkg & shm memory is allocated; check pointers before freeing memory --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… Patch: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 34a82910f5..90f73f243c 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -245,6 +245,10 @@ int init_worker( if(s0->url != NULL && num_servers < NATS_MAX_SERVERS) { len = strlen(s0->url); sc = shm_malloc(len + 1); + if(!sc) { + LM_ERR("no shm memory left\n"); + return -1; + } strcpy(sc, s0->url); sc[len] = '\0'; worker->init_nats_servers[num_servers++] = sc; @@ -368,30 +372,38 @@ int nats_destroy_workers() nats_consumer_worker_t *worker; for(i = 0; i < _nats_proc_count; i++) { worker = &nats_workers[i]; - natsSubscription_Unsubscribe(worker->subscription); - natsSubscription_Destroy(worker->subscription); - natsConnection_Close(worker->conn); - natsConnection_Destroy(worker->conn); - natsOptions_Destroy(worker->opts); - if(worker->uvLoop != NULL) { - uv_loop_close(worker->uvLoop); - } - nats_Close(); - if(worker->subject != NULL) { - shm_free(worker->subject); - } - if(worker->queue_group != NULL) { - shm_free(worker->queue_group); - } - if(worker->on_message != NULL) { - shm_free(worker->on_message); - } - for(s = 0; s < NATS_MAX_SERVERS; s++) { - if(worker->init_nats_servers[s]) { - shm_free(worker->init_nats_servers[s]); + if(worker != NULL) { + if(worker->subscription != NULL) { + natsSubscription_Unsubscribe(worker->subscription); + natsSubscription_Destroy(worker->subscription); + } + if(worker->conn != NULL) { + natsConnection_Close(worker->conn); + natsConnection_Destroy(worker->conn); + } + if(worker->opts != NULL) { + natsOptions_Destroy(worker->opts); + } + if(worker->uvLoop != NULL) { + uv_loop_close(worker->uvLoop); + } + nats_Close(); + if(worker->subject != NULL) { + shm_free(worker->subject); } + if(worker->queue_group != NULL) { + shm_free(worker->queue_group); + } + if(worker->on_message != NULL) { + shm_free(worker->on_message); + } + for(s = 0; s < NATS_MAX_SERVERS; s++) { + if(worker->init_nats_servers[s]) { + shm_free(worker->init_nats_servers[s]); + } + } + shm_free(worker); } - shm_free(worker); } return 0; } @@ -420,6 +432,10 @@ int _init_nats_server_url_add(modparam_t type, void *val) return -1; } value = pkg_malloc(len + 1); + if(!value) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(value, url); value[len] = '\0'; if(init_nats_server_url_add(url) < 0) { @@ -434,6 +450,11 @@ int _init_nats_sub_add(modparam_t type, void *val) char *sub = (char *)val; int len = strlen(sub); char *s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + strcpy(s, sub); s[len] = '\0'; if(init_nats_sub_add(s) < 0) { @@ -529,6 +550,10 @@ int init_nats_sub_add(char *sc) len = strlen(sc); s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(s, sc); s[len] = '\0';

1 0

git:master:b95b2448: nats: make sure pkg & shm memory is allocated; check pointers before freeing memory
by Emmanuel Schmidbauer 30 Jun '21

30 Jun '21

Module: kamailio Branch: master Commit: b95b2448d7e968c2bff59e1d820764defee104aa URL: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-06-28T07:30:40-04:00 nats: make sure pkg & shm memory is allocated; check pointers before freeing memory --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… Patch: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 34a82910f5..90f73f243c 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -245,6 +245,10 @@ int init_worker( if(s0->url != NULL && num_servers < NATS_MAX_SERVERS) { len = strlen(s0->url); sc = shm_malloc(len + 1); + if(!sc) { + LM_ERR("no shm memory left\n"); + return -1; + } strcpy(sc, s0->url); sc[len] = '\0'; worker->init_nats_servers[num_servers++] = sc; @@ -368,30 +372,38 @@ int nats_destroy_workers() nats_consumer_worker_t *worker; for(i = 0; i < _nats_proc_count; i++) { worker = &nats_workers[i]; - natsSubscription_Unsubscribe(worker->subscription); - natsSubscription_Destroy(worker->subscription); - natsConnection_Close(worker->conn); - natsConnection_Destroy(worker->conn); - natsOptions_Destroy(worker->opts); - if(worker->uvLoop != NULL) { - uv_loop_close(worker->uvLoop); - } - nats_Close(); - if(worker->subject != NULL) { - shm_free(worker->subject); - } - if(worker->queue_group != NULL) { - shm_free(worker->queue_group); - } - if(worker->on_message != NULL) { - shm_free(worker->on_message); - } - for(s = 0; s < NATS_MAX_SERVERS; s++) { - if(worker->init_nats_servers[s]) { - shm_free(worker->init_nats_servers[s]); + if(worker != NULL) { + if(worker->subscription != NULL) { + natsSubscription_Unsubscribe(worker->subscription); + natsSubscription_Destroy(worker->subscription); + } + if(worker->conn != NULL) { + natsConnection_Close(worker->conn); + natsConnection_Destroy(worker->conn); + } + if(worker->opts != NULL) { + natsOptions_Destroy(worker->opts); + } + if(worker->uvLoop != NULL) { + uv_loop_close(worker->uvLoop); + } + nats_Close(); + if(worker->subject != NULL) { + shm_free(worker->subject); } + if(worker->queue_group != NULL) { + shm_free(worker->queue_group); + } + if(worker->on_message != NULL) { + shm_free(worker->on_message); + } + for(s = 0; s < NATS_MAX_SERVERS; s++) { + if(worker->init_nats_servers[s]) { + shm_free(worker->init_nats_servers[s]); + } + } + shm_free(worker); } - shm_free(worker); } return 0; } @@ -420,6 +432,10 @@ int _init_nats_server_url_add(modparam_t type, void *val) return -1; } value = pkg_malloc(len + 1); + if(!value) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(value, url); value[len] = '\0'; if(init_nats_server_url_add(url) < 0) { @@ -434,6 +450,11 @@ int _init_nats_sub_add(modparam_t type, void *val) char *sub = (char *)val; int len = strlen(sub); char *s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + strcpy(s, sub); s[len] = '\0'; if(init_nats_sub_add(s) < 0) { @@ -529,6 +550,10 @@ int init_nats_sub_add(char *sc) len = strlen(sc); s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(s, sc); s[len] = '\0';

1 0

Implementation of ios/android push notifications module or similar
by javier falbo 29 Jun '21

29 Jun '21

Hello, As mobile applications based on kamailio are growing exponentially on Play Store and App Store, i would suggest if you could add by default the code for ios/android push notifications. I have problems mainly for incoming call (phone wakeup) on linphone iphone app, as kamailio is missing the push solution. On Android i am using Baresip and works perfect without push. Navigating on the web, i found some uncomplete or minimum tutorials to implement this. Like: https://denys-pozniak.medium.com/apple-push-notification-with-kamailio-eeca… And also some code snippets of a modification of "kamailio.cfg" to add support for ios push notifications. (see below). Could someone have this already working? Or kamailio official developers could add this by default inside source code? # keep a record of an IPhone for 4 hours modparam("htable", "htable", "iphone_remote=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_voip=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_check=>size=10;autoexpire=14400;") modparam("htable", "htable", "vtp=>size=10;autoexpire=120;") route[REGISTRAR] { ... ... if (save("location")) { # user registered, now look at the useragent header for iPhone string if ($hdr(User-Agent)=~"LinphoneiOS.*") { $var(uri) = @contact.uri; # select the uri from contact header $var(pn-prid) = $(var(uri){uri.param,pn-prid}); # get the uri param pn-prid from the uri, i.e. 1DF26BC10F597676B xlog("!!!! - $var(pn-prid)"); $var(i) = 0; $var(n) = $(var(pn-prid){s.count,&}); while( $var(i) <= $var(n)) { $var(pn-prid_item) = $(var(pn-prid){s.select,$var(i),&}); $var(pn-prid_type) = $(var(pn-prid_item){s.select,1,:}); $var(pn-prid_token) = $(var(pn-prid_item){s.select,0,:}); if ( $var(pn-prid_type) == "remote" ) { $var(pn-prid_remote) = $(var(pn-prid_item){s.select,0,:}) ; } if ( $var(pn-prid_type) == "voip" ) { $var(pn-prid_voip) = $(var(pn-prid_item){s.select,0,:}) ; } $var(i) = $var(i) + 1; } xlog("L_INFO","iPhone PUSH tokens for user $fU - remote: $var(pn-prid_remote), voip: $var(pn-prid_voip)"); # store the values of tokens to htable with fromUser as key $sht(iphone_remote=>$fU) = $var(pn-prid_remote); $sht(iphone_voip=>$fU) = $var(pn-prid_voip); $sht(iphone_check=>$fU) = 1; if ( $sht(vtp=>id_index::$tU) != $null ) { xlog("L_INFO", "New $rm ru=$ru tu=$tu \n"); route(JOIN); } } else { # no iphone $sht(iphone_check=>$fU) = 0; } ... ... } route[LOCATION] { ... ... if (!lookup("location")) { $var(rc) = $rc; # handle PUSH notifications for iPhone # iphones should not be registered and contacts stored in database # hence lookup should fail and we need to try to push iphone first if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); route(RELAY); exit; } ... ... if (is_method("INVITE")) { setflag(FLT_ACCMISSED); # handle PUSH notifications for iPhone # in some cases, iphone does not send de-register when going to background # for these circumstances, push iphone even if it has an active registration if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); } } route(RELAY); exit; } route[SUSPEND] { if ( !t_suspend() ) { xlog("L_ERROR","[SUSPEND] failed suspending trasaction [$T(id_index):$T(id_label)]\n"); send_reply("501", "Suspending error"); exit; } else { xlog("L_INFO","[SUSPEND] suspended transaction [$T(id_index):$T(id_label)] $fU=> $rU\n"); $sht(vtp=>id_index::$rU) = $T(id_index); $sht(vtp=>id_label::$rU) = $T(id_label); xlog("L_INFO","[SUSPEND] htable key value [$sht(vtp=>id_index::$rU) -- $sht(vtp=>id_label::$rU)]\n"); route(SENDPUSH); exit; } } route[SENDPUSH] { #http_client_query("http://url/push.php"<http://url/push.php>, "user=$rU\r\npn-tok=$sht(tokens=>$rU)\r\n","Content-Type: text/plain", "$var(result)"); xlog("!!!!!!!!!!!!!!!!!!!!!! PUSH !!!!!!!!!!!!!!!!!!!"); xlog("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); exec_avp("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); xlog("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); sl_send_reply("100", "Pushing"); } route[JOIN] { xlog("L_WARN","[JOIN] htable key value [$sht(vtp=>id_index::$tU) -- $sht(vtp=>id_label::$tU)]\n"); t_continue("$sht(vtp=>id_index::$tU)", "$sht(vtp=>id_label::$tU)", "RESUME"); $sht(vtp=>joined::$tU) = 1; } route[RESUME] { lookup("location"); xlog("L_INFO","[RESUME] rm=$rm ru=$ru du=$du \n"); t_relay(); $sht(vtp=>id_index::$tU) = $null; $sht(vtp=>id_label::$tU) = $null; exit; }

1 0

git:5.5:9dc2e9b4: core: clone modparamx evaluated values
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: 9dc2e9b4e723f865fa92ed03f9c9b90473c83e94 URL: https://github.com/kamailio/kamailio/commit/9dc2e9b4e723f865fa92ed03f9c9b90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:24+02:00 core: clone modparamx evaluated values (cherry picked from commit 68db24577dae35de1e9045f994d9a751b50ad14d) --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/9dc2e9b4e723f865fa92ed03f9c9b90… Patch: https://github.com/kamailio/kamailio/commit/9dc2e9b4e723f865fa92ed03f9c9b90… --- 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:5.5:abbe78ae: core: clone value for loadmodulex
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: abbe78aec28d46b74f59d14334b6e4871915ea4a URL: https://github.com/kamailio/kamailio/commit/abbe78aec28d46b74f59d14334b6e48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:35+02:00 core: clone value for loadmodulex (cherry picked from commit e04890fe90d6e5ce879f968eb689e8616b318d54) --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/abbe78aec28d46b74f59d14334b6e48… Patch: https://github.com/kamailio/kamailio/commit/abbe78aec28d46b74f59d14334b6e48… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 03f8feef81..b26fde218c 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -45,6 +45,7 @@ #include "fmsg.h" #include "async_task.h" #include "shm_init.h" +#include "str_list.h" #include "daemonize.h" #include <sys/stat.h> @@ -57,6 +58,8 @@ struct sr_module* modules=0; +static str_list_t *_ksr_loadmod_strlist = NULL; + /*We need to define this symbol on Solaris becuase libcurl relies on libnspr which looks for this symbol. If it is not defined, dynamic module loading (dlsym) fails */ @@ -656,6 +659,7 @@ int load_modulex(char* mod_path) str sfmt; sip_msg_t *fmsg; char* emod; + str_list_t *sb; emod = mod_path; if(strchr(mod_path, '$') != NULL) { @@ -663,7 +667,12 @@ int load_modulex(char* mod_path) sfmt.s = mod_path; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emod = seval.s; + sb = str_list_block_add(&_ksr_loadmod_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle load module: %s\n", mod_path); + return -1; + } + emod = sb->s.s; } }

1 0

git:5.5:459f40b5: http_client: clone name in http connection structures
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: 459f40b52a8a6f8b2ef70a6986c686448ea572a8 URL: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:41:50+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 (cherry picked from commit 9429083c87b1323e31983cc71551676c199bf640) --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… Patch: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… --- 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:5.5:2dbf4882: http_client: removed function names from logs
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: 2dbf48822451433f4ee8863a954a4c40da0eb2bf URL: https://github.com/kamailio/kamailio/commit/2dbf48822451433f4ee8863a954a4c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:02+02:00 http_client: removed function names from logs (cherry picked from commit 84d245fb4eda7690a89b4057301f81685a9452d8) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/2dbf48822451433f4ee8863a954a4c4… Patch: https://github.com/kamailio/kamailio/commit/2dbf48822451433f4ee8863a954a4c4… --- 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:5.5:b27dc141: http_client: check if shm is initialized in curl_parse_param()
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: b27dc141ccddfb3e0f77399ead8b2b158942de69 URL: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:41:38+02:00 http_client: check if shm is initialized in curl_parse_param() (cherry picked from commit 7741ad7979d54fb4ee1247760d8d5c3666353a96) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… Patch: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… --- 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:e04890fe: core: clone value for loadmodulex
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: e04890fe90d6e5ce879f968eb689e8616b318d54 URL: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T09:25:30+02:00 core: clone value for loadmodulex --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… Patch: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 03f8feef81..b26fde218c 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -45,6 +45,7 @@ #include "fmsg.h" #include "async_task.h" #include "shm_init.h" +#include "str_list.h" #include "daemonize.h" #include <sys/stat.h> @@ -57,6 +58,8 @@ struct sr_module* modules=0; +static str_list_t *_ksr_loadmod_strlist = NULL; + /*We need to define this symbol on Solaris becuase libcurl relies on libnspr which looks for this symbol. If it is not defined, dynamic module loading (dlsym) fails */ @@ -656,6 +659,7 @@ int load_modulex(char* mod_path) str sfmt; sip_msg_t *fmsg; char* emod; + str_list_t *sb; emod = mod_path; if(strchr(mod_path, '$') != NULL) { @@ -663,7 +667,12 @@ int load_modulex(char* mod_path) sfmt.s = mod_path; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emod = seval.s; + sb = str_list_block_add(&_ksr_loadmod_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle load module: %s\n", mod_path); + return -1; + } + emod = sb->s.s; } }

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev