sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: dispatcher: free dset root structure at reload
by Daniel-Constantin Mierla 11 Sep '14

11 Sep '14

Module: sip-router Branch: master Commit: 7fb8c88c1d4aeb50d1e637697132ab0994dcdb28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fb8c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 11 22:36:56 2014 +0200 dispatcher: free dset root structure at reload - reported by Heenan, Timothy Steven --- modules/dispatcher/dispatch.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 5538c94..aa8194f 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -846,12 +846,14 @@ int ds_destroy_list(void) void destroy_list(int list_id) { ds_set_t *sp = NULL; + ds_set_t *sp1 = NULL; ds_dest_t *dest = NULL; sp = ds_lists[list_id]; while(sp) { + sp1 = sp->next; for(dest = sp->dlist; dest!= NULL; dest=dest->next) { if(dest->uri.s!=NULL) @@ -862,7 +864,8 @@ void destroy_list(int list_id) } if (sp->dlist != NULL) shm_free(sp->dlist); - sp = sp->next; + shm_free(sp); + sp = sp1; } ds_lists[list_id] = NULL;

1 0

git:lazedo/kazoo: kazoo: remove dependency on tm module
by Luis Azedo 11 Sep '14

11 Sep '14

Module: sip-router Branch: lazedo/kazoo Commit: 722ee5ea86d38337d2ea901fbd5c087c9cc43ab3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=722ee5e… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: Thu Sep 11 17:32:56 2014 +0100 kazoo: remove dependency on tm module --- modules/kazoo/Makefile | 7 ++----- modules/kazoo/kazoo.c | 24 ------------------------ modules/kazoo/kz_amqp.c | 19 +++++++++++++++++-- modules/kazoo/kz_amqp.h | 1 - 4 files changed, 19 insertions(+), 32 deletions(-) diff --git a/modules/kazoo/Makefile b/modules/kazoo/Makefile index ae8bb2e..087ae6b 100644 --- a/modules/kazoo/Makefile +++ b/modules/kazoo/Makefile @@ -6,14 +6,11 @@ include ../../Makefile.defs auto_gen= NAME=kazoo.so -DEFS+=-I/usr/local/include -DKAMAILIO_MOD_INTERFACE -LIBS=-L/usr/local/lib -lrabbitmq -ljson +DEFS+=-I$(LOCALBASE)/include -I$(SYSBASE)/include -DKAMAILIO_MOD_INTERFACE +LIBS=-L$(LOCALBASE)/lib -I$(SYSBASE)/lib -lrabbitmq -ljson -luuid DEFS += -DSER_MOD_INTERFACE -ifeq ($(CROSS_COMPILE),) -XML2CFG=$(shell which xml2-config) -endif SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index 4428ee9..273f143 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -90,11 +90,6 @@ int dbk_pua_mode = 1; int dbk_single_consumer_on_reconnect = 1; int dbk_consume_messages_on_reconnect = 1; - -struct tm_binds tmb; -pua_api_t kz_pua_api; -presence_api_t kz_presence_api; - int startup_time = 0; int *kz_pipe_fds = NULL; @@ -195,20 +190,6 @@ struct module_exports exports = { mod_child_init /* per-child init function */ }; - - -static int kz_initialize_bindings() { - LM_DBG("kz_initialize_bindings\n"); - - /* load all TM stuff */ - if (load_tm_api(&tmb) == -1) { - LM_ERR("Can't load tm functions. Module TM not loaded?\n"); - return -1; - } - - return 0; -} - static int mod_init(void) { int i; startup_time = (int) time(NULL); @@ -225,11 +206,6 @@ static int mod_init(void) { kz_amqp_init(); - if(kz_initialize_bindings() == -1) { - LM_ERR("Error initializing bindings\n"); - return -1; - } - if(dbk_pua_mode == 1) { kz_db_url.len = kz_db_url.s ? strlen(kz_db_url.s) : 0; LM_DBG("db_url=%s/%d/%p\n", ZSW(kz_db_url.s), kz_db_url.len,kz_db_url.s); diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 3931d27..abfe370 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -5,6 +5,7 @@ #include <amqp_framing.h> #include <amqp_tcp_socket.h> #include <json/json.h> +#include <uuid/uuid.h> #include "../../mem/mem.h" #include "../../timer_proc.h" #include "../../sr_module.h" @@ -575,7 +576,14 @@ int kz_amqp_pipe_send(str *str_exchange, str *str_routing_key, str *str_payload) str unique_string = { 0, 0 }; char serverid[512]; - tmb.generate_callid(&unique_string); + uuid_t id; + char uuid_buffer[40]; + + uuid_generate_random(id); + uuid_unparse_lower(id, uuid_buffer); + unique_string.s = uuid_buffer; + unique_string.len = strlen(unique_string.s); + sprintf(serverid, "kamailio(a)%.*s-<%d>-script-%lu", dbk_node_hostname.len, dbk_node_hostname.s, my_pid(), rpl_query_routing_key_count++); @@ -642,7 +650,14 @@ int kz_amqp_pipe_send_receive(str *str_exchange, str *str_routing_key, str *str_ str unique_string = { 0, 0 }; char serverid[512]; - tmb.generate_callid(&unique_string); + uuid_t id; + char uuid_buffer[40]; + + uuid_generate_random(id); + uuid_unparse_lower(id, uuid_buffer); + unique_string.s = uuid_buffer; + unique_string.len = strlen(unique_string.s); + sprintf(serverid, "kamailio(a)%.*s-<%d>-script-%lu", dbk_node_hostname.len, dbk_node_hostname.s, my_pid(), rpl_query_routing_key_count++); diff --git a/modules/kazoo/kz_amqp.h b/modules/kazoo/kz_amqp.h index 10b9095..27769d6 100644 --- a/modules/kazoo/kz_amqp.h +++ b/modules/kazoo/kz_amqp.h @@ -22,7 +22,6 @@ typedef kz_amqp_connection_info *kz_amqp_connection_info_ptr; extern int dbk_channels; extern str dbk_node_hostname; -extern struct tm_binds tmb; extern str dbk_consumer_event_key; extern str dbk_consumer_event_subkey; extern int dbk_consumer_processes;

1 0

git:master: app_java: allocate enough space to store terminating NULL pointer in split
by Daniel-Constantin Mierla 11 Sep '14

11 Sep '14

Module: sip-router Branch: master Commit: a13e3b46dba4470deb748eec3b700386f453f6f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a13e3b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 11 17:46:52 2014 +0200 app_java: allocate enough space to store terminating NULL pointer in split - on a report by Tom Johnson --- modules/app_java/utils.c | 70 +++++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/app_java/utils.c b/modules/app_java/utils.c index f39c053..b2ff2a3 100644 --- a/modules/app_java/utils.c +++ b/modules/app_java/utils.c @@ -41,49 +41,49 @@ char **split(char *str, char *sep) { - char **buf = NULL; - char *token = NULL; - char *saveptr = NULL; - int i; + char **buf = NULL; + char *token = NULL; + char *saveptr = NULL; + int i; - buf = (char **)pkg_malloc(sizeof(char *)); - if (!buf) - { - LM_ERR("%s: pkg_malloc() has failed. Not enough memory!\n", APP_NAME); - return NULL; - } - memset(&buf, 0, sizeof(char *)); + buf = (char **)pkg_malloc(sizeof(char *)); + if (!buf) + { + LM_ERR("%s: pkg_malloc() has failed. Not enough memory!\n", APP_NAME); + return NULL; + } + memset(&buf, 0, sizeof(char *)); - if (str == NULL) - return buf; + if (str == NULL) + return buf; - if (strncmp(str, sep, strlen(sep)) <= 0) - { - // string doesn't contains a separator - buf[0] = strdup(str); - return buf; - } + if (strncmp(str, sep, strlen(sep)) <= 0) + { + // string doesn't contains a separator + buf[0] = strdup(str); + return buf; + } - token = strdup(str); - for (i=0; token != NULL; token = saveptr, i++) - { - token = strtok_r(token, (const char *)sep, &saveptr); + token = strdup(str); + for (i=0; token != NULL; token = saveptr, i++) + { + token = strtok_r(token, (const char *)sep, &saveptr); - if (token == NULL || !strcmp(token, "")) - break; + if (token == NULL || !strcmp(token, "")) + break; - buf = (char **)pkg_realloc(buf, (i+1) * sizeof(char *)); - if (!buf) - { - LM_ERR("%s: pkg_realloc() has failed. Not enough memory!\n", APP_NAME); - return NULL; + buf = (char **)pkg_realloc(buf, (i+2) * sizeof(char *)); + if (!buf) + { + LM_ERR("%s: pkg_realloc() has failed. Not enough memory!\n", APP_NAME); + return NULL; + } + buf[i] = strdup(token); } - buf[i] = strdup(token); - } - buf[i] = NULL; + buf[i] = NULL; - free(token); + free(token); - return buf; + return buf; }

1 0

git:master: support vhost in connection
by Luis Azedo 11 Sep '14

11 Sep '14

Module: sip-router Branch: master Commit: dfe22fd0c69d58702e8d12ba4f6b7891bb48896e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfe22fd… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: Thu Sep 11 14:47:33 2014 +0100 support vhost in connection --- modules/kazoo/kz_amqp.c | 59 ++++++++++++++++++++++++++++++++++++++++------ modules/kazoo/kz_amqp.h | 3 +- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 1e3c0d2..3931d27 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -127,6 +127,17 @@ void kz_amqp_free_bind(kz_amqp_bind_ptr bind) shm_free(bind); } +void kz_amqp_free_connection(kz_amqp_conn_ptr conn) +{ + if(!conn) + return; + + if(conn->url) + shm_free(conn->url); + shm_free(conn); +} + + void kz_amqp_free_pipe_cmd(kz_amqp_cmd_ptr cmd) { if(cmd == NULL) @@ -269,9 +280,9 @@ void kz_amqp_destroy() { if(kz_pool != NULL) { kz_amqp_conn_ptr conn = kz_pool->head; while(conn != NULL) { - kz_amqp_conn_ptr free = conn; + kz_amqp_conn_ptr tofree = conn; conn = conn->next; - shm_free(free); + kz_amqp_free_connection(tofree); } shm_free(kz_pool); } @@ -279,13 +290,45 @@ void kz_amqp_destroy() { } +#define KZ_URL_MAX_SIZE 50 +static char* KZ_URL_ROOT = "/"; + int kz_amqp_add_connection(modparam_t type, void* val) { kz_amqp_init_connection_pool(); // find a better way + char* url = (char*) val; + int len = strlen(url); + if(len > KZ_URL_MAX_SIZE) { + LM_ERR("connection url exceeds max size %d\n", KZ_URL_MAX_SIZE); + return -1; + } + kz_amqp_conn_ptr newConn = shm_malloc(sizeof(kz_amqp_conn)); memset(newConn, 0, sizeof(kz_amqp_conn)); + newConn->url = shm_malloc( (KZ_URL_MAX_SIZE + 1) * sizeof(char) ); + memset(newConn->url, 0, (KZ_URL_MAX_SIZE + 1) * sizeof(char)); + // maintain compatibility + if (!strncmp((char*)val, "kazoo://", 8)) { + sprintf(newConn->url, "amqp://%s", (char*)(url+(8*sizeof(char))) ); + } else { + strcpy(newConn->url, url); + newConn->url[len] = '\0'; + } + + if(amqp_parse_url(newConn->url, &newConn->info) == AMQP_STATUS_BAD_URL) { + LM_ERR("ERROR PARSING URL \"%s\"\n", newConn->url); + goto error; + } + + + if(newConn->info.vhost == NULL) { + newConn->info.vhost = KZ_URL_ROOT; + } else if(newConn->info.vhost[0] == '/' && strlen(newConn->info.vhost) == 1) { // bug in amqp_parse_url ? + newConn->info.vhost++; + } + if(kz_pool->head == NULL) kz_pool->head = newConn; @@ -294,9 +337,12 @@ int kz_amqp_add_connection(modparam_t type, void* val) kz_pool->tail = newConn; - amqp_parse_url((char*)val, &newConn->info); - return 0; + +error: + kz_amqp_free_connection(newConn); + return -1; + } void kz_amqp_connection_close(kz_amqp_conn_ptr rmq) { @@ -313,9 +359,6 @@ void kz_amqp_connection_close(kz_amqp_conn_ptr rmq) { rmq->conn = NULL; rmq->socket = NULL; rmq->channel_count = 0; - -// lock_release(&kz_pool->lock); - } } @@ -348,7 +391,7 @@ int kz_amqp_connection_open(kz_amqp_conn_ptr rmq) { } if (kz_amqp_error("Logging in", amqp_login(rmq->conn, - "/", //rmq->info.vhost, + rmq->info.vhost, 0, 131072, 0, diff --git a/modules/kazoo/kz_amqp.h b/modules/kazoo/kz_amqp.h index ce4aa5d..10b9095 100644 --- a/modules/kazoo/kz_amqp.h +++ b/modules/kazoo/kz_amqp.h @@ -30,11 +30,11 @@ extern int dbk_consumer_processes; typedef struct kz_amqp_conn_t { kz_amqp_connection_info info; + char* url; amqp_connection_state_t conn; amqp_socket_t *socket; amqp_channel_t channel_count; amqp_channel_t channel_counter; -// gen_lock_t lock; struct kz_amqp_conn_t* next; } kz_amqp_conn, *kz_amqp_conn_ptr; @@ -42,7 +42,6 @@ typedef struct { kz_amqp_conn_ptr current; kz_amqp_conn_ptr head; kz_amqp_conn_ptr tail; -// gen_lock_t lock; } kz_amqp_conn_pool, *kz_amqp_conn_pool_ptr;

2 1

git:lazedo/kazoo: support vhost in connection
by Luis Azedo 11 Sep '14

11 Sep '14

Module: sip-router Branch: lazedo/kazoo Commit: 0d9cf1bd0b34f0fe718d6f52edf72b5a890b62fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d9cf1b… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: Thu Sep 11 14:47:33 2014 +0100 support vhost in connection --- modules/kazoo/kz_amqp.c | 59 ++++++++++++++++++++++++++++++++++++++++------ modules/kazoo/kz_amqp.h | 3 +- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 1e3c0d2..3931d27 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -127,6 +127,17 @@ void kz_amqp_free_bind(kz_amqp_bind_ptr bind) shm_free(bind); } +void kz_amqp_free_connection(kz_amqp_conn_ptr conn) +{ + if(!conn) + return; + + if(conn->url) + shm_free(conn->url); + shm_free(conn); +} + + void kz_amqp_free_pipe_cmd(kz_amqp_cmd_ptr cmd) { if(cmd == NULL) @@ -269,9 +280,9 @@ void kz_amqp_destroy() { if(kz_pool != NULL) { kz_amqp_conn_ptr conn = kz_pool->head; while(conn != NULL) { - kz_amqp_conn_ptr free = conn; + kz_amqp_conn_ptr tofree = conn; conn = conn->next; - shm_free(free); + kz_amqp_free_connection(tofree); } shm_free(kz_pool); } @@ -279,13 +290,45 @@ void kz_amqp_destroy() { } +#define KZ_URL_MAX_SIZE 50 +static char* KZ_URL_ROOT = "/"; + int kz_amqp_add_connection(modparam_t type, void* val) { kz_amqp_init_connection_pool(); // find a better way + char* url = (char*) val; + int len = strlen(url); + if(len > KZ_URL_MAX_SIZE) { + LM_ERR("connection url exceeds max size %d\n", KZ_URL_MAX_SIZE); + return -1; + } + kz_amqp_conn_ptr newConn = shm_malloc(sizeof(kz_amqp_conn)); memset(newConn, 0, sizeof(kz_amqp_conn)); + newConn->url = shm_malloc( (KZ_URL_MAX_SIZE + 1) * sizeof(char) ); + memset(newConn->url, 0, (KZ_URL_MAX_SIZE + 1) * sizeof(char)); + // maintain compatibility + if (!strncmp((char*)val, "kazoo://", 8)) { + sprintf(newConn->url, "amqp://%s", (char*)(url+(8*sizeof(char))) ); + } else { + strcpy(newConn->url, url); + newConn->url[len] = '\0'; + } + + if(amqp_parse_url(newConn->url, &newConn->info) == AMQP_STATUS_BAD_URL) { + LM_ERR("ERROR PARSING URL \"%s\"\n", newConn->url); + goto error; + } + + + if(newConn->info.vhost == NULL) { + newConn->info.vhost = KZ_URL_ROOT; + } else if(newConn->info.vhost[0] == '/' && strlen(newConn->info.vhost) == 1) { // bug in amqp_parse_url ? + newConn->info.vhost++; + } + if(kz_pool->head == NULL) kz_pool->head = newConn; @@ -294,9 +337,12 @@ int kz_amqp_add_connection(modparam_t type, void* val) kz_pool->tail = newConn; - amqp_parse_url((char*)val, &newConn->info); - return 0; + +error: + kz_amqp_free_connection(newConn); + return -1; + } void kz_amqp_connection_close(kz_amqp_conn_ptr rmq) { @@ -313,9 +359,6 @@ void kz_amqp_connection_close(kz_amqp_conn_ptr rmq) { rmq->conn = NULL; rmq->socket = NULL; rmq->channel_count = 0; - -// lock_release(&kz_pool->lock); - } } @@ -348,7 +391,7 @@ int kz_amqp_connection_open(kz_amqp_conn_ptr rmq) { } if (kz_amqp_error("Logging in", amqp_login(rmq->conn, - "/", //rmq->info.vhost, + rmq->info.vhost, 0, 131072, 0, diff --git a/modules/kazoo/kz_amqp.h b/modules/kazoo/kz_amqp.h index ce4aa5d..10b9095 100644 --- a/modules/kazoo/kz_amqp.h +++ b/modules/kazoo/kz_amqp.h @@ -30,11 +30,11 @@ extern int dbk_consumer_processes; typedef struct kz_amqp_conn_t { kz_amqp_connection_info info; + char* url; amqp_connection_state_t conn; amqp_socket_t *socket; amqp_channel_t channel_count; amqp_channel_t channel_counter; -// gen_lock_t lock; struct kz_amqp_conn_t* next; } kz_amqp_conn, *kz_amqp_conn_ptr; @@ -42,7 +42,6 @@ typedef struct { kz_amqp_conn_ptr current; kz_amqp_conn_ptr head; kz_amqp_conn_ptr tail; -// gen_lock_t lock; } kz_amqp_conn_pool, *kz_amqp_conn_pool_ptr;

1 0

[tracker] Comment added: our Record-Route is doubled on subsequent branches
by sip-router 11 Sep '14

11 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#466 - our Record-Route is doubled on subsequent branches User who did this - Andrew Pogrebennyk (marduk) ---------- Daniel, yes I am calling record_route() first time before creating the transaction and then again when routing new branch (after failure route). It didn't occur to me yet so thanks for the hint. My preliminary tests show that I should do if(!t_is_failure_route()) { record_route(); } In fact, we have backported that internal msg_flag for detecting double record_route from master to 4.1 just 2 weeks ago: https://github.com/sipwise/kamailio/commit/1a6523a7793f8478445b311859682b43… But it seems this doesn't work after failure route. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=466#comment1617 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

dbtext patch
by Luis Azedo 11 Sep '14

11 Sep '14

Hi Daniel, dbtext deals with DB1_BLOB in every place i see with the exception of dbt_result_free we still having the issue with the "internal structure not freed" but memory is stable with the attached patch. we were testing it with a table that has a blob column. Best

2 1

Kamailio v4.2 - development frozen
by Daniel-Constantin Mierla 11 Sep '14

11 Sep '14

Hello, development (master) branch of Kamailio enters now in pre-release phase for version 4.2.0. Therefore, no new feature should be pushed to master until we create a dedicated branch for 4.2 (expected to be in about 4 weeks or so). If in doubt to push or not a commit to master, push it first on a personal branch (or attach to an email) and discuss it on sr-dev. The new modules can be a bit more dynamic if there is need to get them to the right shape (e.g., like decision to rename functions, parameters or adjust database structure). We hope to get many people involved in testing, to rich a stable state before releasing 4.2.0. If you want to get involved and need assistance, don't hesitate to write to mailing lists. Help with updating the wiki page for migration from 4.1 to 4.2 as well as what is new in 4.2 is very appreciated. I will post updates about the very soon. Many thanks to everyone involved in development of 4.2 and the early testers that played with master branch. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Next Kamailio Advanced Trainings 2014 - http://www.asipto.com Sep 22-25, Berlin, Germany

1 0

[tracker] Comment added: our Record-Route is doubled on subsequent branches
by sip-router 11 Sep '14

11 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#466 - our Record-Route is doubled on subsequent branches User who did this - Daniel-Constantin Mierla (miconda) ---------- Are calling record_route() first time before creating the transaction and then again when routing new branches (in failure route or branch route)? There is a internal msg_flag that marks a request when record route is added (not sure if in 4.1, but in devel for sure). Also, in devel version, there is a new function from rr module that removes added record route lumps. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=466#comment1616 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: ims_registrar_pcscf: Safety check, if (r) is set ( caused a crash)
by Carsten Bock 11 Sep '14

11 Sep '14

Module: sip-router Branch: master Commit: 9673bbe0fff1c3f05803a7a51f16cee9d299601f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9673bbe… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Sep 11 12:19:18 2014 +0200 ims_registrar_pcscf: Safety check, if (r) is set (caused a crash) --- modules/ims_registrar_pcscf/service_routes.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 851ffad..1eef7f4 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -297,7 +297,7 @@ int check_service_routes(struct sip_msg* _m, udomain_t* _d) { if (r) { LM_DBG("Route is %.*s\n", r->nameaddr.uri.len, r->nameaddr.uri.s); /* Skip first headers containing myself: */ - while (parse_uri(r->nameaddr.uri.s, r->nameaddr.uri.len, &uri) == 0 + while (r && (parse_uri(r->nameaddr.uri.s, r->nameaddr.uri.len, &uri) == 0) && check_self(&uri.host,uri.port_no?uri.port_no:SIP_PORT,0)) { LM_DBG("Self\n"); /* Check for more headers and fail, if it was the last one @@ -315,6 +315,7 @@ int check_service_routes(struct sip_msg* _m, udomain_t* _d) { if (r) LM_DBG("Next Route is %.*s\n", r->nameaddr.uri.len, r->nameaddr.uri.s); } + LM_DBG("We have %d service-routes\n"); /* Then check the following headers: */ for (i=0; i< c->num_service_routes; i++) { LM_DBG("Route must be: %.*s\n", c->service_routes[i].len, c->service_routes[i].s);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014