sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
198 discussions

[kamailio/kamailio] 4.4.x TOPOS - parse_rr() error when using topos (#716)
by darencrew 09 Aug '16

09 Aug '16

On a setup i made, when using record_route without topos, the dialogs are well followed The same setup with topos activated leads to parse_rr() errors like this one: ERROR: <core> [parser/parse_rr.c:119]: do_parse_rr_body(): parse_rr(): Text after comma missing I made some SQL captures to see more about the issue, but nothing convincing except topos seems to be looking for a missing record in its database This record seems to have never been recorded [log-topos.txt](https://github.com/kamailio/kamailio/files/370286/log-topos.… Thank you for your help in diagnosing this issue --- 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/716

2 11

git:master:ef3bc390: Merge pull request #741 from snen/dialog_vars_update_error_fix
by GitHub 09 Aug '16

09 Aug '16

Module: kamailio Branch: master Commit: ef3bc3903ed119605162cba8bb5442de58973400 URL: https://github.com/kamailio/kamailio/commit/ef3bc3903ed119605162cba8bb5442d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-09T15:39:03+02:00 Merge pull request #741 from snen/dialog_vars_update_error_fix dialog: set DLG_FLAG_CHANGED for changed dialog variables --- Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/ef3bc3903ed119605162cba8bb5442d… Patch: https://github.com/kamailio/kamailio/commit/ef3bc3903ed119605162cba8bb5442d… --- diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index e89ee27..dd8dd6d 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -186,7 +186,7 @@ int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val) /* replace the current it with var and free the it */ var->next = it->next; /* Take the previous vflags: */ - var->vflags = it->vflags & DLG_FLAG_CHANGED; + var->vflags = it->vflags | DLG_FLAG_CHANGED; if (it_prev) it_prev->next = var; else *var_list = var; }

1 0

git:master:43c77faa: dialog: set DLG_FLAG_CHANGED for changed dialog variables
by Dmitri Savolainen 09 Aug '16

09 Aug '16

Module: kamailio Branch: master Commit: 43c77faa00021c7c0ee350ecc9965fd517ead92f URL: https://github.com/kamailio/kamailio/commit/43c77faa00021c7c0ee350ecc9965fd… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2016-08-09T12:01:59+03:00 dialog: set DLG_FLAG_CHANGED for changed dialog variables improper flag setting has been the cause of the not DB saving in some scenarios --- Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/43c77faa00021c7c0ee350ecc9965fd… Patch: https://github.com/kamailio/kamailio/commit/43c77faa00021c7c0ee350ecc9965fd… --- diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index e89ee27..dd8dd6d 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -186,7 +186,7 @@ int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val) /* replace the current it with var and free the it */ var->next = it->next; /* Take the previous vflags: */ - var->vflags = it->vflags & DLG_FLAG_CHANGED; + var->vflags = it->vflags | DLG_FLAG_CHANGED; if (it_prev) it_prev->next = var; else *var_list = var; }

1 0

[kamailio/kamailio] dialog: set DLG_FLAG_CHANGED for changed dialog variables (#741)
by Dmitri Savolainen 09 Aug '16

09 Aug '16

i've noticed, some dialog variables are not saved to DB improper flag setting has been the cause of the not DB saving in some scenarios You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/741 -- Commit Summary -- * dialog: set DLG_FLAG_CHANGED for changed dialog variables -- File Changes -- M modules/dialog/dlg_var.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/741.patch https://github.com/kamailio/kamailio/pull/741.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/741

2 2

git:master:6f3c1b32: Merge pull request #740 from sjthomason/solaris-use-sys-md5
by GitHub 09 Aug '16

09 Aug '16

Module: kamailio Branch: master Commit: 6f3c1b32d035361c9d2a1fd22b741348a723cd21 URL: https://github.com/kamailio/kamailio/commit/6f3c1b32d035361c9d2a1fd22b74134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-09T09:17:53+02:00 Merge pull request #740 from sjthomason/solaris-use-sys-md5 core: use system MD5 on Solaris --- Modified: Makefile.defs Modified: md5.c Modified: md5.h --- Diff: https://github.com/kamailio/kamailio/commit/6f3c1b32d035361c9d2a1fd22b74134… Patch: https://github.com/kamailio/kamailio/commit/6f3c1b32d035361c9d2a1fd22b74134… --- diff --git a/Makefile.defs b/Makefile.defs index af5fd45..240fea5 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1832,7 +1832,7 @@ ifeq ($(CC_NAME), suncc) endif OLD_SOLARIS= $(shell echo "$(OSREL)" | \ sed -e 's/^5\.[0-6][^0-9]*$$/yes/' ) - LIBS+= -L$(LOCALBASE)/lib -lxnet -lsocket -lnsl + LIBS+= -L$(LOCALBASE)/lib -lxnet -lsocket -lnsl -lmd5 ifeq ($(OLD_SOLARIS), yes) LIBS+=-lposix4 else diff --git a/md5.c b/md5.c index a0a036a..d675dd1 100644 --- a/md5.c +++ b/md5.c @@ -22,6 +22,8 @@ #include "md5.h" +#ifndef __OS_solaris + #define PUT_64BIT_LE(cp, value) do { \ (cp)[7] = (value) >> 56; \ (cp)[6] = (value) >> 48; \ @@ -247,3 +249,5 @@ MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH]) state[2] += c; state[3] += d; } + +#endif /* __OS_solaris */ diff --git a/md5.h b/md5.h index f094d10..02715b8 100644 --- a/md5.h +++ b/md5.h @@ -15,6 +15,8 @@ #ifndef _MD5_H_ #define _MD5_H_ +#ifndef __OS_solaris + #define MD5_BLOCK_LENGTH 64 #define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) @@ -22,13 +24,6 @@ /* Probably not the proper place, but will do for Debian: */ #include <sys/types.h> -/* fix types for Sun Solaris */ -#if defined(__SVR4) || defined(__sun) - typedef uint8_t u_int8_t; - typedef uint32_t u_int32_t; - typedef uint64_t u_int64_t; -#endif - typedef struct MD5Context { u_int32_t state[4]; /* state */ u_int64_t count; /* number of bits, mod 2^64 */ @@ -49,4 +44,14 @@ static inline void MD5Final(char buf[MD5_DIGEST_LENGTH], MD5_CTX *ctx) { U_MD5Final((unsigned char *)buf, ctx); } +#else /* __OS_solaris */ +#include <md5.h> + +#define U_MD5Update(ctx, input, len) \ + MD5Update(ctx, input, len) +#define U_MD5Final(digest, ctx) \ + MD5Final(digest, ctx) + +#endif /* __OS_solaris */ + #endif /* _MD5_H_ */

1 0

git:master:6cf9b05b: core: use system MD5 on Solaris
by Spencer Thomason 09 Aug '16

09 Aug '16

Module: kamailio Branch: master Commit: 6cf9b05b11fca3c0a2013176d9702cafbbcb5115 URL: https://github.com/kamailio/kamailio/commit/6cf9b05b11fca3c0a2013176d9702ca… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-08-08T16:40:14-07:00 core: use system MD5 on Solaris - Allows use of SPARC optimized functions --- Modified: Makefile.defs Modified: md5.c Modified: md5.h --- Diff: https://github.com/kamailio/kamailio/commit/6cf9b05b11fca3c0a2013176d9702ca… Patch: https://github.com/kamailio/kamailio/commit/6cf9b05b11fca3c0a2013176d9702ca… --- diff --git a/Makefile.defs b/Makefile.defs index af5fd45..240fea5 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1832,7 +1832,7 @@ ifeq ($(CC_NAME), suncc) endif OLD_SOLARIS= $(shell echo "$(OSREL)" | \ sed -e 's/^5\.[0-6][^0-9]*$$/yes/' ) - LIBS+= -L$(LOCALBASE)/lib -lxnet -lsocket -lnsl + LIBS+= -L$(LOCALBASE)/lib -lxnet -lsocket -lnsl -lmd5 ifeq ($(OLD_SOLARIS), yes) LIBS+=-lposix4 else diff --git a/md5.c b/md5.c index a0a036a..d675dd1 100644 --- a/md5.c +++ b/md5.c @@ -22,6 +22,8 @@ #include "md5.h" +#ifndef __OS_solaris + #define PUT_64BIT_LE(cp, value) do { \ (cp)[7] = (value) >> 56; \ (cp)[6] = (value) >> 48; \ @@ -247,3 +249,5 @@ MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH]) state[2] += c; state[3] += d; } + +#endif /* __OS_solaris */ diff --git a/md5.h b/md5.h index f094d10..02715b8 100644 --- a/md5.h +++ b/md5.h @@ -15,6 +15,8 @@ #ifndef _MD5_H_ #define _MD5_H_ +#ifndef __OS_solaris + #define MD5_BLOCK_LENGTH 64 #define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) @@ -22,13 +24,6 @@ /* Probably not the proper place, but will do for Debian: */ #include <sys/types.h> -/* fix types for Sun Solaris */ -#if defined(__SVR4) || defined(__sun) - typedef uint8_t u_int8_t; - typedef uint32_t u_int32_t; - typedef uint64_t u_int64_t; -#endif - typedef struct MD5Context { u_int32_t state[4]; /* state */ u_int64_t count; /* number of bits, mod 2^64 */ @@ -49,4 +44,14 @@ static inline void MD5Final(char buf[MD5_DIGEST_LENGTH], MD5_CTX *ctx) { U_MD5Final((unsigned char *)buf, ctx); } +#else /* __OS_solaris */ +#include <md5.h> + +#define U_MD5Update(ctx, input, len) \ + MD5Update(ctx, input, len) +#define U_MD5Final(digest, ctx) \ + MD5Final(digest, ctx) + +#endif /* __OS_solaris */ + #endif /* _MD5_H_ */

1 0

[kamailio/kamailio] core: use system MD5 on Solaris (#740)
by sjthomason 09 Aug '16

09 Aug '16

- Allows use of SPARC optimized functions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/740 -- Commit Summary -- * core: use system MD5 on Solaris -- File Changes -- M Makefile.defs (2) M md5.c (4) M md5.h (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/740.patch https://github.com/kamailio/kamailio/pull/740.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/740

2 2

Possible memory leak when several modules use SREV_NET_DATA_IN/SREV_NET_DATA_OUT callbacks.
by Vitaliy Aleksandrov 08 Aug '16

08 Aug '16

Hi kamailio developers, While I was working on a custom encryption module based on the corex network_io_intercept feature, I found a possible memory leak. Several modules like corex, gzcompress and topoh SREV_NET_DATA_OUT to catch an outgoing message just before sending it out. Those modules receive a buffer with a sip message and in the end of all their trunsformations use *build_req_buf_from_sip_req* to build a new buffer. *build_req_buf_from_sip_req *allocated pkg memory for its result and kamailio core clears that buffer after sending it out (forward.h:msg_send_buffer:286). As far as I understood, when we have more than one callback in chain, they override pkg allocated buffer and kamailio core frees only the last one (allocated by the last callback) creating a leek. Will be happy to be wrong, but can't find how those memory chunks are freed. Best regargs, Vitaliy Aleksandrov

1 0

git:master:f417fd1c: modules: readme files regenerated - uri_db ...
by Kamailio Dev 08 Aug '16

08 Aug '16

Module: kamailio Branch: master Commit: f417fd1ca4614a52bac3dd47dd18571ec6165063 URL: https://github.com/kamailio/kamailio/commit/f417fd1ca4614a52bac3dd47dd18571… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-08-08T09:01:27+02:00 modules: readme files regenerated - uri_db ... --- Modified: modules/uri_db/README --- Diff: https://github.com/kamailio/kamailio/commit/f417fd1ca4614a52bac3dd47dd18571… Patch: https://github.com/kamailio/kamailio/commit/f417fd1ca4614a52bac3dd47dd18571… --- diff --git a/modules/uri_db/README b/modules/uri_db/README index ee174ee..c00e1d4 100644 --- a/modules/uri_db/README +++ b/modules/uri_db/README @@ -41,7 +41,8 @@ Bogdan-Andrei Iancu 4.1. check_to() 4.2. check_from() - 4.3. does_uri_exist() + 4.3. check_uri(uri) + 4.4. does_uri_exist() List of Examples @@ -54,7 +55,8 @@ Bogdan-Andrei Iancu 1.7. Set use_domain parameter 1.8. check_to usage 1.9. check_from usage - 1.10. does_uri_exist usage + 1.10. check_uri usage + 1.11. does_uri_exist usage Chapter 1. Admin Guide @@ -80,7 +82,8 @@ Chapter 1. Admin Guide 4.1. check_to() 4.2. check_from() - 4.3. does_uri_exist() + 4.3. check_uri(uri) + 4.4. does_uri_exist() 1. Overview @@ -204,7 +207,8 @@ modparam("uri_db", "use_domain", 1) 4.1. check_to() 4.2. check_from() - 4.3. does_uri_exist() + 4.3. check_uri(uri) + 4.4. does_uri_exist() 4.1. check_to() @@ -234,7 +238,25 @@ if (check_from()) { }; ... -4.3. does_uri_exist() +4.3. check_uri(uri) + + Check the username from the given uri against URI table (if + use_uri_table is set) or digest credentials (no DB backend required). + + Description of parameters: + * uri Has to be a valid SIP URI, used to extract the username from. + The parameter can be a static or dynamic (with variables) string. + + This function can be used from REQUEST_ROUTE. + + Example 1.10. check_uri usage +... +if (check_uri("$var(uri)")) { + ... +}; +... + +4.4. does_uri_exist() Check if username in the request URI belongs to an existing user. @@ -243,7 +265,7 @@ if (check_from()) { This function can be used from REQUEST_ROUTE. - Example 1.10. does_uri_exist usage + Example 1.11. does_uri_exist usage ... if (does_uri_exist()) { ...

1 0

git:master:1cbdb6f6: Merge pull request #737 from dunst0/master
by GitHub 08 Aug '16

08 Aug '16

Module: kamailio Branch: master Commit: 1cbdb6f6ee77ee319f39d1cadd629b8ff5525c72 URL: https://github.com/kamailio/kamailio/commit/1cbdb6f6ee77ee319f39d1cadd629b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-08T08:49:03+02:00 Merge pull request #737 from dunst0/master uri_db: added function to check any sip uri --- Modified: modules/uri_db/checks.c Modified: modules/uri_db/checks.h Modified: modules/uri_db/doc/uri_db_admin.xml Modified: modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/1cbdb6f6ee77ee319f39d1cadd629b8… Patch: https://github.com/kamailio/kamailio/commit/1cbdb6f6ee77ee319f39d1cadd629b8… --- diff --git a/modules/uri_db/checks.c b/modules/uri_db/checks.c index 07ea8d8..794bb33 100644 --- a/modules/uri_db/checks.c +++ b/modules/uri_db/checks.c @@ -29,6 +29,7 @@ #include "../../parser/parse_uri.h" #include "../../ut.h" /* Handy utilities */ #include "../../lib/srdb1/db.h" /* Database API */ +#include "../../mod_fix.h" #include "uri_db.h" #include "checks.h" @@ -173,6 +174,30 @@ int check_from(struct sip_msg* _m, char* _s1, char* _s2) /* + * + */ +int check_uri(struct sip_msg* msg, char* uri, char* _s2) +{ + str suri; + struct sip_uri parsed_uri; + + if (fixup_get_svalue(msg, (gparam_t*)uri, &suri) != 0) + { + ERR("cannot get uri value\n"); + return -1; + } + + if (parse_uri(suri.s, suri.len, &parsed_uri) != 0) + { + ERR("Error while parsing URI\n"); + return -1; + } + + return check_username(msg, &parsed_uri); +} + + +/* * Check if uri belongs to a local user */ int does_uri_exist(struct sip_msg* _msg, char* _s1, char* _s2) diff --git a/modules/uri_db/checks.h b/modules/uri_db/checks.h index 36b9ec3..b671013 100644 --- a/modules/uri_db/checks.h +++ b/modules/uri_db/checks.h @@ -43,6 +43,12 @@ int check_from(struct sip_msg* _msg, char* _str1, char* _str2); /* + * + */ +int check_uri(struct sip_msg* msg, char* uri, char* _s2); + + +/* * Check if uri belongs to a local user, contributed by Juha Heinanen */ int does_uri_exist(struct sip_msg* _msg, char* _table, char* _s2); diff --git a/modules/uri_db/doc/uri_db_admin.xml b/modules/uri_db/doc/uri_db_admin.xml index 2dc0e43..ab513b5 100644 --- a/modules/uri_db/doc/uri_db_admin.xml +++ b/modules/uri_db/doc/uri_db_admin.xml @@ -253,6 +253,38 @@ if (check_from()) { </example> </section> + <section id="uri_db.f.check_uri"> + <title> + <function moreinfo="none">check_uri(uri)</function> + </title> + <para> + Check the username from the given uri against &uri; table (if use_uri_table is set) or + digest credentials (no DB backend required). + </para> + <para>Description of parameters:</para> + <itemizedlist> + <listitem> + <para><emphasis>uri</emphasis> Has to be a valid SIP URI, + used to extract the username from. The parameter can be + a static or dynamic (with variables) string. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>check_uri</function> usage</title> + <programlisting format="linespecific"> +... +if (check_uri("$var(uri)")) { + ... +}; +... +</programlisting> + </example> + </section> + <section id="uri_db.f.does_uri_exist"> <title> <function moreinfo="none">does_uri_exist()</function> diff --git a/modules/uri_db/uri_db.c b/modules/uri_db/uri_db.c index c2b9bb4..3f120e4 100644 --- a/modules/uri_db/uri_db.c +++ b/modules/uri_db/uri_db.c @@ -30,6 +30,7 @@ #include "../../ut.h" #include "../../error.h" #include "../../mem/mem.h" +#include "../../mod_fix.h" #include "uri_db.h" #include "checks.h" @@ -78,6 +79,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"check_from", (cmd_function)check_from, 0, 0, 0, REQUEST_ROUTE}, + {"check_uri", (cmd_function)check_uri, 1, fixup_spve_null, 0, + REQUEST_ROUTE}, {"does_uri_exist", (cmd_function)does_uri_exist, 0, 0, fixup_exist, REQUEST_ROUTE|LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016