- sr-dev - kamailio.org

git:master:087654a5: 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: master Commit: 087654a5028cd800e17fcd9d1768135a60fd6706 URL: https://github.com/kamailio/kamailio/commit/087654a5028cd800e17fcd9d1768135… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T16:28:24+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 --- Modified: src/modules/http_async_client/hm_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/087654a5028cd800e17fcd9d1768135… Patch: https://github.com/kamailio/kamailio/commit/087654a5028cd800e17fcd9d1768135… --- 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:master:cec1043a: 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: master Commit: cec1043a9c4daa39b4245b87f28fb5566e8627bd URL: https://github.com/kamailio/kamailio/commit/cec1043a9c4daa39b4245b87f28fb55… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T15:39:49+02:00 core: workaround related to T_OPT for alpine linux musl C library (GH #2095) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/cec1043a9c4daa39b4245b87f28fb55… Patch: https://github.com/kamailio/kamailio/commit/cec1043a9c4daa39b4245b87f28fb55… --- 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.2:a365a8d3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: a365a8d3519d33f5314a9c3bdab4e1c1ea465642 URL: https://github.com/kamailio/kamailio/commit/a365a8d3519d33f5314a9c3bdab4e1c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T15:31:30+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/a365a8d3519d33f5314a9c3bdab4e1c… Patch: https://github.com/kamailio/kamailio/commit/a365a8d3519d33f5314a9c3bdab4e1c… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index bf9f693bd0..5a0d9dab1f 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1427,14 +1427,19 @@ end v1.1.x is not designed for multi-process applications and can result in a crash. Therefore set the PRNG engine to one of the options listed in this section. If libssl 1.1.x (or newer) is detected at compile time, - then the PRNG engine is set to "fastrand". + then the PRNG engine is set to "cryptorand". The following options are avaialble: * krand - use internal kam_rand() function * fastrand - use internal fastrand 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. The default value is empty (not set) for libssl v1.0.x or older, and - "fastrand" for libssl v1.1.x or newer. + "cryptorand" for libssl v1.1.x or newer. Example 1.45. Set rand_engine parameter ...

1 0

git:5.2:dde78715: tls: docs - documented cryptorand engine for prng
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: dde78715ce88c8bfb6530559fcaa3a182ca72af7 URL: https://github.com/kamailio/kamailio/commit/dde78715ce88c8bfb6530559fcaa3a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T15:16:27+02:00 tls: docs - documented cryptorand engine for prng (cherry picked from commit 398641926648a32b635f39f655ae3231038b9c3d) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/dde78715ce88c8bfb6530559fcaa3a1… Patch: https://github.com/kamailio/kamailio/commit/dde78715ce88c8bfb6530559fcaa3a1… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 6028642b5f..dc6494c2db 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1251,7 +1251,7 @@ end is not designed for multi-process applications and can result in a crash. Therefore set the PRNG engine to one of the options listed in this section. If libssl 1.1.x (or newer) is detected at compile time, then - the PRNG engine is set to "fastrand". + the PRNG engine is set to "cryptorand". </para> <para> The following options are avaialble: @@ -1259,10 +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 (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 - "fastrand" for libssl v1.1.x or newer. + "cryptorand" for libssl v1.1.x or newer. </para> <example> <title>Set <varname>rand_engine</varname> parameter</title>

1 0

git:5.2:0e5fbd02: tls: add cryptorand (fortuna) engine for PRNG if libssl v1.1.0+
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 0e5fbd02c95d76045487b707a7386abb029234ff URL: https://github.com/kamailio/kamailio/commit/0e5fbd02c95d76045487b707a7386ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T15:16:17+02:00 tls: add cryptorand (fortuna) engine for PRNG if libssl v1.1.0+ - set it to be the default PRNG with libssl v1.1.0+ (cherry picked from commit 58f6eb7b8bbd6e22994f4b147b6c2fc9c7d1daa0) --- 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/0e5fbd02c95d76045487b707a7386ab… Patch: https://github.com/kamailio/kamailio/commit/0e5fbd02c95d76045487b707a7386ab… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 75d8aa8fd2..424fad8a08 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -453,6 +453,9 @@ int ksr_rand_engine_param(modparam_t type, void* val) } else if(reng->len == 8 && strncasecmp(reng->s, "fastrand", 8) == 0) { LM_DBG("setting fastrand random engine\n"); RAND_set_rand_method(RAND_ksr_fastrand_method()); + } else if (reng->len == 10 && strncasecmp(reng->s, "cryptorand", 10) == 0) { + LM_DBG("setting cryptorand random engine\n"); + RAND_set_rand_method(RAND_ksr_cryptorand_method()); } #endif return 0; @@ -563,8 +566,8 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); #if OPENSSL_VERSION_NUMBER >= 0x10100000L - LM_DBG("setting fastrand random engine\n"); - RAND_set_rand_method(RAND_ksr_fastrand_method()); + LM_DBG("setting cryptorand random engine\n"); + RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif sr_kemi_modules_add(sr_kemi_tls_exports); diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index bc80f658c3..3cb2e8a712 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -129,4 +129,46 @@ const RAND_METHOD *RAND_ksr_fastrand_method(void) return &_ksr_fastrand_method; } + +/* + * Implementation with Fortuna cryptographic PRNG. + * We are not strictly implementing the OpenSSL API here - we will + * not return an error if the PRNG has not been seeded with enough + * randomness to ensure an unpredictable byte sequence. + */ +static int ksr_cryptorand_bytes(unsigned char *outdata, int size) +{ + if (size < 0) { + return 0; + } else if (size == 0) { + return 1; + } + + sr_get_pseudo_random_bytes(outdata, size); + return 1; +} + +static int ksr_cryptorand_status(void) +{ + return 1; +} + +/* + * We don't have a dedicated function for pseudo-random + * bytes, just use the secure version as well for it. + */ +const RAND_METHOD _ksr_cryptorand_method = { + NULL, + ksr_cryptorand_bytes, + NULL, + NULL, + ksr_cryptorand_bytes, + ksr_cryptorand_status +}; + +const RAND_METHOD *RAND_ksr_cryptorand_method(void) +{ + return &_ksr_cryptorand_method; +} + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index d1a3f0d37f..c73d36b8d9 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -27,6 +27,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); #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 0

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

07 Oct '19

Module: kamailio Branch: master Commit: ca12494ec776babab86897eba35b88424a707c69 URL: https://github.com/kamailio/kamailio/commit/ca12494ec776babab86897eba35b884… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T15:16:37+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/ca12494ec776babab86897eba35b884… Patch: https://github.com/kamailio/kamailio/commit/ca12494ec776babab86897eba35b884… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index b0d9fa2601..650a964b58 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1435,12 +1435,14 @@ end The following options are avaialble: * krand - use internal kam_rand() function * fastrand - use internal fastrand function - * cryptorand - use internal cryptorand 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. 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. Example 1.45. Set rand_engine parameter ...

1 0

git:5.3:39864192: tls: docs - documented cryptorand engine for prng
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 398641926648a32b635f39f655ae3231038b9c3d URL: https://github.com/kamailio/kamailio/commit/398641926648a32b635f39f655ae323… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T15:13:58+02:00 tls: docs - documented cryptorand engine for prng --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/398641926648a32b635f39f655ae323… Patch: https://github.com/kamailio/kamailio/commit/398641926648a32b635f39f655ae323… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 6028642b5f..dc6494c2db 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1251,7 +1251,7 @@ end is not designed for multi-process applications and can result in a crash. Therefore set the PRNG engine to one of the options listed in this section. If libssl 1.1.x (or newer) is detected at compile time, then - the PRNG engine is set to "fastrand". + the PRNG engine is set to "cryptorand". </para> <para> The following options are avaialble: @@ -1259,10 +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 (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 - "fastrand" for libssl v1.1.x or newer. + "cryptorand" for libssl v1.1.x or newer. </para> <example> <title>Set <varname>rand_engine</varname> parameter</title>

1 0

git:5.3:58f6eb7b: tls: add cryptorand (fortuna) engine for PRNG if libssl v1.1.0+
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 58f6eb7b8bbd6e22994f4b147b6c2fc9c7d1daa0 URL: https://github.com/kamailio/kamailio/commit/58f6eb7b8bbd6e22994f4b147b6c2fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T14:57:06+02:00 tls: add cryptorand (fortuna) engine for PRNG if libssl v1.1.0+ - set it to be the default PRNG with libssl v1.1.0+ --- 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/58f6eb7b8bbd6e22994f4b147b6c2fc… Patch: https://github.com/kamailio/kamailio/commit/58f6eb7b8bbd6e22994f4b147b6c2fc… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 75d8aa8fd2..424fad8a08 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -453,6 +453,9 @@ int ksr_rand_engine_param(modparam_t type, void* val) } else if(reng->len == 8 && strncasecmp(reng->s, "fastrand", 8) == 0) { LM_DBG("setting fastrand random engine\n"); RAND_set_rand_method(RAND_ksr_fastrand_method()); + } else if (reng->len == 10 && strncasecmp(reng->s, "cryptorand", 10) == 0) { + LM_DBG("setting cryptorand random engine\n"); + RAND_set_rand_method(RAND_ksr_cryptorand_method()); } #endif return 0; @@ -563,8 +566,8 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); #if OPENSSL_VERSION_NUMBER >= 0x10100000L - LM_DBG("setting fastrand random engine\n"); - RAND_set_rand_method(RAND_ksr_fastrand_method()); + LM_DBG("setting cryptorand random engine\n"); + RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif sr_kemi_modules_add(sr_kemi_tls_exports); diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index bc80f658c3..3cb2e8a712 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -129,4 +129,46 @@ const RAND_METHOD *RAND_ksr_fastrand_method(void) return &_ksr_fastrand_method; } + +/* + * Implementation with Fortuna cryptographic PRNG. + * We are not strictly implementing the OpenSSL API here - we will + * not return an error if the PRNG has not been seeded with enough + * randomness to ensure an unpredictable byte sequence. + */ +static int ksr_cryptorand_bytes(unsigned char *outdata, int size) +{ + if (size < 0) { + return 0; + } else if (size == 0) { + return 1; + } + + sr_get_pseudo_random_bytes(outdata, size); + return 1; +} + +static int ksr_cryptorand_status(void) +{ + return 1; +} + +/* + * We don't have a dedicated function for pseudo-random + * bytes, just use the secure version as well for it. + */ +const RAND_METHOD _ksr_cryptorand_method = { + NULL, + ksr_cryptorand_bytes, + NULL, + NULL, + ksr_cryptorand_bytes, + ksr_cryptorand_status +}; + +const RAND_METHOD *RAND_ksr_cryptorand_method(void) +{ + return &_ksr_cryptorand_method; +} + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index d1a3f0d37f..c73d36b8d9 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -27,6 +27,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); #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 0

Errored: kamailio/kamailio#7889 (master - 49a7893)
by Travis CI 07 Oct '19

07 Oct '19

Build Update for kamailio/kamailio ------------------------------------- Build: #7889 Status: Errored Duration: 1 min and 47 secs Commit: 49a7893 (master) Author: Henning Westerholt Message: tls: update name and mailing list in tls_cert.sh script View the changeset: https://github.com/kamailio/kamailio/compare/b0538d6515ad...49a78933845f View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/594505407?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:49a78933: tls: update name and mailing list in tls_cert.sh script
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 49a78933845f136f8f7caaf7e24e6cdcf206cbb5 URL: https://github.com/kamailio/kamailio/commit/49a78933845f136f8f7caaf7e24e6cd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T11:50:29+02:00 tls: update name and mailing list in tls_cert.sh script --- Modified: src/modules/tls/tls_cert.sh --- Diff: https://github.com/kamailio/kamailio/commit/49a78933845f136f8f7caaf7e24e6cd… Patch: https://github.com/kamailio/kamailio/commit/49a78933845f136f8f7caaf7e24e6cd… --- 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.2:dbd4bc09: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: dbd4bc0944664c861a31f42c4c70eac148312969 URL: https://github.com/kamailio/kamailio/commit/dbd4bc0944664c861a31f42c4c70eac… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T11:46:59+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/dbd4bc0944664c861a31f42c4c70eac… Patch: https://github.com/kamailio/kamailio/commit/dbd4bc0944664c861a31f42c4c70eac…

1 0

git:master:876c0529: pkg/docker: updated kamailio-ci subproject
by Sergey Safarov 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 876c0529962678f7f0c610dd7190cb42d623f2a7 URL: https://github.com/kamailio/kamailio/commit/876c0529962678f7f0c610dd7190cb4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-10-07T12:28:17+03:00 pkg/docker: updated kamailio-ci subproject --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/876c0529962678f7f0c610dd7190cb4… Patch: https://github.com/kamailio/kamailio/commit/876c0529962678f7f0c610dd7190cb4… --- diff --git a/pkg/docker b/pkg/docker index b92a1c899b..4b81cba4c2 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 +Subproject commit 4b81cba4c293f79ef3b4ae4a8c391d0da220878e

2 1

git:5.2:466075c0: tls: Makefile - do not enclose fortuna lib in quotes
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 466075c0c9145cf676ffac8102af23478cc1a244 URL: https://github.com/kamailio/kamailio/commit/466075c0c9145cf676ffac8102af234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:44:09+02:00 tls: Makefile - do not enclose fortuna lib in quotes - bsd make keeps them in compile/ldd command (cherry picked from commit f07893606b2129f3a7f24a7d1f7fee619f9b8105) --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/466075c0c9145cf676ffac8102af234… Patch: https://github.com/kamailio/kamailio/commit/466075c0c9145cf676ffac8102af234… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 02f879cc42..7e3c409a70 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -28,7 +28,7 @@ else # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" endif -TLS_EXTRA_LIBS="-L. -lfortuna" +TLS_EXTRA_LIBS= -L. -lfortuna LIBS+= $(TLS_EXTRA_LIBS) # dcm: tls.cfg installed via local 'install-cfg' to update paths

1 0

git:5.2:1ccb215b: xmlrpc: clean allocated buffer for reply when no more memory for reason value
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 1ccb215b96f3dc0bd49ea3feb00f9e8f1a5c1fda URL: https://github.com/kamailio/kamailio/commit/1ccb215b96f3dc0bd49ea3feb00f9e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:43:55+02:00 xmlrpc: clean allocated buffer for reply when no more memory for reason value (cherry picked from commit 36a4b16117d79f1a30a9f929350f75ab8bfd5d2a) (cherry picked from commit aa875e297bea05828f319d71fc68c44969931231) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/1ccb215b96f3dc0bd49ea3feb00f9e8… Patch: https://github.com/kamailio/kamailio/commit/1ccb215b96f3dc0bd49ea3feb00f9e8… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 9521af2386..7552b4d7f1 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2509,7 +2509,7 @@ static int ki_xmlrpc_reply(sip_msg_t* msg, int rcode, str* reason) reply.reason = as_asciiz(reason); if (reply.reason == NULL) { ERR("No memory left\n"); - return -1; + goto error; } if (reply.code >= 300) {

1 0

git:5.2:6beb87f1: tls: use fastrand() for the corresponding rand_engine
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 6beb87f165d9926cd14eb0bd4d57f4167232121c URL: https://github.com/kamailio/kamailio/commit/6beb87f165d9926cd14eb0bd4d57f41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:43:55+02:00 tls: use fastrand() for the corresponding rand_engine (cherry picked from commit f877069e141749796ec02a78ce16342f9e120ef7) (cherry picked from commit 52dda341500c697b988f600d3ae6f1b0065670bc) --- Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/6beb87f165d9926cd14eb0bd4d57f41… Patch: https://github.com/kamailio/kamailio/commit/6beb87f165d9926cd14eb0bd4d57f41… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 9101251dd7..bc80f658c3 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -93,13 +93,13 @@ static int ksr_fastrand_bytes(unsigned char *outdata, int size) } while(size >= sizeof(int)) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, sizeof(int)); size -= sizeof(int); outdata += sizeof(int); } if(size>0) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, size); } return 1;

1 0

git:5.2:d86c831a: core: str2int() test first if result is null, otherwise init it to 0
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: d86c831a474e57acc6bd744eb52a24b3b7b9a3c0 URL: https://github.com/kamailio/kamailio/commit/d86c831a474e57acc6bd744eb52a24b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:43:55+02:00 core: str2int() test first if result is null, otherwise init it to 0 (cherry picked from commit b83a165e2d0e34c9bca742708c1891eb114bae04) (cherry picked from commit ac16e21715e57befcba386e74214fa482bdf97d7) --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/d86c831a474e57acc6bd744eb52a24b… Patch: https://github.com/kamailio/kamailio/commit/d86c831a474e57acc6bd744eb52a24b… --- diff --git a/src/core/ut.h b/src/core/ut.h index 8d4f01e9a1..4a5cc463a5 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -635,12 +635,12 @@ static inline int str2int(str* _s, unsigned int* _r) { int i; - if (_s == NULL) return -1; if (_r == NULL) return -1; + *_r = 0; + if (_s == NULL) return -1; if (_s->len < 0) return -1; if (_s->s == NULL) return -1; - *_r = 0; for(i = 0; i < _s->len; i++) { if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { *_r *= 10;

1 0

git:5.2:e1b740b4: tls: set random number engine to fastrand for libssl1.1+
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: e1b740b43f0fda7bcbf4b36c2816d318193acf54 URL: https://github.com/kamailio/kamailio/commit/e1b740b43f0fda7bcbf4b36c2816d31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:43:55+02:00 tls: set random number engine to fastrand for libssl1.1+ (cherry picked from commit 6d154fbb2ff1d2941316281fad120b5db219deb1) (cherry picked from commit 2935b65d7d909f8ac355b8f2b5404494c4ec2c6b) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e1b740b43f0fda7bcbf4b36c2816d31… Patch: https://github.com/kamailio/kamailio/commit/e1b740b43f0fda7bcbf4b36c2816d31… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 87759249b2..75d8aa8fd2 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -561,6 +561,12 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; register_tls_hooks(&tls_h); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + LM_DBG("setting fastrand random engine\n"); + RAND_set_rand_method(RAND_ksr_fastrand_method()); +#endif + sr_kemi_modules_add(sr_kemi_tls_exports); return 0;

1 0

git:5.2:52e34808: tls: docs for rand_engine parameter
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 52e348087551b42c97bcb235dabbc95255a83b1a URL: https://github.com/kamailio/kamailio/commit/52e348087551b42c97bcb235dabbc95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:43:55+02:00 tls: docs for rand_engine parameter (cherry picked from commit 787b95a5a0573d4e81b2475a84bad59076e34faf) (cherry picked from commit 3c11a405344af55aa4b9c8d35e1c181473cbdf42) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/52e348087551b42c97bcb235dabbc95… Patch: https://github.com/kamailio/kamailio/commit/52e348087551b42c97bcb235dabbc95… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 6ef2d4123f..6028642b5f 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1241,6 +1241,39 @@ end </example> </section> + <section id="tls.p.rand_engine"> + <title><varname>rand_engine</varname> (str)</title> + <para> + Set the ranondom number generator engine for libssl. + </para> + <para> + Note: the default random number generator (PRNG) engine of libssl v1.1.x + is not designed for multi-process applications and can result in a crash. + Therefore set the PRNG engine to one of the options listed in this + section. If libssl 1.1.x (or newer) is detected at compile time, then + the PRNG engine is set to "fastrand". + </para> + <para> + The following options are avaialble: + </para> + <itemizedlist> + <listitem><para>krand - use internal kam_rand() function</para></listitem> + <listitem><para>fastrand - use internal fastrand function</para></listitem> + </itemizedlist> + <para> + The default value is empty (not set) for libssl v1.0.x or older, and + "fastrand" for libssl v1.1.x or newer. + </para> + <example> + <title>Set <varname>rand_engine</varname> parameter</title> + <programlisting> +... +modparam("tls", "rand_engine", "fastrand") +... + </programlisting> + </example> + </section> + <section id="tls.p.engine"> <title><varname>engine</varname> (string)</title> <para>

1 0

git:5.2:f73aa772: tls: option to set use fastrand for rand_engine
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: f73aa7727607c18cf6d6bcb11c51510c8d3660c9 URL: https://github.com/kamailio/kamailio/commit/f73aa7727607c18cf6d6bcb11c51510… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:43:55+02:00 tls: option to set use fastrand for rand_engine (cherry picked from commit 4f514a7956534f1afc1ef30d8332f5dc3547de4b) (cherry picked from commit 43aa779ee9e43805e6a7da2c12562fdc89c5c413) --- 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/f73aa7727607c18cf6d6bcb11c51510… Patch: https://github.com/kamailio/kamailio/commit/f73aa7727607c18cf6d6bcb11c51510… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 52a45353d6..87759249b2 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -449,7 +449,10 @@ int ksr_rand_engine_param(modparam_t type, void* val) LM_DBG("random engine: %.*s\n", reng->len, reng->s); if(reng->len == 5 && strncasecmp(reng->s, "krand", 5) == 0) { LM_DBG("setting krand random engine\n"); - RAND_set_rand_method(RAND_ksr_method()); + RAND_set_rand_method(RAND_ksr_krand_method()); + } else if(reng->len == 8 && strncasecmp(reng->s, "fastrand", 8) == 0) { + LM_DBG("setting fastrand random engine\n"); + RAND_set_rand_method(RAND_ksr_fastrand_method()); } #endif return 0; diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 0f283306dd..9101251dd7 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -27,9 +27,10 @@ #include "../../core/dprint.h" #include "../../core/rand/kam_rand.h" +#include "../../core/rand/fastrand.h" #include "fortuna/random.h" -static int ksr_rand_bytes(unsigned char *outdata, int size) +static int ksr_krand_bytes(unsigned char *outdata, int size) { int r; @@ -57,28 +58,75 @@ static int ksr_rand_bytes(unsigned char *outdata, int size) return 1; } -static int ksr_rand_pseudorand(unsigned char *outdata, int size) +static int ksr_krand_pseudorand(unsigned char *outdata, int size) { - return ksr_rand_bytes(outdata, size); + return ksr_krand_bytes(outdata, size); } -static int ksr_rand_status(void) +static int ksr_krand_status(void) { return 1; } -const RAND_METHOD _ksr_rand_method = { +const RAND_METHOD _ksr_krand_method = { NULL, - ksr_rand_bytes, + ksr_krand_bytes, NULL, NULL, - ksr_rand_pseudorand, - ksr_rand_status + ksr_krand_pseudorand, + ksr_krand_status }; -const RAND_METHOD *RAND_ksr_method(void) +const RAND_METHOD *RAND_ksr_krand_method(void) { - return &_ksr_rand_method; + return &_ksr_krand_method; +} + +static int ksr_fastrand_bytes(unsigned char *outdata, int size) +{ + int r; + + if (size < 0) { + return 0; + } else if (size == 0) { + return 1; + } + + while(size >= sizeof(int)) { + r = kam_rand(); + memcpy(outdata, &r, sizeof(int)); + size -= sizeof(int); + outdata += sizeof(int); + } + if(size>0) { + r = kam_rand(); + memcpy(outdata, &r, size); + } + return 1; +} + +static int ksr_fastrand_pseudorand(unsigned char *outdata, int size) +{ + return ksr_fastrand_bytes(outdata, size); +} + +static int ksr_fastrand_status(void) +{ + return 1; +} + +const RAND_METHOD _ksr_fastrand_method = { + NULL, + ksr_fastrand_bytes, + NULL, + NULL, + ksr_fastrand_pseudorand, + ksr_fastrand_status +}; + +const RAND_METHOD *RAND_ksr_fastrand_method(void) +{ + return &_ksr_fastrand_method; } #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 20b5a20e9c..d1a3f0d37f 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -25,7 +25,8 @@ #include <openssl/rand.h> -const RAND_METHOD *RAND_ksr_method(void); +const RAND_METHOD *RAND_ksr_krand_method(void); +const RAND_METHOD *RAND_ksr_fastrand_method(void); #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 0

git:5.2:c6cac677: tls: add local copy of fortuna and depenencies from git master
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: c6cac67746e96fff43dbf6b55e018a84722a1400 URL: https://github.com/kamailio/kamailio/commit/c6cac67746e96fff43dbf6b55e018a8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:43:54+02:00 tls: add local copy of fortuna and depenencies from git master - add local copy of fortuna and depenencies from git master - not active yet, needs additions in tls_rand.* and probably also Makefile (cherry picked from commit 26d8e3cf82a49ad4e58ced507f7a1787b74656b0) --- Added: src/modules/tls/fortuna/Makefile Added: src/modules/tls/fortuna/fortuna.c Added: src/modules/tls/fortuna/fortuna.h Added: src/modules/tls/fortuna/random.c Added: src/modules/tls/fortuna/random.h Added: src/modules/tls/fortuna/rijndael.c Added: src/modules/tls/fortuna/rijndael.h Added: src/modules/tls/fortuna/rijndael.tbl Added: src/modules/tls/fortuna/sha256.c Added: src/modules/tls/fortuna/sha256.h Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/c6cac67746e96fff43dbf6b55e018a8… Patch: https://github.com/kamailio/kamailio/commit/c6cac67746e96fff43dbf6b55e018a8…

1 0

git:5.3:f0789360: tls: Makefile - do not enclose fortuna lib in quotes
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: f07893606b2129f3a7f24a7d1f7fee619f9b8105 URL: https://github.com/kamailio/kamailio/commit/f07893606b2129f3a7f24a7d1f7fee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T11:42:12+02:00 tls: Makefile - do not enclose fortuna lib in quotes - bsd make keeps them in compile/ldd command --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f07893606b2129f3a7f24a7d1f7fee6… Patch: https://github.com/kamailio/kamailio/commit/f07893606b2129f3a7f24a7d1f7fee6… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 9911882dc8..224bbd81d3 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -28,7 +28,7 @@ else # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" endif -TLS_EXTRA_LIBS="-L. -lfortuna" +TLS_EXTRA_LIBS= -L. -lfortuna LIBS+= $(TLS_EXTRA_LIBS) # dcm: tls.cfg installed via local 'install-cfg' to update paths

1 0

Errored: kamailio/kamailio#7886 (master - b0538d6)
by Travis CI 07 Oct '19

07 Oct '19

Build Update for kamailio/kamailio ------------------------------------- Build: #7886 Status: Errored Duration: 33 secs Commit: b0538d6 (master) Author: Henning Westerholt Message: tls: fix error in DBG message View the changeset: https://github.com/kamailio/kamailio/compare/876c05299626...b0538d6515ad View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/594497545?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:b0538d65: tls: fix error in DBG message
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: b0538d6515ad2a62f4336ec4395d10a5a9fc654b URL: https://github.com/kamailio/kamailio/commit/b0538d6515ad2a62f4336ec4395d10a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T11:31:50+02:00 tls: fix error in DBG message --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b0538d6515ad2a62f4336ec4395d10a… Patch: https://github.com/kamailio/kamailio/commit/b0538d6515ad2a62f4336ec4395d10a… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 5784ce4842..424fad8a08 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -566,7 +566,7 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); #if OPENSSL_VERSION_NUMBER >= 0x10100000L - LM_DBG("setting fastrand random engine\n"); + LM_DBG("setting cryptorand random engine\n"); RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif

1 0

Errored: kamailio/kamailio#7885 (master - 876c052)
by Travis CI 07 Oct '19

07 Oct '19

Build Update for kamailio/kamailio ------------------------------------- Build: #7885 Status: Errored Duration: 33 secs Commit: 876c052 (master) Author: Sergey Safarov Message: pkg/docker: updated kamailio-ci subproject View the changeset: https://github.com/kamailio/kamailio/compare/b1886c15ba56...876c05299626 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/594496259?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:b1886c15: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: b1886c15ba562fef987fe6361df2cb3bbe00888c URL: https://github.com/kamailio/kamailio/commit/b1886c15ba562fef987fe6361df2cb3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T11:02:17+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/b1886c15ba562fef987fe6361df2cb3… Patch: https://github.com/kamailio/kamailio/commit/b1886c15ba562fef987fe6361df2cb3… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 295306a74e..b0d9fa2601 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1430,14 +1430,17 @@ end v1.1.x is not designed for multi-process applications and can result in a crash. Therefore set the PRNG engine to one of the options listed in this section. If libssl 1.1.x (or newer) is detected at compile time, - then the PRNG engine is set to "fastrand". + then the PRNG engine is set to "cryptorand". The following options are avaialble: * krand - use internal kam_rand() function * fastrand - use internal fastrand function + * cryptorand - use internal cryptorand function The default value is empty (not set) for libssl v1.0.x or older, and - "fastrand" for libssl v1.1.x or newer. + "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. Example 1.45. Set rand_engine parameter ...

1 0

git:5.3:30cef0e2: presence: free allocated memory in case of error
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 30cef0e29c39402b91cd6d4b4d323cf3bf9fd033 URL: https://github.com/kamailio/kamailio/commit/30cef0e29c39402b91cd6d4b4d323cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:52:54+02:00 presence: free allocated memory in case of error (cherry picked from commit 4e6c8fe6073d7d52bab66faa68abad2f685d2090) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/30cef0e29c39402b91cd6d4b4d323cf… Patch: https://github.com/kamailio/kamailio/commit/30cef0e29c39402b91cd6d4b4d323cf… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index f9ce4c403f..245c2b95c0 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -2018,6 +2018,7 @@ int add_waiting_watchers(watcher_t *watchers, str pres_uri, str event) w = (watcher_t *)pkg_malloc(sizeof(watcher_t)); if(w == NULL) { + pkg_free(wuri.s); ERR_MEM(PKG_MEM_STR); } memset(w, 0, sizeof(watcher_t));

1 0

git:5.3:aa875e29: xmlrpc: clean allocated buffer for reply when no more memory for reason value
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: aa875e297bea05828f319d71fc68c44969931231 URL: https://github.com/kamailio/kamailio/commit/aa875e297bea05828f319d71fc68c44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:52:41+02:00 xmlrpc: clean allocated buffer for reply when no more memory for reason value (cherry picked from commit 36a4b16117d79f1a30a9f929350f75ab8bfd5d2a) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/aa875e297bea05828f319d71fc68c44… Patch: https://github.com/kamailio/kamailio/commit/aa875e297bea05828f319d71fc68c44… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 9521af2386..7552b4d7f1 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2509,7 +2509,7 @@ static int ki_xmlrpc_reply(sip_msg_t* msg, int rcode, str* reason) reply.reason = as_asciiz(reason); if (reply.reason == NULL) { ERR("No memory left\n"); - return -1; + goto error; } if (reply.code >= 300) {

1 0

git:5.3:52dda341: tls: use fastrand() for the corresponding rand_engine
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 52dda341500c697b988f600d3ae6f1b0065670bc URL: https://github.com/kamailio/kamailio/commit/52dda341500c697b988f600d3ae6f1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:52:33+02:00 tls: use fastrand() for the corresponding rand_engine (cherry picked from commit f877069e141749796ec02a78ce16342f9e120ef7) --- Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/52dda341500c697b988f600d3ae6f1b… Patch: https://github.com/kamailio/kamailio/commit/52dda341500c697b988f600d3ae6f1b… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 9101251dd7..bc80f658c3 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -93,13 +93,13 @@ static int ksr_fastrand_bytes(unsigned char *outdata, int size) } while(size >= sizeof(int)) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, sizeof(int)); size -= sizeof(int); outdata += sizeof(int); } if(size>0) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, size); } return 1;

1 0

git:5.3:ac16e217: core: str2int() test first if result is null, otherwise init it to 0
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: ac16e21715e57befcba386e74214fa482bdf97d7 URL: https://github.com/kamailio/kamailio/commit/ac16e21715e57befcba386e74214fa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:52:23+02:00 core: str2int() test first if result is null, otherwise init it to 0 (cherry picked from commit b83a165e2d0e34c9bca742708c1891eb114bae04) --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ac16e21715e57befcba386e74214fa4… Patch: https://github.com/kamailio/kamailio/commit/ac16e21715e57befcba386e74214fa4… --- diff --git a/src/core/ut.h b/src/core/ut.h index 88df8dba65..2259aea973 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -635,12 +635,12 @@ static inline int str2int(str* _s, unsigned int* _r) { int i; - if (_s == NULL) return -1; if (_r == NULL) return -1; + *_r = 0; + if (_s == NULL) return -1; if (_s->len < 0) return -1; if (_s->s == NULL) return -1; - *_r = 0; for(i = 0; i < _s->len; i++) { if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { *_r *= 10;

1 0

git:5.3:3c11a405: tls: docs for rand_engine parameter
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 3c11a405344af55aa4b9c8d35e1c181473cbdf42 URL: https://github.com/kamailio/kamailio/commit/3c11a405344af55aa4b9c8d35e1c181… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:52:03+02:00 tls: docs for rand_engine parameter (cherry picked from commit 787b95a5a0573d4e81b2475a84bad59076e34faf) --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c11a405344af55aa4b9c8d35e1c181… Patch: https://github.com/kamailio/kamailio/commit/3c11a405344af55aa4b9c8d35e1c181… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 6ef2d4123f..6028642b5f 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1241,6 +1241,39 @@ end </example> </section> + <section id="tls.p.rand_engine"> + <title><varname>rand_engine</varname> (str)</title> + <para> + Set the ranondom number generator engine for libssl. + </para> + <para> + Note: the default random number generator (PRNG) engine of libssl v1.1.x + is not designed for multi-process applications and can result in a crash. + Therefore set the PRNG engine to one of the options listed in this + section. If libssl 1.1.x (or newer) is detected at compile time, then + the PRNG engine is set to "fastrand". + </para> + <para> + The following options are avaialble: + </para> + <itemizedlist> + <listitem><para>krand - use internal kam_rand() function</para></listitem> + <listitem><para>fastrand - use internal fastrand function</para></listitem> + </itemizedlist> + <para> + The default value is empty (not set) for libssl v1.0.x or older, and + "fastrand" for libssl v1.1.x or newer. + </para> + <example> + <title>Set <varname>rand_engine</varname> parameter</title> + <programlisting> +... +modparam("tls", "rand_engine", "fastrand") +... + </programlisting> + </example> + </section> + <section id="tls.p.engine"> <title><varname>engine</varname> (string)</title> <para>

1 0

git:5.3:2935b65d: tls: set random number engine to fastrand for libssl1.1+
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 2935b65d7d909f8ac355b8f2b5404494c4ec2c6b URL: https://github.com/kamailio/kamailio/commit/2935b65d7d909f8ac355b8f2b540449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:51:47+02:00 tls: set random number engine to fastrand for libssl1.1+ (cherry picked from commit 6d154fbb2ff1d2941316281fad120b5db219deb1) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2935b65d7d909f8ac355b8f2b540449… Patch: https://github.com/kamailio/kamailio/commit/2935b65d7d909f8ac355b8f2b540449… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 87759249b2..75d8aa8fd2 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -561,6 +561,12 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; register_tls_hooks(&tls_h); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + LM_DBG("setting fastrand random engine\n"); + RAND_set_rand_method(RAND_ksr_fastrand_method()); +#endif + sr_kemi_modules_add(sr_kemi_tls_exports); return 0;

1 0

git:5.2:254d66b0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 254d66b0a1b88ba91dabffc3b55a0b10430a18e1 URL: https://github.com/kamailio/kamailio/commit/254d66b0a1b88ba91dabffc3b55a0b1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-07T11:01:53+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_cassandra/README --- Diff: https://github.com/kamailio/kamailio/commit/254d66b0a1b88ba91dabffc3b55a0b1… Patch: https://github.com/kamailio/kamailio/commit/254d66b0a1b88ba91dabffc3b55a0b1… --- diff --git a/src/modules/db_cassandra/README b/src/modules/db_cassandra/README index 99cb2bac5b..443f91f1fc 100644 --- a/src/modules/db_cassandra/README +++ b/src/modules/db_cassandra/README @@ -61,6 +61,13 @@ Chapter 1. Admin Guide 1. Overview + Note: the module requires old version of external library, not + compiling with those available out of the stock in the Linux + distributions. It is going to be kept for a while in case someone wants + to pick it up and upgrade. Also, the module was never extensively + tested, therefore take the appropriate actions in case you plan to use + it. + Db_cassandra is one of the Kamailio database modules. It does not export any functions executable from the configuration scripts, but it exports a subset of functions using the database API, and thus, other

1 0

git:5.3:43aa779e: tls: option to set use fastrand for rand_engine
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.3 Commit: 43aa779ee9e43805e6a7da2c12562fdc89c5c413 URL: https://github.com/kamailio/kamailio/commit/43aa779ee9e43805e6a7da2c12562fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:51:25+02:00 tls: option to set use fastrand for rand_engine (cherry picked from commit 4f514a7956534f1afc1ef30d8332f5dc3547de4b) --- 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/43aa779ee9e43805e6a7da2c12562fd… Patch: https://github.com/kamailio/kamailio/commit/43aa779ee9e43805e6a7da2c12562fd… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 52a45353d6..87759249b2 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -449,7 +449,10 @@ int ksr_rand_engine_param(modparam_t type, void* val) LM_DBG("random engine: %.*s\n", reng->len, reng->s); if(reng->len == 5 && strncasecmp(reng->s, "krand", 5) == 0) { LM_DBG("setting krand random engine\n"); - RAND_set_rand_method(RAND_ksr_method()); + RAND_set_rand_method(RAND_ksr_krand_method()); + } else if(reng->len == 8 && strncasecmp(reng->s, "fastrand", 8) == 0) { + LM_DBG("setting fastrand random engine\n"); + RAND_set_rand_method(RAND_ksr_fastrand_method()); } #endif return 0; diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 0f283306dd..9101251dd7 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -27,9 +27,10 @@ #include "../../core/dprint.h" #include "../../core/rand/kam_rand.h" +#include "../../core/rand/fastrand.h" #include "fortuna/random.h" -static int ksr_rand_bytes(unsigned char *outdata, int size) +static int ksr_krand_bytes(unsigned char *outdata, int size) { int r; @@ -57,28 +58,75 @@ static int ksr_rand_bytes(unsigned char *outdata, int size) return 1; } -static int ksr_rand_pseudorand(unsigned char *outdata, int size) +static int ksr_krand_pseudorand(unsigned char *outdata, int size) { - return ksr_rand_bytes(outdata, size); + return ksr_krand_bytes(outdata, size); } -static int ksr_rand_status(void) +static int ksr_krand_status(void) { return 1; } -const RAND_METHOD _ksr_rand_method = { +const RAND_METHOD _ksr_krand_method = { NULL, - ksr_rand_bytes, + ksr_krand_bytes, NULL, NULL, - ksr_rand_pseudorand, - ksr_rand_status + ksr_krand_pseudorand, + ksr_krand_status }; -const RAND_METHOD *RAND_ksr_method(void) +const RAND_METHOD *RAND_ksr_krand_method(void) { - return &_ksr_rand_method; + return &_ksr_krand_method; +} + +static int ksr_fastrand_bytes(unsigned char *outdata, int size) +{ + int r; + + if (size < 0) { + return 0; + } else if (size == 0) { + return 1; + } + + while(size >= sizeof(int)) { + r = kam_rand(); + memcpy(outdata, &r, sizeof(int)); + size -= sizeof(int); + outdata += sizeof(int); + } + if(size>0) { + r = kam_rand(); + memcpy(outdata, &r, size); + } + return 1; +} + +static int ksr_fastrand_pseudorand(unsigned char *outdata, int size) +{ + return ksr_fastrand_bytes(outdata, size); +} + +static int ksr_fastrand_status(void) +{ + return 1; +} + +const RAND_METHOD _ksr_fastrand_method = { + NULL, + ksr_fastrand_bytes, + NULL, + NULL, + ksr_fastrand_pseudorand, + ksr_fastrand_status +}; + +const RAND_METHOD *RAND_ksr_fastrand_method(void) +{ + return &_ksr_fastrand_method; } #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 20b5a20e9c..d1a3f0d37f 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -25,7 +25,8 @@ #include <openssl/rand.h> -const RAND_METHOD *RAND_ksr_method(void); +const RAND_METHOD *RAND_ksr_krand_method(void); +const RAND_METHOD *RAND_ksr_fastrand_method(void); #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 0

[kamailio/kamailio] Kamailio 5.2.3 on Buster - Segmentation fault in libcrypto.so.1.1 (#2077)
by Marco Capetta 07 Oct '19

07 Oct '19

### Description After the upgrade of our system to Debian Buster, kamailio started crashing due to TLS module. The issue look similar to the one described in https://github.com/kamailio/kamailio/issues/1860 In Debian Stretch everything was working fine because we compiled kamailio using openssl-1.0 as suggested in the linked issue. Unfortunately Debian Buster doesn't support that old version of the package so we compiled it with openssl-1.1 and we put in place the workaround suggested here https://github.com/kamailio/kamailio/commit/efdc141ecb5ff72e3224e47deaaa79f… but this didn't solved the issue. #### Debugging Data At the moment I don have full access to the system so I can provide only the following backtrace: (gdb) bt full #0 aesni_ecb_encrypt () at crypto/aes/aesni-x86_64.s:624 No locals. 0000001 0x00007fe7b2159917 in aesni_ecb_cipher (len=16, in=0x7fe7ae3052d0 "\271a\321\064vGKiB\337\344\070\353\220\005\245\020O", <incomplete sequence \323>, out=0x7fe7ae58d068 "", ctx=0x7fe7ae3053b8) at ../crypto/evp/e_aes.c:319 bl = <optimized out> bl = <optimized out> #2 aesni_ecb_cipher (ctx=0x7fe7ae3053b8, out=0x7fe7ae58d068 "", in=0x7fe7ae3052d0 "\271a\321\064vGKiB\337\344\070\353\220\005\245\020O", <incomplete sequence \323>, len=16) at ../crypto/evp/e_aes.c:311 bl = <optimized out> 0000003 0x00007fe7b2165533 in evp_EncryptDecryptUpdate (ctx=0x7fe7ae3053b8, out=0x7fe7ae58d068 "", outl=0x7fff207dc534, in=0x7fe7ae3052d0 "\271a\321\064vGKiB\337\344\070\353\220\005\245\020O", <incomplete sequence \323>, inl=16) at ../crypto/evp/evp_enc.c:333 i = <optimized out> j = <optimized out> bl = 16 cmpl = <optimized out> #4 0x00007fe7b219830f in drbg_ctr_generate (drbg=0x7fe7ae3051e8, out=0x7fe7ae58d068 "", outlen=32, adin=0x0, adinlen=0) at ../crypto/rand/drbg_ctr.c:340 outl = 16 ctr = 0x7fe7ae305290 #5 0x00007fe7b21991fb in RAND_DRBG_generate (drbg=drbg@entry=0x7fe7ae3051e8, out=out@entry=0x7fe7ae58d068 "", outlen=outlen@entry=32, prediction_resistance=prediction_resistance@entry=0, adin=0x0, adinlen=adinlen@entry=0) at ../crypto/rand/drbg_lib.c:638 reseed_required = <optimized out> #6 0x00007fe7b2199481 in RAND_DRBG_bytes (drbg=0x7fe7ae3051e8, out=0x7fe7ae58d068 "", outlen=32) at ../crypto/rand/drbg_lib.c:679 additional = 0x0 additional_len = 0 chunk = 32 ret = <optimized out> 0000007 0x00007fe7b22f96fd in ssl_fill_hello_random (s=s@entry=0x7fe7ae588de0, server=server@entry=0, result=0x7fe7ae58d068 "", len=len@entry=32, dgrd=dgrd@entry=DOWNGRADE_NONE) at ../ssl/s3_lib.c:4589 send_time = <optimized out> ret = <optimized out> #8 0x00007fe7b231b06e in tls_construct_client_hello (s=0x7fe7ae588de0, pkt=0x7fff207dc700) at ../ssl/statem/statem_clnt.c:1153 p = <optimized out> sess_id_len = <optimized out> i = <optimized out> protverr = 0 comp = <optimized out> sess = 0x0 session_id = <optimized out> 0000009 0x00007fe7b231a33f in write_state_machine (s=0x7fe7ae588de0) at ../ssl/statem/statem.c:843 post_work = 0x7fe7b231f5a0 <ossl_statem_client_post_work> mt = 1 pkt = {buf = 0x7fe7ae59fc90, staticbuf = 0x0, curr = 4, written = 4, maxsize = 18446744073709551615, subs = 0x7fe7ae58be30} ret = <optimized out> pre_work = 0x7fe7b231d180 <ossl_statem_client_pre_work> --Type <RET> for more, q to quit, c to continue without paging-- get_construct_message_f = 0x7fe7b231d250 <ossl_statem_client_construct_message> confunc = 0x7fe7b231ad20 <tls_construct_client_hello> st = 0x7fe7ae588e28 transition = 0x7fe7b231cde0 <ossl_statem_client_write_transition> cb = 0x7fe7b2375fb0 st = <optimized out> ret = <optimized out> transition = <optimized out> pre_work = <optimized out> post_work = <optimized out> get_construct_message_f = <optimized out> cb = <optimized out> confunc = <optimized out> mt = <optimized out> pkt = <optimized out> #10 state_machine (s=0x7fe7ae588de0, server=0) at ../ssl/statem/statem.c:443 buf = 0x0 cb = 0x7fe7b2375fb0 st = <optimized out> ret = <optimized out> ssret = <optimized out> 0000011 0x00007fe7b2306264 in SSL_do_handshake (s=0x7fe7ae588de0) at ../ssl/ssl_lib.c:3599 ret = 1 #12 0x00007fe7b23a40b4 in tls_connect () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tls.so No symbol table info available. 0000013 0x00007fe7b23a568d in tls_encode_f () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tls.so No symbol table info available. #14 0x000055f60cceaf7e in tcp_send () No symbol table info available. 0000015 0x00007fe7b4e65920 in send_pr_buffer () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tm.so No symbol table info available. #16 0x00007fe7b4e826e8 in t_send_branch () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tm.so No symbol table info available. 0000017 0x00007fe7b4e85adf in t_forward_nonack () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tm.so No symbol table info available. #18 0x00007fe7b4e69452 in t_relay_to () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tm.so No symbol table info available. #19 0x00007fe7b4e340ea in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/tm.so No symbol table info available. #20 0x000055f60cc50f29 in do_action () No symbol table info available. 0000021 0x000055f60cc4fa1a in run_actions () No symbol table info available. #22 0x000055f60cc517e2 in do_action () --Type <RET> for more, q to quit, c to continue without paging-- No symbol table info available. 0000023 0x000055f60cc4fa1a in run_actions () No symbol table info available. #24 0x000055f60cc5154f in do_action () No symbol table info available. 0000025 0x000055f60cc4fa1a in run_actions () No symbol table info available. #26 0x000055f60cc5d46f in run_top_route () No symbol table info available. 0000027 0x000055f60cd594cf in receive_msg () No symbol table info available. #28 0x000055f60cc7ab45 in udp_rcv_loop () No symbol table info available. 0000029 0x000055f60cc0febb in main_loop () No symbol table info available. #30 0x000055f60cc07415 in main () No symbol table info available. (gdb) ### Additional Information Kamailio version 5.2.3 Debian Buster 10.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/2077

4 30

git:master:d0743460: tls: add cryptorand engine also to tls_mod and documentation, enable as default
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: d0743460f68c0dfcb807319dc9e2247eb51ee1ba URL: https://github.com/kamailio/kamailio/commit/d0743460f68c0dfcb807319dc9e2247… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T10:49:16+02:00 tls: add cryptorand engine also to tls_mod and documentation, enable as default --- Modified: src/modules/tls/doc/params.xml Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d0743460f68c0dfcb807319dc9e2247… Patch: https://github.com/kamailio/kamailio/commit/d0743460f68c0dfcb807319dc9e2247… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 6028642b5f..72d3278ed7 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1251,7 +1251,7 @@ end is not designed for multi-process applications and can result in a crash. Therefore set the PRNG engine to one of the options listed in this section. If libssl 1.1.x (or newer) is detected at compile time, then - the PRNG engine is set to "fastrand". + the PRNG engine is set to "cryptorand". </para> <para> The following options are avaialble: @@ -1259,10 +1259,13 @@ 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> </itemizedlist> <para> The default value is empty (not set) for libssl v1.0.x or older, and - "fastrand" for libssl v1.1.x or newer. + "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. </para> <example> <title>Set <varname>rand_engine</varname> parameter</title> diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 75d8aa8fd2..5784ce4842 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -453,6 +453,9 @@ int ksr_rand_engine_param(modparam_t type, void* val) } else if(reng->len == 8 && strncasecmp(reng->s, "fastrand", 8) == 0) { LM_DBG("setting fastrand random engine\n"); RAND_set_rand_method(RAND_ksr_fastrand_method()); + } else if (reng->len == 10 && strncasecmp(reng->s, "cryptorand", 10) == 0) { + LM_DBG("setting cryptorand random engine\n"); + RAND_set_rand_method(RAND_ksr_cryptorand_method()); } #endif return 0; @@ -564,7 +567,7 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) #if OPENSSL_VERSION_NUMBER >= 0x10100000L LM_DBG("setting fastrand random engine\n"); - RAND_set_rand_method(RAND_ksr_fastrand_method()); + RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif sr_kemi_modules_add(sr_kemi_tls_exports);

1 0

git:5.2:8c70c16d: app_perl: first destroy old interpreter before creating the new one
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 8c70c16d10ed46f4ba8cf002a5b1599a02b5cb93 URL: https://github.com/kamailio/kamailio/commit/8c70c16d10ed46f4ba8cf002a5b1599… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:43:18+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) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8c70c16d10ed46f4ba8cf002a5b1599… Patch: https://github.com/kamailio/kamailio/commit/8c70c16d10ed46f4ba8cf002a5b1599… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 785d4c39b0..3112f9acce 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -262,6 +262,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); @@ -276,26 +278,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.2:0e22d01b: tls: option to set custom random bytess generator
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 0e22d01b54340009d34db92bafb7da5a82c76cc7 URL: https://github.com/kamailio/kamailio/commit/0e22d01b54340009d34db92bafb7da5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:43:07+02:00 tls: option to set custom random bytess generator - attempt to fix GH #2077 which exposes a crash in the libssl v1.1 default random bytes generator (cherry picked from commit fc542100d85a013272dde869e54173a7d5a062f4) --- Added: src/modules/tls/tls_rand.c Added: src/modules/tls/tls_rand.h Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0e22d01b54340009d34db92bafb7da5… Patch: https://github.com/kamailio/kamailio/commit/0e22d01b54340009d34db92bafb7da5…

1 0

git:5.2:7829be65: speeddial: fix stripping domain prefix
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 7829be6555b1da66a3802b713304cb28a5ff29a3 URL: https://github.com/kamailio/kamailio/commit/7829be6555b1da66a3802b713304cb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:42:31+02:00 speeddial: fix stripping domain prefix - increment the index after the value is adjusted (cherry picked from commit 6861995e417c40e9ab530d4c0bed97c57de184fd) --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/7829be6555b1da66a3802b713304cb2… Patch: https://github.com/kamailio/kamailio/commit/7829be6555b1da66a3802b713304cb2… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index d9e52bf3cd..e26bc37bb8 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -117,7 +117,6 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = puri->host.s; db_vals[nr_keys].val.str_val.len = puri->host.len; - nr_keys++; if (dstrip_s.s!=NULL && dstrip_s.len>0 && dstrip_s.len<puri->host.len @@ -126,6 +125,7 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].val.str_val.s += dstrip_s.len; db_vals[nr_keys].val.str_val.len -= dstrip_s.len; } + nr_keys++; } /* take sd from r-uri */ if (parse_sip_msg_uri(_msg) < 0)

1 0

git:5.2:fdb54474: pdt: init len variable to avoid using garbage value
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: fdb54474b7a7cbe953f7869be41459650493e551 URL: https://github.com/kamailio/kamailio/commit/fdb54474b7a7cbe953f7869be414596… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:42:45+02:00 pdt: init len variable to avoid using garbage value (cherry picked from commit 47e0649eca286bfc26c39dd1142169fc06eea077) --- Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/fdb54474b7a7cbe953f7869be414596… Patch: https://github.com/kamailio/kamailio/commit/fdb54474b7a7cbe953f7869be414596… --- diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index e55f5bdfa5..d0ff43871a 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -278,7 +278,6 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) *plen = len; return domain; - } /** @@ -287,7 +286,7 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) { pdt_tree_t *it; - int len; + int len = 0; str *domain=NULL; if(pl==NULL || sdomain==NULL || sdomain->s==NULL || code == NULL @@ -300,13 +299,14 @@ str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) it = pl; while(it!=NULL && str_strcmp(&it->sdomain, sdomain)<0) it = it->next; - + if(it==NULL || str_strcmp(&it->sdomain, sdomain)>0) return NULL; - + domain = get_domain(it, code, &len); if(plen!=NULL) - *plen = len; + *plen = len; + return domain; }

1 0

git:5.2:7c219b4a: core: init local structs to avoid use of garbage values
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 7c219b4a7a2e6a8448d72789587ca10f27fcf36c URL: https://github.com/kamailio/kamailio/commit/7c219b4a7a2e6a8448d72789587ca10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:42:17+02:00 core: init local structs to avoid use of garbage values (cherry picked from commit dfe8db758f84f5e88e0cb35b80a65dcd48158897) --- Modified: src/core/forward.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/7c219b4a7a2e6a8448d72789587ca10… Patch: https://github.com/kamailio/kamailio/commit/7c219b4a7a2e6a8448d72789587ca10… --- diff --git a/src/core/forward.c b/src/core/forward.c index a6bf221a79..11933cf132 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -471,6 +471,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, prev_send_sock=0; err=0; + memset(&dns_srv_h, 0, sizeof(struct dns_srv_handle)); #endif buf=0; diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index aa5af2b2f4..df57c5faa3 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -420,6 +420,7 @@ static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) break; default: LM_CRIT("unknown address family %d\n", su->s.sa_family); + memset(ip, 0, sizeof(ip_addr_t)); } }

1 0

git:5.2:3bd97b2d: jsonrpcc: removed old todo file
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 3bd97b2ddaf537cad9f937485ec94391f78b17a1 URL: https://github.com/kamailio/kamailio/commit/3bd97b2ddaf537cad9f937485ec9439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:45+02:00 jsonrpcc: removed old todo file (cherry picked from commit fa5f36454f2ef5fb4e55dd05f746430d9786e842) --- Removed: src/modules/jsonrpcc/TODO --- Diff: https://github.com/kamailio/kamailio/commit/3bd97b2ddaf537cad9f937485ec9439… Patch: https://github.com/kamailio/kamailio/commit/3bd97b2ddaf537cad9f937485ec9439… --- diff --git a/src/modules/jsonrpcc/TODO b/src/modules/jsonrpcc/TODO deleted file mode 100644 index f0e19152f1..0000000000 --- a/src/modules/jsonrpcc/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* "Reliable" Notifications (implement using requests, and failover on error; ignore non-error responses) ? -* Implement timout for non-Linux systems

1 0

git:5.2:342e1dcd: sms: fixed typo in comments (timout -> timeout)
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 342e1dcdd8d59269efe93f4c3e7651d4019e2dd5 URL: https://github.com/kamailio/kamailio/commit/342e1dcdd8d59269efe93f4c3e7651d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:19+02:00 sms: fixed typo in comments (timout -> timeout) (cherry picked from commit 5631338036c405b1e8c7fe8a1e320db2eb63c3f9) --- Modified: src/modules/sms/libsms_modem.c Modified: src/modules/sms/libsms_modem.h --- Diff: https://github.com/kamailio/kamailio/commit/342e1dcdd8d59269efe93f4c3e7651d… Patch: https://github.com/kamailio/kamailio/commit/342e1dcdd8d59269efe93f4c3e7651d… --- diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index 5093d28ee2..fe0be1f8a7 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -125,7 +125,7 @@ int put_command( struct modem *mdm, char* cmd, int cmd_len, char* answer, } } } - /* repeat until timout */ + /* repeat until timeout */ }while (timeoutcounter<timeout); if (!answer_e) diff --git a/src/modules/sms/libsms_modem.h b/src/modules/sms/libsms_modem.h index feeb6acac9..7eb0a80b04 100644 --- a/src/modules/sms/libsms_modem.h +++ b/src/modules/sms/libsms_modem.h @@ -31,7 +31,7 @@ typedef int(*cds_report)( struct modem* , char* , int ); /* put_command - Sends a command to the modem and waits max timout*0.1 seconds for an answer. + Sends a command to the modem and waits max timeout*0.1 seconds for an answer. The function returns the length of the answer. The answer can be Ok, ERROR or expect. The command may be empty or NULL */

1 0

git:5.2:77c4bd32: ims_qos: fixed typo in comments (timout -> timeout)
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 77c4bd3207173f7e43e67e553fb47f1f260c166e URL: https://github.com/kamailio/kamailio/commit/77c4bd3207173f7e43e67e553fb47f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:29+02:00 ims_qos: fixed typo in comments (timout -> timeout) (cherry picked from commit a6caed41166e555d7297abbae6017c5c54262662) --- Modified: src/modules/ims_qos/rx_str.c --- Diff: https://github.com/kamailio/kamailio/commit/77c4bd3207173f7e43e67e553fb47f1… Patch: https://github.com/kamailio/kamailio/commit/77c4bd3207173f7e43e67e553fb47f1… --- diff --git a/src/modules/ims_qos/rx_str.c b/src/modules/ims_qos/rx_str.c index efa9617222..6b243e85a4 100644 --- a/src/modules/ims_qos/rx_str.c +++ b/src/modules/ims_qos/rx_str.c @@ -104,8 +104,8 @@ int rx_send_str(str *rx_session_id) { if (auth->u.auth.state == AUTH_ST_DISCON) { // If we are in DISCON is because an STR was already sent - // so just wait for STA or for Grace Timout to happen - LM_DBG("Hmmm, auth session already in disconnected state\n"); + // so just wait for STA or for Grace Timeout to happen + LM_DBG("auth session already in disconnected state\n"); cdpb.AAASessionsUnlock(auth->hash); return CSCF_RETURN_FALSE; }

1 0

git:5.2:df08856b: db_mysql: fixed typo in comments (timout -> timeout)
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: df08856b7570ee477e1aaa49d0550e8541f19f02 URL: https://github.com/kamailio/kamailio/commit/df08856b7570ee477e1aaa49d0550e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:03+02:00 db_mysql: fixed typo in comments (timout -> timeout) (cherry picked from commit 75e0e0f4d693e207d2035f84c3e1ddc9cc715ec4) --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/df08856b7570ee477e1aaa49d0550e8… Patch: https://github.com/kamailio/kamailio/commit/df08856b7570ee477e1aaa49d0550e8… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 581e4e14be..97b0e4904c 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -89,7 +89,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) } } /* - * We're doing later a query anyway that will reset the timout of the server, + * We're doing later a query anyway that will reset the timeout of the server, * so it makes sense to set the timestamp value to the actual time in order * to prevent unnecessary pings. */

1 0

git:5.2:b5264c56: tm: removed async mutex define option
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: b5264c56d0fe55622e7f2451d5fbdec1eb05865f URL: https://github.com/kamailio/kamailio/commit/b5264c56d0fe55622e7f2451d5fbdec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:40:37+02:00 tm: removed async mutex define option - it was disbaled due to conflict with reply processing, the reply mutex being used, t_continue() has same processing like a failure handling (cherry picked from commit de11e2850314b12320cf8fed29f709a38a986709) --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/lock.c Modified: src/modules/tm/lock.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/b5264c56d0fe55622e7f2451d5fbdec… Patch: https://github.com/kamailio/kamailio/commit/b5264c56d0fe55622e7f2451d5fbdec… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index baebd82914..88cadb386f 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -407,7 +407,6 @@ struct cell *build_cell(struct sip_msg *p_msg) init_synonym_id(p_msg, new_cell->md5); init_cell_lock(new_cell); - init_async_lock(new_cell); t_stats_created(); return new_cell; diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 2a1e76160e..ba3c7b702e 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -446,11 +446,6 @@ typedef struct cell /* recursive reply lock count */ int reply_rec_lock_level; -#ifdef ENABLE_ASYNC_MUTEX - /* protect against concurrent async continues */ - ser_lock_t async_mutex; -#endif - ticks_t fr_timeout; /* final response interval for retr_bufs */ ticks_t fr_inv_timeout; /* final inv. response interval for retr_bufs */ #ifdef TM_DIFF_RT_TIMEOUT diff --git a/src/modules/tm/lock.c b/src/modules/tm/lock.c index eb2e1a5bf0..8ea3e844a4 100644 --- a/src/modules/tm/lock.c +++ b/src/modules/tm/lock.c @@ -53,9 +53,6 @@ static int sem_nr; gen_lock_set_t *entry_semaphore = 0; gen_lock_set_t *reply_semaphore = 0; -#ifdef ENABLE_ASYNC_MUTEX -gen_lock_set_t *async_semaphore = 0; -#endif #endif @@ -85,12 +82,6 @@ int lock_initialize() lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); } -#ifdef ENABLE_ASYNC_MUTEX - if(async_semaphore != 0) { - lock_set_destroy(async_semaphore); - lock_set_dealloc(async_semaphore); - } -#endif if(i == 0) { LOG(L_CRIT, "lock_initialize: could not allocate semaphore" " sets\n"); @@ -142,20 +133,6 @@ int lock_initialize() i--; goto again; } -#ifdef ENABLE_ASYNC_MUTEX - i++; - if(((async_semaphore = lock_set_alloc(i)) == 0) - || (lock_set_init(async_semaphore) == 0)) { - if(async_semaphore) { - lock_set_dealloc(async_semaphore); - async_semaphore = 0; - } - LM_DBG("async semaphore initialization failure: %s\n", strerror(errno)); - probe_run = 1; - i--; - goto again; - } -#endif /* return success */ LM_INFO("semaphore arrays of size %d allocated\n", sem_nr); @@ -195,13 +172,6 @@ void lock_cleanup() lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); }; -#ifdef ENABLE_ASYNC_MUTEX - if(async_semaphore != 0) { - lock_set_destroy(async_semaphore); - lock_set_dealloc(async_semaphore); - } - async_semaphore = 0; -#endif entry_semaphore = reply_semaphore = 0; } #endif /*GEN_LOCK_T_PREFERED*/ @@ -235,22 +205,6 @@ int init_entry_lock(struct s_table *ht, struct entry *entry) return 0; } -int init_async_lock(struct cell *cell) -{ -#ifdef ENABLE_ASYNC_MUTEX - -#ifdef GEN_LOCK_T_PREFERED - lock_init(&cell->async_mutex); -#else - cell->async_mutex.semaphore_set = async_semaphore; - cell->async_mutex.semaphore_index = cell->hash_index % sem_nr; -#endif /* GEN_LOCK_T_PREFERED */ - -#endif /* ENABLE_ASYNC_MUTEX */ - - return 0; -} - int release_cell_lock(struct cell *cell) { #ifndef GEN_LOCK_T_PREFERED diff --git a/src/modules/tm/lock.h b/src/modules/tm/lock.h index d2c17b712f..e115c03fe4 100644 --- a/src/modules/tm/lock.h +++ b/src/modules/tm/lock.h @@ -58,7 +58,6 @@ void lock_cleanup(void); int init_cell_lock(struct cell *cell); int init_entry_lock(struct s_table *ht, struct entry *entry); -int init_async_lock(struct cell *cell); int release_cell_lock(struct cell *cell); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index c37957daba..c2c0773b3f 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -41,13 +41,8 @@ #include "../../core/data_lump_rpl.h" -#ifdef ENABLE_ASYNC_MUTEX -#define LOCK_ASYNC_CONTINUE(_t) lock(&(_t)->async_mutex ) -#define UNLOCK_ASYNC_CONTINUE(_t) unlock(&(_t)->async_mutex ) -#else #define LOCK_ASYNC_CONTINUE(_t) LOCK_REPLIES(_t) #define UNLOCK_ASYNC_CONTINUE(_t) UNLOCK_REPLIES(_t) -#endif /* Suspends the transaction for later use. * Save the returned hash_index and label to get

1 0

git:5.2:bc8bdcaa: kamctl: Update dbtextdb.py for Python3
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: bc8bdcaa726f375f6deea8228a1ab0cf97c67035 URL: https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… Author: Anthony Messina <amessina(a)messinet.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:40:17+02:00 kamctl: Update dbtextdb.py for Python3 - reported by GH #1747 (cherry picked from commit a44ade38dc420d2699896930ededf54645837a22) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… Patch: https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c…

1 0

git:5.2:f14807f7: app_perl: log the number of reset cycles in debug message
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: f14807f722e85feb8c7d98b08454a432837fecf7 URL: https://github.com/kamailio/kamailio/commit/f14807f722e85feb8c7d98b08454a43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:39:42+02:00 app_perl: log the number of reset cycles in debug message (cherry picked from commit 1fdabbf5ce5fd218a47b7d147ebec5c6c45c1cce) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f14807f722e85feb8c7d98b08454a43… Patch: https://github.com/kamailio/kamailio/commit/f14807f722e85feb8c7d98b08454a43… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 181f70f859..785d4c39b0 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -201,7 +201,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; @@ -380,6 +380,7 @@ static void destroy(void) } +static int app_perl_reset_n = 0; /** * count executions and rest interpreter * @@ -400,8 +401,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) { @@ -411,10 +414,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

git:5.2:438df871: db_cassandra: docs - note about the state of the module
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 438df8714322ef9d100452a5f5f2c33304bb2957 URL: https://github.com/kamailio/kamailio/commit/438df8714322ef9d100452a5f5f2c33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:38:18+02:00 db_cassandra: docs - note about the state of the module (cherry picked from commit 39b7b4073465fd5343297683c59d75510c87d195) --- Modified: src/modules/db_cassandra/doc/db_cassandra_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/438df8714322ef9d100452a5f5f2c33… Patch: https://github.com/kamailio/kamailio/commit/438df8714322ef9d100452a5f5f2c33… --- diff --git a/src/modules/db_cassandra/doc/db_cassandra_admin.xml b/src/modules/db_cassandra/doc/db_cassandra_admin.xml index a9852c984f..0becd4af02 100644 --- a/src/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/src/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -16,6 +16,13 @@ <section> <title>Overview</title> + <para> + Note: the module requires old version of external library, not compiling + with those available out of the stock in the Linux distributions. It is + going to be kept for a while in case someone wants to pick it up and + upgrade. Also, the module was never extensively tested, therefore take + the appropriate actions in case you plan to use it. + </para> <para> Db_cassandra is one of the &kamailio; database modules. It does not export any functions executable from the configuration scripts,

1 0

git:5.2:7e7621a9: app_perl: set G_EVAL flag when executing perl_destroy_func
by Daniel-Constantin Mierla 07 Oct '19

07 Oct '19

Module: kamailio Branch: 5.2 Commit: 7e7621a93013174bf42ff0dd782a46d238c0943a URL: https://github.com/kamailio/kamailio/commit/7e7621a93013174bf42ff0dd782a46d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:38:37+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) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7e7621a93013174bf42ff0dd782a46d… Patch: https://github.com/kamailio/kamailio/commit/7e7621a93013174bf42ff0dd782a46d… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index d8789f919d..181f70f859 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -401,7 +401,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:master:8539b7cf: tls: add cryptorand support for TLS module, add some more comments to existing code
by Henning Westerholt 07 Oct '19

07 Oct '19

Module: kamailio Branch: master Commit: 8539b7cf6c5db86973f4f74f92762de9011b968b URL: https://github.com/kamailio/kamailio/commit/8539b7cf6c5db86973f4f74f92762de… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T10:38:55+02:00 tls: add cryptorand support for TLS module, add some more comments to existing code --- Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/8539b7cf6c5db86973f4f74f92762de… Patch: https://github.com/kamailio/kamailio/commit/8539b7cf6c5db86973f4f74f92762de… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index d5c29b845f..a149b07d33 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -16,7 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - +/* + * OpenSSL docs: + * https://www.openssl.org/docs/man1.1.1/man7/RAND.html + * https://www.openssl.org/docs/man1.1.1/man3/RAND_set_rand_method.html + */ #include <stdlib.h> #include <string.h> @@ -28,7 +32,12 @@ #include "../../core/dprint.h" #include "../../core/rand/kam_rand.h" #include "../../core/rand/fastrand.h" +#include "../../core/rand/fortuna/random.h" +/* + * Implementation for tests with system library PNRG, + * do not use this in production. + */ static int ksr_krand_bytes(unsigned char *outdata, int size) { int r; @@ -76,6 +85,11 @@ const RAND_METHOD *RAND_ksr_krand_method(void) return &_ksr_krand_method; } +/* + * Implementation for tests with fastrand implementation, + * better as system library but still not secure enough. + * Do not use this in production.y + */ static int ksr_fastrand_bytes(unsigned char *outdata, int size) { int r; @@ -123,4 +137,47 @@ const RAND_METHOD *RAND_ksr_fastrand_method(void) return &_ksr_fastrand_method; } +/* + * Implementation with Fortuna cryptographic PRNG. + * We are not strictly implementing the OpenSSL API here - we will + * not return an error if the PRNG has not been seeded with enough + * randomness to ensure an unpredictable byte sequence. + */ +static int ksr_cryptorand_bytes(unsigned char *outdata, int size) +{ + if (size < 0) { + return 0; + } else if (size == 0) { + return 1; + } + + sr_get_pseudo_random_bytes(outdata, size); + return 1; +} + +static int ksr_cryptorand_status(void) +{ + return 1; +} + +/* + * We don't have a dedicated function for pseudo-random + * bytes, just use the secure version as well for it. + */ +const RAND_METHOD _ksr_cryptorand_method = { + NULL, + ksr_cryptorand_bytes, + NULL, + NULL, + ksr_cryptorand_bytes, + ksr_cryptorand_status +}; + +const RAND_METHOD *RAND_ksr_cryptorand_method(void) +{ + return &_ksr_cryptorand_method; +} + + + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index d1a3f0d37f..c73d36b8d9 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -27,6 +27,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); #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 0

git:master:4e6c8fe6: presence: free allocated memory in case of error
by Daniel-Constantin Mierla 05 Oct '19

05 Oct '19

Module: kamailio Branch: master Commit: 4e6c8fe6073d7d52bab66faa68abad2f685d2090 URL: https://github.com/kamailio/kamailio/commit/4e6c8fe6073d7d52bab66faa68abad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-05T20:41:50+02:00 presence: free allocated memory in case of error --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/4e6c8fe6073d7d52bab66faa68abad2… Patch: https://github.com/kamailio/kamailio/commit/4e6c8fe6073d7d52bab66faa68abad2… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index f9ce4c403f..245c2b95c0 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -2018,6 +2018,7 @@ int add_waiting_watchers(watcher_t *watchers, str pres_uri, str event) w = (watcher_t *)pkg_malloc(sizeof(watcher_t)); if(w == NULL) { + pkg_free(wuri.s); ERR_MEM(PKG_MEM_STR); } memset(w, 0, sizeof(watcher_t));

1 0

git:master:954f25c2: etc/kamailio.cfg: updated comment to reflect 5.4 series
by Daniel-Constantin Mierla 04 Oct '19

04 Oct '19

Module: kamailio Branch: master Commit: 954f25c21576052c176f96c0509f0414ea74d69c URL: https://github.com/kamailio/kamailio/commit/954f25c21576052c176f96c0509f041… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-04T18:16:12+02:00 etc/kamailio.cfg: updated comment to reflect 5.4 series --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/954f25c21576052c176f96c0509f041… Patch: https://github.com/kamailio/kamailio/commit/954f25c21576052c176f96c0509f041… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c41b933e5c..24b9ac434e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v5.3 - default configuration script +# Kamailio (OpenSER) SIP Server v5.4 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio #

1 0

git:master:36a4b161: xmlrpc: clean allocated buffer for reply when no more memory for reason value
by Daniel-Constantin Mierla 04 Oct '19

04 Oct '19

Module: kamailio Branch: master Commit: 36a4b16117d79f1a30a9f929350f75ab8bfd5d2a URL: https://github.com/kamailio/kamailio/commit/36a4b16117d79f1a30a9f929350f75a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-04T18:12:15+02:00 xmlrpc: clean allocated buffer for reply when no more memory for reason value --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/36a4b16117d79f1a30a9f929350f75a… Patch: https://github.com/kamailio/kamailio/commit/36a4b16117d79f1a30a9f929350f75a… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 9521af2386..7552b4d7f1 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2509,7 +2509,7 @@ static int ki_xmlrpc_reply(sip_msg_t* msg, int rcode, str* reason) reply.reason = as_asciiz(reason); if (reply.reason == NULL) { ERR("No memory left\n"); - return -1; + goto error; } if (reply.code >= 300) {

1 0

git:5.3:26d8e3cf: tls: add local copy of fortuna and depenencies from git master
by Henning Westerholt 04 Oct '19

04 Oct '19

Module: kamailio Branch: 5.3 Commit: 26d8e3cf82a49ad4e58ced507f7a1787b74656b0 URL: https://github.com/kamailio/kamailio/commit/26d8e3cf82a49ad4e58ced507f7a178… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-04T16:26:20+02:00 tls: add local copy of fortuna and depenencies from git master - add local copy of fortuna and depenencies from git master - not active yet, needs additions in tls_rand.* and probably also Makefile --- Added: src/modules/tls/fortuna/Makefile Added: src/modules/tls/fortuna/fortuna.c Added: src/modules/tls/fortuna/fortuna.h Added: src/modules/tls/fortuna/random.c Added: src/modules/tls/fortuna/random.h Added: src/modules/tls/fortuna/rijndael.c Added: src/modules/tls/fortuna/rijndael.h Added: src/modules/tls/fortuna/rijndael.tbl Added: src/modules/tls/fortuna/sha256.c Added: src/modules/tls/fortuna/sha256.h Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/26d8e3cf82a49ad4e58ced507f7a178… Patch: https://github.com/kamailio/kamailio/commit/26d8e3cf82a49ad4e58ced507f7a178…

1 0

git:master:f877069e: tls: use fastrand() for the corresponding rand_engine
by Daniel-Constantin Mierla 04 Oct '19

04 Oct '19

Module: kamailio Branch: master Commit: f877069e141749796ec02a78ce16342f9e120ef7 URL: https://github.com/kamailio/kamailio/commit/f877069e141749796ec02a78ce16342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-04T11:15:04+02:00 tls: use fastrand() for the corresponding rand_engine --- Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/f877069e141749796ec02a78ce16342… Patch: https://github.com/kamailio/kamailio/commit/f877069e141749796ec02a78ce16342… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 3f78cb93e9..d5c29b845f 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -87,13 +87,13 @@ static int ksr_fastrand_bytes(unsigned char *outdata, int size) } while(size >= sizeof(int)) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, sizeof(int)); size -= sizeof(int); outdata += sizeof(int); } if(size>0) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, size); } return 1;

1 0

git:master:b83a165e: core: str2int() test first if result is null, otherwise init it to 0
by Daniel-Constantin Mierla 04 Oct '19

04 Oct '19

Module: kamailio Branch: master Commit: b83a165e2d0e34c9bca742708c1891eb114bae04 URL: https://github.com/kamailio/kamailio/commit/b83a165e2d0e34c9bca742708c1891e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-04T08:54:35+02:00 core: str2int() test first if result is null, otherwise init it to 0 --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/b83a165e2d0e34c9bca742708c1891e… Patch: https://github.com/kamailio/kamailio/commit/b83a165e2d0e34c9bca742708c1891e… --- diff --git a/src/core/ut.h b/src/core/ut.h index 88df8dba65..2259aea973 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -635,12 +635,12 @@ static inline int str2int(str* _s, unsigned int* _r) { int i; - if (_s == NULL) return -1; if (_r == NULL) return -1; + *_r = 0; + if (_s == NULL) return -1; if (_s->len < 0) return -1; if (_s->s == NULL) return -1; - *_r = 0; for(i = 0; i < _s->len; i++) { if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { *_r *= 10;

1 0

addition of a cryptographic secure RNG to git master
by Henning Westerholt 03 Oct '19

03 Oct '19

Hello, I've added a cryptographic secure pseudo random number generator to git master. It is located in src/core/random/fortuna. There are easy wrapper function available in src/core/random/cryptorand.h - this is the one that is easiest to use. Please use this if you need cryptographic secure random numbers in your module. The wrapper provides a similar API as fastrand or kam_rand: /* seed the generator, will also use system randomness */ void cryptorand_seed(const unsigned int seed) /* generate a 32 bit random number */ unsigned int cryptorand(void) Motivation for this addition was the issue [1] related to the TLS module and openssl-1.1. The implementation was based on libfortuna [2]. It was refactored to the Kamailio core and all not necessary parts were removed. It is seeded from the core at startup and also includes automatic time-based reseeding from kernel random sources. As part of this implementation I also consolidated the existing crypto related code into a new directory: src/core/crypto. This way I could also get rid of the srutils library dependency for several modules. This changes will not backported in this way to 5.3.0. There will be probably for 5.3. a dedicated copy of the necessary code to the TLS module. If you notice any issues, please let me know. Cheers, Henning [1] https://github.com/kamailio/kamailio/issues/2077 [2] https://github.com/henningw/libfortuna -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

1 0

git: new commits in branch master
by Henning Westerholt 03 Oct '19

03 Oct '19

- URL: https://github.com/kamailio/kamailio/commit/6c892196583adf7d4615cdfc9ba9311… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 core: move existing MD5 hash implementation into new core subfolder crypto - URL: https://github.com/kamailio/kamailio/commit/8d1403d59b09868028e2528b84a5bed… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 lib: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/c5c2943f2139b3eecded7577292ade0… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 tm: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/420b6baf2a63d3e65ebfa8d83fc0737… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 auth: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/8ea763eb3bc28008003195c0e22e1c6… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 cfgutils: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/8aa7a19f671cf537cb0617ec1a3f1ec… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 exec: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/9ebe6364c60d0ef6ec61c70fbc22d07… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 memcached: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/abb0f95e9a8457b2d578b82bb9d2b67… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 ims_auth: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/5b7b5f1c9786c7f94f6f051fb47f0f2… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 siputils: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/5bac8fbe6eb2634a714745ae0085091… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 sl: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/99d1a664bda9fcf4758be559dcc52a2… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 topoh: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/018d8bfe5220db796cb0289b938a677… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 uac: adapt md5 #include path to new core location - URL: https://github.com/kamailio/kamailio/commit/aa9bffab566bee2f393e7101329cd7e… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 lib: move existing SHA cryptographic hash function to new core crypto sub dir - URL: https://github.com/kamailio/kamailio/commit/6dead6e8f35882eabb6aa2c505df32e… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 auth: adapt SHA hash function to new location, remove srutils library dependency - URL: https://github.com/kamailio/kamailio/commit/56f4a0912e689a16056b55ac8785d35… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 pv: adapt SHA hash function to new location, remove srutils library dependency - URL: https://github.com/kamailio/kamailio/commit/204124a1e6bdf8f97c342f8a659017a… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 auth_xkeys: adapt SHA hash function to new location, remove srutils library dependency - URL: https://github.com/kamailio/kamailio/commit/b2ec4db5084234d1573ed16ac7bc29e… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:33+02:00 core: add AES implementation to core, necessary for fortuna cryptographic RNG - URL: https://github.com/kamailio/kamailio/commit/f6c2d70ec107f830589eb35130a2e4d… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:34+02:00 core: add fortuna cryptographic random number generator to core - URL: https://github.com/kamailio/kamailio/commit/4012eb43c7dd719aff32aef0b3161ab… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T13:45:34+02:00 core: comment main() test routine in AES implementation out - URL: https://github.com/kamailio/kamailio/commit/7625993165aa829ea454b34c7498b5b… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T14:45:55+02:00 core: synchronize rijndael.c with postgresql upstream (static functions, spelling fixes) - URL: https://github.com/kamailio/kamailio/commit/6f66bd2fdf75dcad961ec225175c670… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T14:53:10+02:00 core: use static for internal fortuna CPRNG functions, add sr_ prefix to public functions - URL: https://github.com/kamailio/kamailio/commit/752f3b4237ae6469ec0ed3efb5d53a7… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T17:28:56+02:00 core: cleanup code for fortuna and random implementation - fix indention for a few functions - use types from sys/types.h consistently - get rid of redundant wrapper function, we implement a wrapper in core anyway - URL: https://github.com/kamailio/kamailio/commit/2402b8abd7f5f5e106d7d23e99052a2… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T17:48:32+02:00 core: add debug logging for automatic reseeding and manual entropy adding - URL: https://github.com/kamailio/kamailio/commit/e68f0926d6118497cd8d5cae54fc003… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T17:49:05+02:00 core: also initialize cryptographic PRNG, use it to seed all others RNGs - URL: https://github.com/kamailio/kamailio/commit/de0c7743e0cd6f9daf90a0dc9d0629d… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-03T17:52:37+02:00 core: add small wrappers around cryptographic PRNG with an interface like fastrand

1 0

git:5.3:eb792682: pkg/kamailio/deb: version set 5.3.0~rc0
by Victor Seva 03 Oct '19

03 Oct '19

Module: kamailio Branch: 5.3 Commit: eb792682973f34b1946a36126a01f6547ae43a5b URL: https://github.com/kamailio/kamailio/commit/eb792682973f34b1946a36126a01f65… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-03T12:02:12+02:00 pkg/kamailio/deb: version set 5.3.0~rc0 --- 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/eb792682973f34b1946a36126a01f65… Patch: https://github.com/kamailio/kamailio/commit/eb792682973f34b1946a36126a01f65…

1 0

git:master:075c74f1: pkg/kamailio/deb: version set 5.4.0~dev0
by Victor Seva 03 Oct '19

03 Oct '19

Module: kamailio Branch: master Commit: 075c74f1dfc7b3402e8c0b9c3ad0e7930b2dcba6 URL: https://github.com/kamailio/kamailio/commit/075c74f1dfc7b3402e8c0b9c3ad0e79… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-03T11:59:52+02:00 pkg/kamailio/deb: version set 5.4.0~dev0 --- 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/075c74f1dfc7b3402e8c0b9c3ad0e79… Patch: https://github.com/kamailio/kamailio/commit/075c74f1dfc7b3402e8c0b9c3ad0e79…

1 0

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

03 Oct '19

Module: kamailio Branch: master Commit: e376fe8aacd37c9f2f889e16d98fb3da6960f95d URL: https://github.com/kamailio/kamailio/commit/e376fe8aacd37c9f2f889e16d98fb3d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-03T11:47:53+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/e376fe8aacd37c9f2f889e16d98fb3d… Patch: https://github.com/kamailio/kamailio/commit/e376fe8aacd37c9f2f889e16d98fb3d…

1 0

git:master:787b95a5: tls: docs for rand_engine parameter
by Daniel-Constantin Mierla 03 Oct '19

03 Oct '19

Module: kamailio Branch: master Commit: 787b95a5a0573d4e81b2475a84bad59076e34faf URL: https://github.com/kamailio/kamailio/commit/787b95a5a0573d4e81b2475a84bad59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-03T11:36:28+02:00 tls: docs for rand_engine parameter --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/787b95a5a0573d4e81b2475a84bad59… Patch: https://github.com/kamailio/kamailio/commit/787b95a5a0573d4e81b2475a84bad59… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 6ef2d4123f..6028642b5f 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1241,6 +1241,39 @@ end </example> </section> + <section id="tls.p.rand_engine"> + <title><varname>rand_engine</varname> (str)</title> + <para> + Set the ranondom number generator engine for libssl. + </para> + <para> + Note: the default random number generator (PRNG) engine of libssl v1.1.x + is not designed for multi-process applications and can result in a crash. + Therefore set the PRNG engine to one of the options listed in this + section. If libssl 1.1.x (or newer) is detected at compile time, then + the PRNG engine is set to "fastrand". + </para> + <para> + The following options are avaialble: + </para> + <itemizedlist> + <listitem><para>krand - use internal kam_rand() function</para></listitem> + <listitem><para>fastrand - use internal fastrand function</para></listitem> + </itemizedlist> + <para> + The default value is empty (not set) for libssl v1.0.x or older, and + "fastrand" for libssl v1.1.x or newer. + </para> + <example> + <title>Set <varname>rand_engine</varname> parameter</title> + <programlisting> +... +modparam("tls", "rand_engine", "fastrand") +... + </programlisting> + </example> + </section> + <section id="tls.p.engine"> <title><varname>engine</varname> (string)</title> <para>

1 0

git:master:6d154fbb: tls: set random number engine to fastrand for libssl1.1+
by Daniel-Constantin Mierla 03 Oct '19

03 Oct '19

Module: kamailio Branch: master Commit: 6d154fbb2ff1d2941316281fad120b5db219deb1 URL: https://github.com/kamailio/kamailio/commit/6d154fbb2ff1d2941316281fad120b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-03T11:36:28+02:00 tls: set random number engine to fastrand for libssl1.1+ --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d154fbb2ff1d2941316281fad120b5… Patch: https://github.com/kamailio/kamailio/commit/6d154fbb2ff1d2941316281fad120b5… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 87759249b2..75d8aa8fd2 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -561,6 +561,12 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; register_tls_hooks(&tls_h); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + LM_DBG("setting fastrand random engine\n"); + RAND_set_rand_method(RAND_ksr_fastrand_method()); +#endif + sr_kemi_modules_add(sr_kemi_tls_exports); return 0;

1 0

git:master:4f514a79: tls: option to set use fastrand for rand_engine
by Daniel-Constantin Mierla 03 Oct '19

03 Oct '19

Module: kamailio Branch: master Commit: 4f514a7956534f1afc1ef30d8332f5dc3547de4b URL: https://github.com/kamailio/kamailio/commit/4f514a7956534f1afc1ef30d8332f5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-03T11:36:28+02:00 tls: option to set use fastrand for rand_engine --- 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/4f514a7956534f1afc1ef30d8332f5d… Patch: https://github.com/kamailio/kamailio/commit/4f514a7956534f1afc1ef30d8332f5d… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 52a45353d6..87759249b2 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -449,7 +449,10 @@ int ksr_rand_engine_param(modparam_t type, void* val) LM_DBG("random engine: %.*s\n", reng->len, reng->s); if(reng->len == 5 && strncasecmp(reng->s, "krand", 5) == 0) { LM_DBG("setting krand random engine\n"); - RAND_set_rand_method(RAND_ksr_method()); + RAND_set_rand_method(RAND_ksr_krand_method()); + } else if(reng->len == 8 && strncasecmp(reng->s, "fastrand", 8) == 0) { + LM_DBG("setting fastrand random engine\n"); + RAND_set_rand_method(RAND_ksr_fastrand_method()); } #endif return 0; diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 7be0d335f7..3f78cb93e9 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -27,8 +27,9 @@ #include "../../core/dprint.h" #include "../../core/rand/kam_rand.h" +#include "../../core/rand/fastrand.h" -static int ksr_rand_bytes(unsigned char *outdata, int size) +static int ksr_krand_bytes(unsigned char *outdata, int size) { int r; @@ -51,28 +52,75 @@ static int ksr_rand_bytes(unsigned char *outdata, int size) return 1; } -static int ksr_rand_pseudorand(unsigned char *outdata, int size) +static int ksr_krand_pseudorand(unsigned char *outdata, int size) { - return ksr_rand_bytes(outdata, size); + return ksr_krand_bytes(outdata, size); } -static int ksr_rand_status(void) +static int ksr_krand_status(void) { return 1; } -const RAND_METHOD _ksr_rand_method = { +const RAND_METHOD _ksr_krand_method = { NULL, - ksr_rand_bytes, + ksr_krand_bytes, NULL, NULL, - ksr_rand_pseudorand, - ksr_rand_status + ksr_krand_pseudorand, + ksr_krand_status }; -const RAND_METHOD *RAND_ksr_method(void) +const RAND_METHOD *RAND_ksr_krand_method(void) { - return &_ksr_rand_method; + return &_ksr_krand_method; +} + +static int ksr_fastrand_bytes(unsigned char *outdata, int size) +{ + int r; + + if (size < 0) { + return 0; + } else if (size == 0) { + return 1; + } + + while(size >= sizeof(int)) { + r = kam_rand(); + memcpy(outdata, &r, sizeof(int)); + size -= sizeof(int); + outdata += sizeof(int); + } + if(size>0) { + r = kam_rand(); + memcpy(outdata, &r, size); + } + return 1; +} + +static int ksr_fastrand_pseudorand(unsigned char *outdata, int size) +{ + return ksr_fastrand_bytes(outdata, size); +} + +static int ksr_fastrand_status(void) +{ + return 1; +} + +const RAND_METHOD _ksr_fastrand_method = { + NULL, + ksr_fastrand_bytes, + NULL, + NULL, + ksr_fastrand_pseudorand, + ksr_fastrand_status +}; + +const RAND_METHOD *RAND_ksr_fastrand_method(void) +{ + return &_ksr_fastrand_method; } #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 20b5a20e9c..d1a3f0d37f 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -25,7 +25,8 @@ #include <openssl/rand.h> -const RAND_METHOD *RAND_ksr_method(void); +const RAND_METHOD *RAND_ksr_krand_method(void); +const RAND_METHOD *RAND_ksr_fastrand_method(void); #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

1 0

Development is open for future release of v5.4.x series
by Daniel-Constantin Mierla 03 Oct '19

03 Oct '19

Hello, the branch 5.3 was created late last evening, therefore the master branch is open for adding new features, to be part of future release series v5.4.x. Any bug fix committed to master that applies to 5.3.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 5.3 or 5.2. Expect that v5.3.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v5.4.0 should be out after another 8-10 months of development, plus 1-2 months of testing, so sometime in close to the end of spring 2020 or afterwards. 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 0

Branch 5.3 has been created
by Daniel-Constantin Mierla 03 Oct '19

03 Oct '19

Hello, the branch 5.3 has been created, to be used for releasing v5.3.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.3 cd kamailio-5.3 git checkout -b 5.3 origin/5.3 Pushing commits in this branch: git push origin 5.3:5.3 Note that 5.3 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. You may notice a bit of more activity on tls (some issue is under work) and siptrace (a bit of cleanup for coherence might be done) modules, but over all no new features will be pushed there. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.2 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.3 will be out, respectively Kamailio v5.3.0. 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 0

Branching 5.3
by Daniel-Constantin Mierla 02 Oct '19

02 Oct '19

Hello, if there are no strong opinions against, then it is time to branch 5.3 on git repository. I am considering to do it by the end of the day on Wednesday, October 2, 2019. After that, the master will be again open for new features, while 5.3 branch will continue to get the only fixes and improvements to documentation and tools. 2-3 weeks later we should release v5.3.0, the first stable version in 5.3.x series. 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:726ad857: Makefile.defs: version set to 5.3.0-rc0
by Daniel-Constantin Mierla 02 Oct '19

02 Oct '19

Module: kamailio Branch: 5.3 Commit: 726ad8579d75e0cd6fd3537140690c997601435c URL: https://github.com/kamailio/kamailio/commit/726ad8579d75e0cd6fd3537140690c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-02T23:45:11+02:00 Makefile.defs: version set to 5.3.0-rc0 - branch 5.3 for v5.3.x release series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/726ad8579d75e0cd6fd3537140690c9… Patch: https://github.com/kamailio/kamailio/commit/726ad8579d75e0cd6fd3537140690c9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5242d223d9..0161d2120b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:685fc6bd: Makefile.defs: version set to 5.4.0-dev0
by Daniel-Constantin Mierla 02 Oct '19

02 Oct '19

Module: kamailio Branch: master Commit: 685fc6bd5388d2dedd07da7420c89f47af69ad42 URL: https://github.com/kamailio/kamailio/commit/685fc6bd5388d2dedd07da7420c89f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-02T23:35:22+02:00 Makefile.defs: version set to 5.4.0-dev0 - master branch is open for new features to be part of v5.4.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/685fc6bd5388d2dedd07da7420c89f4… Patch: https://github.com/kamailio/kamailio/commit/685fc6bd5388d2dedd07da7420c89f4… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5242d223d9..3313524469 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 3 +PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:08ae663b: Makefile.defs: version set to 5.3.0-pre2
by Daniel-Constantin Mierla 02 Oct '19

02 Oct '19

Module: kamailio Branch: master Commit: 08ae663b82ec955cc349c5550b8bea796f148295 URL: https://github.com/kamailio/kamailio/commit/08ae663b82ec955cc349c5550b8bea7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-02T23:32:02+02:00 Makefile.defs: version set to 5.3.0-pre2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/08ae663b82ec955cc349c5550b8bea7… Patch: https://github.com/kamailio/kamailio/commit/08ae663b82ec955cc349c5550b8bea7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e5fa7fdda1..5242d223d9 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -pre2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:c0381899: crypto: remove FIXME, add proper log level for debug statement, rephrase log
by Henning Westerholt 02 Oct '19

02 Oct '19

Module: kamailio Branch: master Commit: c03818998f0bd679a1db67ef3b487dd7f1ec256b URL: https://github.com/kamailio/kamailio/commit/c03818998f0bd679a1db67ef3b487dd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-02T16:29:46+02:00 crypto: remove FIXME, add proper log level for debug statement, rephrase log --- Modified: src/modules/crypto/crypto_uuid.c --- Diff: https://github.com/kamailio/kamailio/commit/c03818998f0bd679a1db67ef3b487dd… Patch: https://github.com/kamailio/kamailio/commit/c03818998f0bd679a1db67ef3b487dd… --- diff --git a/src/modules/crypto/crypto_uuid.c b/src/modules/crypto/crypto_uuid.c index 86a6aa66ff..a4049e6282 100644 --- a/src/modules/crypto/crypto_uuid.c +++ b/src/modules/crypto/crypto_uuid.c @@ -218,9 +218,8 @@ int crypto_generate_SHA1(str* in, str* hash) void* ret; if ((ret=SHA1((unsigned char *)in->s, in->len, crypto_buf)) != crypto_buf) { - LM_ERR("SHA1 algo failed!\n"); - /* FIXME remove LM_BUG */ - LM_BUG("Pointer value %p\n", ret); + LM_ERR("SHA1 algorithm failed!\n"); + LM_DBG("return value from library %p\n", ret); return -1; }

1 0

git:master:9a268f13: crypto: spelling fix in comment
by Henning Westerholt 02 Oct '19

02 Oct '19

Module: kamailio Branch: master Commit: 9a268f13454c498fd374ca24b1a876e057ff155d URL: https://github.com/kamailio/kamailio/commit/9a268f13454c498fd374ca24b1a876e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-02T16:27:40+02:00 crypto: spelling fix in comment --- Modified: src/modules/crypto/api.h --- Diff: https://github.com/kamailio/kamailio/commit/9a268f13454c498fd374ca24b1a876e… Patch: https://github.com/kamailio/kamailio/commit/9a268f13454c498fd374ca24b1a876e… --- diff --git a/src/modules/crypto/api.h b/src/modules/crypto/api.h index fa87923304..ce79c72229 100644 --- a/src/modules/crypto/api.h +++ b/src/modules/crypto/api.h @@ -41,7 +41,7 @@ typedef int (*load_crypto_f)( struct crypto_binds* ); int load_crypto( struct crypto_binds *cb ); /*! - * \brief Function to be called directly from other modules to load the CRYTPO API + * \brief Function to be called directly from other modules to load the CRYPTO API * \param cb crypto API export binding * \return 0 on success, -1 if the API loader could not imported */

1 0

git:5.1:f2920c46: core: skip get_record for DNS extensions e.g. for EDNS0 (GH #2087)
by Henning Westerholt 02 Oct '19

02 Oct '19

Module: kamailio Branch: 5.1 Commit: f2920c4681e10b852e94a3378e1f6920597593ae URL: https://github.com/kamailio/kamailio/commit/f2920c4681e10b852e94a3378e1f692… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-02T12:44:39+02:00 core: skip get_record for DNS extensions e.g. for EDNS0 (GH #2087) (cherry picked from commit aeea940adaddc12c1467a0ac8f5e34d14b1339be) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/f2920c4681e10b852e94a3378e1f692… Patch: https://github.com/kamailio/kamailio/commit/f2920c4681e10b852e94a3378e1f692… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 2b1441e36d..a5ffb86d7d 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -937,6 +937,12 @@ struct rdata* get_record(char* name, int type, int flags) *last=rd; last=&(rd->next); break; + case T_OPT: + /* skip DNS extensions, e.g. EDNS0 */ + rd->rdata=0; + *last=rd; + last=&(rd->next); + break; default: LM_ERR("unknown type %d\n", rtype); rd->rdata=0;

1 0

git:5.1:0b6785d8: core: fix compile error related to missing T_OPT in older (<2.25) glibc (GH #2087)
by Henning Westerholt 02 Oct '19

02 Oct '19

Module: kamailio Branch: 5.1 Commit: 0b6785d8cffad33ff9ed05b1f345426e81fc0c4c URL: https://github.com/kamailio/kamailio/commit/0b6785d8cffad33ff9ed05b1f345426… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-02T12:45:13+02:00 core: fix compile error related to missing T_OPT in older (<2.25) glibc (GH #2087) (cherry picked from commit 325d1e6d53b3db3265d6f76ec34bb3d6a31419c4) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/0b6785d8cffad33ff9ed05b1f345426… Patch: https://github.com/kamailio/kamailio/commit/0b6785d8cffad33ff9ed05b1f345426… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index a5ffb86d7d..439435791a 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -32,6 +32,13 @@ #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 +#ifndef T_OPT +#define T_OPT ns_t_opt +#endif +#endif + #include "resolve.h" #include "compiler_opt.h" #include "dprint.h"

1 0

git:5.2:cd4f3c7a: core: fix compile error related to missing T_OPT in older (<2.25) glibc (GH #2087)
by Henning Westerholt 02 Oct '19

02 Oct '19

Module: kamailio Branch: 5.2 Commit: cd4f3c7ad82ef11e73a8c5a53cea2fb812b7dd60 URL: https://github.com/kamailio/kamailio/commit/cd4f3c7ad82ef11e73a8c5a53cea2fb… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-02T12:45:05+02:00 core: fix compile error related to missing T_OPT in older (<2.25) glibc (GH #2087) (cherry picked from commit 325d1e6d53b3db3265d6f76ec34bb3d6a31419c4) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/cd4f3c7ad82ef11e73a8c5a53cea2fb… Patch: https://github.com/kamailio/kamailio/commit/cd4f3c7ad82ef11e73a8c5a53cea2fb… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index fd74441bf6..9f9705341e 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -32,6 +32,13 @@ #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 +#ifndef T_OPT +#define T_OPT ns_t_opt +#endif +#endif + #include "resolve.h" #include "compiler_opt.h" #include "dprint.h"

1 0

git:5.2:f24fb5cd: core: skip get_record for DNS extensions e.g. for EDNS0 (GH #2087)
by Henning Westerholt 02 Oct '19

02 Oct '19

Module: kamailio Branch: 5.2 Commit: f24fb5cd5509dd7c539bf1c36b2676220dc1e826 URL: https://github.com/kamailio/kamailio/commit/f24fb5cd5509dd7c539bf1c36b26762… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-02T12:44:25+02:00 core: skip get_record for DNS extensions e.g. for EDNS0 (GH #2087) (cherry picked from commit aeea940adaddc12c1467a0ac8f5e34d14b1339be) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/f24fb5cd5509dd7c539bf1c36b26762… Patch: https://github.com/kamailio/kamailio/commit/f24fb5cd5509dd7c539bf1c36b26762… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 80020a96ff..fd74441bf6 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -937,6 +937,12 @@ struct rdata* get_record(char* name, int type, int flags) *last=rd; last=&(rd->next); break; + case T_OPT: + /* skip DNS extensions, e.g. EDNS0 */ + rd->rdata=0; + *last=rd; + last=&(rd->next); + break; default: LM_ERR("unknown type %d\n", rtype); rd->rdata=0;

1 0

[kamailio/kamailio] Kamailio logs errors due to unsupported EDNS0 extension in DNS responses (#2087)
by Florian Floimair 02 Oct '19

02 Oct '19

### Description We are running Kamailio in a Microsoft Azure VM. Azure started adding EDNS0 support - in the form of OPT pseudo-records at the end of replies - a few weeks ago and since then we see a lot of ERROR entries in Kamailio log. These do however have no function impact. >From what I can see they are simply not handled in core/resolv.c (EDNS0 is type 41). Version in use is latest 5.2 package from Kamailio repo on Debian 9 (Stretch). Log entries provided below ### Troubleshooting None, as this has no functional impact aside from filling the logs. #### Reproduction I can provide pcap of DNS traffic that contains EDNS0 OPT pseudo-entries on request. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` Oct 1 14:02:01 kamailio /usr/sbin/kamailio[78878]: ERROR: <core> [core/resolve.c:941]: get_record(): unknown type 41 ``` These lines are seen repeatedly only differing in timestamp and PID of kamailio process. In total about 40% of log entries are like the one above. #### SIP Traffic  not related to SIP, but to DNS ### Possible Solutions Add EDNS0 type 41 in core/resolv.c and don't fire an ERROR in the logs. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.4 (x86_64/linux) 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: unknown compiled with gcc 6.3.0 ``` * **Operating System**:  ``` Debian 9.11 Linux kamailio 4.19.0-0.bpo.5-cloud-amd64 #1 SMP Debian 4.19.37-3~bpo9+1 (2019-05-18) 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/2087

2 8

git:master:58047ba6: app_perl: first destroy old interpreter before creating the new one
by Daniel-Constantin Mierla 02 Oct '19

02 Oct '19

Module: kamailio Branch: master Commit: 58047ba61d0cbceebc8c85590970a573fc396aa5 URL: https://github.com/kamailio/kamailio/commit/58047ba61d0cbceebc8c85590970a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-02T08:32:21+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 --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/58047ba61d0cbceebc8c85590970a57… Patch: https://github.com/kamailio/kamailio/commit/58047ba61d0cbceebc8c85590970a57… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 942581c6d6..954b354638 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -262,6 +262,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); @@ -276,26 +278,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:master:fc542100: tls: option to set custom random bytess generator
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: fc542100d85a013272dde869e54173a7d5a062f4 URL: https://github.com/kamailio/kamailio/commit/fc542100d85a013272dde869e54173a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T23:07:54+02:00 tls: option to set custom random bytess generator - attempt to fix GH #2077 which exposes a crash in the libssl v1.1 default random bytes generator --- Added: src/modules/tls/tls_rand.c Added: src/modules/tls/tls_rand.h Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fc542100d85a013272dde869e54173a… Patch: https://github.com/kamailio/kamailio/commit/fc542100d85a013272dde869e54173a…

1 0

[kamailio/kamailio] Create reverse-of-a-number (#2088)
by ankit-proton 01 Oct '19

01 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2088 -- Commit Summary -- * Create reverse-of-a-number -- File Changes -- A reverse-of-a-number (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2088.patch https://github.com/kamailio/kamailio/pull/2088.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/2088

2 2

git:master:325d1e6d: core: fix compile error related to missing T_OPT in older (<2.25) glibc (GH #2087)
by Henning Westerholt 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 325d1e6d53b3db3265d6f76ec34bb3d6a31419c4 URL: https://github.com/kamailio/kamailio/commit/325d1e6d53b3db3265d6f76ec34bb3d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-01T18:02:44+02:00 core: fix compile error related to missing T_OPT in older (<2.25) glibc (GH #2087) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/325d1e6d53b3db3265d6f76ec34bb3d… Patch: https://github.com/kamailio/kamailio/commit/325d1e6d53b3db3265d6f76ec34bb3d… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index de5a30398e..6edc47e506 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -32,6 +32,13 @@ #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 +#ifndef T_OPT +#define T_OPT ns_t_opt +#endif +#endif + #include "resolve.h" #include "compiler_opt.h" #include "dprint.h"

1 0

git:master:dd594481: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: dd594481ee5478d4509c2e53d88a4e309e7dad67 URL: https://github.com/kamailio/kamailio/commit/dd594481ee5478d4509c2e53d88a4e3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-01T13:46:53+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/dd594481ee5478d4509c2e53d88a4e3… Patch: https://github.com/kamailio/kamailio/commit/dd594481ee5478d4509c2e53d88a4e3…

2 1

git:master:51e72659: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 01 Oct '19

01 Oct '19

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

1 0

git:master:1d014c04: siptrace: fix (copy and paste) errors in siptrace docs
by Henning Westerholt 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 1d014c04cfc67d5ed7c3bd440bcf05eb76b1fc73 URL: https://github.com/kamailio/kamailio/commit/1d014c04cfc67d5ed7c3bd440bcf05e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-01T17:00:36+02:00 siptrace: fix (copy and paste) errors in siptrace docs --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1d014c04cfc67d5ed7c3bd440bcf05e… Patch: https://github.com/kamailio/kamailio/commit/1d014c04cfc67d5ed7c3bd440bcf05e… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index df8fe2f017..abf3f47c26 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -571,7 +571,7 @@ sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); <section id="siptrace.f.sip_trace_mode"> <title> - <function moreinfo="none">sip_trace_mode(tmode])</function> + <function moreinfo="none">sip_trace_mode(tmode)</function> </title> <para> Set the tracing mode: message, transaction or dialog. Only the first @@ -587,7 +587,6 @@ sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); <para> This function can be used in ANY_ROUTE. </para> - </emphasis> <example> <title><function>sip_trace_mode()</function> usage</title> <programlisting format="linespecific">

1 0

git:master:aeea940a: core: skip get_record for DNS extensions e.g. for EDNS0 (GH #2087)
by Henning Westerholt 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: aeea940adaddc12c1467a0ac8f5e34d14b1339be URL: https://github.com/kamailio/kamailio/commit/aeea940adaddc12c1467a0ac8f5e34d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-01T16:41:19+02:00 core: skip get_record for DNS extensions e.g. for EDNS0 (GH #2087) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/aeea940adaddc12c1467a0ac8f5e34d… Patch: https://github.com/kamailio/kamailio/commit/aeea940adaddc12c1467a0ac8f5e34d… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 5169c85cab..de5a30398e 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -951,6 +951,12 @@ struct rdata* get_record(char* name, int type, int flags) *last=rd; last=&(rd->next); break; + case T_OPT: + /* skip DNS extensions, e.g. EDNS0 */ + rd->rdata=0; + *last=rd; + last=&(rd->next); + break; default: LM_ERR("unknown type %d\n", rtype); rd->rdata=0;

1 0

[kamailio/kamailio] Create lol (#2086)
by Amiya Chaturvedi 01 Oct '19

01 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2086 -- Commit Summary -- * Create lol -- File Changes -- A Amiya_Chaturvedi/lol (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2086.patch https://github.com/kamailio/kamailio/pull/2086.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/2086

2 2

git:master:929ff145: siptrace: added sip_trace_mode(tmode)
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 929ff145d78b70f29c388b31e76f84c4b438ee90 URL: https://github.com/kamailio/kamailio/commit/929ff145d78b70f29c388b31e76f84c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T13:23:06+02:00 siptrace: added sip_trace_mode(tmode) - function to specify the tracing mode: message, transaction, dialog - a short form of siptrace with 3 params when the duplicate uri and correlation id are not used - the variant for the older setflag(...)/sip_trace(...) to track all the messages in a transaction --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/929ff145d78b70f29c388b31e76f84c… Patch: https://github.com/kamailio/kamailio/commit/929ff145d78b70f29c388b31e76f84c… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 544fb5392a..20c0c8a907 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -87,6 +87,7 @@ static int w_sip_trace1(struct sip_msg *, char *dest, char *p2); static int w_sip_trace2(struct sip_msg *, char *dest, char *correlation_id); static int w_sip_trace3(struct sip_msg *, char *dest, char *correlation_id, char *trace_type); static int fixup_siptrace(void **param, int param_no); +static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2); static int parse_siptrace_uri(str* duri, dest_info_t* dst); static enum siptrace_type_t parse_siptrace_flag(str* sflags); @@ -198,6 +199,8 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"hlog", (cmd_function)w_hlog2, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"sip_trace_mode", (cmd_function)w_sip_trace_mode, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -1182,6 +1185,54 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, return sip_trace_store(&sto, dst, correlation_id_str); } + +/** + * + */ +static int ki_sip_trace_mode(sip_msg_t *msg, str *smode) +{ + enum siptrace_type_t trace_type; + + if(smode==NULL || smode->s==NULL || smode->len<=0) { + LM_INFO("no tracing mode - trace message\n"); + trace_type = SIPTRACE_MESSAGE; + } else { + switch(smode->s[0]) { + case 'M': + case 'm': + trace_type = SIPTRACE_MESSAGE; + break; + case 'T': + case 't': + trace_type = SIPTRACE_TRANSACTION; + break; + case 'D': + case 'd': + trace_type = SIPTRACE_DIALOG; + break; + default: + trace_type = SIPTRACE_MESSAGE; + LM_INFO("unexpected tracing mode [%.*s] - trace message\n", + smode->len, smode->s); + } + } + + return sip_trace_helper(msg, NULL, NULL, NULL, NULL, trace_type); +} + +/** + * + */ +static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2) +{ + str smode = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)pmode, &smode)<0) { + LM_ERR("failed to get tracing mode parameter\n"); + return -1; + } + return ki_sip_trace_mode(msg, &smode); +} + static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) { siptrace_data_t sto; @@ -2134,6 +2185,11 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siptrace"), str_init("sip_trace_mode"), + SR_KEMIP_INT, ki_sip_trace_mode, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:3033a26a: siptrace: docs for sip_trace_mode() function
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 3033a26a6a8a8e7075dd5a86bf376c73830f2bbe URL: https://github.com/kamailio/kamailio/commit/3033a26a6a8a8e7075dd5a86bf376c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T13:31:47+02:00 siptrace: docs for sip_trace_mode() function --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3033a26a6a8a8e7075dd5a86bf376c7… Patch: https://github.com/kamailio/kamailio/commit/3033a26a6a8a8e7075dd5a86bf376c7… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 21d6090c74..df8fe2f017 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -512,7 +512,7 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") </example> </section> </section> - + <section> <title>Functions</title> <section id="siptrace.f.sip_trace"> @@ -569,6 +569,35 @@ sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); </example> </section> + <section id="siptrace.f.sip_trace_mode"> + <title> + <function moreinfo="none">sip_trace_mode(tmode])</function> + </title> + <para> + Set the tracing mode: message, transaction or dialog. Only the first + character of the parameter matters: m or M for message; t or T for + transaction; d or D for dialog. + </para> + <para> + In message tracing mode only the current message is stored or mirrored. + In transaction tracing mode, all the messages of the current transaction + are stored or mirrored. In dialog tracing mode, all the messages of the + current dialog are stored or mirrored. + </para> + <para> + This function can be used in ANY_ROUTE. + </para> + </emphasis> + <example> + <title><function>sip_trace_mode()</function> usage</title> + <programlisting format="linespecific"> +... +sip_trace_mode("t"); +... +</programlisting> + </example> + </section> + <section id="siptrace.f.hlog"> <title> <function moreinfo="none">hlog([correlation_id,] message)</function>

1 0

git:master:41f6ddb8: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 41f6ddb8162960633b005c759b74efd86296d021 URL: https://github.com/kamailio/kamailio/commit/41f6ddb8162960633b005c759b74efd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-01T10:17:03+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/41f6ddb8162960633b005c759b74efd… Patch: https://github.com/kamailio/kamailio/commit/41f6ddb8162960633b005c759b74efd… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 35b1dd78a3..951482065d 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -435,8 +435,9 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") If set to 1, the module uses core events triggered when receiving or sending SIP traffic to mirror traffic to a SIP capture server using - HEP. It will automatically do the mirroring of all traffic, no need to - set the siptrace flag per request. + HEP. It will automatically do the mirroring of all SIP traffic. It is + no longer needed to set the siptrace flag per request or execute + sip_trace(), if it is done, then there mirroring is duplicated. If set to 0, no automatic mirroring of SIP traffic via HEP.

4 4

git:master:47e0649e: pdt: init len variable to avoid using garbage value
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 47e0649eca286bfc26c39dd1142169fc06eea077 URL: https://github.com/kamailio/kamailio/commit/47e0649eca286bfc26c39dd1142169f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T12:22:34+02:00 pdt: init len variable to avoid using garbage value --- Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/47e0649eca286bfc26c39dd1142169f… Patch: https://github.com/kamailio/kamailio/commit/47e0649eca286bfc26c39dd1142169f… --- diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index e55f5bdfa5..d0ff43871a 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -278,7 +278,6 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) *plen = len; return domain; - } /** @@ -287,7 +286,7 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) { pdt_tree_t *it; - int len; + int len = 0; str *domain=NULL; if(pl==NULL || sdomain==NULL || sdomain->s==NULL || code == NULL @@ -300,13 +299,14 @@ str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) it = pl; while(it!=NULL && str_strcmp(&it->sdomain, sdomain)<0) it = it->next; - + if(it==NULL || str_strcmp(&it->sdomain, sdomain)>0) return NULL; - + domain = get_domain(it, code, &len); if(plen!=NULL) - *plen = len; + *plen = len; + return domain; }

1 0

git:master:6861995e: speeddial: fix stripping domain prefix
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 6861995e417c40e9ab530d4c0bed97c57de184fd URL: https://github.com/kamailio/kamailio/commit/6861995e417c40e9ab530d4c0bed97c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T12:17:48+02:00 speeddial: fix stripping domain prefix - increment the index after the value is adjusted --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/6861995e417c40e9ab530d4c0bed97c… Patch: https://github.com/kamailio/kamailio/commit/6861995e417c40e9ab530d4c0bed97c… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index d9e52bf3cd..e26bc37bb8 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -117,7 +117,6 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = puri->host.s; db_vals[nr_keys].val.str_val.len = puri->host.len; - nr_keys++; if (dstrip_s.s!=NULL && dstrip_s.len>0 && dstrip_s.len<puri->host.len @@ -126,6 +125,7 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].val.str_val.s += dstrip_s.len; db_vals[nr_keys].val.str_val.len -= dstrip_s.len; } + nr_keys++; } /* take sd from r-uri */ if (parse_sip_msg_uri(_msg) < 0)

1 0

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

01 Oct '19

In 5.2 setflag(TRACE); sip_trace(); traces both requests and responses. In master, only requests. Please fix. -- Juha

4 15

git:master:dfe8db75: core: init local structs to avoid use of garbage values
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: dfe8db758f84f5e88e0cb35b80a65dcd48158897 URL: https://github.com/kamailio/kamailio/commit/dfe8db758f84f5e88e0cb35b80a65dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T10:28:43+02:00 core: init local structs to avoid use of garbage values --- Modified: src/core/forward.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/dfe8db758f84f5e88e0cb35b80a65dc… Patch: https://github.com/kamailio/kamailio/commit/dfe8db758f84f5e88e0cb35b80a65dc… --- diff --git a/src/core/forward.c b/src/core/forward.c index 8216ccf88a..a31c1c2af5 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -471,6 +471,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, prev_send_sock=0; err=0; + memset(&dns_srv_h, 0, sizeof(struct dns_srv_handle)); #endif buf=0; diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 668179c45e..afbaece075 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -421,6 +421,7 @@ static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) break; default: LM_CRIT("unknown address family %d\n", su->s.sa_family); + memset(ip, 0, sizeof(ip_addr_t)); } }

1 0

git:master:a886f8ef: core: tcp - safety check that dst address is provided for tcp_send()
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: a886f8ef15677b951e36407735f1fb5b94f0edd0 URL: https://github.com/kamailio/kamailio/commit/a886f8ef15677b951e36407735f1fb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T10:28:43+02:00 core: tcp - safety check that dst address is provided for tcp_send() --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/a886f8ef15677b951e36407735f1fb5… Patch: https://github.com/kamailio/kamailio/commit/a886f8ef15677b951e36407735f1fb5… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 61a692af85..99d33ee719 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2002,8 +2002,13 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, snd_flags_t t_send_flags; #endif /* USE_TLS */ + if(unlikely(dst==NULL)) { + LM_ERR("no destination address provided\n"); + return -1; + } + port=su_getport(&dst->to); - try_local_port = (dst && dst->send_sock)?dst->send_sock->port_no:0; + try_local_port = (dst->send_sock)?dst->send_sock->port_no:0; con_lifetime=cfg_get(tcp, tcp_cfg, con_lifetime); if (likely(port)){ su2ip_addr(&ip, &dst->to);

1 0

git:master:3f23f9ef: siptrace: docs - more info on using trace_mode vs flag/sip_trace()
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 3f23f9ef88e4fa2af8d24c3260cb9821aa2f64cc URL: https://github.com/kamailio/kamailio/commit/3f23f9ef88e4fa2af8d24c3260cb982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T10:06:47+02:00 siptrace: docs - more info on using trace_mode vs flag/sip_trace() --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f23f9ef88e4fa2af8d24c3260cb982… Patch: https://github.com/kamailio/kamailio/commit/3f23f9ef88e4fa2af8d24c3260cb982… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 875dc2348f..21d6090c74 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -471,8 +471,10 @@ modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000") <para> If set to 1, the module uses core events triggered when receiving or sending SIP traffic to mirror traffic to a SIP capture server - using HEP. It will automatically do the mirroring of all traffic, - no need to set the siptrace flag per request. + using HEP. It will automatically do the mirroring of all SIP traffic. + It is no longer needed to set the siptrace flag per request or + execute sip_trace(), if it is done, then there mirroring is + duplicated. </para> <para> If set to 0, no automatic mirroring of SIP traffic via HEP.

1 0

unused variable
by Juha Heinanen 01 Oct '19

01 Oct '19

With latest master, I got this: CC (gcc) [M db_mysql.so] km_dbase.o km_dbase.c: In function 'db_mysql_submit_query': km_dbase.c:71:9: warning: unused variable 't' [-Wunused-variable] time_t t; ^ It would be nice if devs would try to compile the code after making changes. -- Juha

2 2

git:master:a6caed41: ims_qos: fixed typo in comments (timout -> timeout)
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: a6caed41166e555d7297abbae6017c5c54262662 URL: https://github.com/kamailio/kamailio/commit/a6caed41166e555d7297abbae6017c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T09:02:56+02:00 ims_qos: fixed typo in comments (timout -> timeout) --- Modified: src/modules/ims_qos/rx_str.c --- Diff: https://github.com/kamailio/kamailio/commit/a6caed41166e555d7297abbae6017c5… Patch: https://github.com/kamailio/kamailio/commit/a6caed41166e555d7297abbae6017c5… --- diff --git a/src/modules/ims_qos/rx_str.c b/src/modules/ims_qos/rx_str.c index efa9617222..6b243e85a4 100644 --- a/src/modules/ims_qos/rx_str.c +++ b/src/modules/ims_qos/rx_str.c @@ -104,8 +104,8 @@ int rx_send_str(str *rx_session_id) { if (auth->u.auth.state == AUTH_ST_DISCON) { // If we are in DISCON is because an STR was already sent - // so just wait for STA or for Grace Timout to happen - LM_DBG("Hmmm, auth session already in disconnected state\n"); + // so just wait for STA or for Grace Timeout to happen + LM_DBG("auth session already in disconnected state\n"); cdpb.AAASessionsUnlock(auth->hash); return CSCF_RETURN_FALSE; }

1 0

git:master:fa5f3645: jsonrpcc: removed old todo file
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: fa5f36454f2ef5fb4e55dd05f746430d9786e842 URL: https://github.com/kamailio/kamailio/commit/fa5f36454f2ef5fb4e55dd05f746430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T09:04:01+02:00 jsonrpcc: removed old todo file --- Removed: src/modules/jsonrpcc/TODO --- Diff: https://github.com/kamailio/kamailio/commit/fa5f36454f2ef5fb4e55dd05f746430… Patch: https://github.com/kamailio/kamailio/commit/fa5f36454f2ef5fb4e55dd05f746430… --- diff --git a/src/modules/jsonrpcc/TODO b/src/modules/jsonrpcc/TODO deleted file mode 100644 index f0e19152f1..0000000000 --- a/src/modules/jsonrpcc/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* "Reliable" Notifications (implement using requests, and failover on error; ignore non-error responses) ? -* Implement timout for non-Linux systems

1 0

git:master:56313380: sms: fixed typo in comments (timout -> timeout)
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 5631338036c405b1e8c7fe8a1e320db2eb63c3f9 URL: https://github.com/kamailio/kamailio/commit/5631338036c405b1e8c7fe8a1e320db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T09:01:29+02:00 sms: fixed typo in comments (timout -> timeout) --- Modified: src/modules/sms/libsms_modem.c Modified: src/modules/sms/libsms_modem.h --- Diff: https://github.com/kamailio/kamailio/commit/5631338036c405b1e8c7fe8a1e320db… Patch: https://github.com/kamailio/kamailio/commit/5631338036c405b1e8c7fe8a1e320db… --- diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index 5093d28ee2..fe0be1f8a7 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -125,7 +125,7 @@ int put_command( struct modem *mdm, char* cmd, int cmd_len, char* answer, } } } - /* repeat until timout */ + /* repeat until timeout */ }while (timeoutcounter<timeout); if (!answer_e) diff --git a/src/modules/sms/libsms_modem.h b/src/modules/sms/libsms_modem.h index feeb6acac9..7eb0a80b04 100644 --- a/src/modules/sms/libsms_modem.h +++ b/src/modules/sms/libsms_modem.h @@ -31,7 +31,7 @@ typedef int(*cds_report)( struct modem* , char* , int ); /* put_command - Sends a command to the modem and waits max timout*0.1 seconds for an answer. + Sends a command to the modem and waits max timeout*0.1 seconds for an answer. The function returns the length of the answer. The answer can be Ok, ERROR or expect. The command may be empty or NULL */

1 0

git:master:75e0e0f4: db_mysql: fixed typo in comments (timout -> timeout)
by Daniel-Constantin Mierla 01 Oct '19

01 Oct '19

Module: kamailio Branch: master Commit: 75e0e0f4d693e207d2035f84c3e1ddc9cc715ec4 URL: https://github.com/kamailio/kamailio/commit/75e0e0f4d693e207d2035f84c3e1ddc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-01T08:59:44+02:00 db_mysql: fixed typo in comments (timout -> timeout) --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/75e0e0f4d693e207d2035f84c3e1ddc… Patch: https://github.com/kamailio/kamailio/commit/75e0e0f4d693e207d2035f84c3e1ddc… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 3014d374f6..eaff3276b6 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -89,7 +89,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) } } /* - * We're doing later a query anyway that will reset the timout of the server, + * We're doing later a query anyway that will reset the timeout of the server, * so it makes sense to set the timestamp value to the actual time in order * to prevent unnecessary pings. */

1 0

Re: [sr-dev] unused variable
by Juha Heinanen 01 Oct '19

01 Oct '19

Juha Heinanen writes: > It would be nice if devs would try to compile the code after making changes. I apologize. It was stupid statement. -- Juha

1 0

git:master:be04fb6e: siptrace: proper handling when sip trace flag modparam is not set
by Daniel-Constantin Mierla 30 Sep '19

30 Sep '19

Module: kamailio Branch: master Commit: be04fb6eab7caec8a2406a0b3ddee2b07083987e URL: https://github.com/kamailio/kamailio/commit/be04fb6eab7caec8a2406a0b3ddee2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-30T19:56:50+02:00 siptrace: proper handling when sip trace flag modparam is not set - use a dedicated variable to get flag index via param, because 0 is a valid index, resulting in bit 1 being used for sip tracing --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/be04fb6eab7caec8a2406a0b3ddee2b… Patch: https://github.com/kamailio/kamailio/commit/be04fb6eab7caec8a2406a0b3ddee2b… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 35bfb1c78a..24089020fc 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -65,7 +65,7 @@ MODULE_VERSION #define trace_is_off(_msg) \ ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ - || ((_msg->flags & trace_flag) == 0)) + || ((trace_flag != 0) && (_msg->flags & trace_flag) == 0)) #define is_null_pv(_str) \ (!str_strcmp(&_str, pv_get_null_str())) @@ -138,6 +138,7 @@ static str xavp_trace_info_name_s = str_init(XAVP_TRACE_INFO_NAME); #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4 +int trace_flag_param = -1; int trace_flag = 0; int trace_on = 0; @@ -218,7 +219,7 @@ static param_export_t params[] = { {"fromtag_column", PARAM_STR, &fromtag_column}, {"totag_column", PARAM_STR, &totag_column}, {"direction_column", PARAM_STR, &direction_column}, - {"trace_flag", INT_PARAM, &trace_flag}, + {"trace_flag", INT_PARAM, &trace_flag_param}, {"trace_on", INT_PARAM, &trace_on}, {"traced_user_avp", PARAM_STR, &traced_user_avp_str}, {"trace_table_avp", PARAM_STR, &trace_table_avp_str}, @@ -280,11 +281,13 @@ static int mod_init(void) return -1; } - if(trace_flag < 0 || trace_flag > (int)MAX_FLAG) { - LM_ERR("invalid trace flag %d\n", trace_flag); - return -1; + if(trace_flag_param!=-1) { + if(trace_flag_param < -1 || trace_flag_param > (int)MAX_FLAG) { + LM_ERR("invalid trace flag %d\n", trace_flag_param); + return -1; + } + trace_flag = 1 << trace_flag_param; } - trace_flag = 1 << trace_flag; trace_to_database_flag = (int *)shm_malloc(sizeof(int)); if(trace_to_database_flag == NULL) {

1 0

git:master:40e09d86: siptrace: trace transaction when message flag is set
by Daniel-Constantin Mierla 30 Sep '19

30 Sep '19

Module: kamailio Branch: master Commit: 40e09d8625184f19ff5666a2848cbb8c6212db26 URL: https://github.com/kamailio/kamailio/commit/40e09d8625184f19ff5666a2848cbb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-30T20:17:10+02:00 siptrace: trace transaction when message flag is set --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/40e09d8625184f19ff5666a2848cbb8… Patch: https://github.com/kamailio/kamailio/commit/40e09d8625184f19ff5666a2848cbb8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 24089020fc..544fb5392a 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1026,8 +1026,13 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * if (trace_type_p != NULL) { trace_type = *(enum siptrace_type_t *)(trace_type_p); } else { - /* fallback to default */ - trace_type = SIPTRACE_MESSAGE; + /* fallback to default - transaction tracking when flag is set, + * otherwise only the current message*/ + if(msg->flags & trace_flag) { + trace_type = SIPTRACE_TRANSACTION; + } else { + trace_type = SIPTRACE_MESSAGE; + } } return sip_trace_helper(msg, (dest)?&dest_info:NULL,

1 0

[kamailio/kamailio] Problem Parsing Route Header (#2079)
by duarterocha91 30 Sep '19

30 Sep '19

Problem : Route header doesn't seem to be behaving correctly when it contains more than one URI. This issue seems to affect uac_restore mechanics and routing mechanics. In order to test this i've created a test call with a in-dialog "OPTIONS" request. In one scenario, the OPTIONS contains two Route headers with one URI each. In the other scenario, the OPTIONS contains one Route header with two URIs. In the last scenario, there is a failure routing the request to it's destination (404 - Not here) [VTS_2.0.zip](https://github.com/kamailio/kamailio/files/3662292/VTS_2.0.zip) . In both scenarios the URIs used are the same and the remaining of the call beahviour is the same. Find attached to this report two pcap files with the two scenarios. 2Routes.pcap - Two Route headers with one URI each 2 [VTS_2.0.zip](https://github.com/kamailio/kamailio/files/3662287/VTS_2.0.zip) URIs.pcap - One Route Header with two URI. If needed i can do more testing. Best Regards, Duarte Rocha -- 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/2079

3 7

[kamailio/kamailio] kamctl: Update dbtextdb.py for Python3 (#2083)
by Anthony Messina 30 Sep '19

30 Sep '19

- reported by GH #1747   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #1747 #### Description  Updated kamctl/dbtextdb to complie with either Python2 or Python3. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2083 -- Commit Summary -- * kamctl: Update dbtextdb.py for Python3 -- File Changes -- M utils/kamctl/dbtextdb/dbtextdb.py (2252) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2083.patch https://github.com/kamailio/kamailio/pull/2083.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/2083

2 4

git:master:de11e285: tm: removed async mutex define option
by Daniel-Constantin Mierla 30 Sep '19

30 Sep '19

Module: kamailio Branch: master Commit: de11e2850314b12320cf8fed29f709a38a986709 URL: https://github.com/kamailio/kamailio/commit/de11e2850314b12320cf8fed29f709a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-30T09:07:58+02:00 tm: removed async mutex define option - it was disbaled due to conflict with reply processing, the reply mutex being used, t_continue() has same processing like a failure handling --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/lock.c Modified: src/modules/tm/lock.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/de11e2850314b12320cf8fed29f709a… Patch: https://github.com/kamailio/kamailio/commit/de11e2850314b12320cf8fed29f709a… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 3f10817013..d0ec6c8452 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -396,7 +396,6 @@ struct cell *build_cell(struct sip_msg *p_msg) init_synonym_id(p_msg, new_cell->md5); init_cell_lock(new_cell); - init_async_lock(new_cell); t_stats_created(); return new_cell; diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index cf0a4b549f..ef666e5955 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -406,11 +406,6 @@ typedef struct cell /* recursive reply lock count */ int reply_rec_lock_level; -#ifdef ENABLE_ASYNC_MUTEX - /* protect against concurrent async continues */ - ser_lock_t async_mutex; -#endif - ticks_t fr_timeout; /* final response interval for retr_bufs */ ticks_t fr_inv_timeout; /* final inv. response interval for retr_bufs */ retr_timeout_t rt_t1_timeout_ms; /* start retr. interval for retr_bufs */ diff --git a/src/modules/tm/lock.c b/src/modules/tm/lock.c index 45b267d064..c06bd4c16a 100644 --- a/src/modules/tm/lock.c +++ b/src/modules/tm/lock.c @@ -50,9 +50,6 @@ static int sem_nr; gen_lock_set_t *entry_semaphore = 0; gen_lock_set_t *reply_semaphore = 0; -#ifdef ENABLE_ASYNC_MUTEX -gen_lock_set_t *async_semaphore = 0; -#endif #endif @@ -82,12 +79,6 @@ int lock_initialize() lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); } -#ifdef ENABLE_ASYNC_MUTEX - if(async_semaphore != 0) { - lock_set_destroy(async_semaphore); - lock_set_dealloc(async_semaphore); - } -#endif if(i == 0) { LOG(L_CRIT, "lock_initialize: could not allocate semaphore" " sets\n"); @@ -139,20 +130,6 @@ int lock_initialize() i--; goto again; } -#ifdef ENABLE_ASYNC_MUTEX - i++; - if(((async_semaphore = lock_set_alloc(i)) == 0) - || (lock_set_init(async_semaphore) == 0)) { - if(async_semaphore) { - lock_set_dealloc(async_semaphore); - async_semaphore = 0; - } - LM_DBG("async semaphore initialization failure: %s\n", strerror(errno)); - probe_run = 1; - i--; - goto again; - } -#endif /* return success */ LM_INFO("semaphore arrays of size %d allocated\n", sem_nr); @@ -192,13 +169,6 @@ void lock_cleanup() lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); }; -#ifdef ENABLE_ASYNC_MUTEX - if(async_semaphore != 0) { - lock_set_destroy(async_semaphore); - lock_set_dealloc(async_semaphore); - } - async_semaphore = 0; -#endif entry_semaphore = reply_semaphore = 0; } #endif /*GEN_LOCK_T_PREFERED*/ @@ -232,22 +202,6 @@ int init_entry_lock(struct s_table *ht, struct entry *entry) return 0; } -int init_async_lock(struct cell *cell) -{ -#ifdef ENABLE_ASYNC_MUTEX - -#ifdef GEN_LOCK_T_PREFERED - lock_init(&cell->async_mutex); -#else - cell->async_mutex.semaphore_set = async_semaphore; - cell->async_mutex.semaphore_index = cell->hash_index % sem_nr; -#endif /* GEN_LOCK_T_PREFERED */ - -#endif /* ENABLE_ASYNC_MUTEX */ - - return 0; -} - int release_cell_lock(struct cell *cell) { #ifndef GEN_LOCK_T_PREFERED diff --git a/src/modules/tm/lock.h b/src/modules/tm/lock.h index 7e0bf58424..a44f4ebae0 100644 --- a/src/modules/tm/lock.h +++ b/src/modules/tm/lock.h @@ -56,7 +56,6 @@ void lock_cleanup(void); int init_cell_lock(struct cell *cell); int init_entry_lock(struct s_table *ht, struct entry *entry); -int init_async_lock(struct cell *cell); int release_cell_lock(struct cell *cell); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 20807a5cfd..be7b0a6842 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -41,13 +41,8 @@ #include "../../core/data_lump_rpl.h" -#ifdef ENABLE_ASYNC_MUTEX -#define LOCK_ASYNC_CONTINUE(_t) lock(&(_t)->async_mutex ) -#define UNLOCK_ASYNC_CONTINUE(_t) unlock(&(_t)->async_mutex ) -#else #define LOCK_ASYNC_CONTINUE(_t) LOCK_REPLIES(_t) #define UNLOCK_ASYNC_CONTINUE(_t) UNLOCK_REPLIES(_t) -#endif /* Suspends the transaction for later use. * Save the returned hash_index and label to get

1 0

[kamailio/kamailio] download error on repos (#2082)
by nicoonline 30 Sep '19

30 Sep '19

Hello, Is there any problems on the repo's server ? (1/6): kamailio-5.2.4-6.el6.x86_64.rpm | 5.5 MB 00:00 http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata Trying other mirror. http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno 14] PYCURL ERROR 22 - "The requested URL returned error: 416 Requested Range Not Satisfiable" Trying other mirror. (3/6): kamailio-http_client-5.2.4-6.el6.x86_64.rpm | 68 kB 00:00 http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata Trying other mirror. (4/6): kamailio-jansson-5.2.4-6.el6.x86_64.rpm | 90 kB 00:00 http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata Trying other mirror. http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno 14] PYCURL ERROR 22 - "The requested URL returned error: 416 Requested Range Not Satisfiable" Trying other mirror. http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno 14] PYCURL ERROR 22 - "The requested URL returned error: 416 Requested Range Not Satisfiable" Trying other mirror. -- 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/2082

3 4

git:master:a37f3fe8: Merge pull request #2083 from amessina/master
by GitHub 30 Sep '19

30 Sep '19

Module: kamailio Branch: master Commit: a37f3fe8e2c93adcbeaa91ace8b3bff6abc29ff5 URL: https://github.com/kamailio/kamailio/commit/a37f3fe8e2c93adcbeaa91ace8b3bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-30T08:36:40+02:00 Merge pull request #2083 from amessina/master kamctl: Update dbtextdb.py for Python3 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/a37f3fe8e2c93adcbeaa91ace8b3bff… Patch: https://github.com/kamailio/kamailio/commit/a37f3fe8e2c93adcbeaa91ace8b3bff…

1 0

git:master:a44ade38: kamctl: Update dbtextdb.py for Python3
by Anthony Messina 30 Sep '19

30 Sep '19

Module: kamailio Branch: master Commit: a44ade38dc420d2699896930ededf54645837a22 URL: https://github.com/kamailio/kamailio/commit/a44ade38dc420d2699896930ededf54… Author: Anthony Messina <amessina(a)messinet.com> Committer: Anthony Messina <amessina(a)messinet.com> Date: 2019-09-29T11:09:26-05:00 kamctl: Update dbtextdb.py for Python3 - reported by GH #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/a44ade38dc420d2699896930ededf54… Patch: https://github.com/kamailio/kamailio/commit/a44ade38dc420d2699896930ededf54…

1 0

git:master:635cdbc1: lib: add missing debug output for srdb1, db_do_submit_query
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 635cdbc17abd0d213cc0065dcbbb22f1c73ce61b URL: https://github.com/kamailio/kamailio/commit/635cdbc17abd0d213cc0065dcbbb22f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T23:48:44+02:00 lib: add missing debug output for srdb1, db_do_submit_query --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/635cdbc17abd0d213cc0065dcbbb22f… Patch: https://github.com/kamailio/kamailio/commit/635cdbc17abd0d213cc0065dcbbb22f… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index 8510999aba..d2319446a6 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -69,6 +69,7 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, } } + LM_DBG("submitted query: %.*s, result %d\n", _query->len, _query->s, ret); return ret; }

1 0

git:master:671fc87c: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 671fc87ccd345f56e74a87e3ff599912631dcef3 URL: https://github.com/kamailio/kamailio/commit/671fc87ccd345f56e74a87e3ff59991… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-29T23:16:42+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/671fc87ccd345f56e74a87e3ff59991… Patch: https://github.com/kamailio/kamailio/commit/671fc87ccd345f56e74a87e3ff59991… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index fdf6b6f18b..ff466b0e78 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1002,11 +1002,11 @@ modparam("usrloc", "rm_expired_delay", 30) 3.47. server_id_filter (int) Enable (1) or disable (0) filter records by server_id on load and - during cleaning of expired db records. It could be usefull when you - want to use the same location table for several kamailio instances - which are configured to work in db_mode=1 or db_mode=2 (cache modes). - Otherwise one instance of proxy cleans records made by another proxy - and that breaks its cache. + during cleaning of expired db records. It could be useful when you want + to use the same location table for several kamailio instances which are + configured to work in db_mode=1 or db_mode=2 (cache modes). Otherwise + one instance of proxy cleans records made by another proxy and that + breaks its cache. Default value is “0”.

1 0

git:master:8d729f0d: usrloc: spelling fix in comments (usefull -> useful)
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 8d729f0d218d84c0850ade47e5dbe28ba54a5c98 URL: https://github.com/kamailio/kamailio/commit/8d729f0d218d84c0850ade47e5dbe28… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T23:15:31+02:00 usrloc: spelling fix in comments (usefull -> useful) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8d729f0d218d84c0850ade47e5dbe28… Patch: https://github.com/kamailio/kamailio/commit/8d729f0d218d84c0850ade47e5dbe28… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 3dd180b937..0f14209784 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1202,7 +1202,7 @@ modparam("usrloc", "rm_expired_delay", 30) <title><varname>server_id_filter</varname> (int)</title> <para> Enable (1) or disable (0) filter records by server_id on load and during cleaning of expired db records. - It could be usefull when you want to use the same location table for several kamailio instances which are configured to work in db_mode=1 or db_mode=2 (cache modes). + It could be useful when you want to use the same location table for several kamailio instances which are configured to work in db_mode=1 or db_mode=2 (cache modes). Otherwise one instance of proxy cleans records made by another proxy and that breaks its cache. </para> <para>

1 0

git:master:98e1eabc: tls: spelling fix in comments (usefull -> useful)
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 98e1eabc676639b7e739d8641e3fa80f3c5b56dd URL: https://github.com/kamailio/kamailio/commit/98e1eabc676639b7e739d8641e3fa80… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T23:15:40+02:00 tls: spelling fix in comments (usefull -> useful) --- Modified: src/modules/tls/README.TLS --- Diff: https://github.com/kamailio/kamailio/commit/98e1eabc676639b7e739d8641e3fa80… Patch: https://github.com/kamailio/kamailio/commit/98e1eabc676639b7e739d8641e3fa80… --- diff --git a/src/modules/tls/README.TLS b/src/modules/tls/README.TLS index ef3a2ea1f5..3313c7f636 100644 --- a/src/modules/tls/README.TLS +++ b/src/modules/tls/README.TLS @@ -84,7 +84,7 @@ Copyright modification in Makefile.defs. The Makefile.defs file is where the library and include paths are set (where to locate Openssl) Read more on this below on the "external libraries" dependencies. - The cfg.XXX patch provide configuration features from the ser.cfg file, usefull and necessary. + The cfg.XXX patch provide configuration features from the ser.cfg file, useful and necessary. This core module has been compiled successfully with ser branch rel_0_9_0 (updated as of June 2005, ser-0.9.3). It should compile in HEAD too without problem. It has been tested for functionality (successfully) with rel_0_9_0 (ser-0.9.0).

1 0

git:master:64a93405: ctl: spelling fix in comments (usefull -> useful)
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 64a93405470569b098b6d1a45361a80bc5f82644 URL: https://github.com/kamailio/kamailio/commit/64a93405470569b098b6d1a45361a80… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T23:15:11+02:00 ctl: spelling fix in comments (usefull -> useful) --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/64a93405470569b098b6d1a45361a80… Patch: https://github.com/kamailio/kamailio/commit/64a93405470569b098b6d1a45361a80… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index 56a8e26cd6..29e06670ed 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -434,7 +434,7 @@ inline static int binrpc_add_str_type(struct binrpc_pkt* pkt, char* s, int len, -/* adds an avp (name, value) pair, usefull to add structure members */ +/* adds an avp (name, value) pair, useful to add structure members */ inline static int binrpc_addavp(struct binrpc_pkt* pkt, struct binrpc_val* avp) { int ret;

1 0

git:master:68d1bdef: core: spelling fix in comments (usefull -> useful)
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 68d1bdefb373798c740130b50602cdde2e70f876 URL: https://github.com/kamailio/kamailio/commit/68d1bdefb373798c740130b50602cdd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T23:13:41+02:00 core: spelling fix in comments (usefull -> useful) --- Modified: src/Makefile.rules Modified: src/core/dset.h Modified: src/core/tcp_main.c Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/68d1bdefb373798c740130b50602cdd… Patch: https://github.com/kamailio/kamailio/commit/68d1bdefb373798c740130b50602cdd… --- diff --git a/src/Makefile.rules b/src/Makefile.rules index 10d04a1c33..57c955437f 100644 --- a/src/Makefile.rules +++ b/src/Makefile.rules @@ -207,7 +207,7 @@ all: $(NAME) every-module static: $(objs) # clean only the current directory (no modules or utils) -# (it's usefull to have it separated from clean for speeding up make proper) +# (it's useful to have it separated from clean for speeding up make proper) .PHONY: local-clean local-clean: -@rm -f $(objs) $(NAME) $(objs:.o=.il) *.a librpath.lst 2>/dev/null diff --git a/src/core/dset.h b/src/core/dset.h index 9a640da704..ccb0f669c9 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -223,7 +223,7 @@ inline static int get_request_uri(struct sip_msg* _m, str* _u) #define ruri_mark_consumed() (ruri_is_new = 0) /** returns whether or not ruri should be used when forking. - * (usefull for serial forking) + * (useful for serial forking) * @return 0 if already marked as consumed, 1 if not. */ #define ruri_get_forking_state() (ruri_is_new) diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e86fc872a8..61a692af85 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3553,7 +3553,7 @@ int _tcpconn_write_nb(int fd, struct tcp_connection* c, /* handles io from a tcp child process * params: tcp_c - pointer in the tcp_children array, to the entry for * which an io event was detected - * fd_i - fd index in the fd_array (usefull for optimizing + * fd_i - fd index in the fd_array (useful for optimizing * io_watch_deletes) * returns: handle_* return convention: -1 on error, 0 on EAGAIN (no more * io events queued), >0 on success. success/error refer only to @@ -3776,7 +3776,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) * * params: p - pointer in the ser processes array (pt[]), to the entry for * which an io event was detected - * fd_i - fd index in the fd_array (usefull for optimizing + * fd_i - fd index in the fd_array (useful for optimizing * io_watch_deletes) * returns: handle_* return convention: * -1 on error reading from the fd, diff --git a/src/core/timer.c b/src/core/timer.c index 8f6e305b24..1bcd036fda 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -765,7 +765,7 @@ return ret; -/* marks a timer as "to be deleted when the handler ends", usefull when +/* marks a timer as "to be deleted when the handler ends", useful when * the timer handler knows it won't prolong the timer anymore (it will * return 0) and will do some time consuming work. Calling this function * will cause simultaneous timer_dels to return immediately (they won't

1 0

git:master:76353873: lib: spelling fix in comments (usefull -> useful)
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 76353873c63cf3115c05b2e188f36e5a2b0ce9bf URL: https://github.com/kamailio/kamailio/commit/76353873c63cf3115c05b2e188f36e5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T23:14:24+02:00 lib: spelling fix in comments (usefull -> useful) --- Modified: src/lib/cds/cds.h --- Diff: https://github.com/kamailio/kamailio/commit/76353873c63cf3115c05b2e188f36e5… Patch: https://github.com/kamailio/kamailio/commit/76353873c63cf3115c05b2e188f36e5… --- diff --git a/src/lib/cds/cds.h b/src/lib/cds/cds.h index d1f3edd75b..d72e191b2a 100644 --- a/src/lib/cds/cds.h +++ b/src/lib/cds/cds.h @@ -36,7 +36,7 @@ * - many duplicated functions in modules (copy&pasted between modules) * without touching SER's core * - possibility to debug programs outside of SER due to its simplicity - * and many usefull tools + * and many useful tools * * @{ */

1 0

[kamailio/kamailio] uac: Crash on kamcmd uac.reg_reload using auth_ha1 field as password in database table (#2076)
by Alexandru Covalschi 29 Sep '19

29 Sep '19

### Description I was testing latest nightly build to test uacreg with auth_ha1 column. I have 1 record in database: ``` id: 1 l_uuid: 50b08f96-ee5d-44bb-8539-098268ad64d1 l_username: covalschi l_domain: test113.covalschi.reraldomain.com r_username: covalschi r_domain: sip.linphone.org realm: sip.linphone.org auth_username: covalschi auth_password: auth_ha1: f0e0dc4bf176fe8f41280b7b3758150d auth_proxy: sip.linphone.org expires: 3600 flags: 0 reg_delay: 0 socket: ``` When I execute kamcmd uac.reg_reload I get: ```ERROR: read reply failed: Success (0)``` as return code for kamcmd and Kamailio crashes.  ### Troubleshooting It repeats every time, Kamailio crashes with signal 11 #### Reproduction Basically do the same - create a record in database with auth_ha1 instead of password and try kamcmd uac.reg_reload  #### Debugging Data  ``` bt full: https://pastebin.com/by6Nxwhk info locals: https://pastebin.com/ZmEHnupn (gdb) list 1871 in main.c ``` [core.zip](https://github.com/kamailio/kamailio/files/3656555/core.zip) #### Log Messages  ``` 27(380) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 5 0(1) ALERT: <core> [main.c:766]: handle_sigs(): child process 364 exited by a signal 11 0(1) ALERT: <core> [main.c:769]: handle_sigs(): core was generated ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-pre1 (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 stretch in docker Linux dev-covalschi 4.9.0-11-amd64 #1 SMP Debian 4.9.189-3 (2019-09-02) 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/2076

2 8

git:master:ac016795: uac: fix crash related to uacreg HA1 addition, commit 9b501c4945
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: ac016795dae5c0dcb5377fe9efa83fda240a6d17 URL: https://github.com/kamailio/kamailio/commit/ac016795dae5c0dcb5377fe9efa83fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T23:01:42+02:00 uac: fix crash related to uacreg HA1 addition, commit 9b501c4945 - fix crash related to uacreg HA1 addition, commit 9b501c4945 (GH #2076) - it's also necessary to add the new column to the queries --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/ac016795dae5c0dcb5377fe9efa83fd… Patch: https://github.com/kamailio/kamailio/commit/ac016795dae5c0dcb5377fe9efa83fd… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 5ede2458ef..fb45a4fd3d 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1364,7 +1364,7 @@ int uac_reg_load_db(void) } if (DB_CAPABILITY(reg_dbf, DB_CAP_FETCH)) { - if(reg_dbf.query(reg_db_con, 0, 0, 0, db_cols, 0, 13, 0, 0) < 0) + if(reg_dbf.query(reg_db_con, 0, 0, 0, db_cols, 0, 14, 0, 0) < 0) { LM_ERR("Error while querying db\n"); return -1; @@ -1383,7 +1383,7 @@ int uac_reg_load_db(void) } } else { if((ret=reg_dbf.query(reg_db_con, NULL, NULL, NULL, db_cols, - 0, 13, 0, &db_res))!=0 + 0, 14, 0, &db_res))!=0 || RES_ROW_N(db_res)<=0 ) { reg_dbf.free_result(reg_db_con, db_res); @@ -1502,7 +1502,7 @@ int uac_reg_db_refresh(str *pl_uuid) db_vals[0].val.str_val.len = pl_uuid->len; if((ret=reg_dbf.query(reg_db_con, db_keys, NULL, db_vals, db_cols, - 1 /*nr keys*/, 13 /*nr cols*/, 0, &db_res))!=0 + 1 /*nr keys*/, 14 /*nr cols*/, 0, &db_res))!=0 || RES_ROW_N(db_res)<=0 ) { reg_dbf.free_result(reg_db_con, db_res);

1 0

git:master:4ad1382a: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: 4ad1382a6529f9d201a78280998f846dbbd3aa80 URL: https://github.com/kamailio/kamailio/commit/4ad1382a6529f9d201a78280998f846… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-29T21:47:11+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/4ad1382a6529f9d201a78280998f846… Patch: https://github.com/kamailio/kamailio/commit/4ad1382a6529f9d201a78280998f846… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 2be4f37a91..35b1dd78a3 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -145,7 +145,7 @@ Chapter 1. Admin Guide The SIPtrace module offer a possibility to store incoming and outgoing SIP messages in a database and/or duplicate to the capturing server (using HEP, the Homer encapsulation protocol, or plain SIP mode). Since - version 5.4 new levels of tracing are available. Transactions and + version 5.3.0 new levels of tracing are available. Transactions and dialogs can be traced. There are multiple ways of storing information:

1 0

git:master:d3b0710a: siptrace: fix an error in the docs, new tracing functions will be available in 5.3.0
by Henning Westerholt 29 Sep '19

29 Sep '19

Module: kamailio Branch: master Commit: d3b0710a1bf0158a337636c6bb7132209320ef87 URL: https://github.com/kamailio/kamailio/commit/d3b0710a1bf0158a337636c6bb71322… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-29T21:41:59+02:00 siptrace: fix an error in the docs, new tracing functions will be available in 5.3.0 --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d3b0710a1bf0158a337636c6bb71322… Patch: https://github.com/kamailio/kamailio/commit/d3b0710a1bf0158a337636c6bb71322… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index a60b843831..875dc2348f 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -18,7 +18,7 @@ <para> The SIPtrace module offer a possibility to store incoming and outgoing SIP messages in a database and/or duplicate to the capturing server (using <acronym>HEP</acronym>, - the Homer encapsulation protocol, or plain SIP mode). Since version 5.4 new levels of tracing + the Homer encapsulation protocol, or plain SIP mode). Since version 5.3.0 new levels of tracing are available. Transactions and dialogs can be traced. </para> <para>

1 0

git:master:a1a32a92: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: a1a32a927203c8897c577618bb03ab543b5e71f9 URL: https://github.com/kamailio/kamailio/commit/a1a32a927203c8897c577618bb03ab5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-27T18:31:50+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/a1a32a927203c8897c577618bb03ab5… Patch: https://github.com/kamailio/kamailio/commit/a1a32a927203c8897c577618bb03ab5… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 8f3f36a9c8..33b7d8cad6 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1389,10 +1389,11 @@ modparam("dialog", "h_id_start", 5) selected at startup, then incremented by 1 for each new dialog. Setting h_id_start and h_id_step to non-default values should be done when using dlg_db_load_callid(...) or dlg_db_load_extra() to load dialog - records generated by another Kamailio instance, making also sure that - those Kamailio nstances are not going to generate overalapping dialog - hash id values by using different h_id_start and the same h_id_step - (h_id_step has to be greater than the maximum value of h_id_start). + records generated by another Kamailio instance. Pay attention to ensure + that those Kamailio instances are not going to generate overlapping + dialog hash id values by using different h_id_start and the same + h_id_step (h_id_step has to be greater than the maximum value of + h_id_start). Default value is “1”.

1 0

git:5.2:dfe5422a: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.2 Commit: dfe5422a70c264af3428e27decf82ab05024b048 URL: https://github.com/kamailio/kamailio/commit/dfe5422a70c264af3428e27decf82ab… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-27T18:31:35+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/dfe5422a70c264af3428e27decf82ab… Patch: https://github.com/kamailio/kamailio/commit/dfe5422a70c264af3428e27decf82ab… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 18ea72d4f5..a0fa0ccdea 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1375,10 +1375,11 @@ modparam("dialog", "h_id_start", 5) selected at startup, then incremented by 1 for each new dialog. Setting h_id_start and h_id_step to non-default values should be done when using dlg_db_load_callid(...) or dlg_db_load_extra() to load dialog - records generated by another Kamailio instance, making also sure that - those Kamailio nstances are not going to generate overalapping dialog - hash id values by using different h_id_start and the same h_id_step - (h_id_step has to be greater than the maximum value of h_id_start). + records generated by another Kamailio instance. Pay attention to ensure + that those Kamailio instances are not going to generate overlapping + dialog hash id values by using different h_id_start and the same + h_id_step (h_id_step has to be greater than the maximum value of + h_id_start). Default value is “1”.

1 0

git:5.2:983f6436: dialog: two spelling fixes in docs, small rephrasing
by Henning Westerholt 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.2 Commit: 983f6436719f5cb388b165ec6474be631263e2fb URL: https://github.com/kamailio/kamailio/commit/983f6436719f5cb388b165ec6474be6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-27T18:22:34+02:00 dialog: two spelling fixes in docs, small rephrasing (cherry picked from commit 21af49a8db75b80e6a910e6b6ed0412bbcf5608a) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/983f6436719f5cb388b165ec6474be6… Patch: https://github.com/kamailio/kamailio/commit/983f6436719f5cb388b165ec6474be6… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 4b111fb27a..0a461185ee 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1582,8 +1582,8 @@ modparam("dialog", "h_id_start", 5) dialog. Setting h_id_start and h_id_step to non-default values should be done when using dlg_db_load_callid(...) or dlg_db_load_extra() to load dialog records generated by another - &kamailio; instance, making also sure that those &kamailio; - nstances are not going to generate overalapping dialog hash id + &kamailio; instance. Pay attention to ensure that those &kamailio; + instances are not going to generate overlapping dialog hash id values by using different h_id_start and the same h_id_step (h_id_step has to be greater than the maximum value of h_id_start). </para>

1 0

git:master:21af49a8: dialog: two spelling fixes in docs, small rephrasing
by Henning Westerholt 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: 21af49a8db75b80e6a910e6b6ed0412bbcf5608a URL: https://github.com/kamailio/kamailio/commit/21af49a8db75b80e6a910e6b6ed0412… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-27T18:15:25+02:00 dialog: two spelling fixes in docs, small rephrasing --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/21af49a8db75b80e6a910e6b6ed0412… Patch: https://github.com/kamailio/kamailio/commit/21af49a8db75b80e6a910e6b6ed0412… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index a47989eb36..033ffdd2df 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1582,8 +1582,8 @@ modparam("dialog", "h_id_start", 5) dialog. Setting h_id_start and h_id_step to non-default values should be done when using dlg_db_load_callid(...) or dlg_db_load_extra() to load dialog records generated by another - &kamailio; instance, making also sure that those &kamailio; - nstances are not going to generate overalapping dialog hash id + &kamailio; instance. Pay attention to ensure that those &kamailio; + instances are not going to generate overlapping dialog hash id values by using different h_id_start and the same h_id_step (h_id_step has to be greater than the maximum value of h_id_start). </para>

1 0

git:5.1:75a2451c: pkg/kamailio/obs: removed deprecated fedora dists [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.1 Commit: 75a2451cb9fde8f8ec2d6f2d686cd9d093d4fee8 URL: https://github.com/kamailio/kamailio/commit/75a2451cb9fde8f8ec2d6f2d686cd9d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:35:37+03:00 pkg/kamailio/obs: removed deprecated fedora dists [skip ci] (cherry picked from commit 827713c8abb15c50828d7b0597fdf1024a45cbd5) --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/75a2451cb9fde8f8ec2d6f2d686cd9d… Patch: https://github.com/kamailio/kamailio/commit/75a2451cb9fde8f8ec2d6f2d686cd9d… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index f31b9ff31f..9e6620fbcb 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -42,16 +42,6 @@ <path project="Fedora:29" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_28"> - <path project="Fedora:28" repository="update"/> - <path project="Fedora:28" repository="standard"/> - <arch>x86_64</arch> - </repository> - <repository name="Fedora_27"> - <path project="Fedora:27" repository="update"/> - <path project="Fedora:27" repository="standard"/> - <arch>x86_64</arch> - </repository> <repository name="CentOS_7"> <path project="CentOS:CentOS-7" repository="standard"/> <path project="CentOS:CentOS-7" repository="update"/>

1 0

git:5.1:b57691a4: pkg/kamailio/obs: Added fedora rawhide packaging [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.1 Commit: b57691a414675654253ddba295b19abf9e2362b8 URL: https://github.com/kamailio/kamailio/commit/b57691a414675654253ddba295b19ab… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:35:37+03:00 pkg/kamailio/obs: Added fedora rawhide packaging [skip ci] (cherry picked from commit 94a20e8f0005f16b371833b315f8d64457709328) --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/b57691a414675654253ddba295b19ab… Patch: https://github.com/kamailio/kamailio/commit/b57691a414675654253ddba295b19ab… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6a9f26a0bb..5b2021ad1f 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -68,6 +68,56 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 31 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without phonenum +%bcond_without python3 +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 99 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without phonenum +%bcond_without python3 +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -682,6 +732,9 @@ Summary: Python extensions for Kamailio Group: System Environment/Daemons Requires: python, kamailio = %ver BuildRequires: python, python-devel +%if 0%{?fedora} +BuildRequires: python2-devel +%endif %description python Python extensions for Kamailio. @@ -976,20 +1029,9 @@ UUID module for Kamailio. sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py %endif -ln -s ../obs pkg/kamailio/fedora/27 -ln -s ../obs pkg/kamailio/fedora/28 -ln -s ../obs pkg/kamailio/fedora/29 -ln -s ../obs pkg/kamailio/fedora/30 -ln -s ../obs pkg/kamailio/rhel/6 -ln -s ../obs pkg/kamailio/rhel/7 -ln -s ../obs pkg/kamailio/opensuse/1315 -ln -s ../obs pkg/kamailio/opensuse/1330 -ln -s ../obs pkg/kamailio/opensuse/1550 -ln -s ../obs pkg/kamailio/centos/6 -ln -s ../obs pkg/kamailio/centos/7 - %build +ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} export FREERADIUS=1 %endif diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index b0b644b864..f31b9ff31f 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -24,6 +24,19 @@ <path project="Fedora:EPEL:6" repository="RHEL"/> <arch>x86_64</arch> </repository> + <repository name="Fedora_Rawhide"> + <path project="Fedora:Rawhide" repository="standard"/> + <arch>x86_64</arch> + </repository> + <repository name="Fedora_30"> + <path project="Fedora:30" repository="update"/> + <path project="Fedora:30" repository="standard"/> + <arch>x86_64</arch> + <arch>i586</arch> + <arch>armv7l</arch> + <arch>aarch64</arch> + <arch>ppc64le</arch> + </repository> <repository name="Fedora_29"> <path project="Fedora:29" repository="update"/> <path project="Fedora:29" repository="standard"/>

1 0

git:5.1:df5f9bde: pkg/kamailio/obs: fixed rpm buils for CentOS dist on OBS [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.1 Commit: df5f9bde1bc3246a250037397c8310e933740b90 URL: https://github.com/kamailio/kamailio/commit/df5f9bde1bc3246a250037397c8310e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:35:37+03:00 pkg/kamailio/obs: fixed rpm buils for CentOS dist on OBS [skip ci] (cherry picked from commit 3ac708b5d80faf1f7615eb884dba2ce2fc04bdf3) --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/df5f9bde1bc3246a250037397c8310e… Patch: https://github.com/kamailio/kamailio/commit/df5f9bde1bc3246a250037397c8310e… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 452d5d764d..b0b644b864 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -40,11 +40,13 @@ <arch>x86_64</arch> </repository> <repository name="CentOS_7"> + <path project="CentOS:CentOS-7" repository="standard"/> <path project="CentOS:CentOS-7" repository="update"/> <path project="Fedora:EPEL:7" repository="CentOS"/> <arch>x86_64</arch> </repository> <repository name="CentOS_6"> + <path project="CentOS:CentOS-6" repository="standard"/> <path project="CentOS:CentOS-6" repository="update"/> <path project="Fedora:EPEL:6" repository="CentOS"/> <arch>x86_64</arch>

1 0

git:5.1:4ad04d61: pkg/kamailio/obs: set correct group name for systemd unit files [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.1 Commit: 4ad04d611262d331334bcfd130a071828114ce04 URL: https://github.com/kamailio/kamailio/commit/4ad04d611262d331334bcfd130a0718… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:35:37+03:00 pkg/kamailio/obs: set correct group name for systemd unit files [skip ci] (cherry picked from commit e9671df3f458ad40d913bd2ce0792340a5df5948) --- Modified: pkg/kamailio/obs/sipcapture.service Modified: pkg/kamailio/obs/sipcapture.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/4ad04d611262d331334bcfd130a0718… Patch: https://github.com/kamailio/kamailio/commit/4ad04d611262d331334bcfd130a0718… --- diff --git a/pkg/kamailio/obs/sipcapture.service b/pkg/kamailio/obs/sipcapture.service index b6f18cb3ae..6395216308 100644 --- a/pkg/kamailio/obs/sipcapture.service +++ b/pkg/kamailio/obs/sipcapture.service @@ -8,6 +8,8 @@ After=mysqld.service [Service] Type=simple +User=kamailio +Group=kamailio WorkingDirectory=/run/sipcapture Environment='CFGFILE=/etc/kamailio/kamailio-sipcapture.cfg' Environment='SHM_MEMORY=32' @@ -18,8 +20,6 @@ PIDFile=/run/sipcapture/sipcapture.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -DD -P /run/sipcapture/sipcapture.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY Restart=on-failure -User=kamailio -Group=daemon [Install] diff --git a/pkg/kamailio/obs/sipcapture.tmpfiles b/pkg/kamailio/obs/sipcapture.tmpfiles index 17567963a8..12a5da7526 100644 --- a/pkg/kamailio/obs/sipcapture.tmpfiles +++ b/pkg/kamailio/obs/sipcapture.tmpfiles @@ -1 +1 @@ -D /run/sipcapture 0700 kamailio daemon - +D /run/sipcapture 0700 kamailio kamailio -

1 0

git:5.2:75c90d1e: pkg/kamailio/obs: removed deprecated fedora dists [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.2 Commit: 75c90d1e00170f07c8113b131f889e6a59d28192 URL: https://github.com/kamailio/kamailio/commit/75c90d1e00170f07c8113b131f889e6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:30:55+03:00 pkg/kamailio/obs: removed deprecated fedora dists [skip ci] (cherry picked from commit 827713c8abb15c50828d7b0597fdf1024a45cbd5) --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/75c90d1e00170f07c8113b131f889e6… Patch: https://github.com/kamailio/kamailio/commit/75c90d1e00170f07c8113b131f889e6… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 2f4b61d8e9..f536fe29ce 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -50,16 +50,6 @@ <path project="Fedora:29" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_28"> - <path project="Fedora:28" repository="update"/> - <path project="Fedora:28" repository="standard"/> - <arch>x86_64</arch> - </repository> - <repository name="Fedora_27"> - <path project="Fedora:27" repository="update"/> - <path project="Fedora:27" repository="standard"/> - <arch>x86_64</arch> - </repository> <repository name="CentOS_7"> <path project="CentOS:CentOS-7" repository="standard"/> <path project="CentOS:CentOS-7" repository="update"/>

1 0

git:5.2:e7e6b547: pkg/kamailio/obs: fixed rpm buils for CentOS dist on OBS [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.2 Commit: e7e6b547332fb5bdf22b595b9ea7e53794792b27 URL: https://github.com/kamailio/kamailio/commit/e7e6b547332fb5bdf22b595b9ea7e53… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:30:34+03:00 pkg/kamailio/obs: fixed rpm buils for CentOS dist on OBS [skip ci] (cherry picked from commit 3ac708b5d80faf1f7615eb884dba2ce2fc04bdf3) --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/e7e6b547332fb5bdf22b595b9ea7e53… Patch: https://github.com/kamailio/kamailio/commit/e7e6b547332fb5bdf22b595b9ea7e53… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index bec3a6b458..e6693e4729 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -48,11 +48,13 @@ <arch>x86_64</arch> </repository> <repository name="CentOS_7"> + <path project="CentOS:CentOS-7" repository="standard"/> <path project="CentOS:CentOS-7" repository="update"/> <path project="Fedora:EPEL:7" repository="CentOS"/> <arch>x86_64</arch> </repository> <repository name="CentOS_6"> + <path project="CentOS:CentOS-6" repository="standard"/> <path project="CentOS:CentOS-6" repository="update"/> <path project="Fedora:EPEL:6" repository="CentOS"/> <arch>x86_64</arch>

1 0

git:5.2:cffcefb6: pkg/kamailio/obs: Added fedora rawhide packaging [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.2 Commit: cffcefb66776667846b7e1b1c39059cdd0e8bdc9 URL: https://github.com/kamailio/kamailio/commit/cffcefb66776667846b7e1b1c39059c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:30:45+03:00 pkg/kamailio/obs: Added fedora rawhide packaging [skip ci] (cherry picked from commit 94a20e8f0005f16b371833b315f8d64457709328) --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/cffcefb66776667846b7e1b1c39059c… Patch: https://github.com/kamailio/kamailio/commit/cffcefb66776667846b7e1b1c39059c… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 76bd037c35..d60574ef02 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -102,6 +102,56 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 31 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without phonenum +%bcond_without python3 +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 99 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without phonenum +%bcond_without python3 +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -780,7 +830,9 @@ Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel %endif %endif - +%if 0%{?fedora} +BuildRequires: python2-devel +%endif %description python Python extensions for Kamailio. @@ -1099,21 +1151,9 @@ UUID module for Kamailio. sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py %endif -ln -s ../obs pkg/kamailio/fedora/27 -ln -s ../obs pkg/kamailio/fedora/28 -ln -s ../obs pkg/kamailio/fedora/29 -ln -s ../obs pkg/kamailio/fedora/30 -ln -s ../obs pkg/kamailio/rhel/6 -ln -s ../obs pkg/kamailio/rhel/7 -ln -s ../obs pkg/kamailio/opensuse/1315 -ln -s ../obs pkg/kamailio/opensuse/1330 -ln -s ../obs pkg/kamailio/opensuse/1500 -ln -s ../obs pkg/kamailio/opensuse/1550 -ln -s ../obs pkg/kamailio/centos/6 -ln -s ../obs pkg/kamailio/centos/7 - %build +ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} export FREERADIUS=1 %endif diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index e6693e4729..2f4b61d8e9 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -32,6 +32,19 @@ <path project="Fedora:EPEL:6" repository="RHEL"/> <arch>x86_64</arch> </repository> + <repository name="Fedora_Rawhide"> + <path project="Fedora:Rawhide" repository="standard"/> + <arch>x86_64</arch> + </repository> + <repository name="Fedora_30"> + <path project="Fedora:30" repository="update"/> + <path project="Fedora:30" repository="standard"/> + <arch>x86_64</arch> + <arch>i586</arch> + <arch>armv7l</arch> + <arch>aarch64</arch> + <arch>ppc64le</arch> + </repository> <repository name="Fedora_29"> <path project="Fedora:29" repository="update"/> <path project="Fedora:29" repository="standard"/>

1 0

git:5.2:66849717: pkg/kamailio/obs: set correct group name for systemd unit files [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: 5.2 Commit: 668497172343c01509a6ae17efc2c6e3ac26c770 URL: https://github.com/kamailio/kamailio/commit/668497172343c01509a6ae17efc2c6e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:30:09+03:00 pkg/kamailio/obs: set correct group name for systemd unit files [skip ci] (cherry picked from commit e9671df3f458ad40d913bd2ce0792340a5df5948) --- Modified: pkg/kamailio/obs/sipcapture.service Modified: pkg/kamailio/obs/sipcapture.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/668497172343c01509a6ae17efc2c6e… Patch: https://github.com/kamailio/kamailio/commit/668497172343c01509a6ae17efc2c6e… --- diff --git a/pkg/kamailio/obs/sipcapture.service b/pkg/kamailio/obs/sipcapture.service index b6f18cb3ae..6395216308 100644 --- a/pkg/kamailio/obs/sipcapture.service +++ b/pkg/kamailio/obs/sipcapture.service @@ -8,6 +8,8 @@ After=mysqld.service [Service] Type=simple +User=kamailio +Group=kamailio WorkingDirectory=/run/sipcapture Environment='CFGFILE=/etc/kamailio/kamailio-sipcapture.cfg' Environment='SHM_MEMORY=32' @@ -18,8 +20,6 @@ PIDFile=/run/sipcapture/sipcapture.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -DD -P /run/sipcapture/sipcapture.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY Restart=on-failure -User=kamailio -Group=daemon [Install] diff --git a/pkg/kamailio/obs/sipcapture.tmpfiles b/pkg/kamailio/obs/sipcapture.tmpfiles index 17567963a8..12a5da7526 100644 --- a/pkg/kamailio/obs/sipcapture.tmpfiles +++ b/pkg/kamailio/obs/sipcapture.tmpfiles @@ -1 +1 @@ -D /run/sipcapture 0700 kamailio daemon - +D /run/sipcapture 0700 kamailio kamailio -

1 0

git:master:827713c8: pkg/kamailio/obs: removed deprecated fedora dists [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: 827713c8abb15c50828d7b0597fdf1024a45cbd5 URL: https://github.com/kamailio/kamailio/commit/827713c8abb15c50828d7b0597fdf10… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:27:09+03:00 pkg/kamailio/obs: removed deprecated fedora dists [skip ci] --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/827713c8abb15c50828d7b0597fdf10… Patch: https://github.com/kamailio/kamailio/commit/827713c8abb15c50828d7b0597fdf10… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 2f4b61d8e9..f536fe29ce 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -50,16 +50,6 @@ <path project="Fedora:29" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_28"> - <path project="Fedora:28" repository="update"/> - <path project="Fedora:28" repository="standard"/> - <arch>x86_64</arch> - </repository> - <repository name="Fedora_27"> - <path project="Fedora:27" repository="update"/> - <path project="Fedora:27" repository="standard"/> - <arch>x86_64</arch> - </repository> <repository name="CentOS_7"> <path project="CentOS:CentOS-7" repository="standard"/> <path project="CentOS:CentOS-7" repository="update"/>

1 0

git:master:94a20e8f: pkg/kamailio/obs: Added fedora rawhide packaging [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: 94a20e8f0005f16b371833b315f8d64457709328 URL: https://github.com/kamailio/kamailio/commit/94a20e8f0005f16b371833b315f8d64… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:27:09+03:00 pkg/kamailio/obs: Added fedora rawhide packaging [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/94a20e8f0005f16b371833b315f8d64… Patch: https://github.com/kamailio/kamailio/commit/94a20e8f0005f16b371833b315f8d64… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9dec32a876..9dc8a2a249 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -102,6 +102,56 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 31 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without phonenum +%bcond_without python3 +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 99 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without phonenum +%bcond_without python3 +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -780,7 +830,9 @@ Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel %endif %endif - +%if 0%{?fedora} +BuildRequires: python2-devel +%endif %description python Python extensions for Kamailio. @@ -1108,21 +1160,9 @@ UUID module for Kamailio. sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py %endif -ln -s ../obs pkg/kamailio/fedora/27 -ln -s ../obs pkg/kamailio/fedora/28 -ln -s ../obs pkg/kamailio/fedora/29 -ln -s ../obs pkg/kamailio/fedora/30 -ln -s ../obs pkg/kamailio/rhel/6 -ln -s ../obs pkg/kamailio/rhel/7 -ln -s ../obs pkg/kamailio/opensuse/1315 -ln -s ../obs pkg/kamailio/opensuse/1330 -ln -s ../obs pkg/kamailio/opensuse/1500 -ln -s ../obs pkg/kamailio/opensuse/1550 -ln -s ../obs pkg/kamailio/centos/6 -ln -s ../obs pkg/kamailio/centos/7 - %build +ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} export FREERADIUS=1 %endif diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index e6693e4729..2f4b61d8e9 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -32,6 +32,19 @@ <path project="Fedora:EPEL:6" repository="RHEL"/> <arch>x86_64</arch> </repository> + <repository name="Fedora_Rawhide"> + <path project="Fedora:Rawhide" repository="standard"/> + <arch>x86_64</arch> + </repository> + <repository name="Fedora_30"> + <path project="Fedora:30" repository="update"/> + <path project="Fedora:30" repository="standard"/> + <arch>x86_64</arch> + <arch>i586</arch> + <arch>armv7l</arch> + <arch>aarch64</arch> + <arch>ppc64le</arch> + </repository> <repository name="Fedora_29"> <path project="Fedora:29" repository="update"/> <path project="Fedora:29" repository="standard"/>

1 0

git:master:3ac708b5: pkg/kamailio/obs: fixed rpm buils for CentOS dist on OBS [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: 3ac708b5d80faf1f7615eb884dba2ce2fc04bdf3 URL: https://github.com/kamailio/kamailio/commit/3ac708b5d80faf1f7615eb884dba2ce… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:27:08+03:00 pkg/kamailio/obs: fixed rpm buils for CentOS dist on OBS [skip ci] --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/3ac708b5d80faf1f7615eb884dba2ce… Patch: https://github.com/kamailio/kamailio/commit/3ac708b5d80faf1f7615eb884dba2ce… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index bec3a6b458..e6693e4729 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -48,11 +48,13 @@ <arch>x86_64</arch> </repository> <repository name="CentOS_7"> + <path project="CentOS:CentOS-7" repository="standard"/> <path project="CentOS:CentOS-7" repository="update"/> <path project="Fedora:EPEL:7" repository="CentOS"/> <arch>x86_64</arch> </repository> <repository name="CentOS_6"> + <path project="CentOS:CentOS-6" repository="standard"/> <path project="CentOS:CentOS-6" repository="update"/> <path project="Fedora:EPEL:6" repository="CentOS"/> <arch>x86_64</arch>

1 0

git:master:e9671df3: pkg/kamailio/obs: set correct group name for systemd unit files [skip ci]
by Sergey Safarov 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: e9671df3f458ad40d913bd2ce0792340a5df5948 URL: https://github.com/kamailio/kamailio/commit/e9671df3f458ad40d913bd2ce079234… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-27T13:27:08+03:00 pkg/kamailio/obs: set correct group name for systemd unit files [skip ci] --- Modified: pkg/kamailio/obs/sipcapture.service Modified: pkg/kamailio/obs/sipcapture.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/e9671df3f458ad40d913bd2ce079234… Patch: https://github.com/kamailio/kamailio/commit/e9671df3f458ad40d913bd2ce079234… --- diff --git a/pkg/kamailio/obs/sipcapture.service b/pkg/kamailio/obs/sipcapture.service index b6f18cb3ae..6395216308 100644 --- a/pkg/kamailio/obs/sipcapture.service +++ b/pkg/kamailio/obs/sipcapture.service @@ -8,6 +8,8 @@ After=mysqld.service [Service] Type=simple +User=kamailio +Group=kamailio WorkingDirectory=/run/sipcapture Environment='CFGFILE=/etc/kamailio/kamailio-sipcapture.cfg' Environment='SHM_MEMORY=32' @@ -18,8 +20,6 @@ PIDFile=/run/sipcapture/sipcapture.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -DD -P /run/sipcapture/sipcapture.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY Restart=on-failure -User=kamailio -Group=daemon [Install] diff --git a/pkg/kamailio/obs/sipcapture.tmpfiles b/pkg/kamailio/obs/sipcapture.tmpfiles index 17567963a8..12a5da7526 100644 --- a/pkg/kamailio/obs/sipcapture.tmpfiles +++ b/pkg/kamailio/obs/sipcapture.tmpfiles @@ -1 +1 @@ -D /run/sipcapture 0700 kamailio daemon - +D /run/sipcapture 0700 kamailio kamailio -

1 0

git:master:1fdabbf5: app_perl: log the number of reset cycles in debug message
by Daniel-Constantin Mierla 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: 1fdabbf5ce5fd218a47b7d147ebec5c6c45c1cce URL: https://github.com/kamailio/kamailio/commit/1fdabbf5ce5fd218a47b7d147ebec5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-27T12:23:05+02:00 app_perl: log the number of reset cycles in debug message --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1fdabbf5ce5fd218a47b7d147ebec5c… Patch: https://github.com/kamailio/kamailio/commit/1fdabbf5ce5fd218a47b7d147ebec5c… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 2fb711706c..942581c6d6 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -201,7 +201,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; @@ -380,6 +380,7 @@ static void destroy(void) } +static int app_perl_reset_n = 0; /** * count executions and rest interpreter * @@ -400,8 +401,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) { @@ -411,10 +414,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

git:master:5eb2eca0: tools: allow one whitespace between route and name, kamailio parser accept it as well
by Henning Westerholt 27 Sep '19

27 Sep '19

Module: kamailio Branch: master Commit: 5eb2eca034d07f0fdb65cbcee2847945d476cbe2 URL: https://github.com/kamailio/kamailio/commit/5eb2eca034d07f0fdb65cbcee284794… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-27T11:36:28+02:00 tools: allow one whitespace between route and name, kamailio parser accept it as well --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/5eb2eca034d07f0fdb65cbcee284794… Patch: https://github.com/kamailio/kamailio/commit/5eb2eca034d07f0fdb65cbcee284794… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index f5633c92fd..c6545ec9df 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -32,7 +32,7 @@ debug = 0 re_main_route = re.compile("^([a-z]+_)*route[\s\t]*(?![])[\s\t]*\{?", re.I) -re_def_route = re.compile("^([a-z]+_)*route(\[\"?([A-Za-z0-9-_:]+)\"?\])+[\s\t]*\{?", re.I) +re_def_route = re.compile("^([a-z]+_)*route ?(\[\"?([A-Za-z0-9-_:]+)\"?\])+[\s\t]*\{?", re.I) re_call_route = re.compile("^(.*$[\s\t!]*)?route\(\"?([A-Za-z0-9-_]+)\"?$", re.I) routes = {} f_routes = {}

1 0

git:master:9490ec06: app_perl: set G_EVAL flag when executing perl_destroy_func
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: master Commit: 9490ec06d3cf0cfd0b0cf2d0a5ef701ccdabcaba URL: https://github.com/kamailio/kamailio/commit/9490ec06d3cf0cfd0b0cf2d0a5ef701… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T23:09:37+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 --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9490ec06d3cf0cfd0b0cf2d0a5ef701… Patch: https://github.com/kamailio/kamailio/commit/9490ec06d3cf0cfd0b0cf2d0a5ef701… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 3852fa118c..2fb711706c 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -401,7 +401,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

[kamailio/kamailio] EOF in pass_fd.c:receive_fd() (#2075)
by Alex Balashov 26 Sep '19

26 Sep '19

Running `Kamailio 4.4.7:97f308` with heavy `app_perl` usage, `usrloc` (`db_mode` 3) and not much else. After an upgrade from 4.1, getting periodic death like this: ``` Sep 25 20:54:28 switch /sbin/kamailio[29771]: CRITICAL: <core> [pass_fd.c:277]: receive_fd(): EOF on 9 ``` Also happens on 4.2.x. It happens every 30-31 minutes or so on the dot, which suggests that there is some sort of background operation on this operator's system elsewhere that is causing this, but I haven't been able to find it. Anyway, the PID is that of the TCP main marshalling process, i.e. ``` # kamcmd ps | grep -i tcp 15716 tcp receiver (generic) child=0 15717 tcp receiver (generic) child=1 15718 tcp receiver (generic) child=2 15719 tcp receiver (generic) child=3 15720 tcp receiver (generic) child=4 15721 tcp receiver (generic) child=5 15722 tcp receiver (generic) child=6 15723 tcp receiver (generic) child=7 15724 tcp receiver (generic) child=8 15725 tcp receiver (generic) child=9 15726 tcp receiver (generic) child=10 15727 tcp receiver (generic) child=11 15728 tcp receiver (generic) child=12 15729 tcp receiver (generic) child=13 15730 tcp receiver (generic) child=14 15731 tcp receiver (generic) child=15 15732 tcp main process ``` In this case, that would be `15732`. I assume this is because one of the TCP receiver processes dies, but I haven't been able to find any evidence of that. This is a high-volume system, so I can't reduce the worker thread pool too much, but I tried reducing the number of child processes per listener from 16 to 3, and attaching GDB to each one. They all die normally upon receipt of `SIGTERM`: ``` Program received signal SIGTERM, Terminated. 0x00002b1517a436f3 in __epoll_wait_nocancel () from /lib64/libc.so.6 ``` Yet, it is the TCP distributor thread that shows the EOF in `receive_fd()`. Because it's not a crash per se, I don't have a core dump or a way of grabbing the state of the program at the exact moment of the crash. All the processes seem to exit normally. I have read some past issues that mention this, but their ultimate causes don't seem to be relevant here (e.g. no `dialog` usage). Moreover, the commits made to address this issue in other forms are present in the latest 4.4.x. For reasons related to the high traffic volume, running with a higher debug verbosity level or some other fairly obvious ideas (e.g. no forking) aren't practical at all. Any suggestions welcome! -- 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/2075

2 12

Kamailio Rasberry Pi benchmark results
by Henning Westerholt 26 Sep '19

26 Sep '19

Hello, as promised here the report on my Rasberry Pi benchmarks. The numbers were quite impressive! - 3000 registration requests per second (in-memory usrloc) - 300 calls per second for a p2p call (default cfg, only SIP traffic) - about 18 MBit/s incoming and 16 MBit/s outgoing SIP peak traffic could be processed All the details about the test setup and more numbers in the blog post: https://skalatan.de/blog/kamailio-rpi-benchmark Cheers, Henning -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

1 0

AstriDevcon
by Fred Posner 26 Sep '19

26 Sep '19

I've been "accepted" to the AstriDevcon the day prior to Astricon (end of October). If there are any interoperability issues and or dev changes you would like seen with the Asterisk project, I'll be more than happy to proxy them. After all, we're good at proxying. =) With best regards, Fred Posner https://qxork.com Matrix: @fred:matrix.lod.com

1 0

Kamailio v5.1.9 Released
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Hello, Kamailio SIP Server v5.1.9 stable release is out. This is a maintenance release of the previous stable branch, 5.1, that includes fixes since the release of v5.1.8. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.9 or to v5.2.x series. For more details about version 5.1.9 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/09/kamailio-v5-1-9-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the branch 5.1 is the previous stable branch. The latest stable branch is 5.2, at this time with v5.2.4 being released out of it. 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 World Conference - April 27-29, 2020 -- www.kamailioworld.com

2 1

git:5.1:93d4b96e: ChangeLog: content updated for v5.1.9
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.1 Commit: 93d4b96eb3e704ad02edb9c0de63e658011e106c URL: https://github.com/kamailio/kamailio/commit/93d4b96eb3e704ad02edb9c0de63e65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T14:42:02+02:00 ChangeLog: content updated for v5.1.9 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/93d4b96eb3e704ad02edb9c0de63e65… Patch: https://github.com/kamailio/kamailio/commit/93d4b96eb3e704ad02edb9c0de63e65…

1 0

git:5.1:14475598: Makefile.defs: version set to 5.1.9
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.1 Commit: 144755988f07226aeb23bb8009af80038dedbe35 URL: https://github.com/kamailio/kamailio/commit/144755988f07226aeb23bb8009af800… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T14:28:57+02:00 Makefile.defs: version set to 5.1.9 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/144755988f07226aeb23bb8009af800… Patch: https://github.com/kamailio/kamailio/commit/144755988f07226aeb23bb8009af800… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 7085940a93..a17aa9ecc7 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 8 +SUBLEVEL = 9 EXTRAVERSION = # memory manager switcher

1 0

[kamailio/kamailio] ims_ipsec_pcscf : fixed using ipsec_create (#2074)
by Yasin CANER 26 Sep '19

26 Sep '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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  in order to add Server-header to 401 Replies , it has to been permit using in failure routes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2074 -- Commit Summary -- * ims_ipsec_pcscf : fixed using ipsec_create -- File Changes -- M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2074.patch https://github.com/kamailio/kamailio/pull/2074.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/2074

1 1

git:5.1:da88e90f: pkg/kamailio/deb: version set 5.1.9
by Victor Seva 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.1 Commit: da88e90f568a14e16dc1897473036d4c54d09ff7 URL: https://github.com/kamailio/kamailio/commit/da88e90f568a14e16dc1897473036d4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-09-26T09:32:07+02:00 pkg/kamailio/deb: version set 5.1.9 --- 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/da88e90f568a14e16dc1897473036d4… Patch: https://github.com/kamailio/kamailio/commit/da88e90f568a14e16dc1897473036d4… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8

1 0

git:master:b6a0d86b: modules: readme files regenerated - db_cassandra ... [skip ci]
by Kamailio Dev 26 Sep '19

26 Sep '19

Module: kamailio Branch: master Commit: b6a0d86b79dcc8eacbf725a3f5d6b8d123b14fc1 URL: https://github.com/kamailio/kamailio/commit/b6a0d86b79dcc8eacbf725a3f5d6b8d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-26T09:31:48+02:00 modules: readme files regenerated - db_cassandra ... [skip ci] --- Modified: src/modules/db_cassandra/README --- Diff: https://github.com/kamailio/kamailio/commit/b6a0d86b79dcc8eacbf725a3f5d6b8d… Patch: https://github.com/kamailio/kamailio/commit/b6a0d86b79dcc8eacbf725a3f5d6b8d… --- diff --git a/src/modules/db_cassandra/README b/src/modules/db_cassandra/README index 99cb2bac5b..443f91f1fc 100644 --- a/src/modules/db_cassandra/README +++ b/src/modules/db_cassandra/README @@ -61,6 +61,13 @@ Chapter 1. Admin Guide 1. Overview + Note: the module requires old version of external library, not + compiling with those available out of the stock in the Linux + distributions. It is going to be kept for a while in case someone wants + to pick it up and upgrade. Also, the module was never extensively + tested, therefore take the appropriate actions in case you plan to use + it. + Db_cassandra is one of the Kamailio database modules. It does not export any functions executable from the configuration scripts, but it exports a subset of functions using the database API, and thus, other

1 0

git:master:f87f2570: modules: readme files regenerated - dialog ... [skip ci]
by The Root 26 Sep '19

26 Sep '19

Module: kamailio Branch: master Commit: f87f25700aa64f82e9c359cf1788061160dd2276 URL: https://github.com/kamailio/kamailio/commit/f87f25700aa64f82e9c359cf1788061… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2019-09-26T09:31:41+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/f87f25700aa64f82e9c359cf1788061… Patch: https://github.com/kamailio/kamailio/commit/f87f25700aa64f82e9c359cf1788061… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index aecc47fb70..8f3f36a9c8 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1986,9 +1986,9 @@ kamcmd dlg.list_match_ctx furi sw sip:alice@ RPC Command Format: ... -kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 +kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 ... -kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 +kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 ... 9.6. dlg.dlg_list_ctx

1 0

git:5.1:75bff53a: pkg: rpm/specs updated for v5.1.9
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.1 Commit: 75bff53a401d1676d9fa914ea44f48ee93e0467c URL: https://github.com/kamailio/kamailio/commit/75bff53a401d1676d9fa914ea44f48e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T09:24:53+02:00 pkg: rpm/specs updated for v5.1.9 --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/freebsd/Makefile Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/openbsd/Makefile Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/75bff53a401d1676d9fa914ea44f48e… Patch: https://github.com/kamailio/kamailio/commit/75bff53a401d1676d9fa914ea44f48e… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index b694d3fdd1..155dce82bc 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.8 +pkgver=5.1.9 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 1aca5b0085..23082ec857 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.8 +%define ver 5.1.9 %define rel 0%{dist} diff --git a/pkg/kamailio/freebsd/Makefile b/pkg/kamailio/freebsd/Makefile index 0bbca37c0d..d77e70e00b 100644 --- a/pkg/kamailio/freebsd/Makefile +++ b/pkg/kamailio/freebsd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kamailio -PORTVERSION= 5.1.8 +PORTVERSION= 5.1.9 CATEGORIES= net MASTER_SITES= http://kamailio.org/pub/kamailio/${PORTVERSION}/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-tls_src diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9a7c7ca00e..6a9f26a0bb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.8 +%define ver 5.1.9 %define rel 0%{dist} %if 0%{?fedora} == 27 diff --git a/pkg/kamailio/openbsd/Makefile b/pkg/kamailio/openbsd/Makefile index 2b1c04be86..6a16c0178b 100644 --- a/pkg/kamailio/openbsd/Makefile +++ b/pkg/kamailio/openbsd/Makefile @@ -12,7 +12,7 @@ COMMENT-carrierroute = kamailio carrierroute module COMMENT-snmpstats = kamailio snmpstats module COMMENT-perl = kamailio perl modules -VERSION = 5.1.7 +VERSION = 5.1.9 DISTNAME = kamailio-${VERSION} PKGNAME-main = kamailio-${VERSION} PKGNAME-mysql = kamailio-mysql-${VERSION} diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 8e565640f4..52b507fbd4 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.1.8 +%define ver 5.1.9 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 0fe7318c76..26721beb90 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.1.8 +%define ver 5.1.9 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 8387efd42a..659f196e68 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.8 +%define ver 5.1.9 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index b8274b4dbb..49bd4258b1 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.8 +%define ver 5.1.9 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index bd437aee43..cdcd445401 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.8 +%define ver 5.1.9 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:master:39b7b407: db_cassandra: docs - note about the state of the module
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: master Commit: 39b7b4073465fd5343297683c59d75510c87d195 URL: https://github.com/kamailio/kamailio/commit/39b7b4073465fd5343297683c59d755… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T09:19:46+02:00 db_cassandra: docs - note about the state of the module --- Modified: src/modules/db_cassandra/doc/db_cassandra_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/39b7b4073465fd5343297683c59d755… Patch: https://github.com/kamailio/kamailio/commit/39b7b4073465fd5343297683c59d755… --- diff --git a/src/modules/db_cassandra/doc/db_cassandra_admin.xml b/src/modules/db_cassandra/doc/db_cassandra_admin.xml index a9852c984f..0becd4af02 100644 --- a/src/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/src/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -16,6 +16,13 @@ <section> <title>Overview</title> + <para> + Note: the module requires old version of external library, not compiling + with those available out of the stock in the Linux distributions. It is + going to be kept for a while in case someone wants to pick it up and + upgrade. Also, the module was never extensively tested, therefore take + the appropriate actions in case you plan to use it. + </para> <para> Db_cassandra is one of the &kamailio; database modules. It does not export any functions executable from the configuration scripts,

1 0

[kamailio/kamailio] Db_cassandra module in kamailio/kamailio-cli docker image (#2071)
by Gaurav Bmotra 26 Sep '19

26 Sep '19

hi please Add Db_cassandra 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/2071

3 4

Planning the release of v5.1.9
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Hello, I am considering to release v5.1.9 out of the branch 5.1 during the next week, on Tuesday (Sep 24) or Thursday (Sep 26). As usual, if you are aware of issues not reported on tracker or commits that should be backported to branch 5.1, do report them asap in order to get them a chance to be sorted out. 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 2

git:5.1:7ff08c14: app_python: implement missing types for 3 params
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.1 Commit: 7ff08c140d5205ebecba3adb22c05e4a8486b64d URL: https://github.com/kamailio/kamailio/commit/7ff08c140d5205ebecba3adb22c05e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T08:04:03+02:00 app_python: implement missing types for 3 params (cherry picked from commit 261cb0f91e7a85bf56c64bbf929673c46197efcf) (cherry picked from commit 695bdaf4a0501c9b5d455052141f42f9f7d8b349) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7ff08c140d5205ebecba3adb22c05e4… Patch: https://github.com/kamailio/kamailio/commit/7ff08c140d5205ebecba3adb22c05e4…

1 0

git:5.2:02d70893: app_python3: implement missing types for 3 params
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.2 Commit: 02d70893718a96f552dc6426d016a0342e47247f URL: https://github.com/kamailio/kamailio/commit/02d70893718a96f552dc6426d016a03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T08:02:22+02:00 app_python3: implement missing types for 3 params (cherry picked from commit eeeecadeb1452972de7386354dfca37f483cef06) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/02d70893718a96f552dc6426d016a03… Patch: https://github.com/kamailio/kamailio/commit/02d70893718a96f552dc6426d016a03… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 15820cafd0..c9e61e78da 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -277,15 +277,15 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_DBG("params[%d] for: %.*s are int-int-int: [%d] [%d] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].n, vps[2].n); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT - && ket->ptypes[2]==SR_KEMIP_STR) { + && ket->ptypes[2]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "iis:kemi-param-nns", &vps[0].n, - &vps[1].n, &vps[2].s.s)) { + &vps[1].n, &vps[2].s.s)) { LM_ERR("unable to retrieve int-int-str params %d\n", i); return sr_kemi_apy_return_false(); } vps[2].s.len = strlen(vps[2].s.s); LM_DBG("params[%d] for: %.*s are int-int-str: [%d] [%d] [%.*s]\n", i, - fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); + fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "isi:kemi-param-nsn", &vps[0].n, @@ -296,6 +296,18 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[1].s.len = strlen(vps[1].s.s); LM_DBG("params[%d] for: %.*s are int-str-int: [%d] [%.*s] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].s.len, vps[1].s.s, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "iss:kemi-param-nss", &vps[0].n, + &vps[1].s.s, &vps[2].s.s)) { + LM_ERR("unable to retrieve int-str-str param %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are int-str-str: [%d] [%.*s]" + " [%.*s]\n", i, fname.len, fname.s, + vps[0].n, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "sii:kemi-param-snn", &vps[0].s.s, @@ -307,6 +319,19 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_DBG("params[%d] for: %.*s are str-int: [%.*s] [%d] [%d]\n", i, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].n, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "sis:kemi-param-ssn", &vps[0].s.s, + &vps[1].n, &vps[2].s.s)) { + LM_ERR("unable to retrieve str-int-str param %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str-str-int: [%.*s] [%d] [%.*s]\n", + i, fname.len, fname.s, + vps[0].s.len, vps[0].s.s, + vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "ssi:kemi-param-ssn", &vps[0].s.s, @@ -330,7 +355,7 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[0].s.len = strlen(vps[0].s.s); vps[1].s.len = strlen(vps[1].s.s); vps[2].s.len = strlen(vps[2].s.s); - LM_DBG("params[%d] for: %.*s are str-str-int: [%.*s] [%.*s]" + LM_DBG("params[%d] for: %.*s are str-str-str: [%.*s] [%.*s]" " [%.*s]\n", i, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s);

1 0

git:5.2:695bdaf4: app_python: implement missing types for 3 params
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.2 Commit: 695bdaf4a0501c9b5d455052141f42f9f7d8b349 URL: https://github.com/kamailio/kamailio/commit/695bdaf4a0501c9b5d455052141f42f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T08:02:12+02:00 app_python: implement missing types for 3 params (cherry picked from commit 261cb0f91e7a85bf56c64bbf929673c46197efcf) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/695bdaf4a0501c9b5d455052141f42f… Patch: https://github.com/kamailio/kamailio/commit/695bdaf4a0501c9b5d455052141f42f…

1 0

Kamailio ARM support improved, tests
by Henning Westerholt 25 Sep '19

25 Sep '19

Hello, as part of the testing for 5.3.0 I looked into the ARM support in Kamailio. Previously the core used some deprecated assembler functions for atomic operations (locking etc..). There was also no native support for the ARM v7 architecture available. After several fixes and extensions both topics should be now much improved. I did today a lot of tests on Rasberry Pi and also some benchmarking (will send another e-mail when the report is ready). If you use Kamailio on another embedded ARM (>= v6) system it would be great if you also give it a try. Use git master revision ccc0eb6d12a1d (or newer) for your tests. Please report eventual issues to the sr-dev list. Cheers, Henning -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

1 0

git:master:ccc0eb6d: Makefile.defs: remove over-specific -fmpu definition, not needed according to my tests
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: ccc0eb6d12a1deb61536d7887d0baf73a9cc639f URL: https://github.com/kamailio/kamailio/commit/ccc0eb6d12a1deb61536d7887d0baf7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T17:04:05+02:00 Makefile.defs: remove over-specific -fmpu definition, not needed according to my tests --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ccc0eb6d12a1deb61536d7887d0baf7… Patch: https://github.com/kamailio/kamailio/commit/ccc0eb6d12a1deb61536d7887d0baf7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index dad6b7a36b..e5fa7fdda1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1340,9 +1340,8 @@ ifeq ($(ARCH), arm7) # if gcc ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM - #common stuff, use armv7-a similar to debian - #build flags from https://wiki.debian.org/ArmHardFloatPort - CFLAGS=-march=armv7-a -mfpu=vfpv3-d16 $(CC_OPT) -funroll-loops -fsigned-char \ + #common stuff, use armv7-a as lowest common architecture + CFLAGS=-march=armv7-a $(CC_OPT) -funroll-loops -fsigned-char \ $(PROFILE) #if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

1 0

Generating CDRs in JSON format
by Lucian Balaceanu 25 Sep '19

25 Sep '19

Hello guys, I am trying to get the CDRs generated in JSON format just as acc_json module does for transactions accounting, but for now I didn't find a way to do this directly from Kamailio. Please correct me if I am wrong. As far as I understood from the code, acc_json and other modules extending the acc itself are based on the acc_engine structure that contains different function pointers. acc module, by means of acc_run_engines() then calls the appropriate functions in various places. The programming solutions are at least: * extend inside the acc module itself the (log_)write_cdr() function to offer on demand JSON output -- simple to implement, breaks the adaptability given until now by the acc engines * create a sort of an acc_engine for CDRs as well and have this called from an external module (acc_json module) Is there an implementation preference you see in order to attain this CDR as JSON? Do you have any suggestions? Thank you, Lucian Balaceanu

2 1

Re: [sr-dev] [kamailio/kamailio] misc/examples/ims/pcscf/route: Update the rest of the routing scripts for P-CSCF with IPSec support; Fix Rx_AAR() calls. (8f5b70c)
by Yasin CANER 25 Sep '19

25 Sep '19

well , is it possible to catch 401 reply in on_reply_route ? I think it should be in failure_route but it is impossible because ipsec_create function can be on only on OK replies. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/8f5b70ca81e1d49c926a6174191ffe8…

1 0

git:master:074c7ce1: smsops: cast to unsigned long, related to commit a61e04757d5f
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 074c7ce165704aaea0d5ec3cd0d920656c1cd255 URL: https://github.com/kamailio/kamailio/commit/074c7ce165704aaea0d5ec3cd0d9206… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:35:47+02:00 smsops: cast to unsigned long, related to commit a61e04757d5f --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/074c7ce165704aaea0d5ec3cd0d9206… Patch: https://github.com/kamailio/kamailio/commit/074c7ce165704aaea0d5ec3cd0d9206… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index be341b13f3..8dfe70163a 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -469,7 +469,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { if (!rp_data) { rp_data = (sms_rp_data_t*)pkg_malloc(sizeof(struct _sms_rp_data)); if (!rp_data) { - LM_ERR("Error allocating %lu bytes!\n", (long)sizeof(struct _sms_rp_data)); + LM_ERR("Error allocating %lu bytes!\n", (unsigned long)sizeof(struct _sms_rp_data)); return -1; } } else { @@ -846,7 +846,7 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) if (!rp_send_data) { rp_send_data = (sms_rp_data_t*)pkg_malloc(sizeof(struct _sms_rp_data)); if (!rp_send_data) { - LM_ERR("Error allocating %lu bytes!\n", (long)sizeof(struct _sms_rp_data)); + LM_ERR("Error allocating %lu bytes!\n", (unsigned long)sizeof(struct _sms_rp_data)); return -1; } // Initialize structure:

1 0

git:master:ea141f0a: jsonrpcs: cast to unsigned long, related to commit e624cbfa4b0df
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: ea141f0a63cf8a09eb11df53929ead49c5a07338 URL: https://github.com/kamailio/kamailio/commit/ea141f0a63cf8a09eb11df53929ead4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:35:47+02:00 jsonrpcs: cast to unsigned long, related to commit e624cbfa4b0df --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea141f0a63cf8a09eb11df53929ead4… Patch: https://github.com/kamailio/kamailio/commit/ea141f0a63cf8a09eb11df53929ead4… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index da5f199fb6..d939be5d0f 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1011,7 +1011,7 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) return 0; } if(nj->valuestring!=NULL && strlen(nj->valuestring)>JSONRPC_ID_SIZE-1) { - LM_ERR("id attribute is too long (%lu/%d)\n", (long)strlen(nj->valuestring), + LM_ERR("id attribute is too long (%lu/%d)\n", (unsigned long)strlen(nj->valuestring), JSONRPC_ID_SIZE); return 0; }

1 0

git:master:ed0bc07d: call_obj: cast to unsigned long, related to commit 2a2780cb6b04
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: ed0bc07dd66f954757695eebbcd7e49dc5333a9d URL: https://github.com/kamailio/kamailio/commit/ed0bc07dd66f954757695eebbcd7e49… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:35:47+02:00 call_obj: cast to unsigned long, related to commit 2a2780cb6b04 --- Modified: src/modules/call_obj/cobj.c --- Diff: https://github.com/kamailio/kamailio/commit/ed0bc07dd66f954757695eebbcd7e49… Patch: https://github.com/kamailio/kamailio/commit/ed0bc07dd66f954757695eebbcd7e49… --- diff --git a/src/modules/call_obj/cobj.c b/src/modules/call_obj/cobj.c index 1d513ded77..fc839bf3d7 100644 --- a/src/modules/call_obj/cobj.c +++ b/src/modules/call_obj/cobj.c @@ -112,15 +112,15 @@ int cobj_init(int start, int end) size_t total_size = (1 + end - start); /* [start, end] */ size_t array_size = total_size * sizeof(co_object_t); - LM_DBG("Element size: %lu\n", (long)sizeof(co_object_t)); - LM_DBG("List element size: %lu\n", (long)sizeof(cobj_elem_t)); + LM_DBG("Element size: %lu\n", (unsigned long)sizeof(co_object_t)); + LM_DBG("List element size: %lu\n", (unsigned long)sizeof(cobj_elem_t)); co_data->ring = (co_object_t*)shm_malloc(array_size); if (!co_data->ring) { LM_ERR("Cannot allocate shm memory for ring in call object\n"); return -1; } - LM_DBG("Allocated %lu bytes for the ring\n", (long)array_size); + LM_DBG("Allocated %lu bytes for the ring\n", (unsigned long)array_size); /* * Initialize lock.

1 0

git:master:2a2780cb: call_obj: fix compile warning, size_t is unsigned int on 32 bit architectures
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 2a2780cb6b043baca964db19b45c46d9d9adc754 URL: https://github.com/kamailio/kamailio/commit/2a2780cb6b043baca964db19b45c46d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T14:19:21+02:00 call_obj: fix compile warning, size_t is unsigned int on 32 bit architectures --- Modified: src/modules/call_obj/cobj.c --- Diff: https://github.com/kamailio/kamailio/commit/2a2780cb6b043baca964db19b45c46d… Patch: https://github.com/kamailio/kamailio/commit/2a2780cb6b043baca964db19b45c46d… --- diff --git a/src/modules/call_obj/cobj.c b/src/modules/call_obj/cobj.c index be16c2c76a..1d513ded77 100644 --- a/src/modules/call_obj/cobj.c +++ b/src/modules/call_obj/cobj.c @@ -112,15 +112,15 @@ int cobj_init(int start, int end) size_t total_size = (1 + end - start); /* [start, end] */ size_t array_size = total_size * sizeof(co_object_t); - LM_DBG("Element size: %lu\n", sizeof(co_object_t)); - LM_DBG("List element size: %lu\n", sizeof(cobj_elem_t)); + LM_DBG("Element size: %lu\n", (long)sizeof(co_object_t)); + LM_DBG("List element size: %lu\n", (long)sizeof(cobj_elem_t)); co_data->ring = (co_object_t*)shm_malloc(array_size); if (!co_data->ring) { LM_ERR("Cannot allocate shm memory for ring in call object\n"); return -1; } - LM_DBG("Allocated %lu bytes for the ring\n", array_size); + LM_DBG("Allocated %lu bytes for the ring\n", (long)array_size); /* * Initialize lock.

2 2

git:master:eeeecade: app_python3: implement missing types for 3 params
by Daniel-Constantin Mierla 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: eeeecadeb1452972de7386354dfca37f483cef06 URL: https://github.com/kamailio/kamailio/commit/eeeecadeb1452972de7386354dfca37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T15:16:38+02:00 app_python3: implement missing types for 3 params --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/eeeecadeb1452972de7386354dfca37… Patch: https://github.com/kamailio/kamailio/commit/eeeecadeb1452972de7386354dfca37… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index ace7dd0f20..429e3615c5 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -313,15 +313,15 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_DBG("params[%d] for: %.*s are int-int-int: [%d] [%d] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].n, vps[2].n); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT - && ket->ptypes[2]==SR_KEMIP_STR) { + && ket->ptypes[2]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "iis:kemi-param-nns", &vps[0].n, - &vps[1].n, &vps[2].s.s)) { + &vps[1].n, &vps[2].s.s)) { LM_ERR("unable to retrieve int-int-str params %d\n", i); return sr_kemi_apy_return_false(); } vps[2].s.len = strlen(vps[2].s.s); LM_DBG("params[%d] for: %.*s are int-int-str: [%d] [%d] [%.*s]\n", i, - fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); + fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "isi:kemi-param-nsn", &vps[0].n, @@ -332,6 +332,18 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[1].s.len = strlen(vps[1].s.s); LM_DBG("params[%d] for: %.*s are int-str-int: [%d] [%.*s] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].s.len, vps[1].s.s, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "iss:kemi-param-nss", &vps[0].n, + &vps[1].s.s, &vps[2].s.s)) { + LM_ERR("unable to retrieve int-str-str param %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are int-str-str: [%d] [%.*s]" + " [%.*s]\n", i, fname.len, fname.s, + vps[0].n, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "sii:kemi-param-snn", &vps[0].s.s, @@ -343,6 +355,19 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_DBG("params[%d] for: %.*s are str-int: [%.*s] [%d] [%d]\n", i, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].n, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "sis:kemi-param-ssn", &vps[0].s.s, + &vps[1].n, &vps[2].s.s)) { + LM_ERR("unable to retrieve str-int-str param %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str-str-int: [%.*s] [%d] [%.*s]\n", + i, fname.len, fname.s, + vps[0].s.len, vps[0].s.s, + vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "ssi:kemi-param-ssn", &vps[0].s.s, @@ -366,7 +391,7 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[0].s.len = strlen(vps[0].s.s); vps[1].s.len = strlen(vps[1].s.s); vps[2].s.len = strlen(vps[2].s.s); - LM_DBG("params[%d] for: %.*s are str-str-int: [%.*s] [%.*s]" + LM_DBG("params[%d] for: %.*s are str-str-str: [%.*s] [%.*s]" " [%.*s]\n", i, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s);

1 0

git:master:261cb0f9: app_python: implement missing types for 3 params
by Daniel-Constantin Mierla 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 261cb0f91e7a85bf56c64bbf929673c46197efcf URL: https://github.com/kamailio/kamailio/commit/261cb0f91e7a85bf56c64bbf929673c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T15:16:38+02:00 app_python: implement missing types for 3 params --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/261cb0f91e7a85bf56c64bbf929673c… Patch: https://github.com/kamailio/kamailio/commit/261cb0f91e7a85bf56c64bbf929673c…

1 0

git:5.2:40184602: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Sep '19

25 Sep '19

Module: kamailio Branch: 5.2 Commit: 40184602ea9b3550fe740a9f41abd73976e4372c URL: https://github.com/kamailio/kamailio/commit/40184602ea9b3550fe740a9f41abd73… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-25T15:16:52+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/40184602ea9b3550fe740a9f41abd73… Patch: https://github.com/kamailio/kamailio/commit/40184602ea9b3550fe740a9f41abd73… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index fae0040f96..18ea72d4f5 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -12,18 +12,12 @@ Edited by Bogdan-Andrei Iancu -Edited by - Carsten Bock -Edited by - Alex Balashov <abalashov(a)evaristesys.com> -Edited by - Olle E. Johansson <oej(a)edvina.net> @@ -1917,9 +1911,9 @@ kamcmd dlg.list_ctx RPC Command Format: ... -kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 +kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 ... -kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 +kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 ... 9.4. dlg.dlg_list_ctx @@ -2217,36 +2211,36 @@ Chapter 3. Frequently Asked Questions 3.1. - What happened with “use_tight_match” parameter? + What happened with “use_tight_match” parameter? - The parameter was removed with version 1.3 as the option of tight - matching became mandatory and not configurable. Now, the tight matching - is done all the time (when using DID matching). + The parameter was removed with version 1.3 as the option of tight + matching became mandatory and not configurable. Now, the tight matching + is done all the time (when using DID matching). 3.2. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at https://www.kamailio.org/. + Take a look at https://www.kamailio.org/. 3.3. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.kamailio.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.kamailio.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.kamailio.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.kamailio.org>. 3.4. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - https://github.com/kamailio/kamailio/issues. + Please follow the guidelines provided at: + https://github.com/kamailio/kamailio/issues.

1 0

git:5.1:f9e3a89a: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Sep '19

25 Sep '19

Module: kamailio Branch: 5.1 Commit: f9e3a89aeb2bea90e3ae62a158a2211e27c9d471 URL: https://github.com/kamailio/kamailio/commit/f9e3a89aeb2bea90e3ae62a158a2211… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-25T15:16:38+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/f9e3a89aeb2bea90e3ae62a158a2211… Patch: https://github.com/kamailio/kamailio/commit/f9e3a89aeb2bea90e3ae62a158a2211… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index b151726bc5..5678705160 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -12,18 +12,12 @@ Edited by Bogdan-Andrei Iancu -Edited by - Carsten Bock -Edited by - Alex Balashov <abalashov(a)evaristesys.com> -Edited by - Olle E. Johansson <oej(a)edvina.net> @@ -1825,9 +1819,9 @@ kamcmd dlg.list_ctx RPC Command Format: ... -kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 +kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 ... -kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 +kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 ... 9.4. dlg.dlg_list_ctx @@ -2101,39 +2095,39 @@ Chapter 3. Frequently Asked Questions 3.1. - What happened with “use_tight_match” parameter? + What happened with “use_tight_match” parameter? - The parameter was removed with version 1.3 as the option of tight - matching became mandatory and not configurable. Now, the tight matching - is done all the time (when using DID matching). + The parameter was removed with version 1.3 as the option of tight + matching became mandatory and not configurable. Now, the tight matching + is done all the time (when using DID matching). 3.2. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at https://www.kamailio.org/. + Take a look at https://www.kamailio.org/. 3.3. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.kamailio.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.kamailio.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.kamailio.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.kamailio.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.kamailio.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.kamailio.org>. 3.4. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - https://github.com/kamailio/kamailio/issues. + Please follow the guidelines provided at: + https://github.com/kamailio/kamailio/issues.

1 0

[kamailio/kamailio] uac: Fix uac_reg_check_password having '9' disabled in hash string. (#2072)
by Alexandru Covalschi 25 Sep '19

25 Sep '19

Fix uac_reg_check_password having '9' disabled in hash string. #### 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 Previously uac_reg_check_password had check up to <9, which disabled '9' in hash string. Guess it was just a typo, so i fixed it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2072 -- Commit Summary -- * Update uac_reg.c -- File Changes -- M src/modules/uac/uac_reg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2072.patch https://github.com/kamailio/kamailio/pull/2072.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/2072

2 2

git:master:436ef74f: uac: fix uac_reg_check_password having '9' disabled in hash string (GH #2072)
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 436ef74f2e12a17f7187031d5ea40b2fb3bbb107 URL: https://github.com/kamailio/kamailio/commit/436ef74f2e12a17f7187031d5ea40b2… Author: Alexandru Covalschi <568691(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:14:37+02:00 uac: fix uac_reg_check_password having '9' disabled in hash string (GH #2072) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/436ef74f2e12a17f7187031d5ea40b2… Patch: https://github.com/kamailio/kamailio/commit/436ef74f2e12a17f7187031d5ea40b2… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 82704be12c..5ede2458ef 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1238,7 +1238,7 @@ static int uac_reg_check_password(reg_uac_t *reg) return -1; } for(i=0; i<reg->auth_ha1.len; i++) { - if(!((reg->auth_ha1.s[i]>='0' && reg->auth_ha1.s[i]<'9') + if(!((reg->auth_ha1.s[i]>='0' && reg->auth_ha1.s[i]<='9') || (reg->auth_ha1.s[i]>='a' && reg->auth_ha1.s[i]<='f') || (reg->auth_ha1.s[i]>='A' && reg->auth_ha1.s[i]<='F'))) { LM_ERR("invalid char %d in HA1 string: %.*s\n", i,

1 0

[kamailio/kamailio] dialog: Typo in readme of RPC Command dlg.dlg_list example (#2073)
by Jurijs I 25 Sep '19

25 Sep '19

dialog: Typo in readme of RPC Command dlg.dlg_list example, it should be kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1, instead of kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2073 -- Commit Summary -- * Typo in RPC Command dlg.dlg_list example -- File Changes -- M src/modules/dialog/doc/dialog_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2073.patch https://github.com/kamailio/kamailio/pull/2073.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/2073

2 3

git:5.1:ba8ab68b: Typo in RPC Command dlg.dlg_list example
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: 5.1 Commit: ba8ab68b2ccb537c110a79d067d3ab08ca5b116c URL: https://github.com/kamailio/kamailio/commit/ba8ab68b2ccb537c110a79d067d3ab0… Author: Jurijs I <jurijs.ivolga(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:06:17+02:00 Typo in RPC Command dlg.dlg_list example Typo in RPC Command dlg.dlg_list example, it should be kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1, instead of kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 (cherry picked from commit 6319d73aa3aac1d4da689259dc3ec6084bbfca2f) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba8ab68b2ccb537c110a79d067d3ab0… Patch: https://github.com/kamailio/kamailio/commit/ba8ab68b2ccb537c110a79d067d3ab0… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 4ab2c605ff..3f637c9b89 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2320,9 +2320,9 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { <para>RPC Command Format:</para> <programlisting format="linespecific"> ... -&kamcmd; dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 +&kamcmd; dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 ... -&kamcmd; dlg.list abcdrssfrs122444(a)192.168.1.1 +&kamcmd; dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 ... </programlisting> </section>

1 0

git:5.2:1d0e11e3: Typo in RPC Command dlg.dlg_list example
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: 5.2 Commit: 1d0e11e3d240d3b818fe41c51c3e8d1955fcfbf7 URL: https://github.com/kamailio/kamailio/commit/1d0e11e3d240d3b818fe41c51c3e8d1… Author: Jurijs I <jurijs.ivolga(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:06:14+02:00 Typo in RPC Command dlg.dlg_list example Typo in RPC Command dlg.dlg_list example, it should be kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1, instead of kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 (cherry picked from commit 6319d73aa3aac1d4da689259dc3ec6084bbfca2f) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1d0e11e3d240d3b818fe41c51c3e8d1… Patch: https://github.com/kamailio/kamailio/commit/1d0e11e3d240d3b818fe41c51c3e8d1… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 3339e199ce..4b111fb27a 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2428,9 +2428,9 @@ if(has_totag()) { <para>RPC Command Format:</para> <programlisting format="linespecific"> ... -&kamcmd; dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 +&kamcmd; dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 ... -&kamcmd; dlg.list abcdrssfrs122444(a)192.168.1.1 +&kamcmd; dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 ... </programlisting> </section>

1 0

git:master:6319d73a: Typo in RPC Command dlg.dlg_list example
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 6319d73aa3aac1d4da689259dc3ec6084bbfca2f URL: https://github.com/kamailio/kamailio/commit/6319d73aa3aac1d4da689259dc3ec60… Author: Jurijs I <jurijs.ivolga(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:04:22+02:00 Typo in RPC Command dlg.dlg_list example Typo in RPC Command dlg.dlg_list example, it should be kamcmd dlg.dlg_list abcdrssfrs122444(a)192.168.1.1, instead of kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6319d73aa3aac1d4da689259dc3ec60… Patch: https://github.com/kamailio/kamailio/commit/6319d73aa3aac1d4da689259dc3ec60… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 6fa74c8fa3..a47989eb36 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2515,9 +2515,9 @@ if(has_totag()) { <para>RPC Command Format:</para> <programlisting format="linespecific"> ... -&kamcmd; dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 +&kamcmd; dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 ... -&kamcmd; dlg.list abcdrssfrs122444(a)192.168.1.1 +&kamcmd; dlg.dlg_list abcdrssfrs122444(a)192.168.1.1 ... </programlisting> </section>

1 0

git:master:d4adbb31: Makefile.defs: enable SMP mode after ARM v6/ARM v7 fixes on this platform
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: d4adbb31b9dab53a0ee5c6417bd3bbd4ee8c528b URL: https://github.com/kamailio/kamailio/commit/d4adbb31b9dab53a0ee5c6417bd3bbd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T14:47:42+02:00 Makefile.defs: enable SMP mode after ARM v6/ARM v7 fixes on this platform --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d4adbb31b9dab53a0ee5c6417bd3bbd… Patch: https://github.com/kamailio/kamailio/commit/d4adbb31b9dab53a0ee5c6417bd3bbd… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 10b877a284..dad6b7a36b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -863,12 +863,10 @@ endif ifeq ($(ARCH), arm6) use_fast_lock=yes - C_DEFS+=-DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), arm7) use_fast_lock=yes - C_DEFS+=-DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), aarch64)

1 0

git:master:6b1bb063: core: print the architecture for Kamailio was compiled for (included in '-I')
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 6b1bb063adc7310f297ef426af2b415ed2273eb4 URL: https://github.com/kamailio/kamailio/commit/6b1bb063adc7310f297ef426af2b415… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T14:21:07+02:00 core: print the architecture for Kamailio was compiled for (included in '-I') --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/6b1bb063adc7310f297ef426af2b415… Patch: https://github.com/kamailio/kamailio/commit/6b1bb063adc7310f297ef426af2b415… --- diff --git a/src/main.c b/src/main.c index e3c73815ef..a474f88442 100644 --- a/src/main.c +++ b/src/main.c @@ -276,6 +276,7 @@ void print_internals(void) #endif printf(" Source code revision ID: %s\n", ver_id); printf(" Compiled with: %s\n", ver_compiler); + printf(" Compiled architecture: %s\n", ARCH); printf(" Compiled on: %s\n", ver_compiled_time); printf("Thank you for flying %s!\n", NAME); }

1 0

git:master:1bc29ce5: core: improve ARM v6 and ARM v7 atomic operations (branch merge from andrei/armv7)
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 1bc29ce527ffbf135926516ab387a59ae215cfec URL: https://github.com/kamailio/kamailio/commit/1bc29ce527ffbf135926516ab387a59… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T14:44:45+02:00 core: improve ARM v6 and ARM v7 atomic operations (branch merge from andrei/armv7) - improve ARM v6 and ARM v7 atomic operations support in core - this will also fix the swp{b} assembler warning messages on this platform - merged from andrei/armv7 branch (base commit b092c2d10f4672db) - these patches have been already used from some embedded hardware vendors --- Modified: src/core/atomic/atomic_arm.h Modified: src/core/fastlock.h --- Diff: https://github.com/kamailio/kamailio/commit/1bc29ce527ffbf135926516ab387a59… Patch: https://github.com/kamailio/kamailio/commit/1bc29ce527ffbf135926516ab387a59…

1 0

git:master:e624cbfa: jsonrpcs: fix compile warning, size_t is unsigned int on 32 bit architectures
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: e624cbfa4b0dfc88c95844f056b25fa46bd6b1f1 URL: https://github.com/kamailio/kamailio/commit/e624cbfa4b0dfc88c95844f056b25fa… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T14:20:04+02:00 jsonrpcs: fix compile warning, size_t is unsigned int on 32 bit architectures --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e624cbfa4b0dfc88c95844f056b25fa… Patch: https://github.com/kamailio/kamailio/commit/e624cbfa4b0dfc88c95844f056b25fa… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 952b4b3081..da5f199fb6 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1011,7 +1011,7 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) return 0; } if(nj->valuestring!=NULL && strlen(nj->valuestring)>JSONRPC_ID_SIZE-1) { - LM_ERR("id attribute is too long (%lu/%d)\n", strlen(nj->valuestring), + LM_ERR("id attribute is too long (%lu/%d)\n", (long)strlen(nj->valuestring), JSONRPC_ID_SIZE); return 0; }

1 0

git:master:a61e0475: smsops: fix compile warning, size_t is unsigned int on 32 bit architectures
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: a61e04757d5fbc6d756fed6339495e809258dc1e URL: https://github.com/kamailio/kamailio/commit/a61e04757d5fbc6d756fed6339495e8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T14:20:24+02:00 smsops: fix compile warning, size_t is unsigned int on 32 bit architectures --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/a61e04757d5fbc6d756fed6339495e8… Patch: https://github.com/kamailio/kamailio/commit/a61e04757d5fbc6d756fed6339495e8… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 8df667bb77..be341b13f3 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -469,7 +469,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { if (!rp_data) { rp_data = (sms_rp_data_t*)pkg_malloc(sizeof(struct _sms_rp_data)); if (!rp_data) { - LM_ERR("Error allocating %lu bytes!\n", sizeof(struct _sms_rp_data)); + LM_ERR("Error allocating %lu bytes!\n", (long)sizeof(struct _sms_rp_data)); return -1; } } else { @@ -846,7 +846,7 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) if (!rp_send_data) { rp_send_data = (sms_rp_data_t*)pkg_malloc(sizeof(struct _sms_rp_data)); if (!rp_send_data) { - LM_ERR("Error allocating %lu bytes!\n", sizeof(struct _sms_rp_data)); + LM_ERR("Error allocating %lu bytes!\n", (long)sizeof(struct _sms_rp_data)); return -1; } // Initialize structure:

1 0

git:master:ec89ce24: Makefile.defs: add support for ARMv7 architecture (e.g. newer Rasberry Pi 3)
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: ec89ce24367882bf15f39f9a5acd58c652ba6737 URL: https://github.com/kamailio/kamailio/commit/ec89ce24367882bf15f39f9a5acd58c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T11:25:53+02:00 Makefile.defs: add support for ARMv7 architecture (e.g. newer Rasberry Pi 3) - add the possibility to optimize for ARMv7 architecture (e.g. newer Rasberry Pi 3) - can currently be enabled by editing the Makefile.defs and adding '-march=native' at the documented line - warning about swp{b} instructions needed to be fixed in atomic operations - fallback for ARMv8 to ARMv7, as core atomic operations does not support it yet --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ec89ce24367882bf15f39f9a5acd58c… Patch: https://github.com/kamailio/kamailio/commit/ec89ce24367882bf15f39f9a5acd58c… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 18bfca4097..10b877a284 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -136,6 +136,7 @@ endif HOST_ARCH := $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4[uv]/sparc64/ \ -e s/armv[3-5].*/arm/ -e s/armv6.*/arm6/ \ + -e s/armv7.*/arm7/ -e s/armv8.*/arm8/ \ -e "s/Power Macintosh/ppc/" \ -e "s/cobalt/mips2/" \ -e s/amd64/x86_64/ -e s/sparcv9/sparc64/ ) @@ -350,6 +351,9 @@ sparc_macros= __sparc__ __sparc __sparcv8 sparc64_macros= __sparcv9 __sparc_v9__ arm_macros= __arm__ __thumb__ +arm8_macros= __ARM_ARCH_8__ +arm8a_macros= __ARM_ARCH_8A__ +arm7_macros= __ARM_ARCH_7__ arm6_macros= __ARM_ARCH_6__ aarch64_macros= __aarch64__ @@ -367,6 +371,8 @@ alpha_macros= __alpha__ __alpha _M_ALPHA_ ifeq ($(CC_NAME),gcc) #if gcc use gcc arch +# to build with native architecture, e.g. for rasberry pi: add -march=native +# armv8 not supported yet, fallback to armv7 predef_macros:=$(shell $(CC) -dM -E -x c $(CC_EXTRA_OPTS) $(extra_defs) \ $(CFLAGS) /dev/null) @@ -384,7 +390,14 @@ endif # sparc64_macros else ifneq ($(strip $(filter $(arm_macros), $(predef_macros))),) -ifneq ($(strip $(filter $(arm6_macros), $(predef_macros))),) +# arm8 not supported yet from core atomic operations, fallback to arm7 +ifneq ($(strip $(filter $(arm8a_macros), $(predef_macros))),) +CC_ARCH=arm7 +else ifneq ($(strip $(filter $(arm8_macros), $(predef_macros))),) +CC_ARCH=arm7 +else ifneq ($(strip $(filter $(arm7_macros), $(predef_macros))),) +CC_ARCH=arm7 +else ifneq ($(strip $(filter $(arm6_macros), $(predef_macros))),) CC_ARCH=arm6 else # arm6_macros CC_ARCH=arm @@ -845,17 +858,22 @@ endif ifeq ($(ARCH), arm) use_fast_lock=yes - C_DEFS+=-DNOSMP # very unlikely to have an smp arm + C_DEFS+=-DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), arm6) use_fast_lock=yes - C_DEFS+=-DNOSMP # very unlikely to have an smp arm + C_DEFS+=-DNOSMP # memory barriers not implemented for arm +endif + +ifeq ($(ARCH), arm7) + use_fast_lock=yes + C_DEFS+=-DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), aarch64) use_fast_lock=yes - C_DEFS+=-DNOSMP + C_DEFS+=-DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), ppc) @@ -1319,6 +1337,54 @@ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc) endif #CC_NAME, gcc endif #ARCH, arm6 + #if armv7 cpu +ifeq ($(ARCH), arm7) + # if gcc +ifeq ($(CC_NAME), gcc) + C_DEFS+=-DCC_GCC_LIKE_ASM + #common stuff, use armv7-a similar to debian + #build flags from https://wiki.debian.org/ArmHardFloatPort + CFLAGS=-march=armv7-a -mfpu=vfpv3-d16 $(CC_OPT) -funroll-loops -fsigned-char \ + $(PROFILE) + #if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) + CFLAGS+= -ftree-vectorize -fno-strict-overflow +else + #if gcc 4.x+ +ifeq ($(CC_SHORTVER), 4.x) + CFLAGS+= -ftree-vectorize +else + #if gcc 3.4+ +ifeq ($(CC_SHORTVER), 3.4) + CFLAGS+= +else + #if gcc 3.0 +ifeq ($(CC_SHORTVER), 3.0) + CFLAGS+= + #-mcpu=athlon +else +ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5]) +$(warning Old gcc detected ($(CC_SHORTVER)), use gcc 3.0.x \ + for better results) + + CFLAGS+= +else + #really old version +$(warning You are using an old and unsupported gcc \ + version ($(CC_SHORTVER)), compile at your own risk!) + +endif # CC_SHORTVER, 2.9x +endif # CC_SHORTVER, 3.0 +endif # CC_SHORTVER, 3.4 +endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ + +else # CC_NAME, gcc + #other compilers +$(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc) +endif #CC_NAME, gcc +endif #ARCH, arm7 + #if mips (R3000) ifeq ($(ARCH), mips) # if gcc

1 0

git:master:517854cb: core: enable existing atomic operations for ARMv7 architecture (e.g. newer Rasberry Pi 3)
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 517854cba98d33fb632983fe9a2ecf9da9e7e7f9 URL: https://github.com/kamailio/kamailio/commit/517854cba98d33fb632983fe9a2ecf9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T11:22:29+02:00 core: enable existing atomic operations for ARMv7 architecture (e.g. newer Rasberry Pi 3) --- Modified: src/core/atomic/atomic_arm.h Modified: src/core/atomic/atomic_native.h Modified: src/core/atomic_ops.h Modified: src/core/fastlock.h --- Diff: https://github.com/kamailio/kamailio/commit/517854cba98d33fb632983fe9a2ecf9… Patch: https://github.com/kamailio/kamailio/commit/517854cba98d33fb632983fe9a2ecf9… --- diff --git a/src/core/atomic/atomic_arm.h b/src/core/atomic/atomic_arm.h index 2e8f465aa1..98c3f30c46 100644 --- a/src/core/atomic/atomic_arm.h +++ b/src/core/atomic/atomic_arm.h @@ -24,7 +24,7 @@ * Config defines: * - NOSMP * - __CPU_arm - * - __CPU_arm6 - armv6 support (supports atomic ops via ldrex/strex) + * - __CPU_arm6, __CPU_arm7 - armv6, armv7 support (supports atomic ops via ldrex/strex) * @ingroup atomic */ @@ -61,7 +61,7 @@ #endif /* NOSMP */ -#ifdef __CPU_arm6 +#if defined __CPU_arm6 || defined __CPU_arm7 #define HAVE_ASM_INLINE_ATOMIC_OPS @@ -387,7 +387,7 @@ inline static long mb_atomic_add_long(volatile long* v, long i) * -- andrei */ -#endif /* __CPU_arm6 */ +#endif /* __CPU_arm6, arm7 */ #endif diff --git a/src/core/atomic/atomic_native.h b/src/core/atomic/atomic_native.h index 0edbe5d969..5e83a642ea 100644 --- a/src/core/atomic/atomic_native.h +++ b/src/core/atomic/atomic_native.h @@ -30,7 +30,7 @@ * - __CPU_ppc, __CPU_ppc64 - see atomic_ppc.h * - __CPU_sparc - see atomic_sparc.h * - __CPU_sparc64, SPARC64_MODE - see atomic_sparc64.h - * - __CPU_arm, __CPU_arm6 - see atomic_arm.h + * - __CPU_arm, __CPU_arm6, __CPU_arm7 - see atomic_arm.h * - __CPU_alpha - see atomic_alpha.h * @ingroup atomic */ @@ -61,7 +61,7 @@ #include "atomic_sparc.h" -#elif defined __CPU_arm || defined __CPU_arm6 +#elif defined __CPU_arm || defined __CPU_arm6 || defined __CPU_arm7 #include "atomic_arm.h" diff --git a/src/core/atomic_ops.h b/src/core/atomic_ops.h index b757bdceb1..e05e3edb89 100644 --- a/src/core/atomic_ops.h +++ b/src/core/atomic_ops.h @@ -157,7 +157,7 @@ * __CPU_ppc, __CPU_ppc64 - see atomic/atomic_ppc.h * __CPU_sparc - see atomic/atomic_sparc.h * __CPU_sparc64, SPARC64_MODE - see atomic/atomic_sparc64.h - * __CPU_arm, __CPU_arm6 - see atomic/atomic_arm.h + * __CPU_arm, __CPU_arm6, __CPU_arm7 - see atomic/atomic_arm.h * __CPU_alpha - see atomic/atomic_alpha.h */ /* diff --git a/src/core/fastlock.h b/src/core/fastlock.h index a1d1dd80c3..ee95de698b 100644 --- a/src/core/fastlock.h +++ b/src/core/fastlock.h @@ -24,7 +24,6 @@ * \ingroup core * Module: \ref core * WARNING: the code was not tested on the following architectures: - * - arm6 (cross-compiles ok, no test) * - alpha (cross-compiles ok, no test) * - mips64 (cross-compiles ok) * - ppc64 (compiles ok) @@ -74,7 +73,7 @@ typedef volatile int fl_lock_t; #elif defined(__CPU_sparc) #define membar_getlock()/* no need for a compiler barrier, already included */ -#elif defined __CPU_arm || defined __CPU_arm6 +#elif defined __CPU_arm || defined __CPU_arm6 || defined __CPU_arm7 #ifndef NOSMP #warning smp not supported on arm* (no membars), try compiling with -DNOSMP #endif /* NOSMP */ @@ -189,7 +188,7 @@ inline static int tsl(fl_lock_t* lock) "swp %0, %2, [%3] \n\t" : "=&r" (val), "=m"(*lock) : "r"(1), "r" (lock) : "memory" ); -#elif defined __CPU_arm6 +#elif defined __CPU_arm6 || defined __CPU_arm7 asm volatile( " ldrex %0, [%2] \n\t" " cmp %0, #0 \n\t" @@ -354,7 +353,7 @@ inline static void release_lock(fl_lock_t* lock) "stb %%g0, [%1] \n\t" : "=m"(*lock) : "r" (lock) : "memory" ); -#elif defined __CPU_arm || defined __CPU_arm6 +#elif defined __CPU_arm || defined __CPU_arm6 || defined __CPU_arm7 #ifndef NOSMP #warning arm* smp mode not supported (no membars), try compiling with -DNOSMP #endif

1 0

Build failed in Jenkins: kamailiodev-nightly-source » bionic,master #1495
by kamailio＠sipwise.com 25 Sep '19

25 Sep '19

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=bi…> Changes: ------------------------------------------ Started by upstream project "kamailiodev-nightly-source" build number 1495 originally caused by: Started by user Victor Seva Running as SYSTEM Building in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=bi…> No credentials specified > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from https://github.com/kamailio/kamailio.git at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:904) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1144) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1175) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1818) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/*" returned status code 128: stdout: stderr: fatal: unable to access 'https://github.com/kamailio/kamailio.git/': Failed to connect to github.com port 443: No route to host at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2318) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1905) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$400(CliGitAPIImpl.java:81) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:488) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:902) ... 11 more ERROR: Error fetching remote repo 'origin' Archiving artifacts Recording fingerprints Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: Test reports were found but none of them are new. Did leafNodes run? For example, <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=bi…> is 7 hr 16 min old

1 1

Build failed in Jenkins: kamailiodev-nightly-source » precise,master #1495
by kamailio＠sipwise.com 25 Sep '19

25 Sep '19

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=pr…> Changes: ------------------------------------------ Started by upstream project "kamailiodev-nightly-source" build number 1495 originally caused by: Started by user Victor Seva Running as SYSTEM Building in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=pr…> No credentials specified > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from https://github.com/kamailio/kamailio.git at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:904) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1144) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1175) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1818) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/*" returned status code 128: stdout: stderr: fatal: unable to access 'https://github.com/kamailio/kamailio.git/': Failed to connect to github.com port 443: No route to host at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2318) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1905) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$400(CliGitAPIImpl.java:81) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:488) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:902) ... 11 more ERROR: Error fetching remote repo 'origin' Archiving artifacts Recording fingerprints Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: Test reports were found but none of them are new. Did leafNodes run? For example, <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=pr…> is 7 hr 17 min old

1 1

Build failed in Jenkins: kamailiodev-nightly-source » jessie,master #1495
by kamailio＠sipwise.com 25 Sep '19

25 Sep '19

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=je…> Changes: ------------------------------------------ Started by upstream project "kamailiodev-nightly-source" build number 1495 originally caused by: Started by user Victor Seva Running as SYSTEM Building in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=je…> No credentials specified > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from https://github.com/kamailio/kamailio.git at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:904) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1144) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1175) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1818) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/*" returned status code 128: stdout: stderr: fatal: unable to access 'https://github.com/kamailio/kamailio.git/': Failed to connect to github.com port 443: No route to host at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2318) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1905) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$400(CliGitAPIImpl.java:81) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:488) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:902) ... 11 more ERROR: Error fetching remote repo 'origin' Archiving artifacts Recording fingerprints Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: Test reports were found but none of them are new. Did leafNodes run? For example, <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=je…> is 7 hr 17 min old

1 1

Build failed in Jenkins: kamailiodev-nightly-source » xenial,master #1495
by kamailio＠sipwise.com 25 Sep '19

25 Sep '19

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=xe…> Changes: ------------------------------------------ Started by upstream project "kamailiodev-nightly-source" build number 1495 originally caused by: Started by user Victor Seva Running as SYSTEM Building in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=xe…> No credentials specified > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from https://github.com/kamailio/kamailio.git at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:904) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1144) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1175) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1818) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/*" returned status code 128: stdout: stderr: fatal: unable to access 'https://github.com/kamailio/kamailio.git/': Failed to connect to github.com port 443: No route to host at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2318) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1905) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$400(CliGitAPIImpl.java:81) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:488) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:902) ... 11 more ERROR: Error fetching remote repo 'origin' Archiving artifacts Recording fingerprints Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: Test reports were found but none of them are new. Did leafNodes run? For example, <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=xe…> is 7 hr 19 min old

1 1

Build failed in Jenkins: kamailiodev-nightly-source » wheezy,master #1495
by kamailio＠sipwise.com 25 Sep '19

25 Sep '19

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=wh…> Changes: ------------------------------------------ Started by upstream project "kamailiodev-nightly-source" build number 1495 originally caused by: Started by user Victor Seva Running as SYSTEM Building in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=wh…> No credentials specified > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from https://github.com/kamailio/kamailio.git at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:904) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1144) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1175) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499) at hudson.model.Run.execute(Run.java:1818) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/*" returned status code 128: stdout: stderr: fatal: unable to access 'https://github.com/kamailio/kamailio.git/': Failed to connect to github.com port 443: No route to host at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2318) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1905) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$400(CliGitAPIImpl.java:81) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:488) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:902) ... 11 more ERROR: Error fetching remote repo 'origin' Archiving artifacts Recording fingerprints Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: Test reports were found but none of them are new. Did leafNodes run? For example, <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=wh…> is 7 hr 20 min old

1 1

git:master:f31f0814: pkg/kamailio/deb: switch back to libssl-dev 1.1 where available
by Victor Seva 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: f31f0814fa50f29b45bf427cc84d12558834f836 URL: https://github.com/kamailio/kamailio/commit/f31f0814fa50f29b45bf427cc84d125… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-09-25T10:08:05+02:00 pkg/kamailio/deb: switch back to libssl-dev 1.1 where available --- Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/f31f0814fa50f29b45bf427cc84d125… Patch: https://github.com/kamailio/kamailio/commit/f31f0814fa50f29b45bf427cc84d125…

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 24 Sep '19

24 Sep '19

- URL: https://github.com/kamailio/kamailio/commit/3849f7f07cdac109ea6ddb055315fef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:01:14+02:00 apy_python: fixed condition in matching parameter types - GH #1944 (cherry picked from commit cbec7f92213de1ff096ea00c5a7a3b6354f7ede9) (cherry picked from commit 42117d15568025c5604f5aa82d47deec5f996b5a) - URL: https://github.com/kamailio/kamailio/commit/b7f1a753e58701103c33f02b0cf5fd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:01:30+02:00 core: kemi - define for function type with (str*, str*, int, int, str*) params (cherry picked from commit a23f98c1751fffb80463ea61c4de76f62f8dbb6f) (cherry picked from commit 63185483ae8f13e7199c9eedd30d0794a1598a05) - URL: https://github.com/kamailio/kamailio/commit/02a2a53e02a5a7c6ef309b3a0c23bab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:01:47+02:00 app_python: handle kemi sssi parameters (cherry picked from commit a36f2c050ff607b5f3c08b7fc8ed01e082e91dc8) (cherry picked from commit babd8c28b27a2f4154ca3997b04d181f019c82c8) - URL: https://github.com/kamailio/kamailio/commit/8c6f1173117e0ac9992abd6da1f0ea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:02:05+02:00 auth_ephemeral: test the lenghts for compared passwords (cherry picked from commit 42129d35e4510092266322168f68f3019d28bdb8) (cherry picked from commit 7fd6ca67616077fb8aab4a279c8b251de94b4a95) - URL: https://github.com/kamailio/kamailio/commit/ce4a6ade12a42a0ce4d0af71d293e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:02:28+02:00 htable: fix export of kemi sht_reset() - GH #1941 (cherry picked from commit 5b9fb55b6697bf3cd16727110a4b4bcb8350357d) (cherry picked from commit e05a3f30986244d1a1bdbefda63278416b8aa2af) - URL: https://github.com/kamailio/kamailio/commit/6074bf678b282a253e573da3c70497d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:03:05+02:00 siptrace: fix memory leak on sip trace function with dst uri (cherry picked from commit f406266966b68fff9493c62ac5c9ccc5b8237e6b) - URL: https://github.com/kamailio/kamailio/commit/7166913a22c68b40206a54c58e4ac7a… Author: Seven Du <dujinfang(a)x-y-t.cn> Date: 2019-09-24T18:03:23+02:00 core: fix timer typo (cherry picked from commit c85ec2eed71c5d1bc3957437f27ffe9b6f18f4df) (cherry picked from commit de94b66c22a0ad9127bba331433c24564638ca5d) - URL: https://github.com/kamailio/kamailio/commit/72afbd1b9c74e14d54fcf9e0d32ee2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:04:31+02:00 core: return negative on error adding pre-processor substdef - expected by the checks when executing the functions (cherry picked from commit e648fd5e10a6ec694129be5fab0a84c2c90aa916) (cherry picked from commit 256400382a9a4edac601c18cf2affe59b4dd93b4) - URL: https://github.com/kamailio/kamailio/commit/f37e9823ff1318bf37544ad8fef9005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T18:04:47+02:00 db_mongodb: catch the null values and set the type to DB1_STRING - avoid the log message on unhandled type (cherry picked from commit a5781fc4bb3063c6e7abf54d93178ef610617298) (cherry picked from commit 353192ca4f2203fb85fdda6e0ea9e734f27019cf) - URL: https://github.com/kamailio/kamailio/commit/1e578749156b00cbc2c5c0003ec076e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T23:57:46+02:00 tls: register SNI callback for server default profile - make SNI work for other profile when the default one does not have server_name - GH #1938 (cherry picked from commit 08d22b7bd95828554e30f4c23e906cd9d234e1cd) (cherry picked from commit 1d06499462e1e893e5965d2cc9553cbdd5bd347d) - URL: https://github.com/kamailio/kamailio/commit/abeaea5671b271c73e90a20d452e3f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T23:59:38+02:00 usrloc: clone xavp list in contact struct in memory mode (cherry picked from commit 76f0fa8a0330de3885f5f3830eb90061c59045d4) (cherry picked from commit 2f07bb77623c556b440d040203ade01726a59fde) - URL: https://github.com/kamailio/kamailio/commit/c4b915719b4a740d8329fada4d9a582… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T23:59:56+02:00 tm: detect local uac transaction not inserted in the hash table (cherry picked from commit cf0008d843009acc8e40fcad3eceda063b1a358c) (cherry picked from commit 1789377bdb6180b8979a84502ba439366f7f8d45) - URL: https://github.com/kamailio/kamailio/commit/b25dc2f0ed743f8ed3efd391dddf44f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:00:13+02:00 exec: debug message with number of results for exec_avp() (cherry picked from commit 01c50c84aed717f9de689ab4eec3faec59a498e4) (cherry picked from commit db0cabd8673e5ad7468eebae1781dd176bac1788) - URL: https://github.com/kamailio/kamailio/commit/716f0b31482ebf7a7284666aeea50a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:00:27+02:00 pdb: safety check for header length in pdb_msg_dbg() (cherry picked from commit 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760) (cherry picked from commit 29114b86e4360f2de53310070db872cd09aaef6e) - URL: https://github.com/kamailio/kamailio/commit/6a47560d75deb701e5f806c0f12db80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:01:11+02:00 sanity: free parsed proxy-required header in case of failure - reported by GH #1990 (cherry picked from commit ffa2aa438e2a13e6e8bdbe70dd90827ae18279ce) (cherry picked from commit bf5e1698e543bce6cbf424773322a06ae09d2c19) - URL: https://github.com/kamailio/kamailio/commit/edd1ff5371129334ae8a6795dac7301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:01:27+02:00 lib/srdb1: support for username@domain in user id part of db url - used by some cloud database services - reworked patch from GH #1992 (cherry picked from commit d419f427d2acf890e5e45c4f3e8e7a2b2fe4cead) (cherry picked from commit 8848bce61107c98a4b8e6fd2afe3670ec90baf70) - URL: https://github.com/kamailio/kamailio/commit/7025cfaa76f03358426719c1e28ad93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:02:46+02:00 kamctl: relaxed regex check on aor and sip uri - it required a dot (.), not valid for ipv6 and single word domains (e.g., localhost) - now just match on USERNAME_RE@.+ (cherry picked from commit 94e9d47d2d2da82be23f1bae8cd6491c758a384c) (cherry picked from commit a77c4a9268e416abdae5ec74374451d4172cc8e7) - URL: https://github.com/kamailio/kamailio/commit/ea3bdfa4950b1d893f5f2151247f145… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:03:27+02:00 core: pv - increased the size for vars and transformations tables (cherry picked from commit e6b183a1ec3b267cc25040a9b67a1c151ee85555) (cherry picked from commit 77abc5d6923930649bb2fc76dd3b4f5d702684d9) - URL: https://github.com/kamailio/kamailio/commit/a63ff3ee79a9dbd21550f982daf5ed4… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2019-09-25T00:03:57+02:00 evapi:return code and log fixed for no evapi client while sending (cherry picked from commit 08cf17288861bcaa8f3b23166059ead517d1b4fe) (cherry picked from commit 1bba5826292f0dbd6703f8df941f886a2a71c9e9) - URL: https://github.com/kamailio/kamailio/commit/ebbcbdd50721277d1a7a52c77c91969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:04:12+02:00 evapi: adjust log message when no client connected for dispatching (cherry picked from commit a6a2416e59c1e1a5cbadd3ecceecff52201be10d) (cherry picked from commit e2a0873df1e18640e1bfe7bc0adee725202afa2b) - URL: https://github.com/kamailio/kamailio/commit/d8f0c3c0fd1921c5716b29efd8a9a16… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-09-25T00:05:20+02:00 build: Call make via $(MAKE) When we need to call make from within a Makefile, we should do so by using the MAKE variable, which has special meaning for make itself. This makes sure, it will get marked as recursive command, and will make it possible to use the make jobserver. Change-Id: I6829f3ee0a830fc8273e1dffe696382fccc6a093 (cherry picked from commit 2306dd47b308f99e5c22c2d6f4d2bc1200ed8453) (cherry picked from commit 164702ddbc2e88c818f9293d0c31fef163ea45b7) - URL: https://github.com/kamailio/kamailio/commit/613a4cb5b3c5eb0492e81e4a4203d54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:05:36+02:00 tm: proper resoring of backup lumps in case of cloning failure (cherry picked from commit cd379886fa7a8ff01b9618491199f8e5b3ce897f) (cherry picked from commit 5c042d6e1023828f49d7ac75f2b761ad3433ab31) - URL: https://github.com/kamailio/kamailio/commit/6b3521312fe0aa654fbbef4ed05fc66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:05:47+02:00 tm: removed unused error label in prepare_new_uac() (cherry picked from commit c7ceb08b31fdb3f6560d02fff6b6ee71602c19ec) (cherry picked from commit 21fa3d2c130d85a925d2db658dfbd291d21a6baa) - URL: https://github.com/kamailio/kamailio/commit/f7a59032b206b153c7c5ce791581b5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:06:02+02:00 uac: debug messages when restoring from/to headers (cherry picked from commit 7a4c490a63cd3fa924b6921fcd20ba77a6d661fb) (cherry picked from commit 887c49e597572a58f6400736f8dcd753fa4543cd) - URL: https://github.com/kamailio/kamailio/commit/5d70e237dd7850afa785e2162622625… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:06:35+02:00 auth_radius: increase MAX_EXTRA from 4 to 8 - GH #2025 (cherry picked from commit df93a638040f4c1aa4d6ed3799d6f990b0593f94) (cherry picked from commit 5d7784a5e35e3060549e5e12a05d1dfc34fbff19) - URL: https://github.com/kamailio/kamailio/commit/527a609880433b92ff981b84d7b72b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:06:48+02:00 misc_radius: increase MAX_EXTRA from 4 to 8 - GH #2025 (cherry picked from commit 4c537a618949eb48ffed9297f3abc8cdc879b70d) (cherry picked from commit 1d436e38cbadd47a36a5293b88713566e2454eb0) - URL: https://github.com/kamailio/kamailio/commit/6a5efefd1db5799fc0141b1b8f18847… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:07:36+02:00 core: forward - clone outbound buffer for SREV_NET_DATA_OUT event - this event can execute a series of callbacks, leading to leak if only the core function does pkg free - GH #2027 (cherry picked from commit 98249e2cc97e818cf7ad492132ecfea2ce13a78b) (cherry picked from commit 891bd927f3e519bb9fb2f23a65f21f82f2f7e0af) - URL: https://github.com/kamailio/kamailio/commit/5ad50f506b0c80e89e6c110c562db88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:07:46+02:00 topoh: free old outbound buffer inside th_msg_sent() - GH #2027 (cherry picked from commit 37a1765853294016f43bd633667cd623aaaa2d3e) (cherry picked from commit aaeb0ca500f4cbf98631c58da5289eea30b3dd92) - URL: https://github.com/kamailio/kamailio/commit/ec6cdf42460d612af94dc2e94cc5da4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:07:55+02:00 topos: free old outbound buffer inside SREV_NET_DATA_OUT callback - GH #2027 (cherry picked from commit 21816a11a56628a9eee17765645fcf03d57929bd) (cherry picked from commit bbac07207f55216ece4fad4d1aed2ed578cb0e15) - URL: https://github.com/kamailio/kamailio/commit/ac79fe0b99eb27db25a44da4907bb86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:08:03+02:00 dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit ad8d9628da27a3ab68b005ef52842784af6bda3a) (cherry picked from commit 0df6f49fe7a13ce6c01542a16fdd8932043f5ec9) - URL: https://github.com/kamailio/kamailio/commit/d65ff5bf485d8655cdc49b449cb7ed0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:08:15+02:00 gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit d9a1cbc8f66f9fd0991048e5e1ba1579916a092e) (cherry picked from commit d815945cdf85250877c89b3368506d444aa0ff2f) - URL: https://github.com/kamailio/kamailio/commit/e87ecb0d21edc2574cc77bdf1c018f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:08:25+02:00 corex: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit c79dfbeab0bfefaa4dd5cefc41cba3ba157da0ce) (cherry picked from commit 9b6d1e9ee767e2bf2a31dcf817558566d99f81b2) - URL: https://github.com/kamailio/kamailio/commit/ea760c66e1b673577569cb295d81aa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:08:33+02:00 evapi: free the faked msg clone used for dispatcher event route (cherry picked from commit d36a4b00c6becd42cfcec4fc7eb398371e1cc812) (cherry picked from commit 9f4c8c37f50ce15e52ea64388d7aab46167e78cd) - URL: https://github.com/kamailio/kamailio/commit/f1d0bf198235f6a503fa1b3f5f3d3ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:09:00+02:00 core: function to get a new faked message in a specific structure - refactored the code to be able to fill a sip msg structure with content from the faked request (cherry picked from commit 4a904b5fe90253d0d5517cf1a5cdca3695e59ec3) (cherry picked from commit 4db7db8486ecab55e649a4037a1d86cda7633faf) - URL: https://github.com/kamailio/kamailio/commit/f30d203bdeb69e680a2c107883921f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:09:08+02:00 core: clear branches and expose the function for a new faked msg (cherry picked from commit d7bd8a187546f132547788c47ff9a3947be49957) (cherry picked from commit 67f889bcda49ad8f99f619b495e3fa201968ad64) - URL: https://github.com/kamailio/kamailio/commit/9876e6933e1782fe3267245d501343b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:09:17+02:00 evapi: use a completely new fake message structure for dispatcher handling (cherry picked from commit 769dce2fad66efdbc6cce6951bc60b60bf453a19) (cherry picked from commit 0ded702ccbb746a26c7172bcbf80dd971ec8b530) - URL: https://github.com/kamailio/kamailio/commit/922dfa4d03bb199eb15e060934e2b18… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Date: 2019-09-25T00:09:51+02:00 lib: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit 9e29e262f0107cedbf2e2d61d045b05c5a5fc410) (cherry picked from commit 5a4debabd3c6e997200947453503a972b9dcab0f) - URL: https://github.com/kamailio/kamailio/commit/ad6a62cf798c9a5d5ea6bc17732e86a… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Date: 2019-09-25T00:10:00+02:00 db_mysql: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit a7588f382605991bef4499de8c89b10a9468c8cf) (cherry picked from commit d128b3170c6e82ecd5751351885f9098490068f5) - URL: https://github.com/kamailio/kamailio/commit/0eb8767cb1f474d582a5d64dd13036d… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Date: 2019-09-25T00:10:09+02:00 db_postgres: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit f99b4926c817e181f83f92ffa15510ff133d0a15) (cherry picked from commit d6bc471aa41447d605eab42ee0596a2e47e3be29) - URL: https://github.com/kamailio/kamailio/commit/7c2e2959cf6934527fd0c78d45f6e8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:10:37+02:00 tm: set send socket flag when computing the destination and local socket is found (cherry picked from commit 8d608d1c3ed0fe4c69cb02868b746cd0497dd1f5) (cherry picked from commit 09ac3e47ef79dbd599b7dec5b84ae3b792f025ed) - URL: https://github.com/kamailio/kamailio/commit/aa12d7c13baae2e993848ac5f5879c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:11:29+02:00 core: main - set default send tcp sockets to tls if no tcp is available (cherry picked from commit 8a678c244aa34cf352fb614693c6e6d505ce2dfe) (cherry picked from commit 7c3cc32c98a66318fa355fd14c69772e13ba0a4c) - URL: https://github.com/kamailio/kamailio/commit/965bd4dafc78696f0272c58a5f91c1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:11:40+02:00 core: tcp - set default local socket for tls when lookup fails - GH #2028 (cherry picked from commit f40df55af2f50789ca4a8b89a213f7323b1932f2) (cherry picked from commit 28c4e65e7aef8e6ab1129a45fc01e2b4b721adab) - URL: https://github.com/kamailio/kamailio/commit/7db591f381e557d0001cd86a0d8bb7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:11:50+02:00 Makefile.defs: detect if libssl version is 1.1+ - link against pthread to be able to set PTHREAD_PROCESS_SHARED attribute for mutex and rwlock initialization (cherry picked from commit 79619717aa67c219fc36dfaac8d06919b8f2018e) (cherry picked from commit 827dccc75d560257ba4caef5187894dd5dbd7999) - URL: https://github.com/kamailio/kamailio/commit/d26cea9a1ad77e03709113e1406f527… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:11:59+02:00 core: main - functions to set PTHREAD_PROCESS_SHARED for pthread mutex and rwlock - code relocated from src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c - simpler option to initialize kamailio with the workaround for libssl v1.1+ without using the preloaded library approach (cherry picked from commit a8c811e69e964821b73d0861a9547a301253d172) (cherry picked from commit cba7b6a19c9ac0d80e4bf89153796852afb28e9c) - URL: https://github.com/kamailio/kamailio/commit/e6f8c186a8c18f3ca7af38306f126e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:12:09+02:00 log_systemd: return in case the xavp is not valid (cherry picked from commit 9e703c1c1eb362bd68e53b38021aa42f8b173d0c) (cherry picked from commit 3425fbad549c16aa79c001560e7ec9ab7583f353) - URL: https://github.com/kamailio/kamailio/commit/2357b7580d1ac6fb4592f3d7ee10d53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:12:20+02:00 presence: reset freed list to avoid double free in case of error (cherry picked from commit 28dc74fa8a30b17abd7f7b173b66b8538c5a4bb5) (cherry picked from commit ffec32d01d440cb16dbaaac1b497f7ca9d2c363c) - URL: https://github.com/kamailio/kamailio/commit/4f044b0920109ecb189deb98ef42c2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:12:30+02:00 kamctl: kamdbctl.base - replaced get_answer() with a portable version - contributed by Sergey Safarov, GH #2019 (cherry picked from commit 88d06a08a8baf460188745f1d748dd83f275356f) (cherry picked from commit 25585a67489cba4e55e888c68aacb1da17732bd6) - URL: https://github.com/kamailio/kamailio/commit/fdd55ac211fac916845fd4ae77f6375… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:12:40+02:00 core: print a version flag when pthread shared mutex is enabled for tls (cherry picked from commit 801a9e38bcd863950a53ed0ca63a2976376daddc) (cherry picked from commit 40e1dba3b2089ee66fec6e431dbbd2bf1f34374f) - URL: https://github.com/kamailio/kamailio/commit/0d8ed240451257565333d79bc8c8f07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:12:49+02:00 xmlrpc: reset fields in case of error for building fake via (cherry picked from commit b54573ca9167c807a1de39634bed04cb7953dce0) (cherry picked from commit 745475301cdacf9d391b39bb17014538a69d697d) - URL: https://github.com/kamailio/kamailio/commit/39a1f135c15c087382ae2eb9f9c7edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:12:57+02:00 xcap_server: free xpath object before reusing the variable - removed unnecessary resets of local variables at the end of function (cherry picked from commit d0ed04ae7938ef09da1ca215043334190adb9c52) (cherry picked from commit 991a12f98320af2066697cd74394b6fe5900294d) - URL: https://github.com/kamailio/kamailio/commit/c361198e327033ea4f4dd99c520151e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-25T00:25:27+02:00 sanity: fix sip msg var name after backporting proxy require commit

1 0

git:master:24988041: Makefile.defs: fix doc URL for pre-defined architecture compiler macros
by Henning Westerholt 24 Sep '19

24 Sep '19

Module: kamailio Branch: master Commit: 24988041d42c752c8202829d8e92d7a75762ab96 URL: https://github.com/kamailio/kamailio/commit/24988041d42c752c8202829d8e92d7a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-24T22:29:25+02:00 Makefile.defs: fix doc URL for pre-defined architecture compiler macros --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/24988041d42c752c8202829d8e92d7a… Patch: https://github.com/kamailio/kamailio/commit/24988041d42c752c8202829d8e92d7a… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index fe0e4a90fb..18bfca4097 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -341,7 +341,7 @@ endif # ARCH detection # predefined compiler macros for different architectures -# (see http://predef.sourceforge.net/prearch.html for a more complete list) +# (see https://sourceforge.net/p/predef/wiki/Architectures/ for a more complete list) i386_macros= i386 __i386__ __i486__ __i586__ __i686__ \ __i386 _M_IX86 __X86__ _X86_ x86_64_macros= __amd64__ __amd64 __x86_64__ __x86_64 _M_X64

1 0

git:master:0d8a19fd: core: enable mem_join memory manager setting as default
by Henning Westerholt 24 Sep '19

24 Sep '19

Module: kamailio Branch: master Commit: 0d8a19fde8f46d175302f5fe77caed1bdef1a8bc URL: https://github.com/kamailio/kamailio/commit/0d8a19fde8f46d175302f5fe77caed1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-24T22:29:25+02:00 core: enable mem_join memory manager setting as default - enable mem_join memory manager setting as default - this should help with server stability in low memory situations - some downstream projects (e.g. Kazoo) enables this already since years --- Modified: src/core/cfg_core.c Modified: src/core/mem/f_malloc.c Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/0d8a19fde8f46d175302f5fe77caed1… Patch: https://github.com/kamailio/kamailio/commit/0d8a19fde8f46d175302f5fe77caed1… --- diff --git a/src/core/cfg_core.c b/src/core/cfg_core.c index d0b409f158..a23fb8afab 100644 --- a/src/core/cfg_core.c +++ b/src/core/cfg_core.c @@ -113,7 +113,7 @@ struct cfg_group_core default_core_cfg = { 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, 4 pkg_sums, 8 shm_sums, 16 short_status */ 1, /*!< mem_safety - 0 disabled; 1 enabled */ - 0, /*!< mem_join - 0 disabled */ + 1, /*!< mem_join - 1 enabled */ 0, /*!< mem_status_mode - 0 only free fragments, 1 all fragements */ L_ERR, /*!< corelog */ L_DBG, /*!< latency cfg log */ diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index a157f03172..836ba01219 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -656,7 +656,7 @@ void fm_free(void* qmp, void* p) f->mname=mname; #endif #ifdef MEM_JOIN_FREE - if(unlikely(cfg_get(core, core_cfg, mem_join)!=0)) + if(likely(cfg_get(core, core_cfg, mem_join)!=0)) fm_join_frag(qm, f); #endif /*MEM_JOIN_FREE*/ fm_insert_free(qm, f); diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 52d2ef722c..b718dfa3bf 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -529,7 +529,7 @@ void qm_free(void* qmp, void* p) qm->real_used-=size; #ifdef MEM_JOIN_FREE - if(unlikely(cfg_get(core, core_cfg, mem_join)!=0)) { + if(likely(cfg_get(core, core_cfg, mem_join)!=0)) { next=prev=0; /* mark this fragment as used (might fall into the middle of joined frags) * to give us an extra chance of detecting a double free call (if the joined

1 0

git:master:9ac7c87e: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 24 Sep '19

24 Sep '19

Module: kamailio Branch: master Commit: 9ac7c87edb1c9fdbaaeaf413dc0586f32c646276 URL: https://github.com/kamailio/kamailio/commit/9ac7c87edb1c9fdbaaeaf413dc0586f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-24T16:31:56+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/9ac7c87edb1c9fdbaaeaf413dc0586f… Patch: https://github.com/kamailio/kamailio/commit/9ac7c87edb1c9fdbaaeaf413dc0586f… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index bd73411bae..3fcf47cedf 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -540,8 +540,8 @@ Note See also Section 6.33, “cdr_extra (string)”. - The full list of supported pseudo-variables in Sip-Router is available - at: http://sip-router.org/wiki/cookbooks/pseudo-variables/devel + The list with all pseudo-variables in Kamailio can be found at: + https://www.kamailio.org/wiki/. 4.3. CDR with Multi Call-Legs

1 0

git:master:659e2c3e: acc: update doc reference to wiki [skip ci]
by Victor Seva 24 Sep '19

24 Sep '19

Module: kamailio Branch: master Commit: 659e2c3ebb50f4a7362b4de2340883885391ebe6 URL: https://github.com/kamailio/kamailio/commit/659e2c3ebb50f4a7362b4de23408838… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-09-24T16:25:28+02:00 acc: update doc reference to wiki [skip ci] --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/659e2c3ebb50f4a7362b4de23408838… Patch: https://github.com/kamailio/kamailio/commit/659e2c3ebb50f4a7362b4de23408838… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index a0794ca562..f47a92a689 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -352,10 +352,8 @@ if (uri=~"sip:+40") /* calls to Romania */ { </itemizedlist> See also <xref linkend="acc.p.cdr_extra"/>. <para> - The full list of supported pseudo-variables in Sip-Router is - available at: - <ulink url="http://sip-router.org/wiki/cookbooks/pseudo-variables/devel"> - http://sip-router.org/wiki/cookbooks/pseudo-variables/devel</ulink> + The list with all pseudo-variables in &kamailio; can + be found at: &kamwikilink;. </para> </section> </section>

1 0

git:5.2:f8f056b9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Sep '19

24 Sep '19

Module: kamailio Branch: 5.2 Commit: f8f056b9e822aa7a6fa7abc0e335a6fc64cf603e URL: https://github.com/kamailio/kamailio/commit/f8f056b9e822aa7a6fa7abc0e335a6f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-24T12:17:23+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/f8f056b9e822aa7a6fa7abc0e335a6f… Patch: https://github.com/kamailio/kamailio/commit/f8f056b9e822aa7a6fa7abc0e335a6f… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 842e2cfcc7..ebe872869b 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -26,6 +26,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -37,8 +38,9 @@ Daniel-Constantin Mierla List of Examples 1.1. Set smode parameter - 1.2. phonenum_match usage - 1.3. phonenum_match_cn usage + 1.2. Set resid parameter + 1.3. phonenum_match usage + 1.4. phonenum_match_cn usage Chapter 1. Admin Guide @@ -53,6 +55,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -95,10 +98,11 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 3.1. smode (int) - Phone number search mode. + Phone number search mode (not in use yet). Default value is “0”. @@ -107,6 +111,23 @@ Chapter 1. Admin Guide modparam("phonenum", "smode", 0) ... +3.2. resid (str) + + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native Kamailio.cfg file, + registration is done when parsing config and finding variables. + + Default value is “” (empty). + + Example 1.2. Set resid parameter +... +modparam("phonenum", "resid", "src") +... +if(phonenum_match("1-484-555-8888", "src")) { + ... +} +... + 4. Functions 4.1. phonenum_match(num, pvc) @@ -115,14 +136,14 @@ modparam("phonenum", "smode", 0) 4.1. phonenum_match(num, pvc) Match num against the libphonenumber and set the attributes inside the - pvc container. The function has to be called before accessing a key - via: $phn(pvc=>key). + pvc result container. The function has to be called before accessing a + key via: $phn(pvc=>key). The parameters can be static strings or strings with variables. It can be used from ANY_ROUTE. - Example 1.2. phonenum_match usage + Example 1.3. phonenum_match usage ... if(phonenum_match("1-484-555-8888", "src")) { if($phn(src=>valid)==1) { @@ -144,7 +165,7 @@ if(phonenum_match("1-484-555-8888", "src")) { It can be used from ANY_ROUTE. - Example 1.3. phonenum_match_cn usage + Example 1.4. phonenum_match_cn usage ... if(phonenum_match_cn("1-484-555-8888", "US", "src")) { if($phn(src=>valid)==1) {

1 0

git: new commits in branch 5.2
by Daniel-Constantin Mierla 24 Sep '19

24 Sep '19

- URL: https://github.com/kamailio/kamailio/commit/09ac3e47ef79dbd599b7dec5b84ae3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:49:37+02:00 tm: set send socket flag when computing the destination and local socket is found (cherry picked from commit 8d608d1c3ed0fe4c69cb02868b746cd0497dd1f5) - URL: https://github.com/kamailio/kamailio/commit/ccf16cb7b8f84d2f9899d9922f5c940… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2019-09-24T11:50:18+02:00 Module:rtpengine: memory leak is fixed, if no rtpengine in list while reload (cherry picked from commit 0e29879ee950d5a9e9a669c7d5c634416d52f5c9) - URL: https://github.com/kamailio/kamailio/commit/c63d048c7ba2dc1e271fafbbd0e0a74… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2019-09-24T11:52:05+02:00 modules/rtpengine: set_rtpengine_set fix (cherry picked from commit fe6614feb5f9b062a556de82fd7df6fc12c96471) - URL: https://github.com/kamailio/kamailio/commit/80bb3b96f60d3347460a202ec69e012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:53:17+02:00 tls: proper dot position for matching subdomains - reported by GH #2049 (cherry picked from commit 16beec2b7660d416a05f069695b4ce18e8b4e795) - URL: https://github.com/kamailio/kamailio/commit/21ccb8f3e4f5496e5bb71c6cdfeec96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:54:06+02:00 phonenum: new param resid to register result container ids - allow use in KEMI scripting by pre-registering container result id via modparam (cherry picked from commit 67412b4b2b377cca179de2ebe109bd56fb8a63b9) - URL: https://github.com/kamailio/kamailio/commit/e1197ad59685fa97868c5fffcbde841… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:54:17+02:00 phonenum: docs for resid parameter (cherry picked from commit d2bac426192c074368bf78014e0d1d0ca97f3274) - URL: https://github.com/kamailio/kamailio/commit/becc6bc3f90781f64b90879db1f7eea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:54:44+02:00 phonenum: proper access to the str type param resid (cherry picked from commit 56f86535e0ae3fcf8fa2d0b565c7ab61351678d0) - URL: https://github.com/kamailio/kamailio/commit/dcdfc26fc260d36000c991eed89da25… Author: A Alba <ascanio.alba7(a)gmail.com> Date: 2019-09-24T11:55:23+02:00 module rr: KEMI expose record_route_preset (cherry picked from commit e1ab977fd9a61864376782f2534cc0d932347d78) - URL: https://github.com/kamailio/kamailio/commit/7c3cc32c98a66318fa355fd14c69772… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:59:20+02:00 core: main - set default send tcp sockets to tls if no tcp is available (cherry picked from commit 8a678c244aa34cf352fb614693c6e6d505ce2dfe) - URL: https://github.com/kamailio/kamailio/commit/28c4e65e7aef8e6ab1129a45fc01e2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:59:33+02:00 core: tcp - set default local socket for tls when lookup fails - GH #2028 (cherry picked from commit f40df55af2f50789ca4a8b89a213f7323b1932f2) - URL: https://github.com/kamailio/kamailio/commit/827dccc75d560257ba4caef5187894d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:59:47+02:00 Makefile.defs: detect if libssl version is 1.1+ - link against pthread to be able to set PTHREAD_PROCESS_SHARED attribute for mutex and rwlock initialization (cherry picked from commit 79619717aa67c219fc36dfaac8d06919b8f2018e) - URL: https://github.com/kamailio/kamailio/commit/cba7b6a19c9ac0d80e4bf8915379685… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T11:59:57+02:00 core: main - functions to set PTHREAD_PROCESS_SHARED for pthread mutex and rwlock - code relocated from src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c - simpler option to initialize kamailio with the workaround for libssl v1.1+ without using the preloaded library approach (cherry picked from commit a8c811e69e964821b73d0861a9547a301253d172) - URL: https://github.com/kamailio/kamailio/commit/3425fbad549c16aa79c001560e7ec9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T12:00:59+02:00 log_systemd: return in case the xavp is not valid (cherry picked from commit 9e703c1c1eb362bd68e53b38021aa42f8b173d0c) - URL: https://github.com/kamailio/kamailio/commit/ffec32d01d440cb16dbaaac1b497f7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T12:01:10+02:00 presence: reset freed list to avoid double free in case of error (cherry picked from commit 28dc74fa8a30b17abd7f7b173b66b8538c5a4bb5) - URL: https://github.com/kamailio/kamailio/commit/25585a67489cba4e55e888c68aacb1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T12:02:13+02:00 kamctl: kamdbctl.base - replaced get_answer() with a portable version - contributed by Sergey Safarov, GH #2019 (cherry picked from commit 88d06a08a8baf460188745f1d748dd83f275356f) - URL: https://github.com/kamailio/kamailio/commit/40e1dba3b2089ee66fec6e431dbbd2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T12:02:29+02:00 core: print a version flag when pthread shared mutex is enabled for tls (cherry picked from commit 801a9e38bcd863950a53ed0ca63a2976376daddc) - URL: https://github.com/kamailio/kamailio/commit/745475301cdacf9d391b39bb1701453… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T12:03:03+02:00 xmlrpc: reset fields in case of error for building fake via (cherry picked from commit b54573ca9167c807a1de39634bed04cb7953dce0) - URL: https://github.com/kamailio/kamailio/commit/991a12f98320af2066697cd74394b6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-24T12:03:12+02:00 xcap_server: free xpath object before reusing the variable - removed unnecessary resets of local variables at the end of function (cherry picked from commit d0ed04ae7938ef09da1ca215043334190adb9c52)

1 0

[kamailio/kamailio] Entries never expires on dns cache (#2063)
by Mathieu Bodjikian 24 Sep '19

24 Sep '19

Hello, We have a weird bug in our Kamailio boxes. We use the DNS cache (for dns failover to work properly), and on some servers, the cache becomes broken after some time. The expire value is stuck and do not decrement over time, on the entry and on the records : ` kamcmd> dns.lookup A freeswitch { name: freeswitch type: A size_bytes: 200 reference_counter: 2 permanent: no expires: 2 last_used: 0 negative_entry: no records: { { rr_idx: 0 rr_ip: 10.0.0.1 rr_permanent: no rr_expires: 2 } { rr_idx: 1 rr_ip: 10.0.0.2 rr_permanent: no rr_expires: 2 } { rr_idx: 2 rr_ip: 10.0.0.3 rr_permanent: no rr_expires: 2 } } } ` Expires values are computed each time like this : ` now=get_ticks_raw(); expires = (s_ticks_t)(e->expire-now)<0?-1: TICKS_TO_S(e->expire-now); ` So it would means either : - TICKS_TO_S(get_ticks_raw()) == 0 when the entry is created - TICKS_TO_S(get_ticks_raw()) == 0 when the value is printed when we execute a dns.lookup through rpc. Details : - Kamailio : 5.2.4 (x86_64/linux) - OS : Debian 9.9 - Running in Docker on Kubernetes cluster I cannot say how to reproduce, it happens sometimes after running the binary :/ Do you have any idea ? Kind regards, Mathieu Bodjikian -- 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/2063

3 8

[kamailio/kamailio] registrar: memory leak in xavp_rcd (#1834)
by Olle E. Johansson 24 Sep '19

24 Sep '19

### Description Kamailio 5.1 on Debian - Enabled xavp_rcd in registrar - Shared memory usage keeps growing over time ### Troubleshooting - `mod.stats core all `show a large amount of allocated memory for xavp_new_value that keeps growing over time ` xavp_new_value(94): 48815768` #### Reproduction We have the same symptom on multiple servers #### Log Messages Nothing shown in the log yet. ### Possible Solutions Using reg_fetch_contacts to grab expiry time is an alternative that works. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 10:59:52 Jul 3 2018 with gcc 6.3.0 ``` * **Operating System**: ``` Debian 9.7 x86_64 ``` -- 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/1834

5 12

rate-limiting enabled on kamailio.org
by Henning Westerholt 22 Sep '19

22 Sep '19

Hello, just to inform you that rate-limiting on kamailio.org web server has been enabled. The motivation is to throttle robots and other automated services to not overload the server. If you notice any new errors in accessing the service (like page not found, or a 429 Too Many Requests) let us know. Cheers, Henning -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

1 0

git:master:2f690e4c: modules: readme files regenerated - drouting ... [skip ci]
by Kamailio Dev 21 Sep '19

21 Sep '19

Module: kamailio Branch: master Commit: 2f690e4c01502ad744d3e24e368ff4359dcbdf33 URL: https://github.com/kamailio/kamailio/commit/2f690e4c01502ad744d3e24e368ff43… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-22T00:46:32+02:00 modules: readme files regenerated - drouting ... [skip ci] --- Modified: src/modules/drouting/README --- Diff: https://github.com/kamailio/kamailio/commit/2f690e4c01502ad744d3e24e368ff43… Patch: https://github.com/kamailio/kamailio/commit/2f690e4c01502ad744d3e24e368ff43… --- diff --git a/src/modules/drouting/README b/src/modules/drouting/README index b24eb6c78d..a61a00e6d7 100644 --- a/src/modules/drouting/README +++ b/src/modules/drouting/README @@ -6,8 +6,6 @@ Edited by Ovidiu Sas -Edited by - Anca-Maria Vamanu Copyright © 2005-2008 Voice Sistem SRL @@ -307,18 +305,18 @@ Chapter 1. Admin Guide draft 09): Table 1.4. Time recurrence attributes - Attribute Description - dastard Start of interval (RFC 2445 DATE-TIME) - duration Length of interval (RFC 2445 DURATION) - freq Frequency of recurrence (secondly,minutely,hourly, daily,weekly, - monthly, or yearly). - until bound of recurrence (RFC 2445 DATE-TIME) - interval How often the recurrence repeats - byday List of days of the week - bymonthday List of days of the month - byyearday List of days of the year - byweekno List of weeks of the year - bymonth List of months of the year + Attribute Description + dastard Start of interval (RFC 2445 DATE-TIME) + duration Length of interval (RFC 2445 DURATION) + freq Frequency of recurrence (secondly,minutely,hourly, daily,weekly, + monthly, or yearly). + until bound of recurrence (RFC 2445 DATE-TIME) + interval How often the recurrence repeats + byday List of days of the week + bymonthday List of days of the month + byyearday List of days of the year + byweekno List of weeks of the year + bymonth List of months of the year The value stored in database has the format of: <dtstart>|<duration>|<freq>|<until>|<interval>|<byday>|<bymonthday> |<byyearday>|<byweekno>|<bymonth> @@ -509,7 +507,7 @@ Chapter 1. Admin Guide The database url. - Default value is “NULL”. + Default value is “mysql://kamailioro:kamailioro@localhost/kamailio”. Example 1.1. Set db_url parameter ...

1 0

git: new commits in branch master
by Henning Westerholt 21 Sep '19

21 Sep '19

- URL: https://github.com/kamailio/kamailio/commit/4dbe7fa01d43931cbe1bfc041d4a16b… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T22:53:55+02:00 core: remove code for NO_REVERSE_INIT #define from 2002, which don't compile anymore - URL: https://github.com/kamailio/kamailio/commit/0cd270bcb4b4402f94fa65224e8d69c… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T23:35:35+02:00 core: more secure PRNG initialization, use fastrand (its much safer) to init the other PRNGs - URL: https://github.com/kamailio/kamailio/commit/3caeb310bda0a40f0dca3567308df9f… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T23:40:11+02:00 core: improve child_init debug logging - URL: https://github.com/kamailio/kamailio/commit/9d9e6f0df91fdab423bc5740099a9db… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T23:44:33+02:00 drouting: use default DB URL as all the other modules - URL: https://github.com/kamailio/kamailio/commit/e8aa74a0220d6776c417d0f83d438be… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T23:45:00+02:00 drouting: document default DB URL - URL: https://github.com/kamailio/kamailio/commit/f07664492be76212aaa5c380d982860… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T23:53:13+02:00 core: more secure PRNG initialization, use fastrand (its much safer) to init the other PRNGs - more secure PRNG initialization, use fastrand (its much safer) to init the other PRNGs - related to commit 0cd270bcb4b for main process, this is for the forked children - URL: https://github.com/kamailio/kamailio/commit/8dc02a6bd0adb068a07ec7b6b856e20… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:05:18+02:00 uac: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children - URL: https://github.com/kamailio/kamailio/commit/e85c9fc326d7d06a1078a529ed0a873… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:08:31+02:00 dispatcher: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children - URL: https://github.com/kamailio/kamailio/commit/e68bab8a107c19776f0d4abdc52ca8b… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:09:53+02:00 auth: remove commented out code block related to PRNG initialization - URL: https://github.com/kamailio/kamailio/commit/df25b16635e88b493b07bb3c3e0eb6a… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:10:51+02:00 cdp: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children - URL: https://github.com/kamailio/kamailio/commit/930406ec25254859eef0fa1db194d19… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:11:14+02:00 lost: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children - URL: https://github.com/kamailio/kamailio/commit/c89746fd908788807fdae32577450de… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:11:41+02:00 drouting: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children - URL: https://github.com/kamailio/kamailio/commit/6e81ff04eff41666a7fa94a7ac090bd… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:12:14+02:00 mohqueue: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children - URL: https://github.com/kamailio/kamailio/commit/56c6f787a0e968d3ed05c21cffe8bde… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:31:08+02:00 cdp: several own processes are forked, we need to properly initialize the PRNG for them - cdp: several own processes are forked, properly initialize the PRNG for them - related to commit df25b16635e - URL: https://github.com/kamailio/kamailio/commit/53ea0794c9ffeb017e0e5500b0ac248… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:34:49+02:00 sipcapture: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children - URL: https://github.com/kamailio/kamailio/commit/e2c3ed2de42eaa85c52d9d78c6e2076… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-22T00:36:18+02:00 lib: don't initialize the PRNG again, especially with insecure low entropy input - don't initialize the PRNG again, especially with insecure low entropy input - this is done in the core for the main process and all children

1 0

git:5.1:8ff3c229: core: remove unused seq variable in build_iface_list function
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.1 Commit: 8ff3c229f8c659278c0e1209933748b99f478507 URL: https://github.com/kamailio/kamailio/commit/8ff3c229f8c659278c0e1209933748b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:25:55+02:00 core: remove unused seq variable in build_iface_list function (cherry picked from commit 8821cc2f5a6b972307fb71e73cf8d57496e61f66) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/8ff3c229f8c659278c0e1209933748b… Patch: https://github.com/kamailio/kamailio/commit/8ff3c229f8c659278c0e1209933748b… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 424c5d83e8..6c3f6d5921 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -992,7 +992,6 @@ static int build_iface_list(void) struct rtgenmsg g; } req; - int seq = 0; int rtn = 0; struct nlmsghdr* nlp; struct ifaddrmsg *ifi;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev