- sr-dev - kamailio.org

git:5.2:4437787b: lib/srdb1: detect if ipv6 address is between square brakets
by Henning Westerholt 29 Oct '19

29 Oct '19

Module: kamailio Branch: 5.2 Commit: 4437787b3de382ffa8a7df0fad54f5226c1bafd5 URL: https://github.com/kamailio/kamailio/commit/4437787b3de382ffa8a7df0fad54f52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-29T14:53:09+01:00 lib/srdb1: detect if ipv6 address is between square brakets - if not, let it be host part with surrounding brakets, because it can by a mysql conf group name (cherry picked from commit 2aa614d49f4917faec62534a51fcf8ddfc5fb870) --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/4437787b3de382ffa8a7df0fad54f52… Patch: https://github.com/kamailio/kamailio/commit/4437787b3de382ffa8a7df0fad54f52… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 8a43def2d9..b0166cccfd 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -29,6 +29,7 @@ #include "db_id.h" #include "../../core/dprint.h" #include "../../core/mem/mem.h" +#include "../../core/resolve.h" #include "../../core/pt.h" #include "../../core/ut.h" #include <stdlib.h> @@ -109,6 +110,7 @@ static int parse_db_url(struct db_id* id, const str* url) unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; + str sval = STR_NULL; foundanother = 0; prev_token = 0; @@ -251,7 +253,14 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST6: switch(url->s[i]) { case ']': - ipv6_flag = 1; + sval.s = (char*)begin; + sval.len = url->s + i - begin; + if(str2ip6(&sval)==NULL) { + ipv6_flag = 0; + begin -= 1; + } else { + ipv6_flag = 1; + } st = ST_HOST; break; }

1 0

git:5.3:e591ff9d: lib/srdb1: detect if ipv6 address is between square brakets
by Henning Westerholt 29 Oct '19

29 Oct '19

Module: kamailio Branch: 5.3 Commit: e591ff9ded3e3ab8478c7a574c64e27ff35c3e91 URL: https://github.com/kamailio/kamailio/commit/e591ff9ded3e3ab8478c7a574c64e27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-29T14:52:33+01:00 lib/srdb1: detect if ipv6 address is between square brakets - if not, let it be host part with surrounding brakets, because it can by a mysql conf group name (cherry picked from commit 2aa614d49f4917faec62534a51fcf8ddfc5fb870) --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/e591ff9ded3e3ab8478c7a574c64e27… Patch: https://github.com/kamailio/kamailio/commit/e591ff9ded3e3ab8478c7a574c64e27… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 74788ff9bd..094baaa0dd 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -29,6 +29,7 @@ #include "db_id.h" #include "../../core/dprint.h" #include "../../core/mem/mem.h" +#include "../../core/resolve.h" #include "../../core/pt.h" #include "../../core/ut.h" #include <stdlib.h> @@ -111,6 +112,7 @@ static int parse_db_url(struct db_id* id, const str* url) unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; + str sval = STR_NULL; foundanother = 0; prev_token = 0; @@ -253,7 +255,14 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST6: switch(url->s[i]) { case ']': - ipv6_flag = 1; + sval.s = (char*)begin; + sval.len = url->s + i - begin; + if(str2ip6(&sval)==NULL) { + ipv6_flag = 0; + begin -= 1; + } else { + ipv6_flag = 1; + } st = ST_HOST; break; }

1 0

git:5.1:0f177325: lib/srdb1: detect if ipv6 address is between square brakets
by Henning Westerholt 29 Oct '19

29 Oct '19

Module: kamailio Branch: 5.1 Commit: 0f177325c54c7c06142907b8351f7293c7e43087 URL: https://github.com/kamailio/kamailio/commit/0f177325c54c7c06142907b8351f729… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-29T14:53:33+01:00 lib/srdb1: detect if ipv6 address is between square brakets - if not, let it be host part with surrounding brakets, because it can by a mysql conf group name (cherry picked from commit 2aa614d49f4917faec62534a51fcf8ddfc5fb870) --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/0f177325c54c7c06142907b8351f729… Patch: https://github.com/kamailio/kamailio/commit/0f177325c54c7c06142907b8351f729… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 8a43def2d9..b0166cccfd 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -29,6 +29,7 @@ #include "db_id.h" #include "../../core/dprint.h" #include "../../core/mem/mem.h" +#include "../../core/resolve.h" #include "../../core/pt.h" #include "../../core/ut.h" #include <stdlib.h> @@ -109,6 +110,7 @@ static int parse_db_url(struct db_id* id, const str* url) unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; + str sval = STR_NULL; foundanother = 0; prev_token = 0; @@ -251,7 +253,14 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST6: switch(url->s[i]) { case ']': - ipv6_flag = 1; + sval.s = (char*)begin; + sval.len = url->s + i - begin; + if(str2ip6(&sval)==NULL) { + ipv6_flag = 0; + begin -= 1; + } else { + ipv6_flag = 1; + } st = ST_HOST; break; }

1 0

git:master:7c6ef434: kamailio.cfg: rebuilt the section for calling rtpengine_manage()
by Daniel-Constantin Mierla 29 Oct '19

29 Oct '19

Module: kamailio Branch: master Commit: 7c6ef434bdbd0747adfad31172efbc5e50477370 URL: https://github.com/kamailio/kamailio/commit/7c6ef434bdbd0747adfad31172efbc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-29T10:26:12+01:00 kamailio.cfg: rebuilt the section for calling rtpengine_manage() - fixes also missing ifdef check for WITH_RTPENGINE --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/7c6ef434bdbd0747adfad31172efbc5… Patch: https://github.com/kamailio/kamailio/commit/7c6ef434bdbd0747adfad31172efbc5… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 21470ce47c..f37c7ee34e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -818,18 +818,19 @@ route[NATMANAGE] { } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; - if(nat_uac_test("8")) { #!ifdef WITH_RTPENGINE + if(nat_uac_test("8")) { rtpengine_manage("replace-origin replace-session-connection"); -#!else - rtpproxy_manage("co"); -#!endif } else { rtpengine_manage("trust-address replace-origin replace-session-connection"); + } #!else + if(nat_uac_test("8")) { + rtpproxy_manage("co"); + } else { rtpproxy_manage("cor"); -#!endif } +#!endif if (is_request()) { if (!has_totag()) {

1 0

git:master:fcf895d2: kamailio.cfg: option to use rtpengine for nat traversal
by Daniel-Constantin Mierla 29 Oct '19

29 Oct '19

Module: kamailio Branch: master Commit: fcf895d274d1793440529525e1db9603cfa19aec URL: https://github.com/kamailio/kamailio/commit/fcf895d274d1793440529525e1db960… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-29T10:22:05+01:00 kamailio.cfg: option to use rtpengine for nat traversal - define WITH_NAT - define WITH_RTPENGINE --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/fcf895d274d1793440529525e1db960… Patch: https://github.com/kamailio/kamailio/commit/fcf895d274d1793440529525e1db960… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 9047f49fef..21470ce47c 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -45,10 +45,16 @@ # # *** To enable nat traversal execute: # - define WITH_NAT +# - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING # - install RTPProxy: http://www.rtpproxy.org # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 -# - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING +# +# *** To use RTPEngine (instead of RTPProxy) for nat traversal execute: +# - define WITH_RTPENGINE +# - install RTPEngine: https://github.com/sipwise/rtpengine +# - start RTPEngine: +# rtpengine --listen-ng=127.0.0.1:2223 ... # # *** To enable PSTN gateway routing execute: # - define WITH_PSTN @@ -417,9 +423,13 @@ modparam("presence_xml", "force_active", 1) #!endif #!ifdef WITH_NAT +#!ifdef WITH_RTPENGINE +# ----- rtpengine params ----- +modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +#!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") - +#!endit # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) @@ -809,9 +819,16 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; if(nat_uac_test("8")) { +#!ifdef WITH_RTPENGINE + rtpengine_manage("replace-origin replace-session-connection"); +#!else rtpproxy_manage("co"); +#!endif } else { + rtpengine_manage("trust-address replace-origin replace-session-connection"); +#!else rtpproxy_manage("cor"); +#!endif } if (is_request()) {

1 0

git:master:743f5dca: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 29 Oct '19

29 Oct '19

Module: kamailio Branch: master Commit: 743f5dca220b8f1e6a863cd9f68fdeb9c2dc7237 URL: https://github.com/kamailio/kamailio/commit/743f5dca220b8f1e6a863cd9f68fdeb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-29T09:31:25+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/743f5dca220b8f1e6a863cd9f68fdeb… Patch: https://github.com/kamailio/kamailio/commit/743f5dca220b8f1e6a863cd9f68fdeb… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index caeb998e93..b0e4f76f43 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -61,7 +61,7 @@ Ramona-Elena Modroiu 4.4. uac_replace_to(display,uri) 4.5. uac_replace_to(uri) 4.6. uac_restore_to() - 4.7. uac_auth() + 4.7. uac_auth([mode]) 4.8. uac_req_send() 4.9. uac_reg_lookup(uuid, dst) 4.10. uac_reg_status(uuid) @@ -179,7 +179,7 @@ Chapter 1. Admin Guide 4.4. uac_replace_to(display,uri) 4.5. uac_replace_to(uri) 4.6. uac_restore_to() - 4.7. uac_auth() + 4.7. uac_auth([mode]) 4.8. uac_req_send() 4.9. uac_reg_lookup(uuid, dst) 4.10. uac_reg_status(uuid) @@ -596,7 +596,7 @@ modparam("uac", "reg_gc_interval", 60) 4.4. uac_replace_to(display,uri) 4.5. uac_replace_to(uri) 4.6. uac_restore_to() - 4.7. uac_auth() + 4.7. uac_auth([mode]) 4.8. uac_req_send() 4.9. uac_reg_lookup(uuid, dst) 4.10. uac_reg_status(uuid) @@ -743,12 +743,16 @@ uac_replace_to("sip:batman@gotham.org"); uac_restore_to(); ... -4.7. uac_auth() +4.7. uac_auth([mode]) This function can be called only from failure route and will build the authentication response header and insert it into the request without sending anything. + If mode is set to 1, then the password has to be provided in HA1 + format. The parameter can be a static integer or a variable holding an + integer value. + This function can be used from FAILURE_ROUTE. Example 1.28. uac_auth usage @@ -773,7 +777,9 @@ failure_route[TRUNKAUTH] { if(t_check_status("401|407")) { $avp(auser) = "test"; $avp(apass) = "test"; + # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; uac_auth(); + # uac_auth("1"); t_relay(); exit; } @@ -838,10 +844,16 @@ $var(status) = uac_reg_status("$rU"); This function can be used to send an authenticated request to a remote user in the uac registrations table. It sets the request-uri, dst-uri - and auth_*_avp pv's to the values that correspond to the supplied user. - - The mode indicates whether the user should match the local uuid - (mode=0), or the username (mode=1). + and auth_*_avp variables to the values that correspond to the supplied + user. + + The mode is a bitwise set of flags controlling how the matching of the + record is done and what field is used to set auth_password_avp: + * indicates whether the user should match the local uuid (bit + value=0), or the username (bit value=1, int value=1). + * indicates whether the auth_password value is used to set + auth_password_avp (bit value=0), or the auth_ha1 value (bit + value=1, int value=2). The auth_*_avp module parameters must be set to valid pv's.

1 0

[kamailio/kamailio] uac: allow ha1 to be used in uac_reg_request_to (#2102)
by Alexandru Covalschi 29 Oct '19

29 Oct '19

### Description  I'm using uac module to remote authenticate to a trunk. With the addition of ha1 used instead of plaintext password it is also would be nice to be able to use uac_reg_request_to with it. ### Expected behavior There should be auth_ha1_avp for uac module, which will use ha1 instead of plaintext to build the request #### Actual observed behavior auth_password_avp is set to empty string or dot respectively of how you specify it in database, ha1 is not used in uac_reg_request_to ### Possible Solutions  Well logically auth_ha1_avp should be prioritized over auth_password_ha1 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0-dev1 (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_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0``` * **Operating System**:  ``` Debian 10 in docker``` -- 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/2102

2 2

git:master:981d787a: uac: optional param for uac_auth() to specify auth mode
by Daniel-Constantin Mierla 29 Oct '19

29 Oct '19

Module: kamailio Branch: master Commit: 981d787acf5f598f185d0d0ce8091b4e202f4d86 URL: https://github.com/kamailio/kamailio/commit/981d787acf5f598f185d0d0ce8091b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-29T09:15:49+01:00 uac: optional param for uac_auth() to specify auth mode - if mode is set to 1, then the password is provided in ha1 format --- Modified: src/modules/uac/auth.c Modified: src/modules/uac/auth.h Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/981d787acf5f598f185d0d0ce8091b4… Patch: https://github.com/kamailio/kamailio/commit/981d787acf5f598f185d0d0ce8091b4… --- diff --git a/src/modules/uac/auth.c b/src/modules/uac/auth.c index a412dae975..0f5e6d4a9b 100644 --- a/src/modules/uac/auth.c +++ b/src/modules/uac/auth.c @@ -375,9 +375,10 @@ static inline int apply_urihdr_changes( struct sip_msg *req, return -1; } - - -int uac_auth(sip_msg_t *msg) +/** + * + */ +int uac_auth_mode(sip_msg_t *msg, int mode) { static struct authenticate_body auth; struct uac_credential *crd; @@ -451,6 +452,10 @@ int uac_auth(sip_msg_t *msg) goto error; } + if(mode & UACAUTH_MODE_HA1) { + crd->aflags |= UAC_FLCRED_HA1; + } + /* do authentication */ do_uac_auth( &msg->first_line.u.request.method, &t->uac[branch].uri, crd, &auth, response); @@ -489,5 +494,10 @@ int uac_auth(sip_msg_t *msg) return -1; } - - +/** + * + */ +int uac_auth(sip_msg_t *msg) +{ + return uac_auth_mode(msg, 0); +} \ No newline at end of file diff --git a/src/modules/uac/auth.h b/src/modules/uac/auth.h index 274b32e85d..67d6406b7a 100644 --- a/src/modules/uac/auth.h +++ b/src/modules/uac/auth.h @@ -47,6 +47,8 @@ typedef struct authenticate_body { str *cnonce; } uac_authenticate_body_t; +#define UACAUTH_MODE_HA1 (1<<0) + #define AUTHENTICATE_MD5 (1<<0) #define AUTHENTICATE_MD5SESS (1<<1) #define AUTHENTICATE_STALE (1<<2) @@ -67,7 +69,8 @@ void destroy_credentials(void); struct hdr_field *get_autenticate_hdr(struct sip_msg *rpl, int rpl_code); -int uac_auth( struct sip_msg *msg); +int uac_auth(sip_msg_t *msg); +int uac_auth_mode(sip_msg_t *msg, int mode); void do_uac_auth(str *method, str *uri, struct uac_credential *crd, diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 7692600b0f..3212960f4e 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -98,6 +98,7 @@ static int w_restore_from(struct sip_msg* msg, char* p1, char* p2); static int w_replace_to(struct sip_msg* msg, char* p1, char* p2); static int w_restore_to(struct sip_msg* msg, char* p1, char* p2); static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); +static int w_uac_auth_mode(struct sip_msg* msg, char* pmode, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_status(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); @@ -132,6 +133,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_restore_to", (cmd_function)w_restore_to, 0, 0, 0, REQUEST_ROUTE }, {"uac_auth", (cmd_function)w_uac_auth, 0, 0, 0, FAILURE_ROUTE }, + {"uac_auth_mode", (cmd_function)w_uac_auth_mode, 1, + fixup_igp_null, fixup_free_igp_null, FAILURE_ROUTE }, {"uac_req_send", (cmd_function)w_uac_req_send, 0, 0, 0, ANY_ROUTE}, {"uac_reg_lookup", (cmd_function)w_uac_reg_lookup, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE }, @@ -615,6 +618,22 @@ static int ki_uac_auth(struct sip_msg* msg) return (uac_auth(msg)==0)?1:-1; } +static int w_uac_auth_mode(struct sip_msg* msg, char* pmode, char* str2) +{ + int imode = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)pmode, &imode)<0) { + LM_ERR("failed to get the mode parameter\n"); + return -1; + } + return (uac_auth_mode(msg, imode)==0)?1:-1; +} + +static int ki_uac_auth_mode(sip_msg_t* msg, int mode) +{ + return (uac_auth_mode(msg, mode)==0)?1:-1; +} + static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst) { pv_spec_t *dpv; @@ -757,6 +776,11 @@ static sr_kemi_t sr_kemi_uac_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("uac"), str_init("uac_auth_mode"), + SR_KEMIP_INT, ki_uac_auth_mode, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("uac"), str_init("uac_req_send"), SR_KEMIP_INT, ki_uac_req_send, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:825800e6: uac: updated docs for uac_auth()
by Daniel-Constantin Mierla 29 Oct '19

29 Oct '19

Module: kamailio Branch: master Commit: 825800e6d3f297076bcce90f1f82c65a91cbb583 URL: https://github.com/kamailio/kamailio/commit/825800e6d3f297076bcce90f1f82c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-29T09:25:06+01:00 uac: updated docs for uac_auth() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/825800e6d3f297076bcce90f1f82c65… Patch: https://github.com/kamailio/kamailio/commit/825800e6d3f297076bcce90f1f82c65… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e0ea527776..f718924dad 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -802,14 +802,18 @@ uac_restore_to(); </section> <section id="uac.f.uac_auth"> <title> - <function moreinfo="none">uac_auth()</function> + <function moreinfo="none">uac_auth([mode])</function> </title> <para> - This function can be called only from failure route and will + This function can be called only from failure route and will build the authentication response header and insert it into the request without sending anything. </para> <para> + If mode is set to 1, then the password has to be provided in HA1 format. + The parameter can be a static integer or a variable holding an integer value. + </para> + <para> This function can be used from FAILURE_ROUTE. </para> <example> @@ -836,7 +840,9 @@ failure_route[TRUNKAUTH] { if(t_check_status("401|407")) { $avp(auser) = "test"; $avp(apass) = "test"; + # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; uac_auth(); + # uac_auth("1"); t_relay(); exit; }

1 0

git:master:08e67665: uac: updated docs for uac_req_request_to()
by Daniel-Constantin Mierla 29 Oct '19

29 Oct '19

Module: kamailio Branch: master Commit: 08e676654d901644724f52478a88c6d0258304cc URL: https://github.com/kamailio/kamailio/commit/08e676654d901644724f52478a88c6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-29T08:49:27+01:00 uac: updated docs for uac_req_request_to() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/08e676654d901644724f52478a88c6d… Patch: https://github.com/kamailio/kamailio/commit/08e676654d901644724f52478a88c6d… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 8ddf26ca0f..e0ea527776 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -951,12 +951,27 @@ $var(status) = uac_reg_status("$rU"); <function moreinfo="none">uac_reg_request_to(user, mode)</function> </title> <para> - This function can be used to send an authenticated request to a remote user in + This function can be used to send an authenticated request to a remote user in the uac registrations table. It sets the request-uri, dst-uri and auth_*_avp - pv's to the values that correspond to the supplied user. + variables to the values that correspond to the supplied user. </para> <para> - The mode indicates whether the user should match the local uuid (mode=0), or the username (mode=1). + The mode is a bitwise set of flags controlling how the matching of + the record is done and what field is used to set auth_password_avp: + <itemizedlist> + <listitem> + <para> + indicates whether the user should match the local uuid (bit value=0), + or the username (bit value=1, int value=1). + </para> + </listitem> + <listitem> + <para> + indicates whether the auth_password value is used to set auth_password_avp + (bit value=0), or the auth_ha1 value (bit value=1, int value=2). + </para> + </listitem> + </itemizedlist> </para> <para> The auth_*_avp module parameters must be set to valid pv's.

1 0

git:master:82a196ca: uac: extended use of mode param for uac_reg_request_to()
by Daniel-Constantin Mierla 29 Oct '19

29 Oct '19

Module: kamailio Branch: master Commit: 82a196ca567e9dbe89806626ee4d8dba7e9a7533 URL: https://github.com/kamailio/kamailio/commit/82a196ca567e9dbe89806626ee4d8db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-29T08:37:02+01:00 uac: extended use of mode param for uac_reg_request_to() - not it is interpreted as a bitwise set of flags - if first bit is set, then the match is done on username, otherwise on uuid (still backward compatible in this aspect) - if the second bit is set, fetch the auth_ha1 and set it in uac_auth() password avp; if not set, fetch the auth_password (like it was done so far) --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/82a196ca567e9dbe89806626ee4d8db… Patch: https://github.com/kamailio/kamailio/commit/82a196ca567e9dbe89806626ee4d8db… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 7e39c46229..7692600b0f 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -715,7 +715,7 @@ static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* pmode) return -1; } - if (imode > 1) { + if (imode > (UACREG_REQTO_MASK_USER|UACREG_REQTO_MASK_AUTH)) { LM_ERR("invalid mode\n"); return -1; } diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index fb45a4fd3d..907ed721fd 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1678,8 +1678,13 @@ int uac_reg_request_to(struct sip_msg *msg, str *src, unsigned int mode) pv_value_t val; struct action act; struct run_act_ctx ra_ctx; + unsigned int umode; + unsigned int amode; - switch(mode) + umode = mode & UACREG_REQTO_MASK_USER; + amode = mode & UACREG_REQTO_MASK_AUTH; + + switch(umode) { case 0: reg = reg_ht_get_byuuid(src); @@ -1745,13 +1750,17 @@ int uac_reg_request_to(struct sip_msg *msg, str *src, unsigned int mode) goto error; } - // Set auth_password - val.rs = reg->auth_password; + if(amode) { + // set auth_ha1 + val.rs = reg->auth_ha1; + } else { + // set auth_password + val.rs = reg->auth_password; + } if(pv_set_spec_value(msg, &auth_password_spec, 0, &val)!=0) { - LM_ERR("error while setting auth_password\n"); + LM_ERR("error while setting auth password (mode: %d)\n", amode); goto error; } - lock_release(reg->lock); return 1; diff --git a/src/modules/uac/uac_reg.h b/src/modules/uac/uac_reg.h index 9dd9ab8cfe..6f6b5d7590 100644 --- a/src/modules/uac/uac_reg.h +++ b/src/modules/uac/uac_reg.h @@ -25,6 +25,9 @@ #define UACREG_TABLE_VERSION 4 +#define UACREG_REQTO_MASK_USER 1 +#define UACREG_REQTO_MASK_AUTH 2 + extern int reg_timer_interval; extern int reg_retry_interval; extern int reg_htable_size;

1 0

git:master:f3277f27: tcpops: new varaibale $tcp(key)
by Daniel-Constantin Mierla 28 Oct '19

28 Oct '19

Module: kamailio Branch: master Commit: f3277f27cef07e6d33cafcdf149fc34d1b3b079a URL: https://github.com/kamailio/kamailio/commit/f3277f27cef07e6d33cafcdf149fc34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-28T12:55:59+01:00 tcpops: new varaibale $tcp(key) - return attributes related to tcp connection - the key can be: - c_si - connection source ip (useful with HAProxy connections) - c_sp - connection source port (useful with HAProxy connections) - conid - connection id - GH #2103 --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f3277f27cef07e6d33cafcdf149fc34… Patch: https://github.com/kamailio/kamailio/commit/f3277f27cef07e6d33cafcdf149fc34… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index e5ac55d660..b95a642f8d 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -65,6 +65,16 @@ static int fixup_numpv(void** param, int param_no); str tcpops_event_callback = STR_NULL; +static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_tcp_name(pv_spec_p sp, str *in); + +static pv_export_t mod_pvs[] = { + { {"tcp", (sizeof("tcp")-1)}, PVT_CONTEXT, pv_get_tcp, + 0, pv_parse_tcp_name, 0, 0, 0}, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, fixup_numpv, 0, ANY_ROUTE}, @@ -105,7 +115,7 @@ struct module_exports exports = { cmds, /* exported functions to config */ params, /* exported parameters to config */ 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* response function */ mod_init, /* module initialization function */ child_init, /* per child init function */ @@ -602,6 +612,75 @@ static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn) return ki_tcp_get_conid_helper(msg, &saddr, (pv_spec_t*)pvn); } +/** + * + */ +static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + tcp_connection_t *con; + int ival; + str sval; + + if (msg == NULL) { + return -1; + } + + if ((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 1: + sval.s = ip_addr2a(&con->cinfo.src_ip); + tcpconn_put(con); + sval.len = strlen(sval.s); + return pv_get_strval(msg, param, res, &sval); + case 2: + ival = con->cinfo.src_port; + tcpconn_put(con); + return pv_get_sintval(msg, param, res, ival); + default: + ival = con->id; + tcpconn_put(con); + return pv_get_sintval(msg, param, res, ival); + } +} + + +/** + * + */ +static int pv_parse_tcp_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 4: + if(strncmp(in->s, "c_si", 4)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "c_sp", 4)==0) { + sp->pvp.pvn.u.isname.name.n = 2; + } else { goto error; } + break; + case 5: + if(strncmp(in->s, "conid", 5)==0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else { goto error; } + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown pv key: %.*s\n", in->len, in->s); + return -1; +} + /** * */

1 0

git:master:2bb8598e: core: tcp - keep original connection info for haproxy tunnels
by Daniel-Constantin Mierla 28 Oct '19

28 Oct '19

Module: kamailio Branch: master Commit: 2bb8598edef41470f45bccb7a4b4715eed647a44 URL: https://github.com/kamailio/kamailio/commit/2bb8598edef41470f45bccb7a4b4715… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-28T10:23:40+01:00 core: tcp - keep original connection info for haproxy tunnels --- Modified: src/core/ip_addr.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/2bb8598edef41470f45bccb7a4b4715… Patch: https://github.com/kamailio/kamailio/commit/2bb8598edef41470f45bccb7a4b4715… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 0d26e7e756..9a7b67ac5d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -172,6 +172,15 @@ typedef struct dest_info { } dest_info_t; +typedef struct ksr_coninfo { + ip_addr_t src_ip; + ip_addr_t dst_ip; + unsigned short src_port; /* host byte order */ + unsigned short dst_port; /* host byte order */ + int proto; + socket_info_t *csocket; +} ksr_coninfo_t; + typedef struct sr_net_info { str data; receive_info_t* rcv; diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index a428c43f1f..d9a69b6929 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -200,6 +200,7 @@ typedef struct tcp_connection { * reply-ing */ int reader_pid; /* pid of the active reader process */ struct receive_info rcv; /* src & dst ip, ports, proto a.s.o*/ + ksr_coninfo_t cinfo; /* connection info (e.g., for haproxy ) */ struct tcp_req req; /* request data */ atomic_t refcnt; enum sip_protos type; /* PROTO_TCP or a protocol over it, e.g. TLS */ diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 99d33ee719..403c0c6adf 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1021,6 +1021,14 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { bytes = recv(c->s, &hdr, sizeof(hdr), MSG_PEEK); } while (bytes == -1 && (errno == EINTR || errno == EAGAIN)); + /* copy original tunnel address details */ + memcpy(&c->cinfo.src_ip, &c->rcv.src_ip, sizeof(ip_addr_t)); + memcpy(&c->cinfo.dst_ip, &c->rcv.dst_ip, sizeof(ip_addr_t)); + c->cinfo.src_port = c->rcv.src_port; + c->cinfo.dst_port = c->rcv.dst_port; + c->cinfo.proto = (int)c->rcv.proto; + c->cinfo.csocket = c->rcv.bind_address; + src_ip = &c->rcv.src_ip; dst_ip = &c->rcv.dst_ip;

1 0

git:master:1296bb22: core: pad some fields in contained structs for 4 byte alignment
by Daniel-Constantin Mierla 28 Oct '19

28 Oct '19

Module: kamailio Branch: master Commit: 1296bb2270985a1bf3af04f35e4cdae1fe4b184a URL: https://github.com/kamailio/kamailio/commit/1296bb2270985a1bf3af04f35e4cdae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-28T10:00:28+01:00 core: pad some fields in contained structs for 4 byte alignment - safety for sigbus on strict cpu architectures when accesing fields by address --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/1296bb2270985a1bf3af04f35e4cdae… Patch: https://github.com/kamailio/kamailio/commit/1296bb2270985a1bf3af04f35e4cdae… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index afbaece075..0d26e7e756 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -91,6 +91,7 @@ typedef struct addr_info { typedef struct advertise_info { str name; /* name - eg.: foo.bar or 10.0.0.1 */ unsigned short port_no; /* port number */ + short port_pad; /* padding field */ str port_no_str; /* port number converted to string -- optimization*/ str address_str; /*ip address converted to string -- optimization*/ struct ip_addr address; /* ip address */ @@ -109,6 +110,8 @@ typedef struct socket_info { struct socket_info* prev; unsigned short port_no; /* port number */ char proto; /* tcp or udp*/ + char proto_pad0; /* padding field */ + short proto_pad1; /* padding field */ str sock_str; /* Socket proto, ip, and port as string */ struct addr_info* addr_info_lst; /* extra addresses (e.g. SCTP mh) */ int workers; /* number of worker processes for this socket */ @@ -143,7 +146,11 @@ typedef struct receive_info { * the msg was received */ char proto; #ifdef USE_COMP + char proto_pad0; /* padding field */ short comp; /* compression */ +#else + char proto_pad0; /* padding field */ + short proto_pad1; /* padding field */ #endif /* no need for dst_su yet */ } receive_info_t; @@ -153,10 +160,14 @@ typedef struct dest_info { struct socket_info* send_sock; union sockaddr_union to; int id; /* tcp stores the connection id here */ - char proto; snd_flags_t send_flags; + char proto; #ifdef USE_COMP + char proto_pad0; /* padding field */ short comp; +#else + char proto_pad0; /* padding field */ + short proto_pad1; /* padding field */ #endif } dest_info_t;

1 0

[kamailio/kamailio] Malformed INVITE message crashes Kamailio (#2044)
by santoshsridhar 28 Oct '19

28 Oct '19

### Description I have sent malformed data to kamailio server and its getting crashed.  ### Troubleshooting #### Reproduction This can be easily reproducable by remove .(eol) from each line of invite packet  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 32(78) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 13 0(46) ALERT: <core> [main.c:745]: handle_sigs(): child process 47 exited by a signal 11 0(46) ALERT: <core> [main.c:748]: handle_sigs(): core was generated 0(46) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD 2(48) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 6(52) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 8(54) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 12(58) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 13(59) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 15(61) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 17(63) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 18(64) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 20(66) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 22(68) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 24(70) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 26(72) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 28(74) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 32(78) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 25(71) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 21(67) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 23(69) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 14(60) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 3(49) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 29(75) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 19(65) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 30(76) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 11(57) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 7(53) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 31(77) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 16(62) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 9(55) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 27(73) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 10(56) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 4(50) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 5(51) INFO: <core> [main.c:826]: sig_usr(): signal 15 received 0(46) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 2019/08/26 06:14:51.186871 [ERR] (cli) child process died with exit code 1 ``` #### SIP Traffic  ``` INVITE sip:9631793333@10.130.72.178:5060 SIP/2.0 Max-Forwards: 66 From: "9631791999" <sip:9631791999@test.santhos.com>;tag=8BpeDNKX9g7ZN To: <sip:12254431343@52.77.251.154> Call-ID: 0e61d723-400b-1238-5ea2-029e611e72cc CSeq: 8715558 INVITE Supported: timer, path, replaces Allow-Events: talk, hold, conference, refer Content-Type: application/sdp Content-Disposition: session Content-Length: 248 Remote-Party-ID: "9631791999" <sip:9631791999@test.santhos.com>;party=calling;screen=yes;privacy=off Contact: <sip:btpsh-5d5dab4f-36-1@3.82.91.199;alias=10.130.74.48~5060~1> User-Agent: NewServer Accept: application/sdp Allow: INVITE,ACK,CANCEL,BYE,UPDATE v=0 o=- 1566538700029766 7092256907260767331 IN IP4 3.220.58.181 s=X-Lite release 5.6.1 stamp 99140 c=IN IP4 3.220.58.181 t=0 0 m=audio 10030 RTP/AVP 0 101 a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 a=sendrecv ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@test-server:/# kamailio -v version: kamailio 5.1.4 (x86_64/linux) cc647d flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: cc647d compiled on 10:09:16 Jul 29 2019 with gcc 5.4.0 ``` * **Operating System**:  ``` root@test-server:/# cat /etc/debian_version stretch/sid root@test-server:/# uname -a Linux test-server 4.14.77-69.57.amzn1.x86_64 #1 SMP Tue Nov 6 21:32:55 UTC 2018 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/2044

3 7

sl module lacks API function to unregister a callback
by Juha Heinanen 25 Oct '19

25 Oct '19

I tried to implement dynamic registering/unregistering of siptrace module sl callbacks, but it turned out that sl module lacks API function to unregister a callback. -- Juha

1 0

git:master:fb41fe59: pkg/kamailio/alpine: Fixed alpine packaging after 475a54cb04c0594c3fdaffb0a07d370702e80dd4
by Sergey Safarov 25 Oct '19

25 Oct '19

Module: kamailio Branch: master Commit: fb41fe5949a2ba6f3469f54cdf691aae2fc1c195 URL: https://github.com/kamailio/kamailio/commit/fb41fe5949a2ba6f3469f54cdf691aa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-25T15:19:40+03:00 pkg/kamailio/alpine: Fixed alpine packaging after 475a54cb04c0594c3fdaffb0a07d370702e80dd4 changed hash sum after init script update --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/fb41fe5949a2ba6f3469f54cdf691aa… Patch: https://github.com/kamailio/kamailio/commit/fb41fe5949a2ba6f3469f54cdf691aa… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f2ce051ff3..974b99f623 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -581,4 +581,4 @@ sipdump() { } sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz -321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd" +a777338f1a60b95aa2bf3e38314a0cfa77a3397ccad342955409eb95f66ad9c38a3a64d2974d353d50f2aced3936b209063a0f0a7127851b1c278d8384f4cc45 kamailio.initd"

1 0

[kamailio/kamailio] http_async_client: memory mismanagement (#1407)
by Dragos Oancea 25 Oct '19

25 Oct '19

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ 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 #1208 #### Description p->headers.t is dynamically allocated header_list_add() in and should be freed with free_async_query(). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1407 -- Commit Summary -- * http_async_client: memory mismanagement -- File Changes -- M src/modules/http_async_client/async_http.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1407.patch https://github.com/kamailio/kamailio/pull/1407.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/1407

5 11

[kamailio/kamailio] Switch from deprecated /var/run to /run (#2110)
by Guillem Jover 25 Oct '19

25 Oct '19

#### Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The FHS 3.0 ([/run](https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s15.html) and [/var/run](https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch05s13.html)) has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 “squeeze”), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollute the logs. I've included a change to a man page, because even though it looks like a similar case to the READMEs, I didn't find any part of the build system generating 8 section man pages. And I've not split this into components, as it is a global change, and seems preferable to have an atomic and bisectable commit. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2110 -- Commit Summary -- * all: Switch from deprecated /var/run to /run -- File Changes -- M doc/scripts/cdefs2doc/dump_cfg_defs.pl (2) M doc/scripts/cdefs2doc/dump_counters.pl (2) M doc/scripts/cdefs2doc/dump_rpcs.pl (2) M doc/scripts/cdefs2doc/dump_selects.pl (2) M doc/tutorials/cfg_list/Makefile (2) M doc/tutorials/counter_list/Makefile (2) M doc/tutorials/rpc_list/Makefile (2) M doc/tutorials/select_list/Makefile (2) M etc/kamailio.cfg (6) M misc/examples/ims/icscf/kamailio.cfg (6) M misc/examples/ims/pcscf/kamailio.cfg (6) M misc/examples/ims/scscf/kamailio.cfg (6) M misc/examples/kemi/kamailio-basic-kemi.cfg (6) M misc/examples/mixed/kamailio-minimal-anycast.cfg (6) M misc/examples/mixed/kamailio-minimal-proxy.cfg (6) M misc/examples/pkg/kamailio-basic.cfg (6) M misc/examples/pkg/kamailio-oob.cfg (6) M misc/examples/scripts/sr (2) M misc/examples/webrtc/kamailio-default-websocket.cfg (6) M pkg/kamailio/alpine/APKBUILD (4) M pkg/kamailio/alpine/kamailio.initd (4) M pkg/kamailio/deb/bionic/kamailio.postinst (2) M pkg/kamailio/deb/bionic/rules (2) M pkg/kamailio/deb/buster/kamailio.postinst (2) M pkg/kamailio/deb/buster/rules (2) M pkg/kamailio/deb/debian/kamailio.postinst (2) M pkg/kamailio/deb/debian/rules (2) M pkg/kamailio/deb/jessie/kamailio.postinst (2) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/precise/kamailio.postinst (2) M pkg/kamailio/deb/precise/rules (2) M pkg/kamailio/deb/sid/kamailio.postinst (2) M pkg/kamailio/deb/sid/rules (2) M pkg/kamailio/deb/stretch/kamailio.postinst (2) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/kamailio.postinst (2) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/wheezy/kamailio.postinst (2) M pkg/kamailio/deb/wheezy/rules (2) M pkg/kamailio/deb/xenial/kamailio.postinst (2) M pkg/kamailio/deb/xenial/rules (2) M pkg/kamailio/obs/kamailio.init (8) M pkg/kamailio/obs/kamailio.service (2) M pkg/kamailio/openbsd/patches/patch-scripts_kamctlrc (4) M pkg/kamailio/oracle/el6/kamailio.init (4) M pkg/kamailio/oracle/el7/kamailio.service (4) M pkg/kamailio/oracle/el7/kamailio.sysconfig (2) M pkg/kamailio/oracle/kamailio.logrotate (2) M src/Makefile (34) M src/modules/call_control/call_control.c (2) M src/modules/call_control/doc/call_control.8 (4) M src/modules/call_control/doc/call_control_admin.xml (4) M src/modules/cfgt/doc/cfgt_admin.xml (2) M src/modules/ctl/ctl.cfg (2) M src/modules/ctl/doc/ctl.xml (4) M src/modules/ctl/doc/ctl_params.xml (4) M src/modules/ctl/doc/ctl_rpc.xml (4) M src/modules/db_mysql/doc/db_mysql_admin.xml (2) M src/modules/dispatcher/doc/dispatcher_admin.xml (2) M src/modules/ims_diameter_server/examples/kamailio.cfg (2) M src/modules/ims_ocs/examples/full/kamailio.cfg (4) M src/modules/ims_ocs/examples/simple/kamailio.cfg (4) M src/modules/mediaproxy/doc/mediaproxy_admin.xml (4) M src/modules/mediaproxy/mediaproxy.c (2) M src/modules/nat_traversal/doc/nat_traversal_admin.xml (2) M src/modules/sipdump/doc/sipdump_admin.xml (2) M test/unit/7.cfg (2) M utils/kamctl/kamctl.base (2) M utils/kamctl/kamctl.rpcfifo (2) M utils/kamctl/kamctlrc (6) M utils/pdbt/debian/pdb-server.init.d (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2110.patch https://github.com/kamailio/kamailio/pull/2110.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/2110

2 3

git:master:2aa614d4: lib/srdb1: detect if ipv6 address is between square brakets
by Daniel-Constantin Mierla 25 Oct '19

25 Oct '19

Module: kamailio Branch: master Commit: 2aa614d49f4917faec62534a51fcf8ddfc5fb870 URL: https://github.com/kamailio/kamailio/commit/2aa614d49f4917faec62534a51fcf8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-25T12:55:06+02:00 lib/srdb1: detect if ipv6 address is between square brakets - if not, let it be host part with surrounding brakets, because it can by a mysql conf group name --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/2aa614d49f4917faec62534a51fcf8d… Patch: https://github.com/kamailio/kamailio/commit/2aa614d49f4917faec62534a51fcf8d… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 74788ff9bd..094baaa0dd 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -29,6 +29,7 @@ #include "db_id.h" #include "../../core/dprint.h" #include "../../core/mem/mem.h" +#include "../../core/resolve.h" #include "../../core/pt.h" #include "../../core/ut.h" #include <stdlib.h> @@ -111,6 +112,7 @@ static int parse_db_url(struct db_id* id, const str* url) unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; + str sval = STR_NULL; foundanother = 0; prev_token = 0; @@ -253,7 +255,14 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST6: switch(url->s[i]) { case ']': - ipv6_flag = 1; + sval.s = (char*)begin; + sval.len = url->s + i - begin; + if(str2ip6(&sval)==NULL) { + ipv6_flag = 0; + begin -= 1; + } else { + ipv6_flag = 1; + } st = ST_HOST; break; }

1 0

git:master:4bb8bc9a: modules: readme files regenerated - call_control ... [skip ci]
by Kamailio Dev 25 Oct '19

25 Oct '19

Module: kamailio Branch: master Commit: 4bb8bc9a0fa0eb7144b7c8c56d28f2689fce9e6e URL: https://github.com/kamailio/kamailio/commit/4bb8bc9a0fa0eb7144b7c8c56d28f26… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-25T12:16:35+02:00 modules: readme files regenerated - call_control ... [skip ci] --- Modified: src/modules/call_control/README Modified: src/modules/cfgt/README Modified: src/modules/ctl/README Modified: src/modules/db_mysql/README Modified: src/modules/dispatcher/README Modified: src/modules/mediaproxy/README Modified: src/modules/nat_traversal/README Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/4bb8bc9a0fa0eb7144b7c8c56d28f26… Patch: https://github.com/kamailio/kamailio/commit/4bb8bc9a0fa0eb7144b7c8c56d28f26…

1 0

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

25 Oct '19

Daniel-Constantin Mierla writes: > There is also a rpc command to turn tracinf on/off, but it doesn't > affect the trace_mode=1. Again, for the next major release we should > revise and make those options work for all variants: mirroring or save > to db, with control via modparams and rpc... I looked at the code and looks like callbacks are not unregistered/registered again when tracing is turned off/on by rpc command. Doesn't that affect performance negatively? -- Juha

2 1

Info: initialization of libssl 1.1.+ with PTHREAD_PROCESS_SHARED attribute for pthread mutex and rwlock
by Daniel-Constantin Mierla 25 Oct '19

25 Oct '19

Hello, after couple of months waiting for feedback about the workaround with the preloaded shared library to set the PTHREAD_PROCESS_SHARED attribute for pthread mutex/rwlock in order to avoid deadlocks and as it seems to be the solution, I just pushed a few commits to move that code in the core of kamailio. It this way the initialization with the PTHREAD_PROCESS_SHARED attribute is done by default when libssl v1.1 is detected at compile time, without the need of using the approach with a preloaded library. The shared library is still kept in the tls module: * https://github.com/kamailio/kamailio/tree/master/src/modules/tls/utils/open… Probably is going to be removed in the near future. I am asking the community members that use Kamailio on systems with libssl v1.1+ to test the master branch and give feedback. The master branch is anyhow in testing phase for preparing the next major release v5.3.0, so it will help for that as well. If no issue is going to be reported soon, the commits will be backported to stable branches, to re-enable smooth use of Kamailio with libssl v1.1+. When libssl v1.1+ is detected, the core links with pthread, but that was already present in the Makefiles.defs for different compile options. The pthread more or less a default library on linuxes/unixes, so this should not introduce any major dependency to the Kamailio core. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

6 17

git: new commits in branch master
by Daniel-Constantin Mierla 25 Oct '19

25 Oct '19

- URL: https://github.com/kamailio/kamailio/commit/f66b2dd426e3436f9b4f6beed103049… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 kamctl: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/0d97878f03a6e7bd67aa8831a0c4c2d… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 doc/: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/e29dce787fde168166e2b7f8cf6320c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-25T12:00:46+02:00 etc/kamailio.cfg: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/9c8021e8610d36895e732b557a0bd6f… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 misc/examples: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/cbf9f0dd213311613dced20e9dca8d4… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 pkg/deb: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/475a54cb04c0594c3fdaffb0a07d370… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 pkg: rpm, alpine - switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/296eb91192774c9e13312209c046c3a… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 utils/pdbt: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/e2d6074eca8b2592dec16e0eebc42a7… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 test: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/3a099381bcdfc5e0f27653b810309eb… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 src/Makefile: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/2c23d3872d3c0da3eda932b1e967018… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 call_control: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/f387c139b955ae52d9db2ebc074f36b… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 cfgt: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/88d9bbaffc7efc16c6e518c114c4958… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 ctl: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/6654649fe6a81bc32d50dd26054554c… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:46+02:00 db_mysql: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/0fd22771627cc51bf201d27b823d63d… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:47+02:00 dispatcher: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/fef78617dd70a5d22832653411a48a0… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:47+02:00 mediaproxy: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/b21f1e6c98a8c0b4468e3bf0dfda186… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:47+02:00 sipdump: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/2649f6415980940619759c6430b88c1… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:47+02:00 nat_traversal: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/47d96692f80cce90a8174615bb79dce… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:47+02:00 ims_ocs: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs. - URL: https://github.com/kamailio/kamailio/commit/2b78f00b6aa0916276ab2732d5c462d… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-10-25T12:00:47+02:00 ims_diameter_server: switch from deprecated /var/run to /run The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current distributions have done so for a long time (for example in Debian since 6.0 âsqueezeâ), even though they provide a compatibility symlink from /var/run to /run. But software like systemd have started emitting warnings when using /var/run, for example for its PIDFile directive, which pollutes the logs.

1 0

[kamailio/kamailio] Cannot package on CentOS 8 (#2078)
by sergey-safarov 24 Oct '19

24 Oct '19

Several packages not exist in CentOS 8 repos. Will wait until docker centos:8 image available and i will try fix **Not existed deps** ``` nothing provides hiredis-devel nothing provides GeoIP-devel nothing provides mysql-devel nothing provides python nothing provides python-devel nothing provides radiusclient-ng-devel nothing provides squirrel-devel nothing provides python2-rpm-macros ``` -- 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/2078

2 5

git:5.3:eb79a136: pkg/kamailio/obs: packaged lost module [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: 5.3 Commit: eb79a1361ef47671b7ee64789cd89e505d3f7031 URL: https://github.com/kamailio/kamailio/commit/eb79a1361ef47671b7ee64789cd89e5… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T22:54:56+03:00 pkg/kamailio/obs: packaged lost module [skip ci] (cherry picked from commit ac97c59a762b5ebf024775785193a9b25345c2fe) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/eb79a1361ef47671b7ee64789cd89e5… Patch: https://github.com/kamailio/kamailio/commit/eb79a1361ef47671b7ee64789cd89e5… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 71a462b450..ba03940e30 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -321,7 +321,7 @@ Conflicts: kamailio-carrierroute < %ver, kamailio-cpl < %ver Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver -Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver +Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver @@ -686,6 +686,14 @@ BuildRequires: openldap-devel %description ldap LDAP search interface for Kamailio. +%package lost +Summary: HELD (RFC6155) and LOST (RFC5222) location-based routing +Group: %{PKGGROUP} +Requires: libxml2, kamailio = %ver +BuildRequires: libxml2-devel + +%description lost +HELD (RFC6155) and LOST (RFC5222) location-based routing support for Kamailio. %if %{with lua} %package lua @@ -1467,7 +1475,6 @@ fi %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex -%doc %{_docdir}/kamailio/modules/README.lost %doc %{_docdir}/kamailio/modules/README.malloc_test %doc %{_docdir}/kamailio/modules/README.mangler %doc %{_docdir}/kamailio/modules/README.matrix @@ -1621,7 +1628,6 @@ fi %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so -%{_libdir}/kamailio/modules/lost.so %{_libdir}/kamailio/modules/malloc_test.so %{_libdir}/kamailio/modules/mangler.so %{_libdir}/kamailio/modules/matrix.so @@ -1916,6 +1922,11 @@ fi %{_libdir}/kamailio/modules/h350.so %{_libdir}/kamailio/modules/ldap.so +%files lost +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.lost +%{_libdir}/kamailio/modules/lost.so + %if %{with lua} %files lua

1 0

git:5.3:9bf5f8a7: pkg/kamailio/obs: added packaging for RHEL 8 and for CentOS 8 dists GH #2078 [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: 5.3 Commit: 9bf5f8a70edb2a0c5177389cae1ddc1778a53ede URL: https://github.com/kamailio/kamailio/commit/9bf5f8a70edb2a0c5177389cae1ddc1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T23:11:40+03:00 pkg/kamailio/obs: added packaging for RHEL 8 and for CentOS 8 dists GH #2078 [skip ci] (cherry picked from commit a3ce062fdec2d3a5d5e46f49c9d0ea9d449a1bec) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9bf5f8a70edb2a0c5177389cae1ddc1… Patch: https://github.com/kamailio/kamailio/commit/9bf5f8a70edb2a0c5177389cae1ddc1…

1 0

git:5.3:6a2e45a6: pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: 5.3 Commit: 6a2e45a6133b7fe8da3715971e73efd5afe6ca7e URL: https://github.com/kamailio/kamailio/commit/6a2e45a6133b7fe8da3715971e73efd… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T22:54:44+03:00 pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci] (cherry picked from commit 1361ce6e980856ce7a3ffb77349cc45254ced6ab) --- Modified: pkg/kamailio/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6a2e45a6133b7fe8da3715971e73efd… Patch: https://github.com/kamailio/kamailio/commit/6a2e45a6133b7fe8da3715971e73efd… --- diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile index a221ff085c..d6ce6672f4 100644 --- a/pkg/kamailio/Makefile +++ b/pkg/kamailio/Makefile @@ -7,7 +7,7 @@ $(error Please start "make cfg" first) endif RPMBUILD_TOP := /tmp/kamailio_rpmbuild -RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" } +RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" -e "s/-rc[0-9]//"} RPM_REL = ${shell echo "$(RELEASE)." | grep -o -P "dev[0-9]\." } DIST_ARCHIVE = ${shell echo "kamailio-$(RPM_VER)_src.tar.gz"} APK_VERSION = ${shell echo "$(RELEASE)" | grep -o "^[0-9.]*"} @@ -45,7 +45,7 @@ src.rpm: tar -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' \ -i obs/kamailio.spec rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec - mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../.. + mv ${RPMBUILD_TOP}/SRPMS/kamailio-${RPM_VER}*.src.rpm ../.. rm -Rf ${RPMBUILD_TOP} # build rpm packages

1 0

git:5.2:b40d13d4: pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: 5.2 Commit: b40d13d4e68112ff9598fd78fdd0bb7bcad410d8 URL: https://github.com/kamailio/kamailio/commit/b40d13d4e68112ff9598fd78fdd0bb7… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T23:08:03+03:00 pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci] (cherry picked from commit 1361ce6e980856ce7a3ffb77349cc45254ced6ab) --- Modified: pkg/kamailio/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b40d13d4e68112ff9598fd78fdd0bb7… Patch: https://github.com/kamailio/kamailio/commit/b40d13d4e68112ff9598fd78fdd0bb7… --- diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile index a221ff085c..d6ce6672f4 100644 --- a/pkg/kamailio/Makefile +++ b/pkg/kamailio/Makefile @@ -7,7 +7,7 @@ $(error Please start "make cfg" first) endif RPMBUILD_TOP := /tmp/kamailio_rpmbuild -RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" } +RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" -e "s/-rc[0-9]//"} RPM_REL = ${shell echo "$(RELEASE)." | grep -o -P "dev[0-9]\." } DIST_ARCHIVE = ${shell echo "kamailio-$(RPM_VER)_src.tar.gz"} APK_VERSION = ${shell echo "$(RELEASE)" | grep -o "^[0-9.]*"} @@ -45,7 +45,7 @@ src.rpm: tar -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' \ -i obs/kamailio.spec rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec - mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../.. + mv ${RPMBUILD_TOP}/SRPMS/kamailio-${RPM_VER}*.src.rpm ../.. rm -Rf ${RPMBUILD_TOP} # build rpm packages

1 0

git:5.2:dc0d4f85: pkg/kamailio/obs: added packaging for RHEL 8 and for CentOS 8 dists GH #2078 [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: 5.2 Commit: dc0d4f8514ca8aec79e57c49e91360a5ed90f3fd URL: https://github.com/kamailio/kamailio/commit/dc0d4f8514ca8aec79e57c49e91360a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T23:08:23+03:00 pkg/kamailio/obs: added packaging for RHEL 8 and for CentOS 8 dists GH #2078 [skip ci] (cherry picked from commit a3ce062fdec2d3a5d5e46f49c9d0ea9d449a1bec) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/dc0d4f8514ca8aec79e57c49e91360a… Patch: https://github.com/kamailio/kamailio/commit/dc0d4f8514ca8aec79e57c49e91360a…

1 0

git:5.2:116fb010: pkg/kamailio: added rpm spec version and release configuration [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: 5.2 Commit: 116fb0108b0f422cff955a37ce6b16de94f22c64 URL: https://github.com/kamailio/kamailio/commit/116fb0108b0f422cff955a37ce6b16d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T23:08:03+03:00 pkg/kamailio: added rpm spec version and release configuration [skip ci] (cherry picked from commit ab0a69eb01953be97ccdfdb230e5af06bac9649c) --- Modified: pkg/kamailio/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/116fb0108b0f422cff955a37ce6b16d… Patch: https://github.com/kamailio/kamailio/commit/116fb0108b0f422cff955a37ce6b16d… --- diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile index 63c024c158..a221ff085c 100644 --- a/pkg/kamailio/Makefile +++ b/pkg/kamailio/Makefile @@ -6,8 +6,10 @@ else ifneq ($(MAKECMDGOALS),cfg) $(error Please start "make cfg" first) endif -RPMBUILD_TOP := /tmp/rpmbuild -DIST_ARCHIVE = ${shell echo "kamailio-$(RELEASE)_src.tar.gz" | sed -e "s/-dev[0-9]//" } +RPMBUILD_TOP := /tmp/kamailio_rpmbuild +RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" } +RPM_REL = ${shell echo "$(RELEASE)." | grep -o -P "dev[0-9]\." } +DIST_ARCHIVE = ${shell echo "kamailio-$(RPM_VER)_src.tar.gz"} APK_VERSION = ${shell echo "$(RELEASE)" | grep -o "^[0-9.]*"} RPMBUILD_OPT= --define "_topdir $(RPMBUILD_TOP)" GIT_TAG = ${shell git rev-parse HEAD 2> /dev/null} @@ -38,7 +40,10 @@ apk: src.rpm: tar mkdir -p ${RPMBUILD_TOP}/SOURCES mv ../../kamailio-$(RELEASE)_src.tar.gz ${RPMBUILD_TOP}/SOURCES/${DIST_ARCHIVE} - sed -i -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' obs/kamailio.spec + sed -e 's/%define ver .*/%define ver ${RPM_VER}/' \ + -e 's/%define rel .*/%define rel ${RPM_REL}0%{dist}/' \ + -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' \ + -i obs/kamailio.spec rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../.. rm -Rf ${RPMBUILD_TOP}

1 0

git:master:5d1cecd1: pkg/kamailio/obs: small spec formating [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: master Commit: 5d1cecd13ee1644a42000d5900e24d7d8c10b851 URL: https://github.com/kamailio/kamailio/commit/5d1cecd13ee1644a42000d5900e24d7… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T22:47:29+03:00 pkg/kamailio/obs: small spec formating [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5d1cecd13ee1644a42000d5900e24d7… Patch: https://github.com/kamailio/kamailio/commit/5d1cecd13ee1644a42000d5900e24d7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a645e2fbff..2dc6d8b5aa 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -345,7 +345,7 @@ BuildRequires: systemd-mini, shadow %description -Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able +Kamailio is an Open Source SIP Server released under GPL, able to handle thousands of call setups per second. Among features: asynchronous TCP, UDP and SCTP, secure communication via TLS for VoIP (voice, video); IPv4 and IPv6; SIMPLE instant messaging and presence with embedded XCAP server and MSRP @@ -2207,11 +2207,11 @@ fi %files tls %defattr(-,root,root) +%dir %{_libdir}/kamailio/openssl_mutex_shared %doc %{_docdir}/kamailio/modules/README.auth_identity %doc %{_docdir}/kamailio/modules/README.tls %{_libdir}/kamailio/modules/auth_identity.so %{_libdir}/kamailio/modules/tls.so -%dir %{_libdir}/kamailio/openssl_mutex_shared %{_libdir}/kamailio/openssl_mutex_shared/openssl_mutex_shared.so

1 0

git:master:a3ce062f: pkg/kamailio/obs: added packaging for RHEL 8 and for CentOS 8 dists GH #2078 [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: master Commit: a3ce062fdec2d3a5d5e46f49c9d0ea9d449a1bec URL: https://github.com/kamailio/kamailio/commit/a3ce062fdec2d3a5d5e46f49c9d0ea9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T22:47:41+03:00 pkg/kamailio/obs: added packaging for RHEL 8 and for CentOS 8 dists GH #2078 [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a3ce062fdec2d3a5d5e46f49c9d0ea9… Patch: https://github.com/kamailio/kamailio/commit/a3ce062fdec2d3a5d5e46f49c9d0ea9…

1 0

git:master:ac97c59a: pkg/kamailio/obs: packaged lost module [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: master Commit: ac97c59a762b5ebf024775785193a9b25345c2fe URL: https://github.com/kamailio/kamailio/commit/ac97c59a762b5ebf024775785193a9b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T22:47:23+03:00 pkg/kamailio/obs: packaged lost module [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ac97c59a762b5ebf024775785193a9b… Patch: https://github.com/kamailio/kamailio/commit/ac97c59a762b5ebf024775785193a9b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9dc8a2a249..a645e2fbff 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -321,7 +321,7 @@ Conflicts: kamailio-carrierroute < %ver, kamailio-cpl < %ver Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver -Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver +Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver @@ -686,6 +686,14 @@ BuildRequires: openldap-devel %description ldap LDAP search interface for Kamailio. +%package lost +Summary: HELD (RFC6155) and LOST (RFC5222) location-based routing +Group: %{PKGGROUP} +Requires: libxml2, kamailio = %ver +BuildRequires: libxml2-devel + +%description lost +HELD (RFC6155) and LOST (RFC5222) location-based routing support for Kamailio. %if %{with lua} %package lua @@ -1467,7 +1475,6 @@ fi %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex -%doc %{_docdir}/kamailio/modules/README.lost %doc %{_docdir}/kamailio/modules/README.malloc_test %doc %{_docdir}/kamailio/modules/README.mangler %doc %{_docdir}/kamailio/modules/README.matrix @@ -1621,7 +1628,6 @@ fi %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so -%{_libdir}/kamailio/modules/lost.so %{_libdir}/kamailio/modules/malloc_test.so %{_libdir}/kamailio/modules/mangler.so %{_libdir}/kamailio/modules/matrix.so @@ -1916,6 +1922,11 @@ fi %{_libdir}/kamailio/modules/h350.so %{_libdir}/kamailio/modules/ldap.so +%files lost +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.lost +%{_libdir}/kamailio/modules/lost.so + %if %{with lua} %files lua

1 0

git:master:1361ce6e: pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci]
by Sergey Safarov 24 Oct '19

24 Oct '19

Module: kamailio Branch: master Commit: 1361ce6e980856ce7a3ffb77349cc45254ced6ab URL: https://github.com/kamailio/kamailio/commit/1361ce6e980856ce7a3ffb77349cc45… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-24T22:46:51+03:00 pkg/kamailio: Updated RPM spec release extracting for "-rc" [skip ci] --- Modified: pkg/kamailio/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/1361ce6e980856ce7a3ffb77349cc45… Patch: https://github.com/kamailio/kamailio/commit/1361ce6e980856ce7a3ffb77349cc45… --- diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile index a221ff085c..d6ce6672f4 100644 --- a/pkg/kamailio/Makefile +++ b/pkg/kamailio/Makefile @@ -7,7 +7,7 @@ $(error Please start "make cfg" first) endif RPMBUILD_TOP := /tmp/kamailio_rpmbuild -RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" } +RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" -e "s/-rc[0-9]//"} RPM_REL = ${shell echo "$(RELEASE)." | grep -o -P "dev[0-9]\." } DIST_ARCHIVE = ${shell echo "kamailio-$(RPM_VER)_src.tar.gz"} APK_VERSION = ${shell echo "$(RELEASE)" | grep -o "^[0-9.]*"} @@ -45,7 +45,7 @@ src.rpm: tar -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' \ -i obs/kamailio.spec rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec - mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../.. + mv ${RPMBUILD_TOP}/SRPMS/kamailio-${RPM_VER}*.src.rpm ../.. rm -Rf ${RPMBUILD_TOP} # build rpm packages

1 0

git:master:a463c53e: statsc: debug message when fetching stats values
by Daniel-Constantin Mierla 24 Oct '19

24 Oct '19

Module: kamailio Branch: master Commit: a463c53e767114567ff25f0fe50115da0e3d0045 URL: https://github.com/kamailio/kamailio/commit/a463c53e767114567ff25f0fe50115d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-24T12:38:51+02:00 statsc: debug message when fetching stats values --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a463c53e767114567ff25f0fe50115d… Patch: https://github.com/kamailio/kamailio/commit/a463c53e767114567ff25f0fe50115d… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 0cbe246965..fcedfcdeef 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -257,6 +257,7 @@ void statsc_timer(unsigned int ticks, void *param) statsc_nmap_t *sm = NULL; time_t tn; int n; + int i; if(_statsc_info==NULL || _statsc_info->slist==NULL) { LM_ERR("statsc not initialized\n"); @@ -270,8 +271,12 @@ void statsc_timer(unsigned int ticks, void *param) LM_DBG("statsc timer - time: %lu - ticks: %u - index: %d - steps: %llu\n", (unsigned long)tn, ticks, n, (unsigned long long)_statsc_info->steps); + i = 0; for(sm=_statsc_info->slist->next; sm!=NULL; sm=sm->next) { + LM_DBG("fetching value for: [%.*s] - step [%d]\n", sm->rname.len, + sm->rname.s, i); statsc_svalue(&sm->rname, sm->vals + n); + i++; } _statsc_info->steps++; }

1 0

git:master:fe693cc1: pkg/kamailio/deb: allow group write to RuntimeDirectory
by Victor Seva 24 Oct '19

24 Oct '19

Module: kamailio Branch: master Commit: fe693cc1178a9301cdb0be3941d9c70d720920e5 URL: https://github.com/kamailio/kamailio/commit/fe693cc1178a9301cdb0be3941d9c70… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-24T12:08:20+02:00 pkg/kamailio/deb: allow group write to RuntimeDirectory --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/fe693cc1178a9301cdb0be3941d9c70… Patch: https://github.com/kamailio/kamailio/commit/fe693cc1178a9301cdb0be3941d9c70… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target

1 0

git:master:782c3259: kamdbctl: new option DBINITASK to control the steps for db init
by Daniel-Constantin Mierla 23 Oct '19

23 Oct '19

Module: kamailio Branch: master Commit: 782c3259a7afd0a0ea462a8ee17b95eacbfe3c81 URL: https://github.com/kamailio/kamailio/commit/782c3259a7afd0a0ea462a8ee17b95e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-23T08:47:19+02:00 kamdbctl: new option DBINITASK to control the steps for db init - if set DBINITASK=yes, then each step requires confirmation (e.g., database creation, users creation, standard tables creation) - can be useful when needing to run only some of the steps --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/782c3259a7afd0a0ea462a8ee17b95e… Patch: https://github.com/kamailio/kamailio/commit/782c3259a7afd0a0ea462a8ee17b95e… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 5306a6116d..a49c79f2ec 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -52,6 +52,9 @@ ## - known to work for: mysql # DBROOTPW="dbrootpw" +## option to ask confirmation for all database creation steps +# DBINITASK=yes + ## database character set (used by MySQL when creating database) #CHARSET="latin1" diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index e8f8d2e861..bdb8b98ab4 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -238,24 +238,45 @@ kamailio_create () # pars: <database name> exit 1 fi - kamailio_db_create $1 + if [ "$DBINITASK" = "yes" ]; then + get_answer "ask" "Create the database '$1'? (y/n): " + else + ANSWER="y" + fi + if [ "$ANSWER" = "y" ]; then + kamailio_db_create $1 + fi - kamailio_db_grant $1 + if [ "$DBINITASK" = "yes" ]; then + get_answer "ask" "Create database users with access privileges? (y/n): " + else + ANSWER="y" + fi + if [ "$ANSWER" = "y" ]; then + kamailio_db_grant $1 + fi - standard_create $1 + if [ "$DBINITASK" = "yes" ]; then + get_answer "ask" "Create the standard database tables? (y/n): " + else + ANSWER="y" + fi + if [ "$ANSWER" = "y" ]; then + standard_create $1 + fi - get_answer $INSTALL_PRESENCE_TABLES "Install presence related tables? (y/n): " + get_answer $INSTALL_PRESENCE_TABLES "Create the presence related tables? (y/n): " if [ "$ANSWER" = "y" ]; then presence_create $1 fi - get_answer $INSTALL_EXTRA_TABLES "Install tables for $EXTRA_MODULES? (y/n): " + get_answer $INSTALL_EXTRA_TABLES "Create the tables for $EXTRA_MODULES? (y/n): " if [ "$ANSWER" = "y" ]; then HAS_EXTRA="yes" extra_create $1 fi - get_answer $INSTALL_DBUID_TABLES "Install tables for $DBUID_MODULES? (y/n): " + get_answer $INSTALL_DBUID_TABLES "Create the tables for $DBUID_MODULES? (y/n): " if [ "$ANSWER" = "y" ]; then HAS_EXTRA="yes" dbuid_create $1

1 0

[kamailio/kamailio] uac: uacreg send incorrect hash response (#2108)
by Vadim 22 Oct '19

22 Oct '19

### Description  ``` Installed new kamailio 5.3, setting the uac module to register trunk. The trunk has been added to the Mysql with an open password (or use ha1). When try to register and send authorization data, the provider's server always gives a 403 error. After the analysis, I found that the kamailio sends an incorrect hash in response header. ``` ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` Provider send "407 Proxy Authentication Required": Proxy-Authenticate: Digest nonce="MTU3MTY5Mzg2MTrbrxRPWP0AIkC7fowq+nZn", opaque="MTU3MTY5Mzg2MTrbrxRPWP0AIkC7fowq+nZn", algorithm=md5, realm="BREDBAND", qop="auth" Kamailio send new "Register": Proxy-Authorization: Digest username="79205615793", realm="BREDBAND", nonce="MTU3MTY5Mzg2MTrbrxRPWP0AIkC7fowq+nZn", uri="sip:sbc.megafon.ru", opaque="MTU3MTY5Mzg2MTrbrx WP0AIkC7fowq+nZn", qop=auth, nc=00000001, cnonce="3335441185", response="395830e40a92fd7d4564d82dfab1dac0", algorithm=MD5 If you calculate the hash manually: Correct response: "2cee0f5a35c0e4831455496ce040eaf4" ``` ### Possible Solutions  ``` Problem with code in auth_alg.c. He tries to verify that there is an encrypted password, even if it is not set in the database. Next, an uncorrect calculation of the hash for the answer 401 occurs. If you remove the block ``` if(UAC_FLCRED_HA1 & UAC_FLCRED_HA1) { memcpy(sess_key, crd->passwd.s, HASHHEXLEN); sess_key[HASHHEXLEN] = '\0'; if ( auth->flags& AUTHENTICATE_MD5SESS ) { cvt_bin(sess_key, HA1); } else { return; } ``` Password registration works. Maybe there are 2 problems. He constantly tries to calculate the hash for ha1 password (if used open password), and if it is, then the function cvt_bin incorrectly considers it. ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.3.0 (x86_64/linux) 4cc67a ``` * **Operating System**:  ``` Linux refs4 3.16.0-4-amd64 #1 SMP Debian 3.16.7-ckt9-3~deb8u1 (2015-04-24) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2108

3 7

git:5.3:ad190539: uac: proper condition to chech if ha1 flag is set for uac reg authentication
by Daniel-Constantin Mierla 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: ad1905397bd5bb7cca8c32f0f782fd340f07c68b URL: https://github.com/kamailio/kamailio/commit/ad1905397bd5bb7cca8c32f0f782fd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-22T15:20:14+02:00 uac: proper condition to chech if ha1 flag is set for uac reg authentication - GH #2108 (cherry picked from commit 2a3186ee0f8a2989f8de154019fd0ad73b390d73) --- Modified: src/modules/uac/auth_alg.c --- Diff: https://github.com/kamailio/kamailio/commit/ad1905397bd5bb7cca8c32f0f782fd3… Patch: https://github.com/kamailio/kamailio/commit/ad1905397bd5bb7cca8c32f0f782fd3… --- diff --git a/src/modules/uac/auth_alg.c b/src/modules/uac/auth_alg.c index 07af9fc995..6b0b0d3bb3 100644 --- a/src/modules/uac/auth_alg.c +++ b/src/modules/uac/auth_alg.c @@ -96,7 +96,7 @@ void uac_calc_HA1( struct uac_credential *crd, MD5_CTX Md5Ctx; HASH HA1; - if(UAC_FLCRED_HA1 & UAC_FLCRED_HA1) { + if(crd->aflags & UAC_FLCRED_HA1) { memcpy(sess_key, crd->passwd.s, HASHHEXLEN); sess_key[HASHHEXLEN] = '\0'; if ( auth->flags& AUTHENTICATE_MD5SESS ) {

1 0

git:master:2a3186ee: uac: proper condition to chech if ha1 flag is set for uac reg authentication
by Daniel-Constantin Mierla 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 2a3186ee0f8a2989f8de154019fd0ad73b390d73 URL: https://github.com/kamailio/kamailio/commit/2a3186ee0f8a2989f8de154019fd0ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-22T15:16:30+02:00 uac: proper condition to chech if ha1 flag is set for uac reg authentication - GH #2108 --- Modified: src/modules/uac/auth_alg.c --- Diff: https://github.com/kamailio/kamailio/commit/2a3186ee0f8a2989f8de154019fd0ad… Patch: https://github.com/kamailio/kamailio/commit/2a3186ee0f8a2989f8de154019fd0ad… --- diff --git a/src/modules/uac/auth_alg.c b/src/modules/uac/auth_alg.c index 18e5601662..a140b07adf 100644 --- a/src/modules/uac/auth_alg.c +++ b/src/modules/uac/auth_alg.c @@ -96,7 +96,7 @@ void uac_calc_HA1( struct uac_credential *crd, MD5_CTX Md5Ctx; HASH HA1; - if(UAC_FLCRED_HA1 & UAC_FLCRED_HA1) { + if(crd->aflags & UAC_FLCRED_HA1) { memcpy(sess_key, crd->passwd.s, HASHHEXLEN); sess_key[HASHHEXLEN] = '\0'; if ( auth->flags& AUTHENTICATE_MD5SESS ) {

1 0

git:5.3:d6a55699: domain: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: d6a55699c56c5b298442d3bb10838304156d6850 URL: https://github.com/kamailio/kamailio/commit/d6a55699c56c5b298442d3bb1083830… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T11:14:46+02:00 domain: fix spelling error (cherry picked from commit 0944689db2eabbb531fc6daed9db3a9bcc1780b6) --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/d6a55699c56c5b298442d3bb1083830… Patch: https://github.com/kamailio/kamailio/commit/d6a55699c56c5b298442d3bb1083830… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index b093dbc3e4..4cb968e458 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -137,7 +137,7 @@ int hash_table_install(struct domain_list **hash_table, str *did, str *domain) np->did.len = did->len; np->did.s = (char *)shm_malloc(did->len); if(np->did.s == NULL) { - LM_ERR("no shared memeory for did\n"); + LM_ERR("no shared memory for did\n"); shm_free(np); return -1; } @@ -210,4 +210,4 @@ void hash_table_free(struct domain_list **hash_table) hash_table[DOM_HASH_SIZE] = NULL; return; -} \ No newline at end of file +}

1 0

git:master:c0879add: kamdbctl: split create user and grant access statements for mysql
by Daniel-Constantin Mierla 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: c0879add55bef77703f2259f224b4a1f954cd8bf URL: https://github.com/kamailio/kamailio/commit/c0879add55bef77703f2259f224b4a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-22T10:49:18+02:00 kamdbctl: split create user and grant access statements for mysql - MySQL 8 doesn't support all in one statement --- Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/c0879add55bef77703f2259f224b4a1… Patch: https://github.com/kamailio/kamailio/commit/c0879add55bef77703f2259f224b4a1… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 6103705bc0..e8f8d2e861 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -160,8 +160,10 @@ kamailio_db_grant () # pars: <database name> minfo "granting privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW';" + sql_query "" "CREATE USER '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; + GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST'; + CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -169,8 +171,10 @@ kamailio_db_grant () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW';" + sql_query "" "CREATE USER '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost'; + CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -178,8 +182,10 @@ kamailio_db_grant () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW';" + sql_query "" "CREATE USER '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST'; + CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1

1 0

git:5.3:09b3a82e: core: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: 09b3a82e496dd6f45a8f55fb06ca8ff6d4582aa1 URL: https://github.com/kamailio/kamailio/commit/09b3a82e496dd6f45a8f55fb06ca8ff… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:37+02:00 core: fix spelling error (cherry picked from commit e35fe2d7b4ae79be6af9a70d8520620941960a72) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/09b3a82e496dd6f45a8f55fb06ca8ff… Patch: https://github.com/kamailio/kamailio/commit/09b3a82e496dd6f45a8f55fb06ca8ff… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 49065938af..584a491ba2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -250,7 +250,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d", VERSIONVAL/1000000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0); @@ -262,7 +262,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d_%d", VERSIONVAL/1000000, (VERSIONVAL%1000000)/1000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0); @@ -274,7 +274,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d_%d_%d", VERSIONVAL/1000000, (VERSIONVAL%1000000)/1000, VERSIONVAL%1000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0);

1 0

git:5.3:81e39705: pua: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: 81e39705affe8efe3e544ef34ae4e7649f745512 URL: https://github.com/kamailio/kamailio/commit/81e39705affe8efe3e544ef34ae4e76… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:33+02:00 pua: fix spelling error (cherry picked from commit d06e85d6fa9e75e8008bc422a7596671283054f7) --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/81e39705affe8efe3e544ef34ae4e76… Patch: https://github.com/kamailio/kamailio/commit/81e39705affe8efe3e544ef34ae4e76… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index 254e77e7fd..fd13836391 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -669,7 +669,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) { LM_DBG("BLA_SUBSCRIBE FLAG inserted\n"); } - LM_DBG("record for subscribe from %.*s to %.*s inserted in datatbase\n", + LM_DBG("record for subscribe from %.*s to %.*s inserted in database\n", presentity->watcher_uri->len, presentity->watcher_uri->s, presentity->pres_uri->len, presentity->pres_uri->s);

1 0

git:5.3:48e4b9b4: utils/kamctl: update shebang to python3
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: 48e4b9b41c70ebe3f7a478dcdcb628e7a0306123 URL: https://github.com/kamailio/kamailio/commit/48e4b9b41c70ebe3f7a478dcdcb628e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:30+02:00 utils/kamctl: update shebang to python3 (cherry picked from commit 9aa42d7c8161d4a0d085b019a85cde6981b3b4f9) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/48e4b9b41c70ebe3f7a478dcdcb628e… Patch: https://github.com/kamailio/kamailio/commit/48e4b9b41c70ebe3f7a478dcdcb628e… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index b3531c88c6..3a35554013 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Copyright 2008 Google Inc. All Rights Reserved.

1 0

git:5.3:4c36858e: textops: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: 4c36858eb9302465bba492f7901986f6a94198f0 URL: https://github.com/kamailio/kamailio/commit/4c36858eb9302465bba492f7901986f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:26+02:00 textops: fix spelling error (cherry picked from commit 20e6c522c6722012cb8c38ae7e0c1773b2d536ed) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4c36858eb9302465bba492f7901986f… Patch: https://github.com/kamailio/kamailio/commit/4c36858eb9302465bba492f7901986f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index ab7d894bdd..0b7fd9e16e 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -832,7 +832,7 @@ static int ki_regex_substring(sip_msg_t* msg, str *input, str *regex, rc = regcomp(&preg, regex->s, REG_EXTENDED); if (0 != rc) { - LM_ERR("regular experession coudnt be compiled, Error code: (%d)\n", rc); + LM_ERR("regular expression coudnt be compiled, Error code: (%d)\n", rc); pkg_free(pmatch); regfree(&preg); return -1;

1 0

git:5.3:4537518a: smsops: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: 4537518a1df4c579f0603dfdbe947f3cee6d0fe3 URL: https://github.com/kamailio/kamailio/commit/4537518a1df4c579f0603dfdbe947f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:18+02:00 smsops: fix spelling error (cherry picked from commit 4a657005a5c4eff88e48dc2b8847d5800a90bead) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/4537518a1df4c579f0603dfdbe947f3… Patch: https://github.com/kamailio/kamailio/commit/4537518a1df4c579f0603dfdbe947f3… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 8dfe70163a..83d83a7a8e 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -543,7 +543,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_len > body.len - p) { - LM_ERR("TP-User-Data-Lenght is bigger than the remaining message buffer!\n"); + LM_ERR("TP-User-Data-Length is bigger than the remaining message buffer!\n"); return -1; } @@ -564,7 +564,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_read + ie->data.len + 2 /* two octets are read so far */ > udh_len) { - LM_ERR("IE Lenght for IE id %d is bigger than the remaining User-Data element!\n", + LM_ERR("IE Length for IE id %d is bigger than the remaining User-Data element!\n", ie->identifier); pkg_free(ie); return -1;

1 0

git:5.3:c1e5c03a: smsops: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: c1e5c03aadb86abe0b8063f04f1cbcc8e908b0a8 URL: https://github.com/kamailio/kamailio/commit/c1e5c03aadb86abe0b8063f04f1cbcc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:22+02:00 smsops: fix spelling error (cherry picked from commit 4ba14d2f6db6144870650398da6c07b07d23d64d) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c1e5c03aadb86abe0b8063f04f1cbcc… Patch: https://github.com/kamailio/kamailio/commit/c1e5c03aadb86abe0b8063f04f1cbcc… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 83d83a7a8e..5271444039 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -573,7 +573,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { if(ie->identifier == TP_UDH_IE_CONCAT_SM_8BIT_REF) { if(contains_8bit_refnum) { pkg_free(ie); - LM_ERR("IE Concatenated Short Message 8bit Reference occured more than once in UDH\n"); + LM_ERR("IE Concatenated Short Message 8bit Reference occurred more than once in UDH\n"); return -1; }

1 0

git:5.3:a616c673: secfilter: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: a616c673ca4164a026ca8fc64db977bb3ffcef95 URL: https://github.com/kamailio/kamailio/commit/a616c673ca4164a026ca8fc64db977b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:15+02:00 secfilter: fix spelling error (cherry picked from commit 3c26ebe4670eaffce4754bbd0cd76cbecf5bf590) --- Modified: src/modules/secfilter/secfilter_db.c --- Diff: https://github.com/kamailio/kamailio/commit/a616c673ca4164a026ca8fc64db977b… Patch: https://github.com/kamailio/kamailio/commit/a616c673ca4164a026ca8fc64db977b… --- diff --git a/src/modules/secfilter/secfilter_db.c b/src/modules/secfilter/secfilter_db.c index 535b67922e..861f1a14bd 100644 --- a/src/modules/secfilter/secfilter_db.c +++ b/src/modules/secfilter/secfilter_db.c @@ -108,7 +108,7 @@ int secf_append_rule(int action, int type, str *value) char *v = NULL; if(action < 0 || action > 2) { - LM_ERR("Unkown action value %d", action); + LM_ERR("Unknown action value %d", action); return -1; } @@ -147,7 +147,7 @@ int secf_append_rule(int action, int type, str *value) last_node = &last->user; break; default: - LM_ERR("Unkown type value %d", type); + LM_ERR("Unknown type value %d", type); return -1; }

1 0

git:5.3:edc998d5: seas: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: 5.3 Commit: edc998d58fbd9f5555d951c6469d7278525af1e1 URL: https://github.com/kamailio/kamailio/commit/edc998d58fbd9f5555d951c6469d727… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:27:10+02:00 seas: fix spelling error (cherry picked from commit 8a197dcc8d2d063d3615e8800ed8d2f7812cce0f) --- Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/seas/event_dispatcher.h --- Diff: https://github.com/kamailio/kamailio/commit/edc998d58fbd9f5555d951c6469d727… Patch: https://github.com/kamailio/kamailio/commit/edc998d58fbd9f5555d951c6469d727…

1 0

git:master:e35fe2d7: core: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: e35fe2d7b4ae79be6af9a70d8520620941960a72 URL: https://github.com/kamailio/kamailio/commit/e35fe2d7b4ae79be6af9a70d8520620… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:08:34+02:00 core: fix spelling error --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/e35fe2d7b4ae79be6af9a70d8520620… Patch: https://github.com/kamailio/kamailio/commit/e35fe2d7b4ae79be6af9a70d8520620… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 49065938af..584a491ba2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -250,7 +250,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d", VERSIONVAL/1000000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0); @@ -262,7 +262,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d_%d", VERSIONVAL/1000000, (VERSIONVAL%1000000)/1000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0); @@ -274,7 +274,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d_%d_%d", VERSIONVAL/1000000, (VERSIONVAL%1000000)/1000, VERSIONVAL%1000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0);

1 0

git:master:9aa42d7c: utils/kamctl: update shebang to python3
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 9aa42d7c8161d4a0d085b019a85cde6981b3b4f9 URL: https://github.com/kamailio/kamailio/commit/9aa42d7c8161d4a0d085b019a85cde6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:02:36+02:00 utils/kamctl: update shebang to python3 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/9aa42d7c8161d4a0d085b019a85cde6… Patch: https://github.com/kamailio/kamailio/commit/9aa42d7c8161d4a0d085b019a85cde6… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index b3531c88c6..3a35554013 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Copyright 2008 Google Inc. All Rights Reserved.

1 0

git:master:d06e85d6: pua: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: d06e85d6fa9e75e8008bc422a7596671283054f7 URL: https://github.com/kamailio/kamailio/commit/d06e85d6fa9e75e8008bc422a759667… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:04:58+02:00 pua: fix spelling error --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/d06e85d6fa9e75e8008bc422a759667… Patch: https://github.com/kamailio/kamailio/commit/d06e85d6fa9e75e8008bc422a759667… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index 254e77e7fd..fd13836391 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -669,7 +669,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) { LM_DBG("BLA_SUBSCRIBE FLAG inserted\n"); } - LM_DBG("record for subscribe from %.*s to %.*s inserted in datatbase\n", + LM_DBG("record for subscribe from %.*s to %.*s inserted in database\n", presentity->watcher_uri->len, presentity->watcher_uri->s, presentity->pres_uri->len, presentity->pres_uri->s);

1 0

git:master:20e6c522: textops: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 20e6c522c6722012cb8c38ae7e0c1773b2d536ed URL: https://github.com/kamailio/kamailio/commit/20e6c522c6722012cb8c38ae7e0c177… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T10:00:16+02:00 textops: fix spelling error --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/20e6c522c6722012cb8c38ae7e0c177… Patch: https://github.com/kamailio/kamailio/commit/20e6c522c6722012cb8c38ae7e0c177… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index ab7d894bdd..0b7fd9e16e 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -832,7 +832,7 @@ static int ki_regex_substring(sip_msg_t* msg, str *input, str *regex, rc = regcomp(&preg, regex->s, REG_EXTENDED); if (0 != rc) { - LM_ERR("regular experession coudnt be compiled, Error code: (%d)\n", rc); + LM_ERR("regular expression coudnt be compiled, Error code: (%d)\n", rc); pkg_free(pmatch); regfree(&preg); return -1;

1 0

git:master:4ba14d2f: smsops: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 4ba14d2f6db6144870650398da6c07b07d23d64d URL: https://github.com/kamailio/kamailio/commit/4ba14d2f6db6144870650398da6c07b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T09:59:02+02:00 smsops: fix spelling error --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/4ba14d2f6db6144870650398da6c07b… Patch: https://github.com/kamailio/kamailio/commit/4ba14d2f6db6144870650398da6c07b… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 83d83a7a8e..5271444039 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -573,7 +573,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { if(ie->identifier == TP_UDH_IE_CONCAT_SM_8BIT_REF) { if(contains_8bit_refnum) { pkg_free(ie); - LM_ERR("IE Concatenated Short Message 8bit Reference occured more than once in UDH\n"); + LM_ERR("IE Concatenated Short Message 8bit Reference occurred more than once in UDH\n"); return -1; }

1 0

git:master:4a657005: smsops: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 4a657005a5c4eff88e48dc2b8847d5800a90bead URL: https://github.com/kamailio/kamailio/commit/4a657005a5c4eff88e48dc2b8847d58… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T09:57:07+02:00 smsops: fix spelling error --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/4a657005a5c4eff88e48dc2b8847d58… Patch: https://github.com/kamailio/kamailio/commit/4a657005a5c4eff88e48dc2b8847d58… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 8dfe70163a..83d83a7a8e 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -543,7 +543,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_len > body.len - p) { - LM_ERR("TP-User-Data-Lenght is bigger than the remaining message buffer!\n"); + LM_ERR("TP-User-Data-Length is bigger than the remaining message buffer!\n"); return -1; } @@ -564,7 +564,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_read + ie->data.len + 2 /* two octets are read so far */ > udh_len) { - LM_ERR("IE Lenght for IE id %d is bigger than the remaining User-Data element!\n", + LM_ERR("IE Length for IE id %d is bigger than the remaining User-Data element!\n", ie->identifier); pkg_free(ie); return -1;

1 0

git:master:3c26ebe4: secfilter: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 3c26ebe4670eaffce4754bbd0cd76cbecf5bf590 URL: https://github.com/kamailio/kamailio/commit/3c26ebe4670eaffce4754bbd0cd76cb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T09:52:42+02:00 secfilter: fix spelling error --- Modified: src/modules/secfilter/secfilter_db.c --- Diff: https://github.com/kamailio/kamailio/commit/3c26ebe4670eaffce4754bbd0cd76cb… Patch: https://github.com/kamailio/kamailio/commit/3c26ebe4670eaffce4754bbd0cd76cb… --- diff --git a/src/modules/secfilter/secfilter_db.c b/src/modules/secfilter/secfilter_db.c index 535b67922e..861f1a14bd 100644 --- a/src/modules/secfilter/secfilter_db.c +++ b/src/modules/secfilter/secfilter_db.c @@ -108,7 +108,7 @@ int secf_append_rule(int action, int type, str *value) char *v = NULL; if(action < 0 || action > 2) { - LM_ERR("Unkown action value %d", action); + LM_ERR("Unknown action value %d", action); return -1; } @@ -147,7 +147,7 @@ int secf_append_rule(int action, int type, str *value) last_node = &last->user; break; default: - LM_ERR("Unkown type value %d", type); + LM_ERR("Unknown type value %d", type); return -1; }

1 0

git:master:8a197dcc: seas: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 8a197dcc8d2d063d3615e8800ed8d2f7812cce0f URL: https://github.com/kamailio/kamailio/commit/8a197dcc8d2d063d3615e8800ed8d2f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T09:35:10+02:00 seas: fix spelling error --- Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/seas/event_dispatcher.h --- Diff: https://github.com/kamailio/kamailio/commit/8a197dcc8d2d063d3615e8800ed8d2f… Patch: https://github.com/kamailio/kamailio/commit/8a197dcc8d2d063d3615e8800ed8d2f…

1 0

git:master:0944689d: domain: fix spelling error
by Victor Seva 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 0944689db2eabbb531fc6daed9db3a9bcc1780b6 URL: https://github.com/kamailio/kamailio/commit/0944689db2eabbb531fc6daed9db3a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-22T09:32:48+02:00 domain: fix spelling error --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/0944689db2eabbb531fc6daed9db3a9… Patch: https://github.com/kamailio/kamailio/commit/0944689db2eabbb531fc6daed9db3a9… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index b093dbc3e4..4cb968e458 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -137,7 +137,7 @@ int hash_table_install(struct domain_list **hash_table, str *did, str *domain) np->did.len = did->len; np->did.s = (char *)shm_malloc(did->len); if(np->did.s == NULL) { - LM_ERR("no shared memeory for did\n"); + LM_ERR("no shared memory for did\n"); shm_free(np); return -1; } @@ -210,4 +210,4 @@ void hash_table_free(struct domain_list **hash_table) hash_table[DOM_HASH_SIZE] = NULL; return; -} \ No newline at end of file +}

1 0

git:master:3c24dd27: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 3c24dd27056c48528bc33bd90d680b9483785a18 URL: https://github.com/kamailio/kamailio/commit/3c24dd27056c48528bc33bd90d680b9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-22T08:31:18+02:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README --- Diff: https://github.com/kamailio/kamailio/commit/3c24dd27056c48528bc33bd90d680b9… Patch: https://github.com/kamailio/kamailio/commit/3c24dd27056c48528bc33bd90d680b9… --- diff --git a/src/modules/imc/README b/src/modules/imc/README index 1e5f79ef55..e07a66276f 100644 --- a/src/modules/imc/README +++ b/src/modules/imc/README @@ -36,6 +36,8 @@ Anca-Maria Vamanu 3.5. imc_cmd_start_char (str) 3.6. outbound_proxy (str) 3.7. extra_hdrs (str) + 3.8. create_on_join (integer) + 3.9. check_on_create (integer) 4. Functions @@ -62,8 +64,10 @@ Anca-Maria Vamanu 1.5. Set imc_cmd_start_char parameter 1.6. Set outbound_proxy parameter 1.7. Set extra_hdrs parameter - 1.8. Usage of imc_manager() function - 1.9. List of commands + 1.8. Set create_on_join parameter + 1.9. Set check_on_create parameter + 1.10. Usage of imc_manager() function + 1.11. List of commands Chapter 1. Admin Guide @@ -84,6 +88,8 @@ Chapter 1. Admin Guide 3.5. imc_cmd_start_char (str) 3.6. outbound_proxy (str) 3.7. extra_hdrs (str) + 3.8. create_on_join (integer) + 3.9. check_on_create (integer) 4. Functions @@ -145,6 +151,8 @@ Chapter 1. Admin Guide 3.5. imc_cmd_start_char (str) 3.6. outbound_proxy (str) 3.7. extra_hdrs (str) + 3.8. create_on_join (integer) + 3.9. check_on_create (integer) 3.1. db_url (str) @@ -229,6 +237,31 @@ modparam("imc", "outbound_proxy", "sip:kamailio.org;transport=tcp") modparam("imc", "extra_hdrs", "P-Flags: 3\r\n") ... +3.8. create_on_join (integer) + + If set to 1 and user requests to join a non-existing room, the room + will be automatically created. If set to 0, joinin a non-existing room + returns an error. + + The default value is 1. + + Example 1.8. Set create_on_join parameter +... +modparam("imc", "create_on_join", 0) +... + +3.9. check_on_create (integer) + + If set to 1, the chat server will report an error if the user attempts + to create a room that already exists. + + The default value is 0. + + Example 1.9. Set check_on_create parameter +... +modparam("imc", "check_on_create", 1) +... + 4. Functions 4.1. imc_manager() @@ -242,7 +275,7 @@ modparam("imc", "extra_hdrs", "P-Flags: 3\r\n") This function can be used from REQUEST_ROUTE. See command description for error codes returned by this function. - Example 1.8. Usage of imc_manager() function + Example 1.10. Usage of imc_manager() function ... # the rooms will be named chat-xyz to avoid overlapping # with usernames @@ -305,7 +338,7 @@ kamcmd imc_list_members _room_ Next picture presents the list of commands and their parameters. - Example 1.9. List of commands + Example 1.11. List of commands ... 1.create @@ -377,10 +410,21 @@ kamcmd imc_list_members _room_ -only the owner of a room has the right to destroy it -error case: return codes: -110 -- -119 -9.list +9.members -list members in a room -error case: return codes: -100 -- -109 +10.add + -adds a user to a room + -takes 2 parameters: + 1)the complete address of the user + 2)the address of the room -if not present it will be considered + to be the address in the To header of the message + -only certain users have the right to add other users: the owner + and the administrators + -eg: #add sip:john@kamailio.org sip:chat-000@kamailio.org + or #add john(a)kamailio.org sent to sip:chat-000@kamailio.org + -error case: return codes: -50 -- -59 ... 8. Installation

1 0

git:master:6f9bb642: imc: docs - added section ids
by Daniel-Constantin Mierla 22 Oct '19

22 Oct '19

Module: kamailio Branch: master Commit: 6f9bb6427ce201863d60e3255debe31a6a7db776 URL: https://github.com/kamailio/kamailio/commit/6f9bb6427ce201863d60e3255debe31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-22T08:28:09+02:00 imc: docs - added section ids --- Modified: src/modules/imc/doc/imc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6f9bb6427ce201863d60e3255debe31… Patch: https://github.com/kamailio/kamailio/commit/6f9bb6427ce201863d60e3255debe31… --- diff --git a/src/modules/imc/doc/imc_admin.xml b/src/modules/imc/doc/imc_admin.xml index 3c654da6f3..85a31a844a 100644 --- a/src/modules/imc/doc/imc_admin.xml +++ b/src/modules/imc/doc/imc_admin.xml @@ -72,7 +72,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="imc.p.db_url"> <title><varname>db_url</varname> (str)</title> <para> The database url. @@ -91,7 +91,7 @@ modparam("imc", "db_url", "&exampledb;") </programlisting> </example> </section> - <section> + <section id="imc.p.rooms_table"> <title><varname>rooms_table</varname> (str)</title> <para> The name of the table storing IMC rooms. @@ -110,7 +110,7 @@ modparam("imc", "rooms_table", "rooms") </programlisting> </example> </section> - <section> + <section id="imc.p.members_table"> <title><varname>members_table</varname> (str)</title> <para> The name of the table storing IMC members. @@ -129,7 +129,7 @@ modparam("imc", "members_table", "members") </programlisting> </example> </section> - <section> + <section id="imc.p.hash_size"> <title><varname>hash_size</varname> (integer)</title> <para> The power of 2 to get the size of the hash table used for storing @@ -149,7 +149,7 @@ modparam("imc", "hash_size", 8) </programlisting> </example> </section> - <section> + <section id="imc.p.imc_cmd_start_char"> <title><varname>imc_cmd_start_char</varname> (str)</title> <para> The character which indicates that the body of the message is @@ -169,7 +169,7 @@ modparam("imc", "imc_cmd_start_char", "#") </programlisting> </example> </section> - <section> + <section id="imc.p.outbound_proxy"> <title><varname>outbound_proxy</varname> (str)</title> <para> The SIP address used as next hop when sending the message. Very @@ -193,7 +193,7 @@ modparam("imc", "outbound_proxy", "sip:kamailio.org;transport=tcp") </example> </section> - <section> + <section id="imc.p.extra_hdrs"> <title><varname>extra_hdrs</varname> (str)</title> <para> Extra headers (each ending with \r\n) to be added in @@ -213,7 +213,7 @@ modparam("imc", "extra_hdrs", "P-Flags: 3\r\n") </programlisting> </example> </section> - <section> + <section id="imc.p.create_on_join"> <title><varname>create_on_join</varname> (integer)</title> <para> If set to 1 and user requests to join a non-existing @@ -234,7 +234,7 @@ modparam("imc", "create_on_join", 0) </programlisting> </example> </section> - <section> + <section id="imc.p.check_on_create"> <title><varname>check_on_create</varname> (integer)</title> <para> If set to 1, the chat server will report an error if @@ -259,7 +259,7 @@ modparam("imc", "check_on_create", 1) <section> <title>Functions</title> <section> - <title> + <title id="imc.p.imc_manager"> <function moreinfo="none">imc_manager()</function> </title> <para>

1 0

[kamailio/kamailio] LCR stopper flag can't be used with multiple identical rules (#2105)
by pwakano 22 Oct '19

22 Oct '19

### Description Multiple rules with the same prefix and with the stopper flag are added. All the rules have the same priority in the target table. When routing calls to this prefix (load_gw + next_gw), the LCR module does not load balance the calls, it always sends to the same GW. #### Reproduction Scenario is the following, the LCR rules have one default GW which is reachable via an empty rule. However, a certain prefix must not be sent there, so a rule with the stopper flag is added pointing to another GW. This works fine and the default GW is never attempted. However, for load balance purposes, it is necessary to send calls to this prefix to 2 different GWs. So another rule with the same prefix is added with the stopper flag set too. The target table was updated accordingly and has the same priority. When we have all this setup, by calling "next_gw()" we always get the same GW (which is random depending on the DB situation I think). The other(s) GW is never attempted. This does not allow to load balance 2 GWs for rules with the stopper flag. Given the stopper flag should prevent selecting shorter prefixes, it should not restrict the routing for rules with the same prefix (same length). Having this, the load balance of stopper rules would be possible. ### Possible Solutions Apparently, there is no workaround, expect by not using the stopper flag, however then there is a risk of sending calls to GWs with shorter prefix length which is not desired. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**: ``` uname -a Linux uat1-sbc-0002 3.10.0-1062.1.2.el7.x86_64 #1 SMP Mon Sep 30 14:19:46 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/2105

2 3

removing 200-canceling response from kamailio
by vinod mn 18 Oct '19

18 Oct '19

Hi how to remove the "200-canceling" response from kamailio it is very urgent. -- Thanks and regards Vinod.M.N

2 1

how to get the correct dispacther value
by vinod mn 18 Oct '19

18 Oct '19

Hi I am using kamailio 4.4.2 for load-balancing modparam("dispatcher", "dst_avp", "$avp(dsdst)") $avp(dsdst) getting proper dispathcer value. But this value is null in request_route under iif (is_method("CANCEL")){ } How to get the correct dispatcher value for a particular call -- Thanks and regards Vinod.M.N

1 0

[kamailio/kamailio] Unit update (#1889)
by sergey-safarov 18 Oct '19

18 Oct '19

#### Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #1827 #### Description 1) tmpfiles creation is implemented via systemd 2) owner of kamailio process implemented via systemd drop-in 3) kamailio started as simple process, that allow systemd check kamailio process without PID file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1889 -- Commit Summary -- * Init scripts always create kamailio user and group. * Added kamailio.tmpfiles. Directory /run/kamailio is created by command * Starting kamailio as forground process allow systemd not check kamailio PID. -- File Changes -- M pkg/kamailio/deb/buster/kamailio.default (11) M pkg/kamailio/deb/buster/kamailio.service (10) A pkg/kamailio/deb/buster/kamailio.tmpfiles (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1889.patch https://github.com/kamailio/kamailio/pull/1889.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/1889

6 20

git:master:0436af5a: pkg/kamailio/deb: update [skip ci]
by Victor Seva 18 Oct '19

18 Oct '19

Module: kamailio Branch: master Commit: 0436af5abd8b73e17f65020c74943f0f3b72ba0d URL: https://github.com/kamailio/kamailio/commit/0436af5abd8b73e17f65020c74943f0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-18T10:39:05+02:00 pkg/kamailio/deb: update [skip ci] * define User and Group Thanks @sergey-safarov --- Modified: pkg/kamailio/deb/bionic/kamailio.default Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.default Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.default Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.default Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.default Modified: pkg/kamailio/deb/sid/kamailio.default Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.default Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.default Modified: pkg/kamailio/deb/wheezy/kamailio.default Modified: pkg/kamailio/deb/xenial/kamailio.default Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/0436af5abd8b73e17f65020c74943f0… Patch: https://github.com/kamailio/kamailio/commit/0436af5abd8b73e17f65020c74943f0…

1 0

git:master:ac21d494: pkg/kamailio/deb: update /var/run -> /run [skip ci]
by Victor Seva 18 Oct '19

18 Oct '19

Module: kamailio Branch: master Commit: ac21d494253eddd085197e2862c3206efff8233a URL: https://github.com/kamailio/kamailio/commit/ac21d494253eddd085197e2862c3206… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-18T09:54:50+02:00 pkg/kamailio/deb: update /var/run -> /run [skip ci] * introduced on Debian since 7 Wheezy, on Ubuntu since 11.10 Oneiric --- Modified: pkg/kamailio/deb/bionic/kamailio.init Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/ac21d494253eddd085197e2862c3206… Patch: https://github.com/kamailio/kamailio/commit/ac21d494253eddd085197e2862c3206…

1 0

[kamailio/kamailio] dispatcher: ds_list_exist support pv as param (#2099)
by Julien Chavanton 18 Oct '19

18 Oct '19

#### 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  Change parameter one to support pseudo variables ``` if (ds_list_exist("12001") { ... } ``` or ``` $var(id) = 10; if (ds_list_exist($var(id)) { ... } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2099 -- Commit Summary -- * dispatcher: ds_list_exist support pv as param -- File Changes -- M src/modules/dispatcher/dispatch.c (4) M src/modules/dispatcher/dispatcher.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2099.patch https://github.com/kamailio/kamailio/pull/2099.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/2099

4 13

git:master:121dc3ac: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 18 Oct '19

18 Oct '19

Module: kamailio Branch: master Commit: 121dc3acc91eeaaa1b64605464f772256df6b792 URL: https://github.com/kamailio/kamailio/commit/121dc3acc91eeaaa1b64605464f7722… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-18T09:01:24+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/121dc3acc91eeaaa1b64605464f7722… Patch: https://github.com/kamailio/kamailio/commit/121dc3acc91eeaaa1b64605464f7722… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index ca49d40dd2..4f6f3c6b83 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1271,6 +1271,9 @@ failure_route[tryagain] { Check if a specific group is defined in dispatcher list or database. * groupid - A group ID to check. + It returns true (value 1) if the group exists, or otherwise false (-1 + when the group is not found; -2 when evaluating the parameter fails). + This function can be used from ANY_ROUTE. Example 1.47. ds_list_exists usage

1 0

git:master:619b2603: dispatcher: docs - details of returned code by ds_list_exists()
by Daniel-Constantin Mierla 18 Oct '19

18 Oct '19

Module: kamailio Branch: master Commit: 619b2603b486efea29fd314f360647f6d8ef3aec URL: https://github.com/kamailio/kamailio/commit/619b2603b486efea29fd314f360647f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-18T08:52:23+02:00 dispatcher: docs - details of returned code by ds_list_exists() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/619b2603b486efea29fd314f360647f… Patch: https://github.com/kamailio/kamailio/commit/619b2603b486efea29fd314f360647f… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 823935b096..75d26de330 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1529,6 +1529,11 @@ failure_route[tryagain] { </para> </listitem> </itemizedlist> + <para> + It returns true (value 1) if the group exists, or otherwise false + (-1 when the group is not found; -2 when evaluating the parameter + fails). + </para> <para> This function can be used from ANY_ROUTE. </para>

1 0

git:master:fcabdc01: dispatcher: adjustments to ds_list_exist()
by Daniel-Constantin Mierla 18 Oct '19

18 Oct '19

Module: kamailio Branch: master Commit: fcabdc012d5490cfc740d0e0773fd88ed07c2b64 URL: https://github.com/kamailio/kamailio/commit/fcabdc012d5490cfc740d0e0773fd88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-18T08:49:34+02:00 dispatcher: adjustments to ds_list_exist() - info log messages made debug - return -2 if evaluating the fixup param fails --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/fcabdc012d5490cfc740d0e0773fd88… Patch: https://github.com/kamailio/kamailio/commit/fcabdc012d5490cfc740d0e0773fd88… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 483ddb418f..18b713ce02 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1482,16 +1482,16 @@ static inline int ds_get_index(int group, int ds_list_idx, ds_set_t **index) int ds_list_exist(int set) { ds_set_t *si = NULL; - LM_DBG("-- Looking for set %d\n", set); + LM_DBG("looking for destination set [%d]\n", set); /* get the index of the set */ si = ds_avl_find(_ds_list, set); if(si == NULL) { - LM_INFO("destination set [%d] not found\n", set); + LM_DBG("destination set [%d] not found\n", set); return -1; /* False */ } - LM_INFO("destination set [%d] found\n", set); + LM_DBG("destination set [%d] found\n", set); return 1; /* True */ } diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index da5d4c8f62..0be0968ac2 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1025,9 +1025,8 @@ static int w_ds_list_exist(struct sip_msg *msg, char *param, char *p2) if(fixup_get_ivalue(msg, (gparam_p)param, &set) != 0) { LM_ERR("cannot get set id param value\n"); - return -1; + return -2; } - LM_DBG("--- Looking for dispatcher set %d\n", set); return ds_list_exist(set); }

1 0

git:master:e7bbf352: pv: xavp_copy fix docs
by Julien Chavanton 17 Oct '19

17 Oct '19

Module: kamailio Branch: master Commit: e7bbf35275120d763e089a73362bbc7293511e91 URL: https://github.com/kamailio/kamailio/commit/e7bbf35275120d763e089a73362bbc7… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-10-17T16:22:04-07:00 pv: xavp_copy fix docs --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7bbf35275120d763e089a73362bbc7… Patch: https://github.com/kamailio/kamailio/commit/e7bbf35275120d763e089a73362bbc7… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 3fa032d864..86186e02fe 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -311,7 +311,7 @@ xinfo("AFTER $xavp(b[2]=>x) == [a-2-x] == $xavp(b[2]=>y) == [a-2-y]\n"); </programlisting> </example> </section> - <section id="pv.f.xavp_copy"> + <section id="pv.f.xavp_copy2"> <title> <function moreinfo="none">xavp_copy(source_name, source_index, destination_name, destination_index)</function> </title>

1 0

[kamailio/kamailio] pv: adding xavp_copy with destination index (#2097)
by Julien Chavanton 17 Oct '19

17 Oct '19

#### 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) - [ ] 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 MR to add another xavp_copy function taking 4 params ``` xavc_copy("source_name", "source_index", "destination_name", "destination_index") ``` This will let the user copy to a specific position in the stack (replacing its value). This would bring coherent behaviour compared to assign to a specific index vs appending. Example : swapping xavp in and existing stack: (second and third elements) ``` $xavp(a=>x) = "a-0-x"; $xavp(a[0]=>y) = "a-0-y"; $xavp(a=>x) = "a-1-x"; $xavp(a[0]=>y) = "a-1-y"; $xavp(a=>x) = "a-2-x"; $xavp(a[0]=>y) = "a-2-y"; # INFO: <script>: NEW $xavp(a[0]) = [a-2-x][a-2-y] # INFO: <script>: NEW $xavp(a[1]) = [a-1-x][a-1-y] # INFO: <script>: NEW $xavp(a[2]) = [a-0-x][a-0-y] xavp_copy("a", "1", "c"); xavp_copy("a", "2", "a", "1"); xavp_copy("c", "0", "a", "2"); # INFO: <script>: AFTER $xavp(a[0]) = [a-2-x][a-2-y] # INFO: <script>: AFTER $xavp(a[1]) = [a-0-x][a-0-y] # INFO: <script>: AFTER $xavp(a[2]) = [a-1-x][a-1-y] ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2097 -- Commit Summary -- * pv: adding xavp_copy with destination index -- File Changes -- M src/modules/pv/pv.c (78) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2097.patch https://github.com/kamailio/kamailio/pull/2097.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/2097

3 9

git:master:90c7f756: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 17 Oct '19

17 Oct '19

Module: kamailio Branch: master Commit: 90c7f7564eb3e9d12f05a60041bbd4be63f336e5 URL: https://github.com/kamailio/kamailio/commit/90c7f7564eb3e9d12f05a60041bbd4b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-18T00:01:10+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/90c7f7564eb3e9d12f05a60041bbd4b… Patch: https://github.com/kamailio/kamailio/commit/90c7f7564eb3e9d12f05a60041bbd4b…

1 0

git:master:e2a08a77: pv: xavp_copy improved examples
by Julien Chavanton 17 Oct '19

17 Oct '19

Module: kamailio Branch: master Commit: e2a08a77b03565c2bdc863f1aa7d9c5a22af4a7e URL: https://github.com/kamailio/kamailio/commit/e2a08a77b03565c2bdc863f1aa7d9c5… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-10-17T14:50:31-07:00 pv: xavp_copy improved examples --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e2a08a77b03565c2bdc863f1aa7d9c5… Patch: https://github.com/kamailio/kamailio/commit/e2a08a77b03565c2bdc863f1aa7d9c5… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index c66f14df67..3fa032d864 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -290,22 +290,23 @@ $xavp(a=>x) = "a-0-x"; $xavp(a[0]=>y) = "a-0-y"; $xavp(a=>x) = "a-1-x"; $xavp(a[0]=>y) = "a-1-y"; -xinfo("$$xavp(a[0]) = [$xavp(a[0]=>x)][$xavp(a[0]=>y)]\n"); -xinfo("$$xavp(a[1]) = [$xavp(a[1]=>x)][$xavp(a[1]=>y)]\n"); +$xavp(a=>x) = "a-2-x"; +$xavp(a[0]=>y) = "a-2-y"; + +xinfo("BEFORE $xavp(a[0]=>x) == [a-2-x] == $xavp(a[0]=>y) == [a-2-y]\n"); +xinfo("BEFORE $xavp(a[1]=>x) == [a-1-x] == $xavp(a[1]=>y) == [a-1-y]\n"); +xinfo("BEFORE $xavp(a[2]=>x) == [a-0-x] == $xavp(a[2]=>y) == [a-0-y]\n"); # reorder $var(source_index) = 1; $var(destination_name) = "b"; +xavp_copy("a", "2", "b"); xavp_copy("a", "$var(source_index)", "$var(destination_name)"); xavp_copy("a", "0", "$var(destination_name)"); -xinfo("reordered: $$xavp(b[0]) = [$xavp(b[0]=>x)][$xavp(b[0]=>y)]\n"); -xinfo("reordered: $$xavp(b[1]) = [$xavp(b[1]=>x)][$xavp(b[1]=>y)]\n"); -# results in: -# INFO: $xavp(a[0]) = [a-1-x][a-1-y] -# INFO: $xavp(a[1]) = [a-0-x][a-0-y] -# INFO: reordered: $xavp(b[0]) = [a-0-x][a-0-y] -# INFO: reordered: $xavp(b[1]) = [a-1-x][a-1-y] +xinfo("AFTER $xavp(b[0]=>x) == [a-0-x] == $xavp(b[0]=>y) == [a-0-y]\n"); +xinfo("AFTER $xavp(b[1]=>x) == [a-1-x] == $xavp(b[1]=>y) == [a-1-y]\n"); +xinfo("AFTER $xavp(b[2]=>x) == [a-2-x] == $xavp(b[2]=>y) == [a-2-y]\n"); ... </programlisting> </example> @@ -332,24 +333,24 @@ xinfo("reordered: $$xavp(b[1]) = [$xavp(b[1]=>x)][$xavp(b[1]=>y)]\n"); <programlisting format="linespecific"> ... # Using xavp_copy to reorder an existing xavp stack inplace -$xavp(a=>x) = "a-0-x"; -$xavp(a[0]=>y) = "a-0-y"; -$xavp(a=>x) = "a-1-x"; -$xavp(a[0]=>y) = "a-1-y"; -$xavp(a=>x) = "a-2-x"; -$xavp(a[0]=>y) = "a-2-y"; +$xavp(d=>x) = "d-0-x"; +$xavp(d[0]=>y) = "d-0-y"; +$xavp(d=>x) = "d-1-x"; +$xavp(d[0]=>y) = "d-1-y"; +$xavp(d=>x) = "d-2-x"; +$xavp(d[0]=>y) = "d-2-y"; -# INFO: NEW $xavp(a[0]) = [a-2-x][a-2-y] -# INFO: NEW $xavp(a[1]) = [a-1-x][a-1-y] -# INFO: NEW $xavp(a[2]) = [a-0-x][a-0-y] +xinfo("NEW $xavp(d[0]=>x) == [d-2-x] and $xavp(d[0]=>y) == [d-2-y]\n"); +xinfo("NEW $xavp(d[1]=>x) == [d-1-x] and $xavp(d[1]=>y) == [d-1-y]\n"); +xinfo("NEW $xavp(d[2]=>x) == [d-0-x] and $xavp(d[2]=>y) == [d-0-y]\n"); -xavp_copy("a", "1", "c"); -xavp_copy("a", "2", "a", "1"); -xavp_copy("c", "0", "a", "2"); +xavp_copy("d", "0", "e"); +xavp_copy("d", "2", "d", "0"); +xavp_copy("e", "0", "d", "2"); -# INFO: AFTER $xavp(a[0]) = [a-2-x][a-2-y] -# INFO: AFTER $xavp(a[1]) = [a-0-x][a-0-y] -# INFO: AFTER $xavp(a[2]) = [a-1-x][a-1-y] +xinfo("AFTER $xavp(d[0]=>x) == [d-0-x] $xavp(d[0]=>y) == [d-0-y]\n"); +xinfo("AFTER $xavp(d[1]=>x) == [d-1-x] $xavp(d[1]=>y) == [d-1-y]\n"); +xinfo("AFTER $xavp(d[2]=>x) == [d-2-x] $xavp(d[2]=>y) == [d-2-y]\n"); ... </programlisting> </example>

1 0

git:master:a6b11416: pv: adding xavp_copy with destination index
by Julien Chavanton 17 Oct '19

17 Oct '19

Module: kamailio Branch: master Commit: a6b114162ea830863abbd196508d4913060f3f07 URL: https://github.com/kamailio/kamailio/commit/a6b114162ea830863abbd196508d491… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-10-17T14:50:25-07:00 pv: adding xavp_copy with destination index --- Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a6b114162ea830863abbd196508d491… Patch: https://github.com/kamailio/kamailio/commit/a6b114162ea830863abbd196508d491…

1 0

debian buster systemd pid file location
by Juha Heinanen 17 Oct '19

17 Oct '19

Looks like systemd service pid files should nowadays be placed in /run dir instead of /var/run. I noticed this when I got complaint about fail2ban to syslog: Oct 17 20:59:35 lab systemd[1]: /lib/systemd/system/fail2ban.service:12: PIDFile= references path below legacy directory /var/run/, updating /var/run/fail2ban/fail2ban.pid → /run/fail2ban/fail2ban.pid; please update the unit file accordingly. I haven't tried yet with Kamailio, but suspect that a similar warning would be issued. So how about making the change in https://github.com/kamailio/kamailio/blob/master/pkg/kamailio/deb/buster/ka… -- Juha

1 0

Kamailio v5.3.0 Released - new major version is out
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Kamailio v5.3.0 is out – it comes with 6 new modules and a considerable set of improvements touching more than 100 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-3-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.3.0 brings more flexibility and optimizations for KEMI interpreters, enhancements to load balancer, dialog tracking, uac remote registration and tls with libssl 1.1.x implementations, new variables, transformations and plenty of other new features. Enjoy Kamailio v5.3.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 1

removing 200-canceling response from kamailio
by vinod mn 17 Oct '19

17 Oct '19

Hi how to remove the "200-canceling" response from kamailio it is very urgent. -- Thanks and regards Vinod.M.N

2 3

git:5.3:4cc67ada: ChangeLog: content updated for v5.3.0
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Module: kamailio Branch: 5.3 Commit: 4cc67ada604216d2a07def024302b3912ccc4e5d URL: https://github.com/kamailio/kamailio/commit/4cc67ada604216d2a07def024302b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-17T13:27:09+02:00 ChangeLog: content updated for v5.3.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/4cc67ada604216d2a07def024302b39… Patch: https://github.com/kamailio/kamailio/commit/4cc67ada604216d2a07def024302b39…

1 0

git:5.3:52dc42ef: Makefile.defs: version set to 5.3.0
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Module: kamailio Branch: 5.3 Commit: 52dc42ef6e4929ce67403d43909df2f015146c5e URL: https://github.com/kamailio/kamailio/commit/52dc42ef6e4929ce67403d43909df2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-17T13:20:27+02:00 Makefile.defs: version set to 5.3.0 - new major release --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/52dc42ef6e4929ce67403d43909df2f… Patch: https://github.com/kamailio/kamailio/commit/52dc42ef6e4929ce67403d43909df2f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e4d728dc2c..20593fe378 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,8 +106,8 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 0 -EXTRAVERSION = -rc1 +SUBLEVEL = 0 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.3:ce8a69d8: utils: kamdbctl - version set to 5.3.0
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Module: kamailio Branch: 5.3 Commit: ce8a69d891521c862b8374df88f77bb42a760f09 URL: https://github.com/kamailio/kamailio/commit/ce8a69d891521c862b8374df88f77bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-17T12:31:38+02:00 utils: kamdbctl - version set to 5.3.0 --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/ce8a69d891521c862b8374df88f77bb… Patch: https://github.com/kamailio/kamailio/commit/ce8a69d891521c862b8374df88f77bb… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 4597afe09b..f291228180 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.2.0' +VERSION='5.3.0' PATH=$PATH:/usr/local/sbin/

1 0

Releasing Kamailio v5.3.0
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Hello, if there are no known major issues that need longer time to take care of them, in my opinion we could consider releasing the next major version 5.3.0 next week, for me Thursday, October 10 seems to work the best, still allowing a bit more than one week for testing. Any other suggestions? Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat

2 3

git:5.3:a9e65d76: pkg: rpm/specs - set version to 5.3.0
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Module: kamailio Branch: 5.3 Commit: a9e65d76af4f7485b876b97ab8b6d6f1a28d56a7 URL: https://github.com/kamailio/kamailio/commit/a9e65d76af4f7485b876b97ab8b6d6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-17T10:57:23+02:00 pkg: rpm/specs - set version to 5.3.0 --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a9e65d76af4f7485b876b97ab8b6d6f… Patch: https://github.com/kamailio/kamailio/commit/a9e65d76af4f7485b876b97ab8b6d6f… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 74a6566248..d26f2b59db 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.0 +pkgver=5.3.0 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9dc8a2a249..71a462b450 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.0 +%define ver 5.3.0 %define rel dev1.0%{dist} %if 0%{?fedora} == 27 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index e787ecd388..65e64975a7 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.0 +%define ver 5.3.0 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index df65630a85..26df8f9047 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.0 +%define ver 5.3.0 %define rel 0 %define _sharedir %{_prefix}/share

1 0

git:5.3:e0de1a68: nathelper: removed exe flag from c file
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Module: kamailio Branch: 5.3 Commit: e0de1a6842b03b06c56f84ae2dfc153b18f3a7c1 URL: https://github.com/kamailio/kamailio/commit/e0de1a6842b03b06c56f84ae2dfc153… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-17T10:51:32+02:00 nathelper: removed exe flag from c file (cherry picked from commit 82195c2a51c5020ca0024f59492a4e2faef0e15a) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/e0de1a6842b03b06c56f84ae2dfc153… Patch: https://github.com/kamailio/kamailio/commit/e0de1a6842b03b06c56f84ae2dfc153… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100755 new mode 100644

1 0

git:5.3:67cd116c: statsc: free parsed params in case of error
by Daniel-Constantin Mierla 17 Oct '19

17 Oct '19

Module: kamailio Branch: 5.3 Commit: 67cd116cdb05511cbf889a6f4418830c35ec77c3 URL: https://github.com/kamailio/kamailio/commit/67cd116cdb05511cbf889a6f4418830… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-17T10:51:45+02:00 statsc: free parsed params in case of error - wrap some lines of codes in blocks (cherry picked from commit 27020d88b4d3206a8f193dc5343ea8bb5b39b5a1) --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/67cd116cdb05511cbf889a6f4418830… Patch: https://github.com/kamailio/kamailio/commit/67cd116cdb05511cbf889a6f4418830… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 75c88c9cd5..0cbe246965 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -205,7 +205,7 @@ int statsc_nmap_add(str *sname, str *rname) return 0; } sl = _statsc_info->slist; - while(sl->next!=NULL) sl = sl->next; + while(sl->next!=NULL) { sl = sl->next; } sl->next = sm; _statsc_info->slots++; return 0; @@ -287,18 +287,23 @@ int statsc_track_param(modparam_t type, void* val) param_t *pit=NULL; str s; - if(val==NULL) + if(val==NULL) { return -1; - if(statsc_init()<0) + } + if(statsc_init()<0) { return -1; + } s.s = (char*)val; s.len = strlen(s.s); - if(s.s[s.len-1]==';') + if(s.s[s.len-1]==';') { s.len--; - if (parse_params(&s, CLASS_ANY, &phooks, &params_list)<0) + } + if (parse_params(&s, CLASS_ANY, &phooks, &params_list)<0) { return -1; + } for (pit = params_list; pit; pit=pit->next) { if(statsc_nmap_add(&pit->name, &pit->body)<0) { + free_params(params_list); LM_ERR("cannot enable tracking statistics\n"); return -1; } @@ -369,8 +374,9 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) sname.s = NULL; } rpc->scan(ctx, "*d", &range); - if(range<0 || range>statsc_items) + if(range<0 || range>statsc_items) { range = 0; + } } tn = time(NULL);

1 0

git:5.3:195c0150: pkg/kamailio/deb: version set 5.3.0
by Victor Seva 17 Oct '19

17 Oct '19

Module: kamailio Branch: 5.3 Commit: 195c0150c83cdea3ec2f1dcd4c53f59d37280be7 URL: https://github.com/kamailio/kamailio/commit/195c0150c83cdea3ec2f1dcd4c53f59… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-17T09:16:28+02:00 pkg/kamailio/deb: version set 5.3.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/195c0150c83cdea3ec2f1dcd4c53f59… Patch: https://github.com/kamailio/kamailio/commit/195c0150c83cdea3ec2f1dcd4c53f59…

1 0

siptrace errors
by Juha Heinanen 16 Oct '19

16 Oct '19

Using 5.3 branch, I have sip-proxy_ctl> siptrace.status check Disabled but still these kind of errors appear in syslog: Oct 16 12:07:10 salmon /usr/bin/sip-proxy[26459]: ERROR: siptrace [siptrace.c:1250]: trace_onreq_out(): retransmission Oct 16 12:07:11 salmon /usr/bin/sip-proxy[26459]: ERROR: siptrace [siptrace.c:1250]: trace_onreq_out(): retransmission Oct 16 12:07:13 salmon /usr/bin/sip-proxy[26459]: ERROR: siptrace [siptrace.c:1250]: trace_onreq_out(): retransmission How is it possible? -- Juha

2 5

git:5.3:0ba475b8: siptrace: use debug for the log message about retrasmission
by Daniel-Constantin Mierla 16 Oct '19

16 Oct '19

Module: kamailio Branch: 5.3 Commit: 0ba475b82c640047060d49dab9768a5003eb5cf4 URL: https://github.com/kamailio/kamailio/commit/0ba475b82c640047060d49dab9768a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-16T12:18:11+02:00 siptrace: use debug for the log message about retrasmission (cherry picked from commit bf3c70e00b0d8252acca4b8d28f435819dd100b5) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0ba475b82c640047060d49dab9768a5… Patch: https://github.com/kamailio/kamailio/commit/0ba475b82c640047060d49dab9768a5… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 20c0c8a907..dbaefd40d7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1242,12 +1242,12 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) dest_info_t *dst; if(t == NULL || ps == NULL) { - LM_ERR("very weird\n"); + LM_ERR("unexpected parameter values\n"); return; } if(ps->flags & TMCB_RETR_F) { - LM_ERR("retransmission\n"); + LM_DBG("retransmission - ignoring\n"); return; } info = (siptrace_info_t *)(*ps->param);

1 0

git:master:bf3c70e0: siptrace: use debug for the log message about retrasmission
by Daniel-Constantin Mierla 16 Oct '19

16 Oct '19

Module: kamailio Branch: master Commit: bf3c70e00b0d8252acca4b8d28f435819dd100b5 URL: https://github.com/kamailio/kamailio/commit/bf3c70e00b0d8252acca4b8d28f4358… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-16T12:13:07+02:00 siptrace: use debug for the log message about retrasmission --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/bf3c70e00b0d8252acca4b8d28f4358… Patch: https://github.com/kamailio/kamailio/commit/bf3c70e00b0d8252acca4b8d28f4358… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 20c0c8a907..dbaefd40d7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1242,12 +1242,12 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) dest_info_t *dst; if(t == NULL || ps == NULL) { - LM_ERR("very weird\n"); + LM_ERR("unexpected parameter values\n"); return; } if(ps->flags & TMCB_RETR_F) { - LM_ERR("retransmission\n"); + LM_DBG("retransmission - ignoring\n"); return; } info = (siptrace_info_t *)(*ps->param);

1 0

Errored: kamailio/kamailio#7952 (master - 27020d8)
by Travis CI 15 Oct '19

15 Oct '19

Build Update for kamailio/kamailio ------------------------------------- Build: #7952 Status: Errored Duration: 28 secs Commit: 27020d8 (master) Author: Daniel-Constantin Mierla Message: statsc: free parsed params in case of error - wrap some lines of codes in blocks View the changeset: https://github.com/kamailio/kamailio/compare/33b174b979a0...27020d88b4d3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/598265482?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:27020d88: statsc: free parsed params in case of error
by Daniel-Constantin Mierla 15 Oct '19

15 Oct '19

Module: kamailio Branch: master Commit: 27020d88b4d3206a8f193dc5343ea8bb5b39b5a1 URL: https://github.com/kamailio/kamailio/commit/27020d88b4d3206a8f193dc5343ea8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-15T19:40:02+02:00 statsc: free parsed params in case of error - wrap some lines of codes in blocks --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/27020d88b4d3206a8f193dc5343ea8b… Patch: https://github.com/kamailio/kamailio/commit/27020d88b4d3206a8f193dc5343ea8b… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 75c88c9cd5..0cbe246965 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -205,7 +205,7 @@ int statsc_nmap_add(str *sname, str *rname) return 0; } sl = _statsc_info->slist; - while(sl->next!=NULL) sl = sl->next; + while(sl->next!=NULL) { sl = sl->next; } sl->next = sm; _statsc_info->slots++; return 0; @@ -287,18 +287,23 @@ int statsc_track_param(modparam_t type, void* val) param_t *pit=NULL; str s; - if(val==NULL) + if(val==NULL) { return -1; - if(statsc_init()<0) + } + if(statsc_init()<0) { return -1; + } s.s = (char*)val; s.len = strlen(s.s); - if(s.s[s.len-1]==';') + if(s.s[s.len-1]==';') { s.len--; - if (parse_params(&s, CLASS_ANY, &phooks, &params_list)<0) + } + if (parse_params(&s, CLASS_ANY, &phooks, &params_list)<0) { return -1; + } for (pit = params_list; pit; pit=pit->next) { if(statsc_nmap_add(&pit->name, &pit->body)<0) { + free_params(params_list); LM_ERR("cannot enable tracking statistics\n"); return -1; } @@ -369,8 +374,9 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) sname.s = NULL; } rpc->scan(ctx, "*d", &range); - if(range<0 || range>statsc_items) + if(range<0 || range>statsc_items) { range = 0; + } } tn = time(NULL);

1 0

git:5.3:fc91331a: tls: add TLSv1.2+ to example configuration
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.3 Commit: fc91331a92acdef0a17b0341b8d22f93bdbbc1db URL: https://github.com/kamailio/kamailio/commit/fc91331a92acdef0a17b0341b8d22f9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T15:17:54+02:00 tls: add TLSv1.2+ to example configuration (cherry picked from commit aedd2c6470feb6410605110e8e31eca8b43feefb) --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/fc91331a92acdef0a17b0341b8d22f9… Patch: https://github.com/kamailio/kamailio/commit/fc91331a92acdef0a17b0341b8d22f9… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index d8b20049ae..1bfdfc6919 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -8,12 +8,12 @@ # connections that do not match any other server # domain in this configuration file. # -# We do not enable anything else than TLSv1.2 +# We do not enable anything else than TLSv1.2+ # over the public internet. Clients do not have # to present client certificates by default. # [server:default] -method = TLSv1.2 +method = TLSv1.2+ verify_certificate = no require_certificate = no private_key = /usr/local/etc/kamailio/kamailio-selfsigned.key @@ -29,21 +29,21 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem # We require that servers present valid certificate. # [client:default] -#method = TLSv1.2 +#method = TLSv1.2+ verify_certificate = yes require_certificate = yes # --- # This is an example server domain for TLS connections # received from the loopback interface. We allow -# the use of TLSv1.2 protocols here, we do +# the use of TLSv1.2+ protocols here, we do # not require that clients present client certificates # but if they present it it must be valid. We also use # a special certificate and CA list for loopback # interface. # #[server:5.6.7.8:5061] -#method = TLSv1.2 +#method = TLSv1.2+ #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/local_key.pem @@ -76,7 +76,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (domain and subdomains) # #[server:any] -#method = TLSv1.2 +#method = TLSv1.2+ #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_org_key.pem @@ -93,7 +93,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (only subdomains) # #[server:any] -#method = TLSv1.2 +#method = TLSv1.2+ #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_net_key.pem

1 0

git:5.1:15a0eda0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.1 Commit: 15a0eda04c05a895255a3dd9df15ff83298a1910 URL: https://github.com/kamailio/kamailio/commit/15a0eda04c05a895255a3dd9df15ff8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-15T15:17:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/15a0eda04c05a895255a3dd9df15ff8… Patch: https://github.com/kamailio/kamailio/commit/15a0eda04c05a895255a3dd9df15ff8… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index dcdbfed6de..10a9c2a27a 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -537,6 +537,8 @@ Revoking a certificate and using a CRL 9.1. tls_method (string) Sets the TLS protocol method. Possible values are: + * TLSv1.2+ - TLSv1.2 or newer (TLSv1.3, ...) connections are accepted + (available starting with openssl/libssl v1.1.1) * TLSv1.2 - only TLSv1.2 connections are accepted (available starting with openssl/libssl v1.0.1e) * TLSv1.1+ - TLSv1.1 or newer (TLSv1.2, ...) connections are accepted

1 0

git:5.2:e10d4f02: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.2 Commit: e10d4f0224132952ebb9411b06d173b5520b5509 URL: https://github.com/kamailio/kamailio/commit/e10d4f0224132952ebb9411b06d173b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-15T15:17:01+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/e10d4f0224132952ebb9411b06d173b… Patch: https://github.com/kamailio/kamailio/commit/e10d4f0224132952ebb9411b06d173b… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 55a2f93a09..c02343ca3a 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -614,6 +614,8 @@ Place holder 10.1. tls_method (string) Sets the TLS protocol method. Possible values are: + * TLSv1.2+ - TLSv1.2 or newer (TLSv1.3, ...) connections are accepted + (available starting with openssl/libssl v1.1.1) * TLSv1.2 - only TLSv1.2 connections are accepted (available starting with openssl/libssl v1.0.1e) * TLSv1.1+ - TLSv1.1 or newer (TLSv1.2, ...) connections are accepted

1 0

git:5.3:98e22d5e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.3 Commit: 98e22d5e11be5ef9e669635ea472ffe4f1d81e42 URL: https://github.com/kamailio/kamailio/commit/98e22d5e11be5ef9e669635ea472ffe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-15T15:16:40+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/98e22d5e11be5ef9e669635ea472ffe… Patch: https://github.com/kamailio/kamailio/commit/98e22d5e11be5ef9e669635ea472ffe… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 3f40adf0f0..a625036a92 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -617,6 +617,8 @@ Place holder 10.1. tls_method (string) Sets the TLS protocol method. Possible values are: + * TLSv1.2+ - TLSv1.2 or newer (TLSv1.3, ...) connections are accepted + (available starting with openssl/libssl v1.1.1) * TLSv1.2 - only TLSv1.2 connections are accepted (available starting with openssl/libssl v1.0.1e) * TLSv1.1+ - TLSv1.1 or newer (TLSv1.2, ...) connections are accepted @@ -1436,6 +1438,7 @@ end * krand - use internal kam_rand() function * fastrand - use internal fastrand (ISAAC) function * cryptorand - use internal cryptorand (Fortuna) function + * kxlibssl - default libssl rand engine wrapped by a Kamailio mutex Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers

1 0

git:master:33b174b9: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 15 Oct '19

15 Oct '19

Module: kamailio Branch: master Commit: 33b174b979a0c8f3057e82089fb840cff69e380e URL: https://github.com/kamailio/kamailio/commit/33b174b979a0c8f3057e82089fb840c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-15T15:16:23+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/33b174b979a0c8f3057e82089fb840c… Patch: https://github.com/kamailio/kamailio/commit/33b174b979a0c8f3057e82089fb840c… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index c3b40949ca..a625036a92 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -617,6 +617,8 @@ Place holder 10.1. tls_method (string) Sets the TLS protocol method. Possible values are: + * TLSv1.2+ - TLSv1.2 or newer (TLSv1.3, ...) connections are accepted + (available starting with openssl/libssl v1.1.1) * TLSv1.2 - only TLSv1.2 connections are accepted (available starting with openssl/libssl v1.0.1e) * TLSv1.1+ - TLSv1.1 or newer (TLSv1.2, ...) connections are accepted

1 0

git:5.3:dc41cb04: tls: fix missing TLSv1.2+ parameter documentation
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.3 Commit: dc41cb04a5af37192ac5363bb939efb3a45efe90 URL: https://github.com/kamailio/kamailio/commit/dc41cb04a5af37192ac5363bb939efb… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T15:16:12+02:00 tls: fix missing TLSv1.2+ parameter documentation (cherry picked from commit 5e00109fabe3507f1c20cbef80348e72ddb78cc8) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/dc41cb04a5af37192ac5363bb939efb… Patch: https://github.com/kamailio/kamailio/commit/dc41cb04a5af37192ac5363bb939efb… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 301183c566..2d627876bc 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -19,6 +19,12 @@ Sets the TLS protocol method. Possible values are: </para> <itemizedlist> + <listitem> + <para> + <emphasis>TLSv1.2+</emphasis> - TLSv1.2 or newer (TLSv1.3, ...) + connections are accepted (available starting with openssl/libssl v1.1.1) + </para> + </listitem> <listitem> <para> <emphasis>TLSv1.2</emphasis> - only TLSv1.2 connections are accepted

1 0

git:5.2:597ac3f5: tls: fix missing TLSv1.2+ parameter documentation
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.2 Commit: 597ac3f589b82982c02631f3dc8b7962969b9645 URL: https://github.com/kamailio/kamailio/commit/597ac3f589b82982c02631f3dc8b796… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T15:15:56+02:00 tls: fix missing TLSv1.2+ parameter documentation (cherry picked from commit 5e00109fabe3507f1c20cbef80348e72ddb78cc8) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/597ac3f589b82982c02631f3dc8b796… Patch: https://github.com/kamailio/kamailio/commit/597ac3f589b82982c02631f3dc8b796… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 301183c566..2d627876bc 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -19,6 +19,12 @@ Sets the TLS protocol method. Possible values are: </para> <itemizedlist> + <listitem> + <para> + <emphasis>TLSv1.2+</emphasis> - TLSv1.2 or newer (TLSv1.3, ...) + connections are accepted (available starting with openssl/libssl v1.1.1) + </para> + </listitem> <listitem> <para> <emphasis>TLSv1.2</emphasis> - only TLSv1.2 connections are accepted

1 0

git:5.1:4b480e6a: tls: fix missing TLSv1.2+ parameter documentation
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.1 Commit: 4b480e6abac93bef6ae9a571db6e72192f3be4b2 URL: https://github.com/kamailio/kamailio/commit/4b480e6abac93bef6ae9a571db6e721… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T15:15:38+02:00 tls: fix missing TLSv1.2+ parameter documentation (cherry picked from commit 5e00109fabe3507f1c20cbef80348e72ddb78cc8) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b480e6abac93bef6ae9a571db6e721… Patch: https://github.com/kamailio/kamailio/commit/4b480e6abac93bef6ae9a571db6e721… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index e3d236dea4..2839b62658 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -19,6 +19,12 @@ Sets the TLS protocol method. Possible values are: </para> <itemizedlist> + <listitem> + <para> + <emphasis>TLSv1.2+</emphasis> - TLSv1.2 or newer (TLSv1.3, ...) + connections are accepted (available starting with openssl/libssl v1.1.1) + </para> + </listitem> <listitem> <para> <emphasis>TLSv1.2</emphasis> - only TLSv1.2 connections are accepted

1 0

git:master:5e00109f: tls: fix missing TLSv1.2+ parameter documentation
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: master Commit: 5e00109fabe3507f1c20cbef80348e72ddb78cc8 URL: https://github.com/kamailio/kamailio/commit/5e00109fabe3507f1c20cbef80348e7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T15:13:09+02:00 tls: fix missing TLSv1.2+ parameter documentation --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e00109fabe3507f1c20cbef80348e7… Patch: https://github.com/kamailio/kamailio/commit/5e00109fabe3507f1c20cbef80348e7… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 301183c566..2d627876bc 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -19,6 +19,12 @@ Sets the TLS protocol method. Possible values are: </para> <itemizedlist> + <listitem> + <para> + <emphasis>TLSv1.2+</emphasis> - TLSv1.2 or newer (TLSv1.3, ...) + connections are accepted (available starting with openssl/libssl v1.1.1) + </para> + </listitem> <listitem> <para> <emphasis>TLSv1.2</emphasis> - only TLSv1.2 connections are accepted

1 0

git:master:aedd2c64: tls: add TLSv1.2+ to example configuration
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: master Commit: aedd2c6470feb6410605110e8e31eca8b43feefb URL: https://github.com/kamailio/kamailio/commit/aedd2c6470feb6410605110e8e31eca… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T15:13:32+02:00 tls: add TLSv1.2+ to example configuration --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/aedd2c6470feb6410605110e8e31eca… Patch: https://github.com/kamailio/kamailio/commit/aedd2c6470feb6410605110e8e31eca… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index d8b20049ae..1bfdfc6919 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -8,12 +8,12 @@ # connections that do not match any other server # domain in this configuration file. # -# We do not enable anything else than TLSv1.2 +# We do not enable anything else than TLSv1.2+ # over the public internet. Clients do not have # to present client certificates by default. # [server:default] -method = TLSv1.2 +method = TLSv1.2+ verify_certificate = no require_certificate = no private_key = /usr/local/etc/kamailio/kamailio-selfsigned.key @@ -29,21 +29,21 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem # We require that servers present valid certificate. # [client:default] -#method = TLSv1.2 +#method = TLSv1.2+ verify_certificate = yes require_certificate = yes # --- # This is an example server domain for TLS connections # received from the loopback interface. We allow -# the use of TLSv1.2 protocols here, we do +# the use of TLSv1.2+ protocols here, we do # not require that clients present client certificates # but if they present it it must be valid. We also use # a special certificate and CA list for loopback # interface. # #[server:5.6.7.8:5061] -#method = TLSv1.2 +#method = TLSv1.2+ #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/local_key.pem @@ -76,7 +76,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (domain and subdomains) # #[server:any] -#method = TLSv1.2 +#method = TLSv1.2+ #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_org_key.pem @@ -93,7 +93,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (only subdomains) # #[server:any] -#method = TLSv1.2 +#method = TLSv1.2+ #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_net_key.pem

1 0

git:5.3:c32bccf1: tls: switch to TLSv1.2 in example cfg, usage of TLS 1.0 is not recommended anymore
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.3 Commit: c32bccf1cebf70e512f16c15124db1c717e01769 URL: https://github.com/kamailio/kamailio/commit/c32bccf1cebf70e512f16c15124db1c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T14:18:14+02:00 tls: switch to TLSv1.2 in example cfg, usage of TLS 1.0 is not recommended anymore (cherry picked from commit 3fa7b04cb6ac4170343455fa4f591fa95f7a3ff9) --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/c32bccf1cebf70e512f16c15124db1c… Patch: https://github.com/kamailio/kamailio/commit/c32bccf1cebf70e512f16c15124db1c… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index b84ba8fcfc..d8b20049ae 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -8,12 +8,12 @@ # connections that do not match any other server # domain in this configuration file. # -# We do not enable anything else than TLSv1 +# We do not enable anything else than TLSv1.2 # over the public internet. Clients do not have # to present client certificates by default. # [server:default] -method = TLSv1 +method = TLSv1.2 verify_certificate = no require_certificate = no private_key = /usr/local/etc/kamailio/kamailio-selfsigned.key @@ -29,21 +29,21 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem # We require that servers present valid certificate. # [client:default] -#method = TLSv1 +#method = TLSv1.2 verify_certificate = yes require_certificate = yes # --- # This is an example server domain for TLS connections # received from the loopback interface. We allow -# the use of TLSv1 protocols here, we do +# the use of TLSv1.2 protocols here, we do # not require that clients present client certificates # but if they present it it must be valid. We also use # a special certificate and CA list for loopback # interface. # #[server:5.6.7.8:5061] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/local_key.pem @@ -76,7 +76,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (domain and subdomains) # #[server:any] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_org_key.pem @@ -93,7 +93,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (only subdomains) # #[server:any] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_net_key.pem

2 2

git:5.3:7454cb89: dispatcher: add some debug logging for ds_update_state function
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.3 Commit: 7454cb8938df103ad77a3ec6c7eb733558ceea86 URL: https://github.com/kamailio/kamailio/commit/7454cb8938df103ad77a3ec6c7eb733… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T14:18:29+02:00 dispatcher: add some debug logging for ds_update_state function (cherry picked from commit 8ee71161f907201e1734a4b2476636cfb518dab3) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/7454cb8938df103ad77a3ec6c7eb733… Patch: https://github.com/kamailio/kamailio/commit/7454cb8938df103ad77a3ec6c7eb733… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index a3c33a0cbb..483ddb418f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2688,6 +2688,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) LM_ERR("destination set [%d] not found\n", group); return -1; } + LM_DBG("update state for %.*s in group %d to %d\n", address->len, address->s, group, state); while(i < idx->nr) { if(idx->dlist[i].uri.len == address->len @@ -2718,12 +2719,15 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) if(state & DS_TRYING_DST) { idx->dlist[i].message_count++; + LM_DBG("destination did not replied %d times, threshold %d\n", + idx->dlist[i].message_count, probing_threshold); /* Destination is not replying.. Increasing failure counter */ if(idx->dlist[i].message_count >= probing_threshold) { - /* Destionation has too much lost messages.. Bringing it to inactive state */ + /* Destination has too much lost messages.. Bringing it to inactive state */ idx->dlist[i].flags &= ~DS_TRYING_DST; idx->dlist[i].flags |= DS_INACTIVE_DST; idx->dlist[i].message_count = 0; + LM_DBG("deactivate destination, threshold %d reached\n", probing_threshold); } } else { if(!(init_state & DS_TRYING_DST) @@ -2733,9 +2737,12 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) if(idx->dlist[i].message_count < inactive_threshold) { /* Destination has not enough successful replies.. Leaving it into inactive state */ idx->dlist[i].flags |= DS_INACTIVE_DST; + LM_DBG("destination replied successful %d times, threshold %d\n", + idx->dlist[i].message_count, inactive_threshold); } else { /* Destination has enough replied messages.. Bringing it to active state */ idx->dlist[i].message_count = 0; + LM_DBG("activate destination, threshold %d reached\n", inactive_threshold); } } else { idx->dlist[i].message_count = 0; @@ -2753,6 +2760,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) ds_reinit_rweight_on_state_change( old_state, idx->dlist[i].flags, idx); + LM_DBG("old state was %d, set new state to %d\n", old_state, idx->dlist[i].flags); return 0; } i++;

1 0

git:5.2:722b8f0f: tls: switch to TLSv1.2 in example cfg, usage of TLS 1.0 is not recommended anymore
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: 5.2 Commit: 722b8f0f3147359ce20bf6a2ba1a463ae79f6d93 URL: https://github.com/kamailio/kamailio/commit/722b8f0f3147359ce20bf6a2ba1a463… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T14:18:44+02:00 tls: switch to TLSv1.2 in example cfg, usage of TLS 1.0 is not recommended anymore (cherry picked from commit 3fa7b04cb6ac4170343455fa4f591fa95f7a3ff9) --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/722b8f0f3147359ce20bf6a2ba1a463… Patch: https://github.com/kamailio/kamailio/commit/722b8f0f3147359ce20bf6a2ba1a463… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index b84ba8fcfc..d8b20049ae 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -8,12 +8,12 @@ # connections that do not match any other server # domain in this configuration file. # -# We do not enable anything else than TLSv1 +# We do not enable anything else than TLSv1.2 # over the public internet. Clients do not have # to present client certificates by default. # [server:default] -method = TLSv1 +method = TLSv1.2 verify_certificate = no require_certificate = no private_key = /usr/local/etc/kamailio/kamailio-selfsigned.key @@ -29,21 +29,21 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem # We require that servers present valid certificate. # [client:default] -#method = TLSv1 +#method = TLSv1.2 verify_certificate = yes require_certificate = yes # --- # This is an example server domain for TLS connections # received from the loopback interface. We allow -# the use of TLSv1 protocols here, we do +# the use of TLSv1.2 protocols here, we do # not require that clients present client certificates # but if they present it it must be valid. We also use # a special certificate and CA list for loopback # interface. # #[server:5.6.7.8:5061] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/local_key.pem @@ -76,7 +76,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (domain and subdomains) # #[server:any] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_org_key.pem @@ -93,7 +93,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (only subdomains) # #[server:any] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_net_key.pem

1 0

git:master:3fa7b04c: tls: switch to TLSv1.2 in example cfg, usage of TLS 1.0 is not recommended anymore
by Henning Westerholt 15 Oct '19

15 Oct '19

Module: kamailio Branch: master Commit: 3fa7b04cb6ac4170343455fa4f591fa95f7a3ff9 URL: https://github.com/kamailio/kamailio/commit/3fa7b04cb6ac4170343455fa4f591fa… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-15T14:14:16+02:00 tls: switch to TLSv1.2 in example cfg, usage of TLS 1.0 is not recommended anymore --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3fa7b04cb6ac4170343455fa4f591fa… Patch: https://github.com/kamailio/kamailio/commit/3fa7b04cb6ac4170343455fa4f591fa… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index b84ba8fcfc..d8b20049ae 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -8,12 +8,12 @@ # connections that do not match any other server # domain in this configuration file. # -# We do not enable anything else than TLSv1 +# We do not enable anything else than TLSv1.2 # over the public internet. Clients do not have # to present client certificates by default. # [server:default] -method = TLSv1 +method = TLSv1.2 verify_certificate = no require_certificate = no private_key = /usr/local/etc/kamailio/kamailio-selfsigned.key @@ -29,21 +29,21 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem # We require that servers present valid certificate. # [client:default] -#method = TLSv1 +#method = TLSv1.2 verify_certificate = yes require_certificate = yes # --- # This is an example server domain for TLS connections # received from the loopback interface. We allow -# the use of TLSv1 protocols here, we do +# the use of TLSv1.2 protocols here, we do # not require that clients present client certificates # but if they present it it must be valid. We also use # a special certificate and CA list for loopback # interface. # #[server:5.6.7.8:5061] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/local_key.pem @@ -76,7 +76,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (domain and subdomains) # #[server:any] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_org_key.pem @@ -93,7 +93,7 @@ require_certificate = yes # - it requires to have 'server_name' to match on SNI (only subdomains) # #[server:any] -#method = TLSv1 +#method = TLSv1.2 #verify_certificate = yes #require_certificate = no #private_key = /usr/local/etc/kamailio/tls/mysipserver_net_key.pem

1 0

Kamailio jwt module or Lua script
by Joey Golan 14 Oct '19

14 Oct '19

Hi all, I would like to authenticate subscribers using JWT tokens and I wonder which approach is better: 1. Writhing a dedicated kamailio module. 2. Writing a Lua script. What would work better performance wise? Thanks, Joey.

3 5

git:master:8ee71161: dispatcher: add some debug logging for ds_update_state function
by Henning Westerholt 14 Oct '19

14 Oct '19

Module: kamailio Branch: master Commit: 8ee71161f907201e1734a4b2476636cfb518dab3 URL: https://github.com/kamailio/kamailio/commit/8ee71161f907201e1734a4b2476636c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-14T14:35:17+02:00 dispatcher: add some debug logging for ds_update_state function --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/8ee71161f907201e1734a4b2476636c… Patch: https://github.com/kamailio/kamailio/commit/8ee71161f907201e1734a4b2476636c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index a3c33a0cbb..483ddb418f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2688,6 +2688,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) LM_ERR("destination set [%d] not found\n", group); return -1; } + LM_DBG("update state for %.*s in group %d to %d\n", address->len, address->s, group, state); while(i < idx->nr) { if(idx->dlist[i].uri.len == address->len @@ -2718,12 +2719,15 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) if(state & DS_TRYING_DST) { idx->dlist[i].message_count++; + LM_DBG("destination did not replied %d times, threshold %d\n", + idx->dlist[i].message_count, probing_threshold); /* Destination is not replying.. Increasing failure counter */ if(idx->dlist[i].message_count >= probing_threshold) { - /* Destionation has too much lost messages.. Bringing it to inactive state */ + /* Destination has too much lost messages.. Bringing it to inactive state */ idx->dlist[i].flags &= ~DS_TRYING_DST; idx->dlist[i].flags |= DS_INACTIVE_DST; idx->dlist[i].message_count = 0; + LM_DBG("deactivate destination, threshold %d reached\n", probing_threshold); } } else { if(!(init_state & DS_TRYING_DST) @@ -2733,9 +2737,12 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) if(idx->dlist[i].message_count < inactive_threshold) { /* Destination has not enough successful replies.. Leaving it into inactive state */ idx->dlist[i].flags |= DS_INACTIVE_DST; + LM_DBG("destination replied successful %d times, threshold %d\n", + idx->dlist[i].message_count, inactive_threshold); } else { /* Destination has enough replied messages.. Bringing it to active state */ idx->dlist[i].message_count = 0; + LM_DBG("activate destination, threshold %d reached\n", inactive_threshold); } } else { idx->dlist[i].message_count = 0; @@ -2753,6 +2760,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) ds_reinit_rweight_on_state_change( old_state, idx->dlist[i].flags, idx); + LM_DBG("old state was %d, set new state to %d\n", old_state, idx->dlist[i].flags); return 0; } i++;

1 0

git:master:82195c2a: nathelper: removed exe flag from c file
by Daniel-Constantin Mierla 11 Oct '19

11 Oct '19

Module: kamailio Branch: master Commit: 82195c2a51c5020ca0024f59492a4e2faef0e15a URL: https://github.com/kamailio/kamailio/commit/82195c2a51c5020ca0024f59492a4e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-11T14:02:57+02:00 nathelper: removed exe flag from c file --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/82195c2a51c5020ca0024f59492a4e2… Patch: https://github.com/kamailio/kamailio/commit/82195c2a51c5020ca0024f59492a4e2… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100755 new mode 100644

1 0

Re: [sr-dev] [SR-Users] Kamailio v5.2.5 Released
by Andrew Chen 10 Oct '19

10 Oct '19

Awesome. Thanks. On Thu, Oct 10, 2019 at 1:04 PM Joel Serrano <joel(a)textplus.com> wrote: > Hey Andy, > > I think you probably checked before the CI pipeline finished preparing the > packages haha... Right now v5.2.5 is available in the repo: > > http://deb.kamailio.org/kamailio52/pool/main/k/kamailio/ > > > Cheers, > Joel. > > > > On Thu, Oct 10, 2019 at 7:17 AM Andrew Chen <achen(a)fuze.com> wrote: > >> Hi Daniel, >> >> Can we have this available in apt repository as well? I don't seem to >> see it: >> >> kamailio | 5.2.4+bionic | http://deb.kamailio.org/kamailio52 >> bionic/main amd64 Packages >> kamailio | 5.2.4+bionic | http://deb.kamailio.org/kamailio52 >> bionic/main Sources >> >> This is all I see even after apt-get update. >> >> Thanks. >> --Andy >> >> >> On Thu, Oct 10, 2019 at 8:26 AM Daniel-Constantin Mierla < >> miconda(a)gmail.com> wrote: >> >>> Hello, >>> >>> Kamailio SIP Server v5.2.5 stable release is out. >>> >>> This is a maintenance release of the latest stable branch, 5.2, that >>> includes fixes since the release of v5.2.4. There is no change to >>> database schema or configuration language structure that you have to do >>> on previous installations of v5.2.x. Deployments running previous v5.2.x >>> versions are strongly recommended to be upgraded to v5.2.5. >>> >>> For more details about version 5.2.5 (including links and guidelines to >>> download the tarball or from GIT repository), visit: >>> >>> * https://www.kamailio.org/w/2019/10/kamailio-v5-2-5-released/ >>> >>> RPM, Debian/Ubuntu packages will be available soon as well. >>> >>> Many thanks to all contributing and using Kamailio! >>> >>> Cheers, >>> Daniel >>> >>> -- >>> Daniel-Constantin Mierla -- www.asipto.com >>> www.twitter.com/miconda -- www.linkedin.com/in/miconda >>> Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- >>> https://asipto.com/u/kat >>> >>> >>> _______________________________________________ >>> Kamailio (SER) - Users Mailing List >>> sr-users(a)lists.kamailio.org >>> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >>> >> >> >> -- >> Andy Chen >> Sr. Telephony Lead Engineer >> 415 516 5535 (M) >> achen@ <achen(a)thinkingphones.com>fuze.com >> >> >> *Confidentiality Notice: The information contained in this e-mail and any >> attachments may be confidential. If you are not an intended recipient, you >> are hereby notified that any dissemination, distribution or copying of >> this >> e-mail is strictly prohibited. If you have received this e-mail in error, >> please notify the sender and permanently delete the e-mail and any >> attachments immediately. You should not retain, copy or use this e-mail or >> any attachment for any purpose, nor disclose all or any part of the >> contents to any other person. Thank you.* >> _______________________________________________ >> Kamailio (SER) - Users Mailing List >> sr-users(a)lists.kamailio.org >> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >> > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users > -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@ <achen(a)thinkingphones.com>fuze.com -- *Confidentiality Notice: The information contained in this e-mail and any attachments may be confidential. If you are not an intended recipient, you are hereby notified that any dissemination, distribution or copying of this e-mail is strictly prohibited. If you have received this e-mail in error, please notify the sender and permanently delete the e-mail and any attachments immediately. You should not retain, copy or use this e-mail or any attachment for any purpose, nor disclose all or any part of the contents to any other person. Thank you.*

1 0

Kamailio v5.2.5 Released
by Daniel-Constantin Mierla 10 Oct '19

10 Oct '19

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

2 1

git:master:038158c9: core: new global parameter uri_host_extra_chars
by Daniel-Constantin Mierla 10 Oct '19

10 Oct '19

Module: kamailio Branch: master Commit: 038158c99da96933c26b11a919ed1cbe29af9fab URL: https://github.com/kamailio/kamailio/commit/038158c99da96933c26b11a919ed1cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-10T14:25:43+02:00 core: new global parameter uri_host_extra_chars - allow specifying additional chars to be allowed in host part - example: uri_host_extra_chars = "_" --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/038158c99da96933c26b11a919ed1cb… Patch: https://github.com/kamailio/kamailio/commit/038158c99da96933c26b11a919ed1cb… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index a640bd158f..25671d1127 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -470,6 +470,8 @@ LATENCY_LIMIT_DB latency_limit_db LATENCY_LIMIT_ACTION latency_limit_action LATENCY_LIMIT_CFG latency_limit_cfg +URI_HOST_EXTRA_CHARS "uri_host_extra_chars" + MSG_TIME msg_time ONSEND_RT_REPLY "onsend_route_reply" CFG_DESCRIPTION "description"|"descr"|"desc" @@ -980,6 +982,7 @@ IMPORTFILE "import_file" <INITIAL>{LOADPATH} { count(); yylval.strval=yytext; return LOADPATH; } <INITIAL>{MODPARAM} { count(); yylval.strval=yytext; return MODPARAM; } <INITIAL>{CFGENGINE} { count(); yylval.strval=yytext; return CFGENGINE; } +<INITIAL>{URI_HOST_EXTRA_CHARS} { yylval.strval=yytext; return URI_HOST_EXTRA_CHARS; } <INITIAL>{EQUAL} { count(); return EQUAL; } <INITIAL>{ADDEQ} { count(); return ADDEQ; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 0042af8327..56a8c9ab8c 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -503,6 +503,7 @@ extern char *default_routename; %token LATENCY_LIMIT_CFG %token MSG_TIME %token ONSEND_RT_REPLY +%token URI_HOST_EXTRA_CHARS %token FLAGS_DECL %token AVPFLAGS_DECL @@ -1437,6 +1438,8 @@ assign_stm: user_agent_hdr.len=strlen(user_agent_hdr.s); } | USER_AGENT_HEADER EQUAL error { yyerror("string value expected"); } + | URI_HOST_EXTRA_CHARS EQUAL STRING { _sr_uri_host_extra_chars=$3; } + | URI_HOST_EXTRA_CHARS EQUAL error { yyerror("string value expected"); } | REPLY_TO_VIA EQUAL NUMBER { reply_to_via=$3; } | REPLY_TO_VIA EQUAL error { yyerror("boolean value expected"); } | LISTEN EQUAL id_lst { diff --git a/src/core/globals.h b/src/core/globals.h index 2149eeccd6..81fad0b284 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -215,6 +215,8 @@ extern int ksr_route_locks_size; extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; +extern char *_sr_uri_host_extra_chars; + #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ extern unsigned int dns_timer_interval; /* gc timer interval in s */ diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index dbf5a7f9f7..ec39ea7cf2 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -37,6 +37,25 @@ static char _sr_uri_empty_buf[2] = {0}; static str _sr_uri_empty = { _sr_uri_empty_buf, 0 }; +/* extra chars that should be allowed in URI host */ +char *_sr_uri_host_extra_chars = ""; + +int uri_host_char_allowed(char c) +{ + int i = 0; + + if(_sr_uri_host_extra_chars==NULL || _sr_uri_host_extra_chars[0]=='\0') { + return 0; + } + while(_sr_uri_host_extra_chars[i]!='\0') { + if(_sr_uri_host_extra_chars[i]==c) { + return 1; + } + i++; + } + return 0; +} + /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri * returns: fills uri & returns <0 on error or 0 if ok @@ -542,7 +561,8 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) switch(*p) { check_host_end; default: - if(!isalnum(*p) && (*p != '.') && (*p != '-')) { + if(!isalnum(*p) && (*p != '.') && (*p != '-') + && !uri_host_char_allowed(*p)) { goto error_bad_host; } }

1 0

git:5.2:8d08d3fd: Makefile.defs: version set to 5.2.5
by Daniel-Constantin Mierla 10 Oct '19

10 Oct '19

Module: kamailio Branch: 5.2 Commit: 8d08d3fdb8f70955ae0bcbf62a32761d653383a3 URL: https://github.com/kamailio/kamailio/commit/8d08d3fdb8f70955ae0bcbf62a32761… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-10T10:33:45+02:00 Makefile.defs: version set to 5.2.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8d08d3fdb8f70955ae0bcbf62a32761… Patch: https://github.com/kamailio/kamailio/commit/8d08d3fdb8f70955ae0bcbf62a32761… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index fe15cda4d1..483a11eb27 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 2 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:5.2:62d35f9e: ChangeLog: content updated for v5.2.5
by Daniel-Constantin Mierla 10 Oct '19

10 Oct '19

Module: kamailio Branch: 5.2 Commit: 62d35f9e80577f511371ef3e4571773ecaa18b03 URL: https://github.com/kamailio/kamailio/commit/62d35f9e80577f511371ef3e4571773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-10T10:44:09+02:00 ChangeLog: content updated for v5.2.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/62d35f9e80577f511371ef3e4571773… Patch: https://github.com/kamailio/kamailio/commit/62d35f9e80577f511371ef3e4571773…

1 0

git:5.2:b8fed3a4: pkg/kamailio: updated version to 5.2.5 in spec files
by Daniel-Constantin Mierla 10 Oct '19

10 Oct '19

Module: kamailio Branch: 5.2 Commit: b8fed3a479d970f2c9e77ef0f3fcf7bff1ae3efe URL: https://github.com/kamailio/kamailio/commit/b8fed3a479d970f2c9e77ef0f3fcf7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-10T09:56:18+02:00 pkg/kamailio: updated version to 5.2.5 in spec files --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b8fed3a479d970f2c9e77ef0f3fcf7b… Patch: https://github.com/kamailio/kamailio/commit/b8fed3a479d970f2c9e77ef0f3fcf7b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index ced35284bf..67c7655ceb 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.2.4 +pkgver=5.2.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d60574ef02..7ece485fdb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.4 +%define ver 5.2.5 %define rel dev1.0%{dist} %if 0%{?fedora} == 27 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 0495af393e..a886e20629 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.4 +%define ver 5.2.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 86707938b6..4fb384f59b 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.4 +%define ver 5.2.5 %define rel 0 %define _sharedir %{_prefix}/share

1 0

git:5.2:361b5c5d: pkg/kamailio/deb: version set 5.2.5
by Victor Seva 10 Oct '19

10 Oct '19

Module: kamailio Branch: 5.2 Commit: 361b5c5d75bbbcf231654c0c44fbbf49619b341d URL: https://github.com/kamailio/kamailio/commit/361b5c5d75bbbcf231654c0c44fbbf4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-10T09:45:56+02:00 pkg/kamailio/deb: version set 5.2.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/361b5c5d75bbbcf231654c0c44fbbf4… Patch: https://github.com/kamailio/kamailio/commit/361b5c5d75bbbcf231654c0c44fbbf4…

1 0

Releasing Kamailio v5.2.5
by Daniel-Constantin Mierla 10 Oct '19

10 Oct '19

Hello, I am considering to release Kamailio v5.2.5 out of the latest branch 5.2 on Thursday, October 10. As usual, if you noticed any patch that should be backported or you are aware of some issue not yet reported, announce it to sr-dev or via bug tracker. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat

1 1

git:5.3:eaed1189: modules: readme files regenerated - modules ... [skip ci]
by The Root 10 Oct '19

10 Oct '19

Module: kamailio Branch: 5.3 Commit: eaed118951d605b5961fdcf57a81a25881642e1b URL: https://github.com/kamailio/kamailio/commit/eaed118951d605b5961fdcf57a81a25… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2019-10-09T21:31:14+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/eaed118951d605b5961fdcf57a81a25… Patch: https://github.com/kamailio/kamailio/commit/eaed118951d605b5961fdcf57a81a25…

3 2

[kamailio/kamailio] pv: adding xavp_copy with destination index (#2096)
by Julien Chavanton 09 Oct '19

09 Oct '19

#### 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) - [ ] 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 MR to add another xavp_copy function taking 4 params ``` xavc_copy("source_name", "source_index", "destination_name", "destination_index") ``` This will let the user copy to a specific position in the stack (replacing its value). This would bring coherent behaviour compared to assign to a specific index vs appending. Example : swapping xavp in and existing stack: (second and third elements) ``` $xavp(a=>x) = "a-0-x"; $xavp(a[0]=>y) = "a-0-y"; $xavp(a=>x) = "a-1-x"; $xavp(a[0]=>y) = "a-1-y"; $xavp(a=>x) = "a-2-x"; $xavp(a[0]=>y) = "a-2-y"; # INFO: <script>: NEW $xavp(a[0]) = [a-2-x][a-2-y] # INFO: <script>: NEW $xavp(a[1]) = [a-1-x][a-1-y] # INFO: <script>: NEW $xavp(a[2]) = [a-0-x][a-0-y] xavp_copy("a", "1", "c"); xavp_copy("a", "2", "a", "1"); xavp_copy("c", "0", "a", "2"); # INFO: <script>: AFTER $xavp(a[0]) = [a-2-x][a-2-y] # INFO: <script>: AFTER $xavp(a[1]) = [a-0-x][a-0-y] # INFO: <script>: AFTER $xavp(a[2]) = [a-1-x][a-1-y] ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2096 -- Commit Summary -- * pv: adding xavp_copy with destination index -- File Changes -- M src/modules/pv/pv.c (78) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2096.patch https://github.com/kamailio/kamailio/pull/2096.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/2096

1 2

git:5.2:9271ec3e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 9271ec3e0bc1de5d911f44e311104d8d685e8f4b URL: https://github.com/kamailio/kamailio/commit/9271ec3e0bc1de5d911f44e311104d8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T22:46:37+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/9271ec3e0bc1de5d911f44e311104d8… Patch: https://github.com/kamailio/kamailio/commit/9271ec3e0bc1de5d911f44e311104d8… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index c8241be6e6..433f2c833c 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -427,9 +427,11 @@ modparam("websocket", "ping_application_data", "WebSockets rock") A bitmap that allows you to control the sub-protocols supported by the WebSocket server. * 1 - sip (RFC 7118) - * 2 - msrp (RFC 7977) - msrp.so must be loaded before websocket.so + * 2 - msrp (RFC 7977) - the msrp module must be loaded before the + websocket module - Default value is 1 when msrp.so is not loaded 3 when msrp.so is loaded. + Default value is 1 when msrp module is not loaded, 3 when msrp module + is loaded. Example 1.8. Set sub_protocols parameter ...

1 0

git:5.3:1c1791db: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 1c1791db132aaa87dec0a60a2080680da19a49f9 URL: https://github.com/kamailio/kamailio/commit/1c1791db132aaa87dec0a60a2080680… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T22:46:24+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/1c1791db132aaa87dec0a60a2080680… Patch: https://github.com/kamailio/kamailio/commit/1c1791db132aaa87dec0a60a2080680… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index c8241be6e6..433f2c833c 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -427,9 +427,11 @@ modparam("websocket", "ping_application_data", "WebSockets rock") A bitmap that allows you to control the sub-protocols supported by the WebSocket server. * 1 - sip (RFC 7118) - * 2 - msrp (RFC 7977) - msrp.so must be loaded before websocket.so + * 2 - msrp (RFC 7977) - the msrp module must be loaded before the + websocket module - Default value is 1 when msrp.so is not loaded 3 when msrp.so is loaded. + Default value is 1 when msrp module is not loaded, 3 when msrp module + is loaded. Example 1.8. Set sub_protocols parameter ...

1 0

git:master:af8e6703: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: af8e67033da2dabab319a9ecc21a279e6609f447 URL: https://github.com/kamailio/kamailio/commit/af8e67033da2dabab319a9ecc21a279… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T22:46:11+02:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/af8e67033da2dabab319a9ecc21a279… Patch: https://github.com/kamailio/kamailio/commit/af8e67033da2dabab319a9ecc21a279… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index c8241be6e6..433f2c833c 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -427,9 +427,11 @@ modparam("websocket", "ping_application_data", "WebSockets rock") A bitmap that allows you to control the sub-protocols supported by the WebSocket server. * 1 - sip (RFC 7118) - * 2 - msrp (RFC 7977) - msrp.so must be loaded before websocket.so + * 2 - msrp (RFC 7977) - the msrp module must be loaded before the + websocket module - Default value is 1 when msrp.so is not loaded 3 when msrp.so is loaded. + Default value is 1 when msrp module is not loaded, 3 when msrp module + is loaded. Example 1.8. Set sub_protocols parameter ...

1 0

git:5.2:88adabad: websocket: small doc improvement (use module names instead of file names)
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 88adabadaa1b2916dbdffdc7a6eb526dc124c871 URL: https://github.com/kamailio/kamailio/commit/88adabadaa1b2916dbdffdc7a6eb526… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T22:43:33+02:00 websocket: small doc improvement (use module names instead of file names) (cherry picked from commit 179c536e972f4f8739a4ba3446610161d8cb913f) --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/88adabadaa1b2916dbdffdc7a6eb526… Patch: https://github.com/kamailio/kamailio/commit/88adabadaa1b2916dbdffdc7a6eb526… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 6b6483d73f..132ede160b 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -378,11 +378,11 @@ modparam("websocket", "ping_application_data", "WebSockets rock") </para></listitem> <listitem><para> <emphasis>2</emphasis> - msrp (RFC 7977) - - msrp.so must be loaded before websocket.so + the msrp module must be loaded before the websocket module </para></listitem> </itemizedlist> - <para><emphasis>Default value is 1 when msrp.so is not loaded - 3 when msrp.so is loaded.</emphasis></para> + <para><emphasis>Default value is 1 when msrp module is not loaded, + 3 when msrp module is loaded.</emphasis></para> <example> <title>Set <varname>sub_protocols</varname> parameter</title>

1 0

git:5.3:90fb9166: websocket: small doc improvement (use module names instead of file names)
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 90fb9166dd8ec011540c3401cc583996b5bd7c5a URL: https://github.com/kamailio/kamailio/commit/90fb9166dd8ec011540c3401cc58399… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T22:43:12+02:00 websocket: small doc improvement (use module names instead of file names) (cherry picked from commit 179c536e972f4f8739a4ba3446610161d8cb913f) --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90fb9166dd8ec011540c3401cc58399… Patch: https://github.com/kamailio/kamailio/commit/90fb9166dd8ec011540c3401cc58399… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 6b6483d73f..132ede160b 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -378,11 +378,11 @@ modparam("websocket", "ping_application_data", "WebSockets rock") </para></listitem> <listitem><para> <emphasis>2</emphasis> - msrp (RFC 7977) - - msrp.so must be loaded before websocket.so + the msrp module must be loaded before the websocket module </para></listitem> </itemizedlist> - <para><emphasis>Default value is 1 when msrp.so is not loaded - 3 when msrp.so is loaded.</emphasis></para> + <para><emphasis>Default value is 1 when msrp module is not loaded, + 3 when msrp module is loaded.</emphasis></para> <example> <title>Set <varname>sub_protocols</varname> parameter</title>

1 0

git:master:179c536e: websocket: small doc improvement (use module names instead of file names)
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 179c536e972f4f8739a4ba3446610161d8cb913f URL: https://github.com/kamailio/kamailio/commit/179c536e972f4f8739a4ba344661016… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T22:41:47+02:00 websocket: small doc improvement (use module names instead of file names) --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/179c536e972f4f8739a4ba344661016… Patch: https://github.com/kamailio/kamailio/commit/179c536e972f4f8739a4ba344661016… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 6b6483d73f..132ede160b 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -378,11 +378,11 @@ modparam("websocket", "ping_application_data", "WebSockets rock") </para></listitem> <listitem><para> <emphasis>2</emphasis> - msrp (RFC 7977) - - msrp.so must be loaded before websocket.so + the msrp module must be loaded before the websocket module </para></listitem> </itemizedlist> - <para><emphasis>Default value is 1 when msrp.so is not loaded - 3 when msrp.so is loaded.</emphasis></para> + <para><emphasis>Default value is 1 when msrp module is not loaded, + 3 when msrp module is loaded.</emphasis></para> <example> <title>Set <varname>sub_protocols</varname> parameter</title>

1 0

git:5.3:102131c2: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 102131c20c179572452946c5dc82557ad1da2234 URL: https://github.com/kamailio/kamailio/commit/102131c20c179572452946c5dc82557… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T21:31:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/102131c20c179572452946c5dc82557… Patch: https://github.com/kamailio/kamailio/commit/102131c20c179572452946c5dc82557… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 4e783711ee..caeb998e93 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -85,7 +85,7 @@ Ramona-Elena Modroiu 8.5. uac.reg_reload 8.6. uac.reg_refresh 8.7. uac.reg_active - 8.8. + 8.8. uac.reg_add 9. Remote Registration @@ -203,7 +203,7 @@ Chapter 1. Admin Guide 8.5. uac.reg_reload 8.6. uac.reg_refresh 8.7. uac.reg_active - 8.8. + 8.8. uac.reg_add 9. Remote Registration @@ -957,7 +957,7 @@ event_route[uac:reply] { 8.5. uac.reg_reload 8.6. uac.reg_refresh 8.7. uac.reg_active - 8.8. + 8.8. uac.reg_add 8.1. uac.reg_dump @@ -1054,6 +1054,8 @@ event_route[uac:reply] { kamctl rpc uac.reg_active 1 ... +8.8. uac.reg_add + Add a new UAC remote registration record. If one with the same unique id is found, it is deleted. @@ -1095,7 +1097,7 @@ event_route[uac:reply] { * r_domain - remote domain, e.g.,: sipprovider.com - * realm - remote relam, e.g.,: sipprovider.com + * realm - remote realm, e.g.,: sipprovider.com * auth_username - authentication username, e.g.,: test123

1 0

git:5.3:f581c136: modules: readme files regenerated - modules ... [skip ci]
by The Root 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: f581c1360979adf4087b594b4638cec4b945576f URL: https://github.com/kamailio/kamailio/commit/f581c1360979adf4087b594b4638cec… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2019-10-09T21:31:14+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/f581c1360979adf4087b594b4638cec… Patch: https://github.com/kamailio/kamailio/commit/f581c1360979adf4087b594b4638cec… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index bd0328b446..fdd95cd8e9 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -92,6 +92,10 @@ Chapter 1. Admin Guide routing block configurations. It adds new features similar to the textops module (textops eXtentions). + Note: If you add or remove message parts (header, body etc..) it may be + required to execute msg_apply_changes() from this module if there are + other operations done on the SIP message later on. + 2. Functions 2.1. msg_apply_changes()

1 0

git:5.2:aac6b027: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: aac6b02731bfdd0b9627cbc6f78f8337bf09c666 URL: https://github.com/kamailio/kamailio/commit/aac6b02731bfdd0b9627cbc6f78f833… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T21:46:27+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/aac6b02731bfdd0b9627cbc6f78f833… Patch: https://github.com/kamailio/kamailio/commit/aac6b02731bfdd0b9627cbc6f78f833… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index d028ca7e45..55a2f93a09 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1433,6 +1433,7 @@ end * krand - use internal kam_rand() function * fastrand - use internal fastrand (ISAAC) function * cryptorand - use internal cryptorand (Fortuna) function + * kxlibssl - default libssl rand engine wrapped by a Kamailio mutex Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers diff --git a/src/modules/uac/README b/src/modules/uac/README index 0dae86dc80..e98b70b7cc 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -1016,7 +1016,7 @@ event_route[uac:reply] { * r_domain - remote domain, e.g.,: sipprovider.com - * realm - remote relam, e.g.,: sipprovider.com + * realm - remote realm, e.g.,: sipprovider.com * auth_username - authentication username, e.g.,: test123

1 0

git:master:8a51d2d7: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 8a51d2d7bb248c2718a9fc45bb1581b80fdc72e4 URL: https://github.com/kamailio/kamailio/commit/8a51d2d7bb248c2718a9fc45bb1581b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T21:31:08+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/8a51d2d7bb248c2718a9fc45bb1581b… Patch: https://github.com/kamailio/kamailio/commit/8a51d2d7bb248c2718a9fc45bb1581b… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 4e783711ee..caeb998e93 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -85,7 +85,7 @@ Ramona-Elena Modroiu 8.5. uac.reg_reload 8.6. uac.reg_refresh 8.7. uac.reg_active - 8.8. + 8.8. uac.reg_add 9. Remote Registration @@ -203,7 +203,7 @@ Chapter 1. Admin Guide 8.5. uac.reg_reload 8.6. uac.reg_refresh 8.7. uac.reg_active - 8.8. + 8.8. uac.reg_add 9. Remote Registration @@ -957,7 +957,7 @@ event_route[uac:reply] { 8.5. uac.reg_reload 8.6. uac.reg_refresh 8.7. uac.reg_active - 8.8. + 8.8. uac.reg_add 8.1. uac.reg_dump @@ -1054,6 +1054,8 @@ event_route[uac:reply] { kamctl rpc uac.reg_active 1 ... +8.8. uac.reg_add + Add a new UAC remote registration record. If one with the same unique id is found, it is deleted. @@ -1095,7 +1097,7 @@ event_route[uac:reply] { * r_domain - remote domain, e.g.,: sipprovider.com - * realm - remote relam, e.g.,: sipprovider.com + * realm - remote realm, e.g.,: sipprovider.com * auth_username - authentication username, e.g.,: test123

1 0

git:5.2:9a97bbae: tls: added rand engine kxlibssl
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 9a97bbae48725955e991bbbf4c28dbfbd6b0e0c2 URL: https://github.com/kamailio/kamailio/commit/9a97bbae48725955e991bbbf4c28dbf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T21:29:38+02:00 tls: added rand engine kxlibssl - use default libssl engine wrapped in a kamailio mutex lock - manual backport from master (cherry picked from commit 29a75074c99b334ea80d78a247562684d18b2116) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/9a97bbae48725955e991bbbf4c28dbf… Patch: https://github.com/kamailio/kamailio/commit/9a97bbae48725955e991bbbf4c28dbf…

1 0

git:5.2:66baf224: tls: docs for kxlibssl rand engine
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 66baf224211877241b4c5d8911d36083fe7d58c5 URL: https://github.com/kamailio/kamailio/commit/66baf224211877241b4c5d8911d3608… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T21:29:52+02:00 tls: docs for kxlibssl rand engine - manual backport (cherry picked from commit 64c35a9f06ef42ecbfe2ac11a7ed171c7e91c06c) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/66baf224211877241b4c5d8911d3608… Patch: https://github.com/kamailio/kamailio/commit/66baf224211877241b4c5d8911d3608… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index c6ec3b067d..301183c566 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1260,6 +1260,7 @@ end <listitem><para>krand - use internal kam_rand() function</para></listitem> <listitem><para>fastrand - use internal fastrand (ISAAC) function</para></listitem> <listitem><para>cryptorand - use internal cryptorand (Fortuna) function</para></listitem> + <listitem><para>kxlibssl - default libssl rand engine wrapped by a &kamailio; mutex</para></listitem> </itemizedlist> <para> Note: the krand and fastrand engines are not recommended for use on

1 0

git:5.3:64c35a9f: tls: docs for kxlibssl rand engine
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 64c35a9f06ef42ecbfe2ac11a7ed171c7e91c06c URL: https://github.com/kamailio/kamailio/commit/64c35a9f06ef42ecbfe2ac11a7ed171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T21:28:56+02:00 tls: docs for kxlibssl rand engine - manual backport --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/64c35a9f06ef42ecbfe2ac11a7ed171… Patch: https://github.com/kamailio/kamailio/commit/64c35a9f06ef42ecbfe2ac11a7ed171… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index c6ec3b067d..301183c566 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1260,6 +1260,7 @@ end <listitem><para>krand - use internal kam_rand() function</para></listitem> <listitem><para>fastrand - use internal fastrand (ISAAC) function</para></listitem> <listitem><para>cryptorand - use internal cryptorand (Fortuna) function</para></listitem> + <listitem><para>kxlibssl - default libssl rand engine wrapped by a &kamailio; mutex</para></listitem> </itemizedlist> <para> Note: the krand and fastrand engines are not recommended for use on

1 0

git:5.3:29a75074: tls: added rand engine kxlibssl
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 29a75074c99b334ea80d78a247562684d18b2116 URL: https://github.com/kamailio/kamailio/commit/29a75074c99b334ea80d78a24756268… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T21:28:56+02:00 tls: added rand engine kxlibssl - use default libssl engine wrapped in a kamailio mutex lock - manual backport from master --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/29a75074c99b334ea80d78a24756268… Patch: https://github.com/kamailio/kamailio/commit/29a75074c99b334ea80d78a24756268…

1 0

git:5.3:e22bc63d: uac: spelling fix in docs, add missing title section for uac.reg_add
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: e22bc63df21a96a2ad8a7e0c6302d4c73bac667c URL: https://github.com/kamailio/kamailio/commit/e22bc63df21a96a2ad8a7e0c6302d4c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:25:03+02:00 uac: spelling fix in docs, add missing title section for uac.reg_add (cherry picked from commit 073907aa1f3b325b121801f06a65e7e7175154f3) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e22bc63df21a96a2ad8a7e0c6302d4c… Patch: https://github.com/kamailio/kamailio/commit/e22bc63df21a96a2ad8a7e0c6302d4c… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 1a48b5663e..8ddf26ca0f 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1279,6 +1279,9 @@ event_route[uac:reply] { </section> <section id="uac.r.uac.reg_add"> + <title> + <function moreinfo="none">uac.reg_add</function> + </title> <para> Add a new UAC remote registration record. If one with the same unique id is found, it is deleted. @@ -1356,7 +1359,7 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>realm</emphasis> - remote relam, e.g.,: + <emphasis>realm</emphasis> - remote realm, e.g.,: sipprovider.com </para></listitem> </itemizedlist>

1 0

git:5.3:841182e9: uri_db: spelling fix in variable name
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 841182e9ee55dca5b932a7716d14b3350ab3671f URL: https://github.com/kamailio/kamailio/commit/841182e9ee55dca5b932a7716d14b33… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:24:46+02:00 uri_db: spelling fix in variable name (cherry picked from commit 23b60ed9fbf9396bd531c76f57c133d5850c0764) --- Modified: src/modules/uri_db/checks.h --- Diff: https://github.com/kamailio/kamailio/commit/841182e9ee55dca5b932a7716d14b33… Patch: https://github.com/kamailio/kamailio/commit/841182e9ee55dca5b932a7716d14b33… --- diff --git a/src/modules/uri_db/checks.h b/src/modules/uri_db/checks.h index 959dbbbfb3..5eb504a1a0 100644 --- a/src/modules/uri_db/checks.h +++ b/src/modules/uri_db/checks.h @@ -63,7 +63,7 @@ int uridb_db_ver(const str* db_url); int ki_check_to(struct sip_msg* _m); int ki_check_from(struct sip_msg* _m); int ki_check_uri(struct sip_msg* msg, str *suri); -int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srelam); +int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srealm); int ki_does_uri_exist(struct sip_msg* _msg); #endif /* CHECKS_H */

1 0

git:5.2:9617f51a: uac: spelling fix in uac docs
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 9617f51a19dc715932ddbb58e72fb264ae90b747 URL: https://github.com/kamailio/kamailio/commit/9617f51a19dc715932ddbb58e72fb26… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:24:00+02:00 uac: spelling fix in uac docs (cherry picked from commit 167efd5eea2e9a918ecda4249fa5574cfba4e310) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9617f51a19dc715932ddbb58e72fb26… Patch: https://github.com/kamailio/kamailio/commit/9617f51a19dc715932ddbb58e72fb26… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 1eabfffab7..5b16cf6eb9 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1261,7 +1261,7 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>realm</emphasis> - remote relam, e.g.,: + <emphasis>realm</emphasis> - remote realm, e.g.,: sipprovider.com </para></listitem> </itemizedlist>

1 0

git:5.1:167efd5e: uac: spelling fix in uac docs
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: 167efd5eea2e9a918ecda4249fa5574cfba4e310 URL: https://github.com/kamailio/kamailio/commit/167efd5eea2e9a918ecda4249fa5574… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:22:38+02:00 uac: spelling fix in uac docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/167efd5eea2e9a918ecda4249fa5574… Patch: https://github.com/kamailio/kamailio/commit/167efd5eea2e9a918ecda4249fa5574… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index d96f49a90f..b996229305 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1152,7 +1152,7 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>realm</emphasis> - remote relam, e.g.,: + <emphasis>realm</emphasis> - remote realm, e.g.,: sipprovider.com </para></listitem> </itemizedlist>

1 0

git:master:23b60ed9: uri_db: spelling fix in variable name
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 23b60ed9fbf9396bd531c76f57c133d5850c0764 URL: https://github.com/kamailio/kamailio/commit/23b60ed9fbf9396bd531c76f57c133d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:19:34+02:00 uri_db: spelling fix in variable name --- Modified: src/modules/uri_db/checks.h --- Diff: https://github.com/kamailio/kamailio/commit/23b60ed9fbf9396bd531c76f57c133d… Patch: https://github.com/kamailio/kamailio/commit/23b60ed9fbf9396bd531c76f57c133d… --- diff --git a/src/modules/uri_db/checks.h b/src/modules/uri_db/checks.h index 959dbbbfb3..5eb504a1a0 100644 --- a/src/modules/uri_db/checks.h +++ b/src/modules/uri_db/checks.h @@ -63,7 +63,7 @@ int uridb_db_ver(const str* db_url); int ki_check_to(struct sip_msg* _m); int ki_check_from(struct sip_msg* _m); int ki_check_uri(struct sip_msg* msg, str *suri); -int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srelam); +int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srealm); int ki_does_uri_exist(struct sip_msg* _msg); #endif /* CHECKS_H */

1 0

git:master:073907aa: uac: spelling fix in docs, add missing title section for uac.reg_add
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 073907aa1f3b325b121801f06a65e7e7175154f3 URL: https://github.com/kamailio/kamailio/commit/073907aa1f3b325b121801f06a65e7e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:19:34+02:00 uac: spelling fix in docs, add missing title section for uac.reg_add --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/073907aa1f3b325b121801f06a65e7e… Patch: https://github.com/kamailio/kamailio/commit/073907aa1f3b325b121801f06a65e7e… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 1a48b5663e..8ddf26ca0f 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1279,6 +1279,9 @@ event_route[uac:reply] { </section> <section id="uac.r.uac.reg_add"> + <title> + <function moreinfo="none">uac.reg_add</function> + </title> <para> Add a new UAC remote registration record. If one with the same unique id is found, it is deleted. @@ -1356,7 +1359,7 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>realm</emphasis> - remote relam, e.g.,: + <emphasis>realm</emphasis> - remote realm, e.g.,: sipprovider.com </para></listitem> </itemizedlist>

1 0

git:5.2:9230834a: avp: free allocated variable in case of error
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 9230834aec2de5a078c0a4a81f33bd5483729898 URL: https://github.com/kamailio/kamailio/commit/9230834aec2de5a078c0a4a81f33bd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T19:37:42+02:00 avp: free allocated variable in case of error (cherry picked from commit 5a18155c0fe661e7488f75afa7b0ea7638932943) (cherry picked from commit fc9ca0fcdff7ebc5399374038bc6a0aa02207229) --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/9230834aec2de5a078c0a4a81f33bd5… Patch: https://github.com/kamailio/kamailio/commit/9230834aec2de5a078c0a4a81f33bd5… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f597086d92..f11d56baeb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1380,7 +1380,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - hdr_name_t *h; + hdr_name_t *h = NULL; int n; str *s; if(param_no == 1) { @@ -1427,6 +1427,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", params); + pkg_free(h); return E_CFG; } params++; @@ -1434,6 +1435,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier " "specified\n"); + pkg_free(h); return E_CFG; } } else {

1 0

git:5.2:f36d6562: tm: skip resuming suspended transactions put on wait
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: f36d6562e54acc2b2f72c04a628b8e85f36bc9dd URL: https://github.com/kamailio/kamailio/commit/f36d6562e54acc2b2f72c04a628b8e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T19:37:58+02:00 tm: skip resuming suspended transactions put on wait - transaction is expired in that moment, pending its destroy process - GH #2055 (cherry picked from commit 52afc7b70f8e4abfb347c84872ab7daa202a6a24) (cherry picked from commit c44bd17c79bc0119ae201b826d84b9514700eda9) --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/f36d6562e54acc2b2f72c04a628b8e8… Patch: https://github.com/kamailio/kamailio/commit/f36d6562e54acc2b2f72c04a628b8e8… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 45cbf0b4ed..e2baadb2ae 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1586,11 +1586,12 @@ int t_get_canceled_ident(struct sip_msg* msg, unsigned int* hash_index, * 0). * @param hash_index - searched transaction hash_index (part of the ident). * @param label - searched transaction label (part of the ident). + * @param filter - if 1, skip transaction put on-wait (terminated state). * @return -1 on error/not found, 1 on success (found) * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ -int t_lookup_ident(struct cell ** trans, unsigned int hash_index, - unsigned int label) +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter) { struct cell* p_cell; struct entry* hash_bucket; @@ -1608,9 +1609,19 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, #endif hash_bucket=&(get_tm_table()->entries[hash_index]); /* all the transactions from the entry are compared */ - clist_foreach(hash_bucket, p_cell, next_c){ + clist_foreach(hash_bucket, p_cell, next_c) { prefetch_loc_r(p_cell->next_c, 1); - if(p_cell->label == label){ + if(p_cell->label == label) { + if(filter==1) { + if(t_on_wait(p_cell)) { + /* transaction in terminated state */ + UNLOCK_HASH(hash_index); + set_t(0, T_BR_UNDEFINED); + *trans=NULL; + LM_DBG("transaction in terminated phase - skipping\n"); + return -1; + } + } REF_UNSAFE(p_cell); UNLOCK_HASH(hash_index); set_t(p_cell, T_BR_UNDEFINED); @@ -1622,14 +1633,27 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, UNLOCK_HASH(hash_index); set_t(0, T_BR_UNDEFINED); - *trans=p_cell; + *trans=NULL; LM_DBG("transaction not found\n"); return -1; } - +/** lookup a transaction based on its identifier (hash_index:label). + * @param trans - double pointer to cell structure, that will be filled + * with the result (a pointer to an existing transaction or + * 0). + * @param hash_index - searched transaction hash_index (part of the ident). + * @param label - searched transaction label (part of the ident). + * @return -1 on error/not found, 1 on success (found) + * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). + */ +int t_lookup_ident(struct cell ** trans, unsigned int hash_index, + unsigned int label) +{ + return t_lookup_ident_filter(trans, hash_index, label, 0); +} /** check if a transaction is local or not. * Check if the transaction corresponding to the current message diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 2180311f69..d01528518b 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -94,6 +94,8 @@ typedef int (*tset_fr_f)(struct sip_msg*, unsigned int, unsigned int); int t_is_local(struct sip_msg*); int t_get_trans_ident(struct sip_msg* p_msg, unsigned int* hash_index, unsigned int* label); int t_lookup_ident(struct cell** trans, unsigned int hash_index, unsigned int label); +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter); /* lookup a transaction by callid and cseq */ int t_lookup_callid(struct cell** trans, str callid, str cseq); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index c2c0773b3f..3f129303fe 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -187,9 +187,9 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, backup_T = get_t(); backup_T_branch = get_t_branch(); - if (t_lookup_ident(&t, hash_index, label) < 0) { + if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { set_t(backup_T, backup_T_branch); - LM_ERR("transaction not found\n"); + LM_ERR("active transaction not found\n"); return -1; }

1 0

git:5.3:c44bd17c: tm: skip resuming suspended transactions put on wait
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: c44bd17c79bc0119ae201b826d84b9514700eda9 URL: https://github.com/kamailio/kamailio/commit/c44bd17c79bc0119ae201b826d84b95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T18:48:40+02:00 tm: skip resuming suspended transactions put on wait - transaction is expired in that moment, pending its destroy process - GH #2055 (cherry picked from commit 52afc7b70f8e4abfb347c84872ab7daa202a6a24) --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/c44bd17c79bc0119ae201b826d84b95… Patch: https://github.com/kamailio/kamailio/commit/c44bd17c79bc0119ae201b826d84b95… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index b1182a9e71..510599f742 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1568,11 +1568,12 @@ int t_get_canceled_ident(struct sip_msg* msg, unsigned int* hash_index, * 0). * @param hash_index - searched transaction hash_index (part of the ident). * @param label - searched transaction label (part of the ident). + * @param filter - if 1, skip transaction put on-wait (terminated state). * @return -1 on error/not found, 1 on success (found) * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ -int t_lookup_ident(struct cell ** trans, unsigned int hash_index, - unsigned int label) +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter) { struct cell* p_cell; struct entry* hash_bucket; @@ -1590,9 +1591,19 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, #endif hash_bucket=&(get_tm_table()->entries[hash_index]); /* all the transactions from the entry are compared */ - clist_foreach(hash_bucket, p_cell, next_c){ + clist_foreach(hash_bucket, p_cell, next_c) { prefetch_loc_r(p_cell->next_c, 1); - if(p_cell->label == label){ + if(p_cell->label == label) { + if(filter==1) { + if(t_on_wait(p_cell)) { + /* transaction in terminated state */ + UNLOCK_HASH(hash_index); + set_t(0, T_BR_UNDEFINED); + *trans=NULL; + LM_DBG("transaction in terminated phase - skipping\n"); + return -1; + } + } REF_UNSAFE(p_cell); UNLOCK_HASH(hash_index); set_t(p_cell, T_BR_UNDEFINED); @@ -1604,14 +1615,27 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, UNLOCK_HASH(hash_index); set_t(0, T_BR_UNDEFINED); - *trans=p_cell; + *trans=NULL; LM_DBG("transaction not found\n"); return -1; } - +/** lookup a transaction based on its identifier (hash_index:label). + * @param trans - double pointer to cell structure, that will be filled + * with the result (a pointer to an existing transaction or + * 0). + * @param hash_index - searched transaction hash_index (part of the ident). + * @param label - searched transaction label (part of the ident). + * @return -1 on error/not found, 1 on success (found) + * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). + */ +int t_lookup_ident(struct cell ** trans, unsigned int hash_index, + unsigned int label) +{ + return t_lookup_ident_filter(trans, hash_index, label, 0); +} /** check if a transaction is local or not. * Check if the transaction corresponding to the current message diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 347d088d48..2a5e67d3de 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -92,6 +92,8 @@ typedef int (*tset_fr_f)(struct sip_msg*, unsigned int, unsigned int); int t_is_local(struct sip_msg*); int t_get_trans_ident(struct sip_msg* p_msg, unsigned int* hash_index, unsigned int* label); int t_lookup_ident(struct cell** trans, unsigned int hash_index, unsigned int label); +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter); /* lookup a transaction by callid and cseq */ int t_lookup_callid(struct cell** trans, str callid, str cseq); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index be7b0a6842..949340f1ce 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -187,9 +187,9 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, backup_T = get_t(); backup_T_branch = get_t_branch(); - if (t_lookup_ident(&t, hash_index, label) < 0) { + if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { set_t(backup_T, backup_T_branch); - LM_ERR("transaction not found\n"); + LM_ERR("active transaction not found\n"); return -1; }

1 0

git:5.3:fc9ca0fc: avp: free allocated variable in case of error
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: fc9ca0fcdff7ebc5399374038bc6a0aa02207229 URL: https://github.com/kamailio/kamailio/commit/fc9ca0fcdff7ebc5399374038bc6a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T18:48:27+02:00 avp: free allocated variable in case of error (cherry picked from commit 5a18155c0fe661e7488f75afa7b0ea7638932943) --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/fc9ca0fcdff7ebc5399374038bc6a0a… Patch: https://github.com/kamailio/kamailio/commit/fc9ca0fcdff7ebc5399374038bc6a0a… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f597086d92..f11d56baeb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1380,7 +1380,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - hdr_name_t *h; + hdr_name_t *h = NULL; int n; str *s; if(param_no == 1) { @@ -1427,6 +1427,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", params); + pkg_free(h); return E_CFG; } params++; @@ -1434,6 +1435,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier " "specified\n"); + pkg_free(h); return E_CFG; } } else {

1 0

git:5.1:f7b7ef94: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: f7b7ef940083fc53228c3de1c091496daaefaaf8 URL: https://github.com/kamailio/kamailio/commit/f7b7ef940083fc53228c3de1c091496… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T18:01:43+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/f7b7ef940083fc53228c3de1c091496… Patch: https://github.com/kamailio/kamailio/commit/f7b7ef940083fc53228c3de1c091496… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 60b458d189..f68ae5a9f2 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -92,6 +92,10 @@ Chapter 1. Admin Guide routing block configurations. It adds new features similar to the textops module (textops eXtentions). + Note: If you add or remove message parts (header, body etc..) it may be + required to execute msg_apply_changes() from this module if there are + other operations done on the SIP message later on. + 2. Functions 2.1. msg_apply_changes()

1 0

git:5.2:0afa37d0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 0afa37d08b83a050152bbfec9e8ac764e78fd97a URL: https://github.com/kamailio/kamailio/commit/0afa37d08b83a050152bbfec9e8ac76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T18:01:29+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/0afa37d08b83a050152bbfec9e8ac76… Patch: https://github.com/kamailio/kamailio/commit/0afa37d08b83a050152bbfec9e8ac76… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index bd0328b446..fdd95cd8e9 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -92,6 +92,10 @@ Chapter 1. Admin Guide routing block configurations. It adds new features similar to the textops module (textops eXtentions). + Note: If you add or remove message parts (header, body etc..) it may be + required to execute msg_apply_changes() from this module if there are + other operations done on the SIP message later on. + 2. Functions 2.1. msg_apply_changes()

1 0

git:5.1:a600953c: texopsx: extend docs with a small note about msg_apply_changes()
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: a600953cef1c1ab9bb4d30f485f51ba9c188f460 URL: https://github.com/kamailio/kamailio/commit/a600953cef1c1ab9bb4d30f485f51ba… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T17:57:23+02:00 texopsx: extend docs with a small note about msg_apply_changes() (cherry picked from commit 899b826bcf2ebe0197fae5766962e0c193c585ec) --- Modified: src/modules/textopsx/doc/textopsx.xml --- Diff: https://github.com/kamailio/kamailio/commit/a600953cef1c1ab9bb4d30f485f51ba… Patch: https://github.com/kamailio/kamailio/commit/a600953cef1c1ab9bb4d30f485f51ba… --- diff --git a/src/modules/textopsx/doc/textopsx.xml b/src/modules/textopsx/doc/textopsx.xml index b7fe0d14a8..1967229ac1 100644 --- a/src/modules/textopsx/doc/textopsx.xml +++ b/src/modules/textopsx/doc/textopsx.xml @@ -37,6 +37,11 @@ in routing block configurations. It adds new features similar to the textops module (textops eXtentions). </para> + <para> + Note: If you add or remove message parts (header, body etc..) it + may be required to execute msg_apply_changes() from this module + if there are other operations done on the SIP message later on. + </para> </section> <xi:include href="functions.xml"/>

1 0

git:5.2:698e21f2: texopsx: extend docs with a small note about msg_apply_changes()
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 698e21f29b25c432057c4792d8134a4e953efeb9 URL: https://github.com/kamailio/kamailio/commit/698e21f29b25c432057c4792d8134a4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T17:57:03+02:00 texopsx: extend docs with a small note about msg_apply_changes() (cherry picked from commit 899b826bcf2ebe0197fae5766962e0c193c585ec) --- Modified: src/modules/textopsx/doc/textopsx.xml --- Diff: https://github.com/kamailio/kamailio/commit/698e21f29b25c432057c4792d8134a4… Patch: https://github.com/kamailio/kamailio/commit/698e21f29b25c432057c4792d8134a4… --- diff --git a/src/modules/textopsx/doc/textopsx.xml b/src/modules/textopsx/doc/textopsx.xml index b7fe0d14a8..1967229ac1 100644 --- a/src/modules/textopsx/doc/textopsx.xml +++ b/src/modules/textopsx/doc/textopsx.xml @@ -37,6 +37,11 @@ in routing block configurations. It adds new features similar to the textops module (textops eXtentions). </para> + <para> + Note: If you add or remove message parts (header, body etc..) it + may be required to execute msg_apply_changes() from this module + if there are other operations done on the SIP message later on. + </para> </section> <xi:include href="functions.xml"/>

1 0

git:5.2:4006c2cc: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 4006c2cc53818f52a9a3211c3906d5a7c829970e URL: https://github.com/kamailio/kamailio/commit/4006c2cc53818f52a9a3211c3906d5a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T17:16:26+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/4006c2cc53818f52a9a3211c3906d5a… Patch: https://github.com/kamailio/kamailio/commit/4006c2cc53818f52a9a3211c3906d5a… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 5a0d9dab1f..d028ca7e45 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1431,12 +1431,12 @@ end The following options are avaialble: * krand - use internal kam_rand() function - * fastrand - use internal fastrand function - * cryptorand - use internal cryptorand (fortuna) function + * fastrand - use internal fastrand (ISAAC) function + * cryptorand - use internal cryptorand (Fortuna) function Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers - with enough randomness. + with enough randomness and are not cryptographically secure. The default value is empty (not set) for libssl v1.0.x or older, and "cryptorand" for libssl v1.1.x or newer.

1 0

git:5.3:21e0fba6: tls: add initial seeding to cryptorand generator, as we don't do it in core
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 21e0fba6adb9e77e91ea83ed79b13621df556e1e URL: https://github.com/kamailio/kamailio/commit/21e0fba6adb9e77e91ea83ed79b1362… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T16:56:31+02:00 tls: add initial seeding to cryptorand generator, as we don't do it in core - add initial seeding to cryptorand generator initialization to main proces - only as additional fallback in case of no access to system entropy sources - not needed for 5.3 - we do it in here in the core for all processes --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/21e0fba6adb9e77e91ea83ed79b1362… Patch: https://github.com/kamailio/kamailio/commit/21e0fba6adb9e77e91ea83ed79b1362… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 424fad8a08..eaa9593a31 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -567,6 +567,7 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) #if OPENSSL_VERSION_NUMBER >= 0x10100000L LM_DBG("setting cryptorand random engine\n"); + ksr_cryptorand_seed_init(); RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 3cb2e8a712..14c0321c04 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -171,4 +171,19 @@ const RAND_METHOD *RAND_ksr_cryptorand_method(void) return &_ksr_cryptorand_method; } +/* seed the generator during startup, internally it will also use system entropy */ +void ksr_cryptorand_seed_init() { + u_int8_t bytes[4]; + unsigned int seed; + + seed = fastrand(); + bytes[0] = (seed >> 24) & 0xFF; + bytes[1] = (seed >> 16) & 0xFF; + bytes[2] = (seed >> 8) & 0xFF; + bytes[3] = seed & 0xFF; + + LM_DBG("seeding cryptorand generator with %u\n", seed); + sr_add_entropy(bytes, 4); +} + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index c73d36b8d9..2b61e3b2ed 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -29,5 +29,7 @@ const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void); const RAND_METHOD *RAND_ksr_cryptorand_method(void); +void ksr_cryptorand_seed_init(); + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 1

git:5.2:4288880c: tls: add initial seeding to cryptorand generator, as we don't do it in core
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 4288880cd5a11c255ecf426311033a74a8e292f4 URL: https://github.com/kamailio/kamailio/commit/4288880cd5a11c255ecf426311033a7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T17:02:03+02:00 tls: add initial seeding to cryptorand generator, as we don't do it in core - add initial seeding to cryptorand generator initialization to main proces - only as additional fallback in case of no access to system entropy sources - not needed for 5.3 - we do it in here in the core for all processes (cherry picked from commit 21e0fba6adb9e77e91ea83ed79b13621df556e1e) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/4288880cd5a11c255ecf426311033a7… Patch: https://github.com/kamailio/kamailio/commit/4288880cd5a11c255ecf426311033a7… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 424fad8a08..eaa9593a31 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -567,6 +567,7 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) #if OPENSSL_VERSION_NUMBER >= 0x10100000L LM_DBG("setting cryptorand random engine\n"); + ksr_cryptorand_seed_init(); RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 3cb2e8a712..14c0321c04 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -171,4 +171,19 @@ const RAND_METHOD *RAND_ksr_cryptorand_method(void) return &_ksr_cryptorand_method; } +/* seed the generator during startup, internally it will also use system entropy */ +void ksr_cryptorand_seed_init() { + u_int8_t bytes[4]; + unsigned int seed; + + seed = fastrand(); + bytes[0] = (seed >> 24) & 0xFF; + bytes[1] = (seed >> 16) & 0xFF; + bytes[2] = (seed >> 8) & 0xFF; + bytes[3] = seed & 0xFF; + + LM_DBG("seeding cryptorand generator with %u\n", seed); + sr_add_entropy(bytes, 4); +} + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index c73d36b8d9..2b61e3b2ed 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -29,5 +29,7 @@ const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void); const RAND_METHOD *RAND_ksr_cryptorand_method(void); +void ksr_cryptorand_seed_init(); + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 0

git:5.2:6170ca3b: tls: small extensions in parameter docs related to PRNG engines
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 6170ca3bb3f309bd20061fc7eb747631c405980d URL: https://github.com/kamailio/kamailio/commit/6170ca3bb3f309bd20061fc7eb74763… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T17:01:51+02:00 tls: small extensions in parameter docs related to PRNG engines (cherry picked from commit 6fb06e5f71bdf1b7fc689701a57f543e34836812) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/6170ca3bb3f309bd20061fc7eb74763… Patch: https://github.com/kamailio/kamailio/commit/6170ca3bb3f309bd20061fc7eb74763… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index dc6494c2db..c6ec3b067d 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1258,13 +1258,13 @@ end </para> <itemizedlist> <listitem><para>krand - use internal kam_rand() function</para></listitem> - <listitem><para>fastrand - use internal fastrand function</para></listitem> - <listitem><para>cryptorand - use internal cryptorand (fortuna) function</para></listitem> + <listitem><para>fastrand - use internal fastrand (ISAAC) function</para></listitem> + <listitem><para>cryptorand - use internal cryptorand (Fortuna) function</para></listitem> </itemizedlist> <para> Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers - with enough randomness. + with enough randomness and are not cryptographically secure. </para> <para> The default value is empty (not set) for libssl v1.0.x or older, and

1 0

git:5.2:64cdf0df: tls: update name and mailing list in tls_cert.sh script
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 64cdf0df255932856abceb650cb4ce543b3cd519 URL: https://github.com/kamailio/kamailio/commit/64cdf0df255932856abceb650cb4ce5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T16:39:21+02:00 tls: update name and mailing list in tls_cert.sh script (cherry picked from commit 49a78933845f136f8f7caaf7e24e6cdcf206cbb5) --- Modified: src/modules/tls/tls_cert.sh --- Diff: https://github.com/kamailio/kamailio/commit/64cdf0df255932856abceb650cb4ce5… Patch: https://github.com/kamailio/kamailio/commit/64cdf0df255932856abceb650cb4ce5… --- diff --git a/src/modules/tls/tls_cert.sh b/src/modules/tls/tls_cert.sh index 9e1cd7fa3c..dc9ea24380 100755 --- a/src/modules/tls/tls_cert.sh +++ b/src/modules/tls/tls_cert.sh @@ -11,7 +11,7 @@ # Configuration variables ############################################################################# NAME=$MAIN_NAME -if [ -z "$NAME" ] ; then NAME="sip-router"; fi; +if [ -z "$NAME" ] ; then NAME="kamailio"; fi; DEFAULT_DIR="/usr/local/etc/$NAME" DEFAULT_DAYS=365 DEFAULT_INFO="Self-signed certificate for $NAME" @@ -102,7 +102,7 @@ AUTHOR Written by Jan Janak <jan(a)iptel.org> REPORTING BUGS - Report bugs to <sr-dev(a)sip-router.org> + Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage

1 0

git:5.3:679f2065: tls: update name and mailing list in tls_cert.sh script
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 679f20654ebf52855fdaad1d72cd6572dd9f9743 URL: https://github.com/kamailio/kamailio/commit/679f20654ebf52855fdaad1d72cd657… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T16:39:07+02:00 tls: update name and mailing list in tls_cert.sh script (cherry picked from commit 49a78933845f136f8f7caaf7e24e6cdcf206cbb5) --- Modified: src/modules/tls/tls_cert.sh --- Diff: https://github.com/kamailio/kamailio/commit/679f20654ebf52855fdaad1d72cd657… Patch: https://github.com/kamailio/kamailio/commit/679f20654ebf52855fdaad1d72cd657… --- diff --git a/src/modules/tls/tls_cert.sh b/src/modules/tls/tls_cert.sh index 9e1cd7fa3c..dc9ea24380 100755 --- a/src/modules/tls/tls_cert.sh +++ b/src/modules/tls/tls_cert.sh @@ -11,7 +11,7 @@ # Configuration variables ############################################################################# NAME=$MAIN_NAME -if [ -z "$NAME" ] ; then NAME="sip-router"; fi; +if [ -z "$NAME" ] ; then NAME="kamailio"; fi; DEFAULT_DIR="/usr/local/etc/$NAME" DEFAULT_DAYS=365 DEFAULT_INFO="Self-signed certificate for $NAME" @@ -102,7 +102,7 @@ AUTHOR Written by Jan Janak <jan(a)iptel.org> REPORTING BUGS - Report bugs to <sr-dev(a)sip-router.org> + Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage

1 0

git:5.3:6fb06e5f: tls: small extensions in parameter docs related to PRNG engines
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 6fb06e5f71bdf1b7fc689701a57f543e34836812 URL: https://github.com/kamailio/kamailio/commit/6fb06e5f71bdf1b7fc689701a57f543… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T15:47:05+02:00 tls: small extensions in parameter docs related to PRNG engines --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/6fb06e5f71bdf1b7fc689701a57f543… Patch: https://github.com/kamailio/kamailio/commit/6fb06e5f71bdf1b7fc689701a57f543… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index dc6494c2db..c6ec3b067d 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1258,13 +1258,13 @@ end </para> <itemizedlist> <listitem><para>krand - use internal kam_rand() function</para></listitem> - <listitem><para>fastrand - use internal fastrand function</para></listitem> - <listitem><para>cryptorand - use internal cryptorand (fortuna) function</para></listitem> + <listitem><para>fastrand - use internal fastrand (ISAAC) function</para></listitem> + <listitem><para>cryptorand - use internal cryptorand (Fortuna) function</para></listitem> </itemizedlist> <para> Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers - with enough randomness. + with enough randomness and are not cryptographically secure. </para> <para> The default value is empty (not set) for libssl v1.0.x or older, and

1 0

git:master:12558445: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 12558445c2a569e8566e61d8085a06db7f13a769 URL: https://github.com/kamailio/kamailio/commit/12558445c2a569e8566e61d8085a06d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T15:46:10+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/12558445c2a569e8566e61d8085a06d… Patch: https://github.com/kamailio/kamailio/commit/12558445c2a569e8566e61d8085a06d… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index f8d4e9743b..c3b40949ca 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1434,13 +1434,13 @@ end The following options are avaialble: * krand - use internal kam_rand() function - * fastrand - use internal fastrand function - * cryptorand - use internal cryptorand (fortuna) function + * fastrand - use internal fastrand (ISAAC) function + * cryptorand - use internal cryptorand (Fortuna) function * kxlibssl - default libssl rand engine wrapped by a Kamailio mutex Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers - with enough randomness. + with enough randomness and are not cryptographically secure. The default value is empty (not set) for libssl v1.0.x or older, and "cryptorand" for libssl v1.1.x or newer.

1 0

git:master:4162eed8: tls: small extensions in parameter docs related to PRNG engines
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 4162eed87325ac74de2d275a18c4843b672b9bee URL: https://github.com/kamailio/kamailio/commit/4162eed87325ac74de2d275a18c4843… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T15:39:14+02:00 tls: small extensions in parameter docs related to PRNG engines --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/4162eed87325ac74de2d275a18c4843… Patch: https://github.com/kamailio/kamailio/commit/4162eed87325ac74de2d275a18c4843… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index bf400da6c8..301183c566 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1258,14 +1258,14 @@ end </para> <itemizedlist> <listitem><para>krand - use internal kam_rand() function</para></listitem> - <listitem><para>fastrand - use internal fastrand function</para></listitem> - <listitem><para>cryptorand - use internal cryptorand (fortuna) function</para></listitem> + <listitem><para>fastrand - use internal fastrand (ISAAC) function</para></listitem> + <listitem><para>cryptorand - use internal cryptorand (Fortuna) function</para></listitem> <listitem><para>kxlibssl - default libssl rand engine wrapped by a &kamailio; mutex</para></listitem> </itemizedlist> <para> Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers - with enough randomness. + with enough randomness and are not cryptographically secure. </para> <para> The default value is empty (not set) for libssl v1.0.x or older, and

1 0

[kamailio/kamailio] Segfault in t_reply of Kamailio v5.2.2 rev. 9bc44f (#2055)
by Muhammad Shahzad Shafi 09 Oct '19

09 Oct '19

### Description Kamailio v5.2.2 rev. 9bc44f randomly crashes once a week. The problem seems to be related to TM and ASYNC modules as seen in back-trace of dump core below.  ### Troubleshooting None. We have dump core file available for analysis. #### Reproduction Randomly, roughly once every 5 to 7 days.  #### Debugging Data  ``` Program terminated with signal 11, Segmentation fault. #0 0xb4ecdb33 in faked_env (t=0x7ad779f8, msg=0x0, is_async_env=1) at t_reply.c:813 813 t_reply.c: No such file or directory. (gdb) info locals __FUNCTION__ = "faked_env" (gdb) list 808 in t_reply.c (gdb) bt full #0 0xb4ecdb33 in faked_env (t=0x7ad779f8, msg=0x0, is_async_env=1) at t_reply.c:813 __FUNCTION__ = "faked_env" #1 0xb4eedba2 in t_continue_helper (hash_index=48512, label=393930873, rtact=0xb5ba6184, cbname=0x0, cbparam=0x0) at t_suspend.c:337 t = 0x7ad779f8 backup_T = 0xffffffff backup_T_branch = -1 faked_req = 0x7afdf1bc brpl = 0x0 erpl = 0x8055fd2 faked_req_len = 3176 cancel_data = {cancel_bitmap = 3076137104, reason = {cause = 26896, u = {text = {s = 0xb51cc7e0 "\254\026\003", len = 134606304}, e2e_cancel = 0xb51cc7e0, packed_hdrs = {s = 0xb51cc7e0 "\254\026\003", len = 134606304}}}} branch = 0 uac = 0x7ad77b64 ret = 0 cb_type = 2 msg_status = -1256442488 last_uac_status = -1245318100 reply_status = 137942287 do_put_on_wait = 134606304 hdr = 0xb55987d8 prev = 0x0 tmp = 0x0 route_type_bk = 1 keng = 0x0 evname = {s = 0xb4f31305 "tm:continue", len = 11} __FUNCTION__ = "t_continue_helper" #2 0xb4ef0a2d in t_continue (hash_index=48512, label=393930873, route=0xb5ba6184) at t_suspend.c:583 No locals. #3 0xb43ceac3 in async_exec_task (param=0x7a94bf54) at async_sleep.c:233 atp = 0x7a94bf54 keng = 0x0 cbname = {s = 0x0, len = 0} evname = {s = 0xb43d1a94 "async:task-exec", len = 15} __FUNCTION__ = "async_exec_task" #4 0x080894c6 in async_task_run (idx=4) at core/async_task.c:282 ptask = 0x7a94bf4c received = 4 __FUNCTION__ = "async_task_run" #5 0x08087ca1 in async_task_child_init (rank=0) at core/async_task.c:185 pid = 0 i = 3 __FUNCTION__ = "async_task_child_init" #6 0x08201d26 in init_child (rank=0) at core/sr_module.c:871 ret = 62 #7 0x0806b3d9 in main_loop () at main.c:1737 i = 4 pid = 5982 si = 0x0 si_desc = "udp receiver child=3 sock=85.118.42.43:5080\000\000\002a\267гn\267p\037\000\000\240\263n\267\364\237n\267\240\263n\267`\025\316\b\220W\371\277\315\002a\267\220\000\000\000`\025\316\b\364\237n\267\025\000\000\000\060X\371\277\355\ng\267\060/\316\b0/\316\b@q\245\265\000@\000\000@\220n\267\000\000\000" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #8 0x08071e84 in main (argc=13, argv=0xbff95be4) at main.c:2696 cfg_stream = 0x8bd3008 c = -1 r = 0 tmp = 0xbff96822 "" tmp_len = -1218858976 port = 2209 proto = 1 options = 0x83779a8 ":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 = 1217010649 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xbff95be4 p = 0x805e474 "[\201\303\060\037@" st = {st_dev = 14, __pad1 = 0, st_ino = 10873, st_mode = 16832, st_nlink = 2, st_uid = 0, st_gid = 0, st_rdev = 0, __pad2 = 0, st_size = 120, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1559687937, tv_nsec = 2808493}, st_mtim = {tv_sec = 1566372756, tv_nsec = 587274417}, st_ctim = { tv_sec = 1567450779, tv_nsec = 139516276}, __unused4 = 0, __unused5 = 0} __FUNCTION__ = "main" ``` #### Log Messages  ``` Sep 3 03:02:03 webrtc-as1 kernel: [7785063.653846] kamailio[5987]: segfault at 318 ip b4ecdb33 sp bff94f90 error 6 in tm.so[b4e15000+12a000] ``` #### SIP Traffic Not available ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (i386/linux) 9bc44f flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9bc44f -dirty compiled on 11:33:22 Apr 29 2019 with gcc 4.7.2 ``` * **Operating System**:  ``` Linux webrtc-as1 3.16.0-0.bpo.4-686-pae #1 SMP Debian 3.16.36-1+deb8u2~bpo70+1 (2016-10-19) i686 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/2055

2 9

git:master:52afc7b7: tm: skip resuming suspended transactions put on wait
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 52afc7b70f8e4abfb347c84872ab7daa202a6a24 URL: https://github.com/kamailio/kamailio/commit/52afc7b70f8e4abfb347c84872ab7da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T12:40:02+02:00 tm: skip resuming suspended transactions put on wait - transaction is expired in that moment, pending its destroy process - GH #2055 --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/52afc7b70f8e4abfb347c84872ab7da… Patch: https://github.com/kamailio/kamailio/commit/52afc7b70f8e4abfb347c84872ab7da… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index b1182a9e71..510599f742 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1568,11 +1568,12 @@ int t_get_canceled_ident(struct sip_msg* msg, unsigned int* hash_index, * 0). * @param hash_index - searched transaction hash_index (part of the ident). * @param label - searched transaction label (part of the ident). + * @param filter - if 1, skip transaction put on-wait (terminated state). * @return -1 on error/not found, 1 on success (found) * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ -int t_lookup_ident(struct cell ** trans, unsigned int hash_index, - unsigned int label) +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter) { struct cell* p_cell; struct entry* hash_bucket; @@ -1590,9 +1591,19 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, #endif hash_bucket=&(get_tm_table()->entries[hash_index]); /* all the transactions from the entry are compared */ - clist_foreach(hash_bucket, p_cell, next_c){ + clist_foreach(hash_bucket, p_cell, next_c) { prefetch_loc_r(p_cell->next_c, 1); - if(p_cell->label == label){ + if(p_cell->label == label) { + if(filter==1) { + if(t_on_wait(p_cell)) { + /* transaction in terminated state */ + UNLOCK_HASH(hash_index); + set_t(0, T_BR_UNDEFINED); + *trans=NULL; + LM_DBG("transaction in terminated phase - skipping\n"); + return -1; + } + } REF_UNSAFE(p_cell); UNLOCK_HASH(hash_index); set_t(p_cell, T_BR_UNDEFINED); @@ -1604,14 +1615,27 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, UNLOCK_HASH(hash_index); set_t(0, T_BR_UNDEFINED); - *trans=p_cell; + *trans=NULL; LM_DBG("transaction not found\n"); return -1; } - +/** lookup a transaction based on its identifier (hash_index:label). + * @param trans - double pointer to cell structure, that will be filled + * with the result (a pointer to an existing transaction or + * 0). + * @param hash_index - searched transaction hash_index (part of the ident). + * @param label - searched transaction label (part of the ident). + * @return -1 on error/not found, 1 on success (found) + * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). + */ +int t_lookup_ident(struct cell ** trans, unsigned int hash_index, + unsigned int label) +{ + return t_lookup_ident_filter(trans, hash_index, label, 0); +} /** check if a transaction is local or not. * Check if the transaction corresponding to the current message diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 347d088d48..2a5e67d3de 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -92,6 +92,8 @@ typedef int (*tset_fr_f)(struct sip_msg*, unsigned int, unsigned int); int t_is_local(struct sip_msg*); int t_get_trans_ident(struct sip_msg* p_msg, unsigned int* hash_index, unsigned int* label); int t_lookup_ident(struct cell** trans, unsigned int hash_index, unsigned int label); +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter); /* lookup a transaction by callid and cseq */ int t_lookup_callid(struct cell** trans, str callid, str cseq); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index be7b0a6842..949340f1ce 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -187,9 +187,9 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, backup_T = get_t(); backup_T_branch = get_t_branch(); - if (t_lookup_ident(&t, hash_index, label) < 0) { + if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { set_t(backup_T, backup_T_branch); - LM_ERR("transaction not found\n"); + LM_ERR("active transaction not found\n"); return -1; }

1 0

[kamailio/kamailio] Kamailio stops responding to SIP requests when it cannot resolve DNS from siptrace (#2081)
by ramontelnyx 09 Oct '19

09 Oct '19

#### Reproduction ``` You can reproduce the issue by: 1) Enabling siptrace 2) Populating the duplicate_uri field with a non-existing domain 3) Sending test calls ``` #### Log Messages ``` 1(1164) CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "homer7-hep.query.consul" 1(1164) ERROR: siptrace [siptrace_hep.c:177]: trace_send_hep3_duplicate(): bad host name in uri ``` ### Additional Information ``` # /usr/local/sbin/kamailio -version version: kamailio 5.2.4 (x86_64/linux) a57138 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a57138 compiled on 14:41:20 Aug 21 2019 with gcc 6.3.0 ``` * **Operating System**: ``` LInux Debian Stretch Linux 4.4.0-109-generic #132-Ubuntu SMP Tue Jan 9 19:52:39 UTC 2018 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/2081

2 4

git:5.1:8cb302f3: app_perl: first destroy old interpreter before creating the new one
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: 8cb302f39941b121875dd402ead726de6ec5a624 URL: https://github.com/kamailio/kamailio/commit/8cb302f39941b121875dd402ead726d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T08:55:28+02:00 app_perl: first destroy old interpreter before creating the new one - on interpreter reset, the new one may inherit globals from the old one, if that is not yet destroyed (cherry picked from commit 58047ba61d0cbceebc8c85590970a573fc396aa5) (cherry picked from commit 8c70c16d10ed46f4ba8cf002a5b1599a02b5cb93) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8cb302f39941b121875dd402ead726d… Patch: https://github.com/kamailio/kamailio/commit/8cb302f39941b121875dd402ead726d… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 74f08acff2..7a10a506c8 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -264,6 +264,8 @@ PerlInterpreter *parser_init(void) { * */ int unload_perl(PerlInterpreter *p) { + /* clean and reset everything */ + PL_perl_destruct_level = 1; perl_destruct(p); perl_free(p); @@ -278,26 +280,26 @@ int unload_perl(PerlInterpreter *p) { */ int perl_reload(void) { - - PerlInterpreter *new_perl; - - new_perl = parser_init(); - - if (new_perl) { + if(my_perl) { unload_perl(my_perl); - my_perl = new_perl; + } + my_perl = parser_init(); + #ifdef PERL_EXIT_DESTRUCT_END - PL_exit_flags |= PERL_EXIT_DESTRUCT_END; + PL_exit_flags |= PERL_EXIT_DESTRUCT_END; #else #warning Perl 5.8.x should be used. Please upgrade. #warning This binary will be unsupported. - PL_exit_flags |= PERL_EXIT_EXPECTED; + PL_exit_flags |= PERL_EXIT_EXPECTED; #endif + + if(my_perl) { + LM_DBG("new perl interpreter initialized\n"); return 0; } else { - return -1; + LM_CRIT("failed to initialize a new perl interpreter - exiting\n"); + exit(-1); } - }

1 0

git:5.1:0d8cf56e: app_perl: set G_EVAL flag when executing perl_destroy_func
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: 0d8cf56eb4fb98dd5a14a20bec2876bb09b4fbed URL: https://github.com/kamailio/kamailio/commit/0d8cf56eb4fb98dd5a14a20bec2876b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T08:55:10+02:00 app_perl: set G_EVAL flag when executing perl_destroy_func - trap use of die in the perl libs to avoid having an exit when reset_cycles is used (cherry picked from commit 9490ec06d3cf0cfd0b0cf2d0a5ef701ccdabcaba) (cherry picked from commit 7e7621a93013174bf42ff0dd782a46d238c0943a) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0d8cf56eb4fb98dd5a14a20bec2876b… Patch: https://github.com/kamailio/kamailio/commit/0d8cf56eb4fb98dd5a14a20bec2876b… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index d7e1e5c8ed..329a691192 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -403,7 +403,7 @@ int app_perl_reset_interpreter(void) return 0; if(perl_destroy_func) - call_argv(perl_destroy_func, G_DISCARD | G_NOARGS, args); + call_argv(perl_destroy_func, G_DISCARD | G_NOARGS | G_EVAL, args); gettimeofday(&t1, NULL); if (perl_reload()<0) {

1 0

git:5.1:36e3ef7d: app_perl: log the number of reset cycles in debug message
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: 36e3ef7d07170000c8f95b9bb304fea0e7442f8d URL: https://github.com/kamailio/kamailio/commit/36e3ef7d07170000c8f95b9bb304fea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T08:55:19+02:00 app_perl: log the number of reset cycles in debug message (cherry picked from commit 1fdabbf5ce5fd218a47b7d147ebec5c6c45c1cce) (cherry picked from commit f14807f722e85feb8c7d98b08454a432837fecf7) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/36e3ef7d07170000c8f95b9bb304fea… Patch: https://github.com/kamailio/kamailio/commit/36e3ef7d07170000c8f95b9bb304fea… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 329a691192..74f08acff2 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -203,7 +203,7 @@ PerlInterpreter *parser_init(void) { perl_construct(new_perl); argv[0] = ""; argc++; /* First param _needs_ to be empty */ - + /* Possible Include path extension by modparam */ if (modpath && (strlen(modpath) > 0)) { modpathset_start = argc; @@ -382,6 +382,7 @@ static void destroy(void) } +static int app_perl_reset_n = 0; /** * count executions and rest interpreter * @@ -402,8 +403,10 @@ int app_perl_reset_interpreter(void) if(_ap_exec_cycles<=*_ap_reset_cycles) return 0; - if(perl_destroy_func) + if(perl_destroy_func) { call_argv(perl_destroy_func, G_DISCARD | G_NOARGS | G_EVAL, args); + LM_DBG("perl destroy function executed\n"); + } gettimeofday(&t1, NULL); if (perl_reload()<0) { @@ -413,10 +416,11 @@ int app_perl_reset_interpreter(void) } gettimeofday(&t2, NULL); - LM_INFO("perl interpreter has been reset [%d/%d] (%d.%06d => %d.%06d)\n", + app_perl_reset_n++; + LM_INFO("perl interpreter has been reset [%d/%d] (%d.%06d => %d.%06d) (n: %d)\n", _ap_exec_cycles, *_ap_reset_cycles, (int)t1.tv_sec, (int)t1.tv_usec, - (int)t2.tv_sec, (int)t2.tv_usec); + (int)t2.tv_sec, (int)t2.tv_usec, app_perl_reset_n); _ap_exec_cycles = 0; return 0;

1 0

Kamailio Developers Meeting, Nov 14-15, 2019, in Dusseldorf
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Hello, Kamailio SIP Server project is organizing another meeting of its developers during November 14-15, 2019, hosted again by sipgate.de in Dusseldorf, Germany. The event is intended to facilitate the interaction between Kamailio developers and to offer a convenient environment for working together on several topics of high interest for the project, including writing code for Kamailio and its tools, improving documentation, or discuss about future development. Everyone from the community is welcome to join. Please note we have a limited capacity of 20 seats in the meeting room. Also, very important to be aware that this is not an event to learn how to use Kamailio. More details about the event, the venue, how to register, are available at: * https://www.kamailio.org/w/developers-meeting/ Looking forward to those two intensive hacking Kamailio days in Dusseldorf! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat

1 1

git:master:77329bdd: pkg/kamailio/deb: version set 5.4.0~dev1
by Victor Seva 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: 77329bdd360344fd31f515c90f90e087a81ba3ad URL: https://github.com/kamailio/kamailio/commit/77329bdd360344fd31f515c90f90e08… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-08T13:25:43+02:00 pkg/kamailio/deb: version set 5.4.0~dev1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/77329bdd360344fd31f515c90f90e08… Patch: https://github.com/kamailio/kamailio/commit/77329bdd360344fd31f515c90f90e08…

1 0

git:master:a12e436d: Makefile.defs: version set to 5.4.0-dev1
by Daniel-Constantin Mierla 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: a12e436d054aba1c71cace2de4bf270d97ee1063 URL: https://github.com/kamailio/kamailio/commit/a12e436d054aba1c71cace2de4bf270… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:32:41+02:00 Makefile.defs: version set to 5.4.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a12e436d054aba1c71cace2de4bf270… Patch: https://github.com/kamailio/kamailio/commit/a12e436d054aba1c71cace2de4bf270… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3313524469..336eba1f44 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:223380dc: kamctl: updated the version for kamctl and kamdbctl
by Daniel-Constantin Mierla 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: 223380dccdfc74c5a79c2bfa5281a1f75ea0f453 URL: https://github.com/kamailio/kamailio/commit/223380dccdfc74c5a79c2bfa5281a1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:25:14+02:00 kamctl: updated the version for kamctl and kamdbctl --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/223380dccdfc74c5a79c2bfa5281a1f… Patch: https://github.com/kamailio/kamailio/commit/223380dccdfc74c5a79c2bfa5281a1f… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index c97ad491a2..7fd9197a35 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.3.0' +VERSION='5.4.0' PATH=$PATH:/usr/local/sbin/ diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 4597afe09b..faa07cb38a 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.2.0' +VERSION='5.4.0' PATH=$PATH:/usr/local/sbin/

1 0

git:master:5a18155c: avp: free allocated variable in case of error
by Daniel-Constantin Mierla 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: 5a18155c0fe661e7488f75afa7b0ea7638932943 URL: https://github.com/kamailio/kamailio/commit/5a18155c0fe661e7488f75afa7b0ea7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:31:39+02:00 avp: free allocated variable in case of error --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/5a18155c0fe661e7488f75afa7b0ea7… Patch: https://github.com/kamailio/kamailio/commit/5a18155c0fe661e7488f75afa7b0ea7… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f597086d92..f11d56baeb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1380,7 +1380,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - hdr_name_t *h; + hdr_name_t *h = NULL; int n; str *s; if(param_no == 1) { @@ -1427,6 +1427,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", params); + pkg_free(h); return E_CFG; } params++; @@ -1434,6 +1435,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier " "specified\n"); + pkg_free(h); return E_CFG; } } else {

1 0

[kamailio/kamailio] q_malloc crash on Kamailio 5.2.3 with http_async_query function (#2091)
by Michal Škuta 08 Oct '19

08 Oct '19

### Description We added http_async_client module to our configuration. We want to send HTTP POST request after the call is ended (in event_route[dialog_end]). We used the function **http_async_query** and right after calling the function Kamailio child exited by a signal 6 (more in the log down). ### Troubleshooting #### Reproduction In our system we just added http_async_module and its function http_async_query. It is located in own route HTTP_TEST_CALL_END called from event_route[dialog:end] Somewhat like this: ``` route[HTTP_TEST_CALL_END] { t_newtran(); $http_req(body) = "TEST"; http_async_query("http://192.168.6.23:2080/cdr_http", "HTTP_TEST_REPLY"); } ```  #### Debugging Data  ``` Core was generated by `/opt/ipgate/kamailio/sbin/kamailio -f /opt/ipgate/kamailio/etc/kamailio/kamaili'. Program terminated with signal 6, Aborted. #0 0xb7791424 in __kernel_vsyscall () (gdb) bt full #0 0xb7791424 in __kernel_vsyscall () No symbol table info available. #1 0xb7633661 in raise () from /lib/i386-linux-gnu/i686/cmov/libc.so.6 No symbol table info available. #2 0xb7636a92 in abort () from /lib/i386-linux-gnu/i686/cmov/libc.so.6 No symbol table info available. #3 0x0829fed6 in qm_debug_check_frag (qm=0x97607008, f=0x97a7ff3c, file=0x966f22d6 "http_async_client: hm_hash.c", line=82, efile=0x83f5093 "core/mem/q_malloc.c", eline=384) at core/mem/q_malloc.c:151 __FUNCTION__ = "qm_debug_check_frag" #4 0x082a16aa in qm_malloc (qmp=0x97607008, size=8, file=0x966f22d6 "http_async_client: hm_hash.c", func=0x966f2bfb "build_hash_key", line=82, mname=0x966f22c4 "http_async_client") at core/mem/q_malloc.c:384 qm = 0x97607008 f = 0x97a7ff3c hash = 4 list_cntr = 1 __FUNCTION__ = "qm_malloc" #5 0x966d5323 in build_hash_key (p=0x567d9620) at hm_hash.c:82 hash_str = 0x966f2be9 pointer_str = 0x97a7ff1c "0x567d9620" len = 10 hash = 360 __FUNCTION__ = "build_hash_key" #6 0x966d5d94 in build_http_m_cell (p=0x567d9620) at hm_hash.c:116 cell = 0x567cab3c len = 360 __FUNCTION__ = "build_http_m_cell" #7 0x966eafac in new_request (query=0xbfe65718, query_params=0xbfe65720, cb=0x966c9125 <async_http_cb>, param=0x567be804) at http_multi.c:442 __FUNCTION__ = "new_request" easy = 0x567d9620 rc = -1217109748 cell = 0x0 #8 0x966ce473 in notification_socket_cb (fd=16, event=2, arg=0x5679c988) at async_http.c:390 worker = 0x5679c988 received = 4 i = 0 len = -1075423144 aq = 0x567be804 query_params = {timeout = 500, tls_verify_host = 1, tls_verify_peer = 1, headers = 0x0, method = 0, tls_client_cert = 0x0, tls_client_key = 0x0, tls_ca_path = 0x0, body = { s = 0x567cb650 "TEST\300\300\300\300\355\357ͫ", len = 4}, authmethod = 3, username = 0x0, password = 0x0} query = {s = 0x567bf75c "http://192.168.6.23:2080/cdr_httpt_", len = 33} __FUNCTION__ = "notification_socket_cb" #9 0x9661d522 in event_base_loop () from /usr/lib/i386-linux-gnu/libevent-2.0.so.5 No symbol table info available. #10 0x9661e683 in event_base_dispatch () from /usr/lib/i386-linux-gnu/libevent-2.0.so.5 No symbol table info available. #11 0x966c8a4c in async_http_run_worker (worker=0x5679c988) at async_http.c:92 No locals. #12 0x966dabcd in child_init (rank=0) at http_async_client_mod.c:352 ---Type <return> to continue, or q <return> to quit--- pid = 0 i = 0 __FUNCTION__ = "child_init" #13 0x08200daa in init_mod_child (m=0x976a286c, rank=0) at core/sr_module.c:846 __FUNCTION__ = "init_mod_child" #14 0x082011ad in init_child (rank=0) at core/sr_module.c:874 ret = 23 #15 0x0806b409 in main_loop () at main.c:1737 i = 3 pid = 5318 si = 0x0 si_desc = "udp receiver child=2 sock=192.168.5.67:5060\000]\330g\267\360\243v\267X\037\000\000\300\243v\267\364\217v\267\300\243v\267\b\376R\t`\\\346\277]\330g\267\251\000\000\000\b\376R\t\364\217v\267\025\000\000\000\000]\346\277\367\273m\267\060+Z\t0+Z\t\\\v\232\227\000@\000\000@\200v\267\000\000\000" nrprocs = 3 woneinit = 1 __FUNCTION__ = "main_loop" #16 0x08071eb4 in main (argc=13, argv=0xbfe660b4) at main.c:2696 cfg_stream = 0x93f3008 c = -1 r = 0 tmp = 0xbfe6678c "" tmp_len = -1216949440 port = 2210 proto = 1 options = 0x8376690 ":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 = 2661251522 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xbfe65fe0 p = 0x805e4a0 "[\201\303p\374?" st = {st_dev = 14, __pad1 = 0, st_ino = 5047, st_mode = 16877, st_nlink = 2, st_uid = 109, st_gid = 111, st_rdev = 0, __pad2 = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1561470746, tv_nsec = 145357408}, st_mtim = {tv_sec = 1570111971, tv_nsec = 819339961}, st_ctim = {tv_sec = 1570111972, tv_nsec = 31337425}, __unused4 = 0, __unused5 = 0} __FUNCTION__ = "main" (gdb) info locals No symbol table info available. (gdb) list 1876 int proto; 1877 char *options; 1878 int ret; 1879 unsigned int seed; 1880 int rfd; 1881 int debug_save, debug_flag; 1882 int dont_fork_cnt; 1883 struct name_lst* n_lst; 1884 char *p; 1885 struct stat st = {0}; ``` #### Log Messages  ``` Oct 3 16:13:37 sip_server /opt/ipgate/kamailio/sbin/kamailio[5331]: CRITICAL: <core> [core/mem/q_malloc.c:149]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(c0003032, abcdefed)[0x97a7ff3c:0x97a7ff58]! Memory allocator was called from http_async_client: hm_hash.c:82. Fragment marked by http_async_client: hm_hash.c:71. Exec from core/mem/q_malloc.c:384. Oct 3 16:13:37 sip_server /opt/ipgate/kamailio/sbin/kamailio[5315]: INFO: <script>: XLOG: 93ffd680-1f94-4f60-b3b0-0fd599a46677 [onsend_route] Request BYE sent to sip:FreeSWITCH@192.168.5.94:5060;transport=udp;gw=balancer1 Oct 3 16:13:42 sip_server call-control[5004]: Starting factory <callcontrol.rating.RatingEngineFactory instance at 0xb6e8114c> Oct 3 16:13:42 sip_server call-control[5004]: <twisted.internet.tcp.Connector instance at 0xb6e8116c> will retry in 14 seconds Oct 3 16:13:42 sip_server call-control[5004]: Stopping factory <callcontrol.rating.RatingEngineFactory instance at 0xb6e8114c> Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5312]: ALERT: <core> [main.c:756]: handle_sigs(): child process 5331 exited by a signal 6 Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5312]: ALERT: <core> [main.c:759]: handle_sigs(): core was generated Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5312]: INFO: <core> [main.c:781]: handle_sigs(): terminating due to SIGCHLD Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5321]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received ... ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.3 (i386/linux) dcce68 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: dcce68 compiled on 17:08:25 Jun 20 2019 with gcc 4.7.2 ``` * **Operating System**:  ``` Debian GNU/Linux 7.1 (wheezy) Linux munda 3.2.0-4-686-pae #1 SMP Debian 3.2.46-1+deb7u1 i686 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/2091

3 6

git:master:a52f0508: tls: fixed prototypes for seed() and add() functions for kxlibssl rand engine
by Daniel-Constantin Mierla 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: a52f05087a211bfecd36300907d0bff7170e08ec URL: https://github.com/kamailio/kamailio/commit/a52f05087a211bfecd36300907d0bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:11:48+02:00 tls: fixed prototypes for seed() and add() functions for kxlibssl rand engine - libssl 1.1.x docs seem to be inconsistent with the code --- Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/a52f05087a211bfecd36300907d0bff… Patch: https://github.com/kamailio/kamailio/commit/a52f05087a211bfecd36300907d0bff… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 71d8de7bac..2cdb2ec0ef 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -209,42 +209,38 @@ void ksr_kxlibssl_init(void) } } -#ifdef __OS_darwin -int ksr_kxlibssl_seed(const void *buf, int num) -#else +#ifdef KSRTLSVOID void ksr_kxlibssl_seed(const void *buf, int num) -#endif { -#ifdef __OS_darwin + ksr_kxlibssl_init(); + if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { + return; + } + if(_ksr_kxlibssl_local_method->seed == NULL) { + return; + } + lock_get(_ksr_kxlibssl_local_lock); + _ksr_kxlibssl_local_method->seed(buf, num); + lock_release(_ksr_kxlibssl_local_lock); +} +#else +int ksr_kxlibssl_seed(const void *buf, int num) +{ int ret; -#endif ksr_kxlibssl_init(); if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } if(_ksr_kxlibssl_local_method->seed == NULL) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } lock_get(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin ret = _ksr_kxlibssl_local_method->seed(buf, num); -#else - _ksr_kxlibssl_local_method->seed(buf, num); -#endif lock_release(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin return ret; -#endif } +#endif int ksr_kxlibssl_bytes(unsigned char *buf, int num) { @@ -277,42 +273,39 @@ void ksr_kxlibssl_cleanup(void) lock_release(_ksr_kxlibssl_local_lock); } -#ifdef __OS_darwin -int ksr_kxlibssl_add(const void *buf, int num, double randomness) -#else +#ifdef KSRTLSVOID void ksr_kxlibssl_add(const void *buf, int num, int randomness) -#endif { -#ifdef __OS_darwin + ksr_kxlibssl_init(); + if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { + return; + } + if(_ksr_kxlibssl_local_method->add == NULL) { + return; + } + lock_get(_ksr_kxlibssl_local_lock); + _ksr_kxlibssl_local_method->add(buf, num, randomness); + lock_release(_ksr_kxlibssl_local_lock); +} +#else +int ksr_kxlibssl_add(const void *buf, int num, double randomness) +{ int ret; -#endif ksr_kxlibssl_init(); if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } if(_ksr_kxlibssl_local_method->add == NULL) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } lock_get(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin ret = _ksr_kxlibssl_local_method->add(buf, num, randomness); -#else - _ksr_kxlibssl_local_method->add(buf, num, randomness); -#endif lock_release(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin + return ret; -#endif } +#endif int ksr_kxlibssl_pseudorand(unsigned char *buf, int num) {

1 0

git:master:b590df77: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: b590df771e59b78963d3748b157d21896f9abaa8 URL: https://github.com/kamailio/kamailio/commit/b590df771e59b78963d3748b157d218… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-08T12:01:36+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/b590df771e59b78963d3748b157d218… Patch: https://github.com/kamailio/kamailio/commit/b590df771e59b78963d3748b157d218… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 650a964b58..f8d4e9743b 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1436,6 +1436,7 @@ end * krand - use internal kam_rand() function * fastrand - use internal fastrand function * cryptorand - use internal cryptorand (fortuna) function + * kxlibssl - default libssl rand engine wrapped by a Kamailio mutex Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers

1 0

git:master:98a392fa: tls: docs for kxlibssl rand engine
by Daniel-Constantin Mierla 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: 98a392fa38419cd99494002dad66d4e1587110d3 URL: https://github.com/kamailio/kamailio/commit/98a392fa38419cd99494002dad66d4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T11:58:40+02:00 tls: docs for kxlibssl rand engine --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/98a392fa38419cd99494002dad66d4e… Patch: https://github.com/kamailio/kamailio/commit/98a392fa38419cd99494002dad66d4e… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index dc6494c2db..bf400da6c8 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1260,6 +1260,7 @@ end <listitem><para>krand - use internal kam_rand() function</para></listitem> <listitem><para>fastrand - use internal fastrand function</para></listitem> <listitem><para>cryptorand - use internal cryptorand (fortuna) function</para></listitem> + <listitem><para>kxlibssl - default libssl rand engine wrapped by a &kamailio; mutex</para></listitem> </itemizedlist> <para> Note: the krand and fastrand engines are not recommended for use on

1 0

git:master:99eafac2: tls: added rand engine kxlibssl
by Daniel-Constantin Mierla 08 Oct '19

08 Oct '19

Module: kamailio Branch: master Commit: 99eafac2d92533ba93cd8244173aef0db0e76b0c URL: https://github.com/kamailio/kamailio/commit/99eafac2d92533ba93cd8244173aef0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T11:56:05+02:00 tls: added rand engine kxlibssl - use default libssl engine wrapped in a kamailio mutex lock --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/99eafac2d92533ba93cd8244173aef0… Patch: https://github.com/kamailio/kamailio/commit/99eafac2d92533ba93cd8244173aef0…

1 0

git:5.3:7f892850: pkg/kamailio/deb: version set 5.3.0~rc1
by Victor Seva 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 7f892850916a6d668386575d1bb1ed1b3a638059 URL: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T23:21:33+02:00 pkg/kamailio/deb: version set 5.3.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1… Patch: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1…

1 0

git:5.2:9fc7c9a1: usrloc: keep a private copy of urecord before running ul_callbacks
by Victor Seva 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 9fc7c9a1ee97e708247e050988eabf8b529c5fb2 URL: https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T23:10:19+02:00 usrloc: keep a private copy of urecord before running ul_callbacks fixes #2089 (cherry picked from commit f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8… Patch: https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index d451057bdd..80980c4cdf 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) str user, contact; int i; int n; - urecord_t* r; + urecord_t r; ucontact_t* c; #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; @@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) } lock_udomain(_d, &user); - get_static_urecord(_d, &user, &r); + /* don't use the same static value from get_static_urecord() */ + memset( &r, 0, sizeof(struct urecord) ); + r.aor = user; + r.aorhash = ul_get_aorhash(&user); + r.domain = _d->name; - if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { + if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", user.len, user.s); - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); goto error; } @@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) user.len, user.s); } } - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */

1 0

git:5.3:5f477b4e: usrloc: keep a private copy of urecord before running ul_callbacks
by Victor Seva 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 5f477b4e58e4d9b02aa20176c314b2915ff832f5 URL: https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b29… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T23:11:03+02:00 usrloc: keep a private copy of urecord before running ul_callbacks fixes #2089 (cherry picked from commit f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b29… Patch: https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b29… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index d451057bdd..80980c4cdf 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) str user, contact; int i; int n; - urecord_t* r; + urecord_t r; ucontact_t* c; #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; @@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) } lock_udomain(_d, &user); - get_static_urecord(_d, &user, &r); + /* don't use the same static value from get_static_urecord() */ + memset( &r, 0, sizeof(struct urecord) ); + r.aor = user; + r.aorhash = ul_get_aorhash(&user); + r.domain = _d->name; - if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { + if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", user.len, user.s); - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); goto error; } @@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) user.len, user.s); } } - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */

1 0

[kamailio/kamailio] ursloc has a memory leak if db_mode is DB_ONLY and calling reg_fetch_contacts() (#2089)
by Victor Seva 07 Oct '19

07 Oct '19

### Description usrloc should not leave any ucontact behind when on DB_ONLY ### Troubleshooting #### Reproduction ``` event_route[usrloc:contact-expired] { $var(uri) = "sip:" + $ulc(exp=>aor) + "@localhost"; xinfo("expired contact for $ulc(exp=>aor) uri:$var(uri)"); reg_fetch_contacts("location", "$var(uri)", "caller"); if($(ulc(caller=>count)) < 0) { xinfo("no more contacts for $ulc(exp=>aor)\n"); } else { xinfo("$ulc(exp=>aor) has $(ulc(caller=>count)) contacts left\n"); } return; } ``` REGISTER a subscriber and let it expire #### Debugging Data after ``` root@16d059a62a76:/code/utils/kamcmd# sh /kamdev/shm_dump.sh 1 2 qm_status: alloc'd from usrloc: dlist.c: new_dlist(557) 2 qm_status: alloc'd from usrloc: dlist.c: new_dlist(565) 2 qm_status: alloc'd from usrloc: ucontact.c: new_ucontact(96) 2 qm_status: alloc'd from usrloc: udomain.c: new_udomain(91) 2 qm_status: alloc'd from usrloc: udomain.c: new_udomain(98) 2 qm_status: alloc'd from usrloc: ul_callback.c: init_ulcb_list(45) 2 qm_status: alloc'd from usrloc: ul_callback.c: register_ulcb(94) 6 qm_status: alloc'd from usrloc: udomain.c: build_stat_name(56) 10 qm_status: alloc'd from usrloc: ../../core/ut.h: shm_str_dup(722) ``` #### Log Messages ``` 1(4112) DEBUG: usrloc [udomain.c:996]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] 1(4112) DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f621e476bd0, callback type 8/8, id 0 entered 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1015 a=63 n=assign 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1016 a=25 n=xinfo 1(4112) INFO: <script>: expired contact for 1001-whatever uri:sip:1001-whatever@localhost 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1017 a=27 n=reg_fetch_contacts 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1022 a=16 n=if 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1021 a=25 n=xinfo 1(4112) INFO: <script>: 1001-whatever has 1 contacts left 1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1023 a=2 n=return ``` ### Possible Solutions I think the problem resides on udomain_contact_expired_cb() and using get_urecord(). PR will follow. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0-dev0 (x86_64/linux) 075c74 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: 075c74 compiled on 10:36:45 Oct 3 2019 with gcc 8.3.0 ``` -- 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/2089

1 2

[kamailio/kamailio] usrloc: keep a private copy of urecord before running ul_callbacks (#2090)
by Victor Seva 07 Oct '19

07 Oct '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2089 #### Description keep a local urecord in order not to loose ucontacts when calling ul_callbacks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2090 -- Commit Summary -- * usrloc: keep a private copy of urecord before running ul_callbacks -- File Changes -- M src/modules/usrloc/udomain.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2090.patch https://github.com/kamailio/kamailio/pull/2090.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/2090

2 3

git:master:f3cf0a2f: usrloc: keep a private copy of urecord before running ul_callbacks
by Victor Seva 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b URL: https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T22:56:21+02:00 usrloc: keep a private copy of urecord before running ul_callbacks fixes #2089 --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab… Patch: https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index d451057bdd..80980c4cdf 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) str user, contact; int i; int n; - urecord_t* r; + urecord_t r; ucontact_t* c; #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; @@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) } lock_udomain(_d, &user); - get_static_urecord(_d, &user, &r); + /* don't use the same static value from get_static_urecord() */ + memset( &r, 0, sizeof(struct urecord) ); + r.aor = user; + r.aorhash = ul_get_aorhash(&user); + r.domain = _d->name; - if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { + if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", user.len, user.s); - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); goto error; } @@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) user.len, user.s); } } - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */

1 0

[kamailio] avpops: avp_copy add xavp (#7)
by Victor Seva 07 Oct '19

07 Oct '19

We have avp_copy on avpops module but we don’t have anything to copy xavps. ``` // copy all the content of an avp to a xavp $xavp(a[0]=>b) = $(avp(x)[*]); // deleting left content $xavp(a[0]=>b[*]) = $(avp(x)[*]); // copy xavp to a xavp with index $xavp(a[0]) = $xavp(b[1]); // all $xavp(a[*]) = $xavp(b[*]); // copy all content of a xavp to a avp $avp(x) = $xavp(a[0]=>b[*]); ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/7

4 8

git:master:2f641a40: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 2f641a405ad703f5b3124621aa30291ef8742903 URL: https://github.com/kamailio/kamailio/commit/2f641a405ad703f5b3124621aa30291… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T21:01:09+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/2f641a405ad703f5b3124621aa30291… Patch: https://github.com/kamailio/kamailio/commit/2f641a405ad703f5b3124621aa30291…

1 0

[kamailio/kamailio] core: adding xavp_clone_level_nodata_with_new_name (#2070)
by Julien Chavanton 07 Oct '19

07 Oct '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description proposal for `xavp_copy()` param1: source xavp name param2: source xavp index param3: destination xavp name The command will copy only one specific xavp from the stack. If the destination xavp stack exist it will append else it will create a new one, it seems to be more or less compatible to what we do with XAVP in general. We can not reorder xavp stack like in the following example : ``` route[TEST] { $xavp(a=>x) = "a-0-x"; $xavp(a[0]=>y) = "a-0-y"; $xavp(a=>x) = "a-1-x"; $xavp(a[0]=>y) = "a-1-y"; xinfo("$$xavp(a[0]) = [$xavp(a[0]=>x)][$xavp(a[0]=>y)]\n"); xinfo("$$xavp(a[1]) = [$xavp(a[1]=>x)][$xavp(a[1]=>y)]\n"); $var(src_idx) = 1; $var(v) = "b"; xavp_copy("a", "$var(src_idx)", "$var(v)"); $var(src_idx) = 0; xavp_copy("a", "$var(src_idx)", "$var(v)"); xinfo("$$xavp(b[0]) = [$xavp(b[0]=>x)][$xavp(b[0]=>y)]\n"); xinfo("$$xavp(b[1]) = [$xavp(b[1]=>x)][$xavp(b[1]=>y)]\n"); } ``` ``` 2(137) INFO: <script>: $xavp(a[0]) = [a-1-x][a-1-y] 2(137) INFO: <script>: $xavp(a[1]) = [a-0-x][a-0-y] 2(137) INFO: pv [pv.c:827]: w_xavp_copy(): xavp_copy(new): $xavp(a[1]) >> $xavp(b) 2(137) INFO: pv [pv.c:833]: w_xavp_copy(): xavp_copy(append): $xavp(a[0]) >> $xavp(b) 2(137) INFO: <script>: $xavp(b[0]) = [a-0-x][a-0-y] 2(137) INFO: <script>: $xavp(b[1]) = [a-1-x][a-1-y] ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2070 -- Commit Summary -- * core: adding xavp_clone_level_nodata_with_new_name -- File Changes -- M src/core/xavp.c (126) M src/core/xavp.h (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2070.patch https://github.com/kamailio/kamailio/pull/2070.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/2070

3 11

git:master:e3816557: pv: adding xavp_copy
by Julien Chavanton 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: e38165575c5e05e871fd3eb89973b385c2146539 URL: https://github.com/kamailio/kamailio/commit/e38165575c5e05e871fd3eb89973b38… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-10-01T09:23:13-07:00 pv: adding xavp_copy --- Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/e38165575c5e05e871fd3eb89973b38… Patch: https://github.com/kamailio/kamailio/commit/e38165575c5e05e871fd3eb89973b38…

1 0

git:master:75226997: Merge pull request #2070 from kamailio/xavp_copy
by GitHub 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 75226997422218a70acc121f4d9f65d9034de7ce URL: https://github.com/kamailio/kamailio/commit/75226997422218a70acc121f4d9f65d… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-10-07T12:00:57-07:00 Merge pull request #2070 from kamailio/xavp_copy pv: adding xavp_copy --- Modified: src/core/xavp.c Modified: src/core/xavp.h Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/75226997422218a70acc121f4d9f65d… Patch: https://github.com/kamailio/kamailio/commit/75226997422218a70acc121f4d9f65d…

1 0

git:master:3cffe878: core: adding xavp_clone_level_nodata_with_new_name
by Julien Chavanton 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 3cffe8789fd14baef4ff548bb2afc5b2ca9ed66e URL: https://github.com/kamailio/kamailio/commit/3cffe8789fd14baef4ff548bb2afc5b… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-10-01T09:22:43-07:00 core: adding xavp_clone_level_nodata_with_new_name --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/3cffe8789fd14baef4ff548bb2afc5b… Patch: https://github.com/kamailio/kamailio/commit/3cffe8789fd14baef4ff548bb2afc5b… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e5e33f6e9d..f279def1ed 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -693,11 +693,16 @@ struct str_list *xavp_get_list_key_names(sr_xavp_t *xavp) return result; } +sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) +{ + return xavp_clone_level_nodata_with_new_name(xold, &xold->name); +} + /** * clone the xavp without values that are custom data * - only one list level is cloned, other sublists are ignored */ -sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) +sr_xavp_t *xavp_clone_level_nodata_with_new_name(sr_xavp_t *xold, str *dst_name) { sr_xavp_t *xnew = NULL; sr_xavp_t *navp = NULL; @@ -713,13 +718,13 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) LM_INFO("xavp value type is 'data' - ignoring in clone\n"); return NULL; } - xnew = xavp_new_value(&xold->name, &xold->val); + xnew = xavp_new_value(dst_name, &xold->val); if(xnew==NULL) { LM_ERR("cannot create cloned root xavp\n"); return NULL; } - LM_DBG("cloned root xavp [%.*s]\n", xold->name.len, xold->name.s); + LM_DBG("cloned root xavp [%.*s] >> [%.*s]\n", xold->name.len, xold->name.s, dst_name->len, dst_name->s); if(xold->val.type!=SR_XTYPE_XAVP) { diff --git a/src/core/xavp.h b/src/core/xavp.h index 071a421a4a..85c4bb3a3d 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -102,6 +102,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list); void xavp_print_list(sr_xavp_t **head); sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold); +sr_xavp_t *xavp_clone_level_nodata_with_new_name(sr_xavp_t *xold, str *dst_name); sr_xavp_t* xavp_get_child(str *rname, str *cname); sr_xavp_t* xavp_get_child_with_ival(str *rname, str *cname);

1 0

[kamailio/kamailio] HeartBeat Module (#1698)
by Surendra Tiwari 07 Oct '19

07 Oct '19

### Description Right now, kamailio did not generate the heartbeat events a call. It's very important to have heartbeat event in kamailio so billing solution can be built independent of kamailio. Heartbeat module can be built separately with having following parameters: modparam("heartbeat","duration",30) // this will describe at what pace heartbeat will get generated for every call. modparam("heartbeat","signature",caller=$dlg_var(caller);callee=$dlg_var(callee);account_id=$dlg_var(account_id)) -- this will tell what data to send.  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.4 (x86_64/linux) a1df59 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a1df59 compiled on 06:23:23 Oct 30 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-4-160:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 14.04.5 LTS Release: 14.04 Codename: trusty root@ip-172-31-4-160:~# uname -a Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 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/1698

2 3

[kamailio/kamailio] $T_reply_last returns current reply status instead of previous (#735)
by Alex Hermann 07 Oct '19

07 Oct '19

The PV _$T_reply_last_ is supposed to return the _previous_ reply status. Since commit b7c588dff06 to fix #315 this PV returns the _current_ reply status. --- 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/735

2 4

[kamailio/kamailio] mongoDB module in kamailio/kamailio-cli doker image (#1995)
by Gaurav Bmotra 07 Oct '19

07 Oct '19

plz help me to install mongoDB module in kamailio/kamailio-cli doker image -- 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/1995

3 11

git:5.3:6ab666f4: Makefile.defs: version set to 5.3.0-rc1
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 6ab666f4bb205d4729bfa8874a351f351ef5275e URL: https://github.com/kamailio/kamailio/commit/6ab666f4bb205d4729bfa8874a351f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T18:51:51+02:00 Makefile.defs: version set to 5.3.0-rc1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6ab666f4bb205d4729bfa8874a351f3… Patch: https://github.com/kamailio/kamailio/commit/6ab666f4bb205d4729bfa8874a351f3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 0161d2120b..e4d728dc2c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -rc0 +EXTRAVERSION = -rc1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] failed build on alpine linux (#2095)
by sergey-safarov 07 Oct '19

07 Oct '19

### Description During build on alpine we get error ``` generating core/autover.h ... CC (gcc) [kamailio] main.o CC (gcc) [kamailio] core/daemonize.o CC (gcc) [kamailio] core/nonsip_hooks.o CC (gcc) [kamailio] core/timer_proc.o CC (gcc) [kamailio] core/select_buf.o CC (gcc) [kamailio] core/stun.o CC (gcc) [kamailio] core/action.o CC (gcc) [kamailio] core/raw_listener.o CC (gcc) [kamailio] core/sctp_core.o CC (gcc) [kamailio] core/str.o CC (gcc) [kamailio] core/atomic_ops.o CC (gcc) [kamailio] core/bit_count.o CC (gcc) [kamailio] core/select_core.o CC (gcc) [kamailio] core/pvapi.o CC (gcc) [kamailio] core/forward.o CC (gcc) [kamailio] core/ut.o CC (gcc) [kamailio] core/timer.o CC (gcc) [kamailio] core/ver.o CC (gcc) [kamailio] core/id.o CC (gcc) [kamailio] core/switch.o CC (gcc) [kamailio] core/kemi.o CC (gcc) [kamailio] core/local_timer.o CC (gcc) [kamailio] core/dns_cache.o CC (gcc) [kamailio] core/route.o CC (gcc) [kamailio] core/udp_server.o CC (gcc) [kamailio] core/sr_compat.o CC (gcc) [kamailio] core/locking.o CC (gcc) [kamailio] core/socket_info.o CC (gcc) [kamailio] core/resolve.o core/resolve.c: In function 'get_record': core/resolve.c:961:9: error: 'T_OPT' undeclared (first use in this function) 961 | case T_OPT: | ^~~~~ core/resolve.c:961:9: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile.rules:100: core/resolve.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make[1]: Leaving directory '/usr/src/kamailio/pkg/kamailio/alpine/src/kamailio-49a78933845f136f8f7caaf7e24e6cdcf206cbb5/src' make: *** [Makefile:30: all] Error 2 >>> ERROR: kamailio: build failed >>> kamailio: Uninstalling dependencies... (1/1) Purging .makedepends-kamailio (20191007.100221) OK: 635 MiB in 184 packages pre_build hook failed! (1) ``` -- 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/2095

2 10

git:5.3:970f86d2: core: workaround related to T_OPT for alpine linux musl C library (GH #2095)
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 970f86d2fc8c842f267dc99fa1ebb4093b5586ad URL: https://github.com/kamailio/kamailio/commit/970f86d2fc8c842f267dc99fa1ebb40… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T17:24:23+02:00 core: workaround related to T_OPT for alpine linux musl C library (GH #2095) (cherry picked from commit cec1043a9c4daa39b4245b87f28fb5566e8627bd) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/970f86d2fc8c842f267dc99fa1ebb40… Patch: https://github.com/kamailio/kamailio/commit/970f86d2fc8c842f267dc99fa1ebb40… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 6edc47e506..ac9b2f2363 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -32,8 +32,12 @@ #include <resolv.h> #include <string.h> -/* older glibc < 2.25 does not include T_OPT in nameser_compat.h yet */ -#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 25 +/* + * Older glibc < 2.25 does not include T_OPT in nameser_compat.h yet. + * On alpine linux musl library it is also not defined. There is no + * musl feature test macro, so we look for glibc instead. + */ +#if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ < 25) || !defined __GLIBC__ #ifndef T_OPT #define T_OPT ns_t_opt #endif

1 0

git:5.3:a4cab366: pkg/docker: updated kamailio-ci submodule
by Sergey Safarov 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: a4cab366dd03c1e8dcd6e36ba1bfa01104aafcbf URL: https://github.com/kamailio/kamailio/commit/a4cab366dd03c1e8dcd6e36ba1bfa01… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-07T18:23:12+03:00 pkg/docker: updated kamailio-ci submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/a4cab366dd03c1e8dcd6e36ba1bfa01… Patch: https://github.com/kamailio/kamailio/commit/a4cab366dd03c1e8dcd6e36ba1bfa01… --- diff --git a/pkg/docker b/pkg/docker index b92a1c899b..25986598eb 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 +Subproject commit 25986598ebed3a3a89fcdf77a76498c30b842630

1 0

git:master:7cd2635b: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 7cd2635b5c464c3f5b1cc0fc76f442b32bdff5ad URL: https://github.com/kamailio/kamailio/commit/7cd2635b5c464c3f5b1cc0fc76f442b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T17:16:13+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/7cd2635b5c464c3f5b1cc0fc76f442b… Patch: https://github.com/kamailio/kamailio/commit/7cd2635b5c464c3f5b1cc0fc76f442b… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index bd0328b446..fdd95cd8e9 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -92,6 +92,10 @@ Chapter 1. Admin Guide routing block configurations. It adds new features similar to the textops module (textops eXtentions). + Note: If you add or remove message parts (header, body etc..) it may be + required to execute msg_apply_changes() from this module if there are + other operations done on the SIP message later on. + 2. Functions 2.1. msg_apply_changes()

1 0

git:5.3:46effd6a: texopsx: extend docs with a small note about msg_apply_changes()
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 46effd6a25fb1bf4c789307b3b097bd2c25e9fac URL: https://github.com/kamailio/kamailio/commit/46effd6a25fb1bf4c789307b3b097bd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T17:06:52+02:00 texopsx: extend docs with a small note about msg_apply_changes() (cherry picked from commit 899b826bcf2ebe0197fae5766962e0c193c585ec) --- Modified: src/modules/textopsx/doc/textopsx.xml --- Diff: https://github.com/kamailio/kamailio/commit/46effd6a25fb1bf4c789307b3b097bd… Patch: https://github.com/kamailio/kamailio/commit/46effd6a25fb1bf4c789307b3b097bd… --- diff --git a/src/modules/textopsx/doc/textopsx.xml b/src/modules/textopsx/doc/textopsx.xml index b7fe0d14a8..1967229ac1 100644 --- a/src/modules/textopsx/doc/textopsx.xml +++ b/src/modules/textopsx/doc/textopsx.xml @@ -37,6 +37,11 @@ in routing block configurations. It adds new features similar to the textops module (textops eXtentions). </para> + <para> + Note: If you add or remove message parts (header, body etc..) it + may be required to execute msg_apply_changes() from this module + if there are other operations done on the SIP message later on. + </para> </section> <xi:include href="functions.xml"/>

1 0

git:master:899b826b: texopsx: extend docs with a small note about msg_apply_changes()
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 899b826bcf2ebe0197fae5766962e0c193c585ec URL: https://github.com/kamailio/kamailio/commit/899b826bcf2ebe0197fae5766962e0c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T17:04:54+02:00 texopsx: extend docs with a small note about msg_apply_changes() --- Modified: src/modules/textopsx/doc/textopsx.xml --- Diff: https://github.com/kamailio/kamailio/commit/899b826bcf2ebe0197fae5766962e0c… Patch: https://github.com/kamailio/kamailio/commit/899b826bcf2ebe0197fae5766962e0c… --- diff --git a/src/modules/textopsx/doc/textopsx.xml b/src/modules/textopsx/doc/textopsx.xml index b7fe0d14a8..1967229ac1 100644 --- a/src/modules/textopsx/doc/textopsx.xml +++ b/src/modules/textopsx/doc/textopsx.xml @@ -37,6 +37,11 @@ in routing block configurations. It adds new features similar to the textops module (textops eXtentions). </para> + <para> + Note: If you add or remove message parts (header, body etc..) it + may be required to execute msg_apply_changes() from this module + if there are other operations done on the SIP message later on. + </para> </section> <xi:include href="functions.xml"/>

1 0

git:master:4e9f49a5: tls: docs - relocated the note about krand and fastrand from default value paragraph
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 4e9f49a5e8ebd90d6b6913310402acea7f5a3ca9 URL: https://github.com/kamailio/kamailio/commit/4e9f49a5e8ebd90d6b6913310402ace… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T15:07:41+02:00 tls: docs - relocated the note about krand and fastrand from default value paragraph - rephrased a bit to avoid eventual confusion they are not production ready --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e9f49a5e8ebd90d6b6913310402ace… Patch: https://github.com/kamailio/kamailio/commit/4e9f49a5e8ebd90d6b6913310402ace… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 72d3278ed7..dc6494c2db 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1259,13 +1259,16 @@ end <itemizedlist> <listitem><para>krand - use internal kam_rand() function</para></listitem> <listitem><para>fastrand - use internal fastrand function</para></listitem> - <listitem><para>cryptorand - use internal cryptorand function</para></listitem> + <listitem><para>cryptorand - use internal cryptorand (fortuna) function</para></listitem> </itemizedlist> + <para> + Note: the krand and fastrand engines are not recommended for use on + systems requiring strong security, as they may not generate numbers + with enough randomness. + </para> <para> The default value is empty (not set) for libssl v1.0.x or older, and - "cryptorand" for libssl v1.1.x or newer. The krand and fastrand engines are - not recommended for production use, as they will not generate secure enough - random numbers. + "cryptorand" for libssl v1.1.x or newer. </para> <example> <title>Set <varname>rand_engine</varname> parameter</title>

2 3

git:5.1:31ee7514: core: workaround related to T_OPT for alpine linux musl C library (GH #2095)
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.1 Commit: 31ee751409e0efdace1f76ee78cc85da78b049b8 URL: https://github.com/kamailio/kamailio/commit/31ee751409e0efdace1f76ee78cc85d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T16:35:44+02:00 core: workaround related to T_OPT for alpine linux musl C library (GH #2095) (cherry picked from commit cec1043a9c4daa39b4245b87f28fb5566e8627bd) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/31ee751409e0efdace1f76ee78cc85d… Patch: https://github.com/kamailio/kamailio/commit/31ee751409e0efdace1f76ee78cc85d… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 439435791a..f12b6e1ca6 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -32,8 +32,12 @@ #include <resolv.h> #include <string.h> -/* older glibc < 2.25 does not include T_OPT in nameser_compat.h yet */ -#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 25 +/* + * Older glibc < 2.25 does not include T_OPT in nameser_compat.h yet. + * On alpine linux musl library it is also not defined. There is no + * musl feature test macro, so we look for glibc instead. + */ +#if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ < 25) || !defined __GLIBC__ #ifndef T_OPT #define T_OPT ns_t_opt #endif

1 0

git:5.2:052c647e: core: workaround related to T_OPT for alpine linux musl C library (GH #2095)
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 052c647e310b59efd06903668aec231eadf321c2 URL: https://github.com/kamailio/kamailio/commit/052c647e310b59efd06903668aec231… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T16:35:11+02:00 core: workaround related to T_OPT for alpine linux musl C library (GH #2095) (cherry picked from commit cec1043a9c4daa39b4245b87f28fb5566e8627bd) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/052c647e310b59efd06903668aec231… Patch: https://github.com/kamailio/kamailio/commit/052c647e310b59efd06903668aec231… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 9f9705341e..04e65962ea 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -32,8 +32,12 @@ #include <resolv.h> #include <string.h> -/* older glibc < 2.25 does not include T_OPT in nameser_compat.h yet */ -#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 25 +/* + * Older glibc < 2.25 does not include T_OPT in nameser_compat.h yet. + * On alpine linux musl library it is also not defined. There is no + * musl feature test macro, so we look for glibc instead. + */ +#if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ < 25) || !defined __GLIBC__ #ifndef T_OPT #define T_OPT ns_t_opt #endif

1 0

git:5.2:c419dfdd: http_async_client: use enough size to print pointer as string in build_hash_key()
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: c419dfddfbfc7b250a4be18665d4ed779435ac2e URL: https://github.com/kamailio/kamailio/commit/c419dfddfbfc7b250a4be18665d4ed7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T16:30:47+02:00 http_async_client: use enough size to print pointer as string in build_hash_key() - use local string variables instead of allocation in pkg, because the values are needed only inside the function - use safer snprintf() instead of sprintf() - GH #2091 (cherry picked from commit 087654a5028cd800e17fcd9d1768135a60fd6706) (cherry picked from commit 2ec8caa1ef9577fa4f21fb1fa2f9f6217a29f3eb) --- Modified: src/modules/http_async_client/hm_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/c419dfddfbfc7b250a4be18665d4ed7… Patch: https://github.com/kamailio/kamailio/commit/c419dfddfbfc7b250a4be18665d4ed7… --- diff --git a/src/modules/http_async_client/hm_hash.c b/src/modules/http_async_client/hm_hash.c index 9497809847..b18a8b9c37 100644 --- a/src/modules/http_async_client/hm_hash.c +++ b/src/modules/http_async_client/hm_hash.c @@ -62,39 +62,25 @@ int init_http_m_table(unsigned int size) unsigned int build_hash_key(void *p) { - str *hash_str; - char *pointer_str; - int len; + str hash_str; + char pointer_str[20]; unsigned int hash; - pointer_str = (char *)pkg_malloc(sizeof(p) + 1); - - if (pointer_str==0) { - LM_ERR("no more pkg mem\n"); + hash_str.len = snprintf(pointer_str, 20, "%p", p); + if(hash_str.len<=0 || hash_str.len>=20) { + LM_ERR("failed to print the pointer address\n"); return 0; } + LM_DBG("received id %p (%d)-> %s (%d)\n", p, (int)sizeof(p), pointer_str, + hash_str.len); - sprintf(pointer_str, "%p", p); - len = strlen(pointer_str); - LM_DBG("received id %p (%d)-> %s (%d)\n", p, (int)sizeof(p), pointer_str, len); + hash_str.s = pointer_str; - hash_str = (str *)pkg_malloc(sizeof(str)); - if (hash_str==0) { - LM_ERR("no more pkg mem\n"); - pkg_free(pointer_str); - return 0; - } - hash_str->s = pointer_str; - hash_str->len = len; - - hash = core_hash(hash_str, 0, hash_size); + hash = core_hash(&hash_str, 0, hash_size); LM_DBG("hash for %p is %d\n", p, hash); - pkg_free(pointer_str); - pkg_free(hash_str); - return hash; }

1 0

git:5.3:2ec8caa1: http_async_client: use enough size to print pointer as string in build_hash_key()
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 2ec8caa1ef9577fa4f21fb1fa2f9f6217a29f3eb URL: https://github.com/kamailio/kamailio/commit/2ec8caa1ef9577fa4f21fb1fa2f9f62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T16:29:16+02:00 http_async_client: use enough size to print pointer as string in build_hash_key() - use local string variables instead of allocation in pkg, because the values are needed only inside the function - use safer snprintf() instead of sprintf() - GH #2091 (cherry picked from commit 087654a5028cd800e17fcd9d1768135a60fd6706) --- Modified: src/modules/http_async_client/hm_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/2ec8caa1ef9577fa4f21fb1fa2f9f62… Patch: https://github.com/kamailio/kamailio/commit/2ec8caa1ef9577fa4f21fb1fa2f9f62… --- diff --git a/src/modules/http_async_client/hm_hash.c b/src/modules/http_async_client/hm_hash.c index 9497809847..b18a8b9c37 100644 --- a/src/modules/http_async_client/hm_hash.c +++ b/src/modules/http_async_client/hm_hash.c @@ -62,39 +62,25 @@ int init_http_m_table(unsigned int size) unsigned int build_hash_key(void *p) { - str *hash_str; - char *pointer_str; - int len; + str hash_str; + char pointer_str[20]; unsigned int hash; - pointer_str = (char *)pkg_malloc(sizeof(p) + 1); - - if (pointer_str==0) { - LM_ERR("no more pkg mem\n"); + hash_str.len = snprintf(pointer_str, 20, "%p", p); + if(hash_str.len<=0 || hash_str.len>=20) { + LM_ERR("failed to print the pointer address\n"); return 0; } + LM_DBG("received id %p (%d)-> %s (%d)\n", p, (int)sizeof(p), pointer_str, + hash_str.len); - sprintf(pointer_str, "%p", p); - len = strlen(pointer_str); - LM_DBG("received id %p (%d)-> %s (%d)\n", p, (int)sizeof(p), pointer_str, len); + hash_str.s = pointer_str; - hash_str = (str *)pkg_malloc(sizeof(str)); - if (hash_str==0) { - LM_ERR("no more pkg mem\n"); - pkg_free(pointer_str); - return 0; - } - hash_str->s = pointer_str; - hash_str->len = len; - - hash = core_hash(hash_str, 0, hash_size); + hash = core_hash(&hash_str, 0, hash_size); LM_DBG("hash for %p is %d\n", p, hash); - pkg_free(pointer_str); - pkg_free(hash_str); - return hash; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev