sr-dev February 2014

sr-dev@lists.kamailio.org

38 participants
235 discussions

git:4.1: dmq: fixed crash caused by freeing pointer too early on tm callback

by Charles Chance

Module: sip-router Branch: 4.1 Commit: 01c5ad7cb67bdb5d6140061aa0c2f8152f6f03cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01c5ad7… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Fri Feb 14 10:21:00 2014 +0000 dmq: fixed crash caused by freeing pointer too early on tm callback (cherry picked from commit 8be7de6d1d383c2e0e476e739a6b3fa5101bac12) --- modules/dmq/dmqnode.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/dmq/dmqnode.c b/modules/dmq/dmqnode.c index bc7c108..cf1d9db 100644 --- a/modules/dmq/dmqnode.c +++ b/modules/dmq/dmqnode.c @@ -228,8 +228,12 @@ dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) void destroy_dmq_node(dmq_node_t* node, int shm) { if(shm) { + if (node->params!=NULL) + shm_free_params(node->params); shm_free_node(node); } else { + if (node->params!=NULL) + free_params(node->params); pkg_free_node(node); } } @@ -283,8 +287,6 @@ void shm_free_node(dmq_node_t* node) { if (node->orig_uri.s!=NULL) shm_free(node->orig_uri.s); - if (node->params!=NULL) - shm_free_params(node->params); shm_free(node); } @@ -295,8 +297,6 @@ void pkg_free_node(dmq_node_t* node) { if (node->orig_uri.s!=NULL) pkg_free(node->orig_uri.s); - if (node->params!=NULL) - free_params(node->params); pkg_free(node); } @@ -312,7 +312,7 @@ int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) while(cur) { if(cmp_dmq_node(cur, node)) { *prev = cur->next; - shm_free_node(cur); + destroy_dmq_node(cur, 1); lock_release(&list->lock); return 1; }

10 years, 10 months

git:master: dmq: fixed crash caused by freeing pointer too early on tm callback

by Charles Chance

Module: sip-router Branch: master Commit: 8be7de6d1d383c2e0e476e739a6b3fa5101bac12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8be7de6… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Fri Feb 14 10:21:00 2014 +0000 dmq: fixed crash caused by freeing pointer too early on tm callback --- modules/dmq/dmqnode.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/dmq/dmqnode.c b/modules/dmq/dmqnode.c index bc7c108..cf1d9db 100644 --- a/modules/dmq/dmqnode.c +++ b/modules/dmq/dmqnode.c @@ -228,8 +228,12 @@ dmq_node_t* find_dmq_node_uri(dmq_node_list_t* list, str* uri) void destroy_dmq_node(dmq_node_t* node, int shm) { if(shm) { + if (node->params!=NULL) + shm_free_params(node->params); shm_free_node(node); } else { + if (node->params!=NULL) + free_params(node->params); pkg_free_node(node); } } @@ -283,8 +287,6 @@ void shm_free_node(dmq_node_t* node) { if (node->orig_uri.s!=NULL) shm_free(node->orig_uri.s); - if (node->params!=NULL) - shm_free_params(node->params); shm_free(node); } @@ -295,8 +297,6 @@ void pkg_free_node(dmq_node_t* node) { if (node->orig_uri.s!=NULL) pkg_free(node->orig_uri.s); - if (node->params!=NULL) - free_params(node->params); pkg_free(node); } @@ -312,7 +312,7 @@ int del_dmq_node(dmq_node_list_t* list, dmq_node_t* node) while(cur) { if(cmp_dmq_node(cur, node)) { *prev = cur->next; - shm_free_node(cur); + destroy_dmq_node(cur, 1); lock_release(&list->lock); return 1; }

10 years, 10 months

git:master: lib/ims:modules/ims_charging, ims_icscf, ims_qos, ims_registrar_scscf: fixed pkg_mem leak

by Jason Penton

Module: sip-router Branch: master Commit: 1d6b1d8765d7a6d21c291d2076a3a80a1710c11c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d6b1d8… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Feb 14 09:57:45 2014 +0200 lib/ims:modules/ims_charging,ims_icscf,ims_qos,ims_registrar_scscf: fixed pkg_mem leak - fixed leak when parsing msg headers on a shm msg - instead now pass in flag to say if parsing is on shm_msg or not (is_shm) - assumes all common headers are already parsed before pkg_mem msg is cloned --- lib/ims/ims_getters.c | 33 ++++++++++++++++++----- lib/ims/ims_getters.h | 3 +- modules/ims_charging/ims_ro.c | 4 +- modules/ims_icscf/location.c | 2 +- modules/ims_qos/rx_aar.c | 13 +++++++-- modules/ims_registrar_scscf/registrar_notify.c | 4 +- modules/ims_registrar_scscf/save.c | 2 +- 7 files changed, 44 insertions(+), 17 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 082a5c2..aa37c7d 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -388,13 +388,32 @@ str s_asserted_identity={"P-Asserted-Identity",19}; * @param msg - the sip message * @returns the asserted identity */ -str cscf_get_asserted_identity(struct sip_msg *msg) -{ - str uri = {0,0}; - if (!msg) return uri; - if((parse_pai_header(msg) == 0) && (msg->pai) && (msg->pai->parsed)) { +str cscf_get_asserted_identity(struct sip_msg *msg, int is_shm) { + int len; + str uri = { 0, 0 }; + + if (!msg || !msg->pai) + return uri; + + if ((parse_pai_header(msg) == 0) && (msg->pai) && (msg->pai->parsed)) { to_body_t *pai = get_pai(msg)->id; - return pai->uri; + if (!is_shm) + return pai->uri; + + //make a pkg malloc str to return to consuming function + len = pai->uri.len + 1; + uri.s = (char*) pkg_malloc(pai->uri.len + 1); + if (!uri.s) { + LM_ERR("no more pkg mem\n"); + return uri; + } + memset(uri.s, 0, len); + memcpy(uri.s, pai->uri.s, pai->uri.len); + uri.len = pai->uri.len; + + p_id_body_t* ptr = (p_id_body_t*) msg->pai->parsed; + msg->pai->parsed = 0; + free_pai_ppi_body(ptr); } return uri; } @@ -855,7 +874,7 @@ int cscf_is_initial_request(struct sip_msg *msg) int cscf_get_originating_user( struct sip_msg * msg, str *uri ) { struct to_body * from; - *uri = cscf_get_asserted_identity(msg); + *uri = cscf_get_asserted_identity(msg, 0); if (!uri->len) { /* Fallback to From header */ if ( parse_from_header( msg ) == -1 ) { diff --git a/lib/ims/ims_getters.h b/lib/ims/ims_getters.h index 0b01ffc..2217ddc 100644 --- a/lib/ims/ims_getters.h +++ b/lib/ims/ims_getters.h @@ -153,9 +153,10 @@ int cscf_has_originating(struct sip_msg *msg, char *str1, char *str2); /** * Looks for the P-Asserted-Identity header and extracts its content * @param msg - the sip message + * @is_shm - is the message a shm message * @returns the asserted identity */ -str cscf_get_asserted_identity(struct sip_msg *msg); +str cscf_get_asserted_identity(struct sip_msg *msg, int is_shm); /** * Extracts the realm from a SIP/TEL URI. * - SIP - the hostname diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index f650e90..ab5937a 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -361,7 +361,7 @@ int get_sip_header_info(struct sip_msg * req, *expires = cscf_get_expires_hdr(req, 0); *callid = cscf_get_call_id(req, NULL); - if ((*asserted_id_uri = cscf_get_asserted_identity(req)).len == 0) { + if ((*asserted_id_uri = cscf_get_asserted_identity(req, 0)).len == 0) { LM_DBG("No P-Asserted-Identity hdr found. Using From hdr"); if (!cscf_get_from_uri(req, asserted_id_uri)) { @@ -955,7 +955,7 @@ int Ro_Send_CCR(struct sip_msg *msg, str* direction, str* charge_type, str* unit //getting asserted identity - if ((asserted_identity = cscf_get_asserted_identity(msg)).len == 0) { + if ((asserted_identity = cscf_get_asserted_identity(msg, 0)).len == 0) { LM_DBG("No P-Asserted-Identity hdr found. Using From hdr for asserted_identity"); asserted_identity = dlg->from_uri; } diff --git a/modules/ims_icscf/location.c b/modules/ims_icscf/location.c index 3d0f09a..4aac051 100644 --- a/modules/ims_icscf/location.c +++ b/modules/ims_icscf/location.c @@ -98,7 +98,7 @@ int I_perform_location_information_request(struct sip_msg* msg, char* route, cha /* extract data from message */ if (orig) { - public_identity = cscf_get_asserted_identity(msg); + public_identity = cscf_get_asserted_identity(msg, 0); } else { public_identity = cscf_get_public_identity_from_requri(msg); } diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 69d04c0..3d7fc22 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -411,7 +411,7 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, AAASession* auth, char* direction, saved_transaction_t* saved_t_data) { AAAMessage* aar = 0; - + int must_free_asserted_identity = 0; str identifier; int identifier_type; @@ -494,17 +494,20 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, if (dlg_direction == DLG_MOBILE_ORIGINATING) { LM_DBG("originating direction\n"); - if ((identifier = cscf_get_asserted_identity(req)).len == 0) { + if ((identifier = cscf_get_asserted_identity(req, 1)).len == 0) { LM_DBG("No P-Asserted-Identity hdr found in request. Using From hdr in req"); if (!cscf_get_from_uri(req, &identifier)) { LM_ERR("Error assigning P-Asserted-Identity using From hdr in req"); goto error; } + } else { + must_free_asserted_identity = 1; } } else { LM_DBG("terminating direction\n"); - if ((identifier = cscf_get_asserted_identity(res)).len == 0) { + + if ((identifier = cscf_get_asserted_identity(res, 0)).len == 0) { LM_DBG("No P-Asserted-Identity hdr found in response. Using To hdr in resp"); if (!cscf_get_to_uri(res, &identifier)) { @@ -522,6 +525,10 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, rx_add_subscription_id_avp(aar, identifier, identifier_type); + if (must_free_asserted_identity) { + pkg_free(identifier.s); + } + LM_DBG("Adding reservation priority...\n"); /* Add Reservation Priority AVP*/ diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index 1fc1f07..3f04dbe 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -153,7 +153,7 @@ int can_publish_reg(struct sip_msg *msg, char *_t, char *str2) { goto done; } - asserted_id = cscf_get_asserted_identity(msg); + asserted_id = cscf_get_asserted_identity(msg, 0); if (!asserted_id.len) { LM_ERR("P-Asserted-Identity empty.\n"); goto error; @@ -312,7 +312,7 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { } - asserted_id = cscf_get_asserted_identity(msg); + asserted_id = cscf_get_asserted_identity(msg, 0); if (!asserted_id.len) { LM_ERR("P-Asserted-Identity empty.\n"); goto error; diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index a54728c..78d5793 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -987,7 +987,7 @@ int assign_server_unreg(struct sip_msg* _m, char* str1, str* direction, char* ro enum cscf_dialog_direction dir = cscf_get_dialog_direction(direction->s); switch (dir) { case CSCF_MOBILE_ORIGINATING: - public_identity = cscf_get_asserted_identity(_m); + public_identity = cscf_get_asserted_identity(_m, 0); break; case CSCF_MOBILE_TERMINATING: public_identity = cscf_get_public_identity_from_requri(_m);

10 years, 10 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Jason Penton

Module: sip-router Branch: master Commit: ef550ca12e26306214f1e532c6a755d5e33d420d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef550ca… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Feb 14 10:01:55 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

10 years, 10 months

git:master: htable: adding flags and expires fields to htable. get RPC command

by Ovidiu Sas

Module: sip-router Branch: master Commit: 059bd9c5576e7e14bc69506330990a165286d9c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=059bd9c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Feb 12 16:14:35 2014 -0500 htable: adding flags and expires fields to htable.get RPC command --- modules/htable/htable.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index ab2ecea..a5e110e 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -649,6 +649,8 @@ error: return 0; } +#define RPC_DATE_BUF_LEN 21 + static const char* htable_dump_doc[2] = { "Dump the contents of hash table.", 0 @@ -710,6 +712,8 @@ static void htable_rpc_get(rpc_t* rpc, void* c) { ht_cell_t *htc; /*!< One HT cell */ void* th; void* vh; + struct tm *_expire_t; + char expire_buf[RPC_DATE_BUF_LEN]="NEVER"; if (rpc->scan(c, "SS", &htname, &keyname) < 2) { rpc->fault(c, 500, "Not enough parameters (htable name and key name)"); @@ -742,14 +746,27 @@ static void htable_rpc_get(rpc_t* rpc, void* c) { goto error; } + if (htc->expire) { + _expire_t = localtime(&htc->expire); + strftime(expire_buf, RPC_DATE_BUF_LEN - 1, + "%Y-%m-%d %H:%M:%S", _expire_t); + } + LM_NOTICE("got expire [%s]\n", expire_buf); + if(htc->flags&AVP_VAL_STR) { - if(rpc->struct_add(vh, "SS", "name", &htc->name.s, "value", &htc->value.s)<0) + if(rpc->struct_add(vh, "SSds", "name", &htc->name.s, + "value", &htc->value.s, + "flags", htc->flags, + "expire", expire_buf)<0) { rpc->fault(c, 500, "Internal error adding item"); goto error; } } else { - if(rpc->struct_add(vh, "Sd", "name", &htc->name.s, "value", (int)htc->value.n)) + if(rpc->struct_add(vh, "Sdds", "name", &htc->name.s, + "value", (int)htc->value.n, + "flags", htc->flags, + "expire", expire_buf)<0) { rpc->fault(c, 500, "Internal error adding item"); goto error; @@ -892,7 +909,7 @@ static void htable_rpc_dump(rpc_t* rpc, void* c) } else { if(rpc->struct_add(vh, "Sd", "name", &it->name.s, - "value", (int)it->value.n)) + "value", (int)it->value.n)<0) { rpc->fault(c, 500, "Internal error adding item"); goto error;

10 years, 10 months

git:master: modules/lcr: add index of selected gw to defunct_gw_avp

by Juha Heinanen

Module: sip-router Branch: master Commit: 982a002fb89b9a2bcb65d678e1fd37918398e86d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=982a002… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Feb 13 22:33:18 2014 +0200 modules/lcr: add index of selected gw to defunct_gw_avp also when ping_interval value is positive --- modules/lcr/lcr_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 031147f..a5c804d 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2058,7 +2058,7 @@ next: add_gws_into_avps(gws, matched_gws, gw_index, &ruri_user); /* Add lcr_id into AVP */ - if (defunct_capability_param > 0) { + if ((defunct_capability_param > 0) || (ping_interval_param > 0)) { delete_avp(lcr_id_avp_type, lcr_id_avp); val.n = lcr_id; add_avp(lcr_id_avp_type, lcr_id_avp, val); @@ -2513,7 +2513,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) } /* Add index of selected gw to defunct gw AVP */ - if (defunct_capability_param > 0) { + if ((defunct_capability_param > 0) || (ping_interval_param > 0)) { delete_avp(defunct_gw_avp_type, defunct_gw_avp); val.n = gw_index; add_avp(defunct_gw_avp_type, defunct_gw_avp, val);

10 years, 10 months

topoh internals

by Camille Oudot

Hi, I have a question about the topoh masking function: If we can control of 2 UAs A and B, when A invites B, A will know his plain Contact data, and B will see the masked one, and we will be able to collect almost arbitrary (data, encoded_data) couples. Kamailio's topoh module internals, if i've understood correctly, conceptually make use of such functions: * encode(contact_A, secret_key) -> result is contact_A_masked * decode(contact_A_masked, secret_key) -> result is contact_A What kind of method is used to do the encoding/decoding? Is it complex to compute the secret key, knowing both contact_A and contact_A_masked? Regards, -- Camille

10 years, 10 months

Memory stats via SNMP

by Federico Cabiddu

Hi everyone, I'm starting using snmpstats module to monitor Kamailio and I feel the lack of some internal statistics/alarms on kamailio memory usage. If you think it's worth I would be happy to develop support for them. In this case I was wondering which mib those statistics should belong to. I would tend to put them into KAMAILIO-MIB, under kamailioServer sub-tree. What do you think about? Regards, Federico Cabiddu

10 years, 10 months

TM best practice for parsing SHM cloned message headers

by Jason Penton

Hi, What is the best practice when needing to parse for a specific header on a message in TM (i.e. a cloned message sitting in SHM memory - eg "t->uas.request")? Of course we cannot simply use existing parsing functions as they allocate pkg_mem. Cheers Jason

10 years, 10 months

git:master: modules/ims_registrar_pcscf: fixed pkg_mem leak when sending subscribe

by Richard Good

Module: sip-router Branch: master Commit: 7611a9595349d4978080efab0ed09b123b0f3cce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7611a95… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Feb 13 09:37:37 2014 +0200 modules/ims_registrar_pcscf: fixed pkg_mem leak when sending subscribe --- modules/ims_registrar_pcscf/notify.c | 1 + modules/ims_registrar_pcscf/save.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/ims_registrar_pcscf/notify.c b/modules/ims_registrar_pcscf/notify.c index 67f03ac..9b2973e 100644 --- a/modules/ims_registrar_pcscf/notify.c +++ b/modules/ims_registrar_pcscf/notify.c @@ -268,6 +268,7 @@ int process_body(struct sip_msg* msg, str notify_body, udomain_t * domain) { LM_ERR("wrong format[%.*s] - failed unsubscribing to reginfo\n",aor.len, aor.s); } reginfo_subscribe_real(msg, presentity_uri_pv, 0, 0); + pv_elem_free_all(presentity_uri_pv); } /* Now lets process the Contact's from this Registration: */ diff --git a/modules/ims_registrar_pcscf/save.c b/modules/ims_registrar_pcscf/save.c index d56b8ce..e9bcd7d 100644 --- a/modules/ims_registrar_pcscf/save.c +++ b/modules/ims_registrar_pcscf/save.c @@ -395,6 +395,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { } reginfo_subscribe_real(_m, presentity_uri_pv, service_routes, subscription_expires); + pv_elem_free_all(presentity_uri_pv); } done:

10 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2014