sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:master: lib/srdb1 Prevent crash in case of incorrect parameter

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2ded4b2f05ed0ddd41de268490113989f6b7ca03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ded4b2… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 17:04:09 2011 +0200 lib/srdb1 Prevent crash in case of incorrect parameter Reported by clang. --- lib/srdb1/db_id.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index 7a8b5d7..2761c65 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -207,12 +207,14 @@ static int parse_db_url(struct db_id* id, const str* url) return 0; err: + if (!id) goto end; if (id->scheme) pkg_free(id->scheme); if (id->username) pkg_free(id->username); if (id->password) pkg_free(id->password); if (id->host) pkg_free(id->host); if (id->database) pkg_free(id->database); if (prev_token) pkg_free(prev_token); + end: return -1; }

13 years, 11 months

git:master: modules_k/ mi_datagram Fixed pkg_free of incorrect pointer on error path

by Marius Zbihlei

Module: sip-router Branch: master Commit: acfff3cdcc410c17938fedf1b8c30b5e766558e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acfff3c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 16:53:43 2011 +0200 modules_k/mi_datagram Fixed pkg_free of incorrect pointer on error path Static analysis provided by clang and llvm --- modules_k/mi_datagram/datagram_fnc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/mi_datagram/datagram_fnc.c b/modules_k/mi_datagram/datagram_fnc.c index e26a55a..72cdff9 100644 --- a/modules_k/mi_datagram/datagram_fnc.c +++ b/modules_k/mi_datagram/datagram_fnc.c @@ -335,6 +335,7 @@ static void datagram_close_async(struct mi_root *mi_rpl,struct mi_handler *hdl, mi_create_dtgram_replysocket(reply_sock, p->domain, err); + memset(&dtgram, 0, sizeof(dtgram)); if (mi_rpl!=0) { /*allocate the response datagram*/

13 years, 11 months

git:master: Prevent NULL pointer dereference when rtype was incorrect

by Marius Zbihlei

Module: sip-router Branch: master Commit: f7c16aaa7eacf64ba17a54720db2f9a4b58ad134 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7c16aa… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 17:20:40 2011 +0200 Prevent NULL pointer dereference when rtype was incorrect Found with clang --- route.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/route.c b/route.c index 46725ae..7a29ded 100644 --- a/route.c +++ b/route.c @@ -1754,7 +1754,7 @@ inline static int comp_ip(int op, struct ip_addr* ip, int rtype, default: LOG(L_CRIT, "BUG: comp_ip: invalid type for " " src_ip or dst_ip (%d)\n", rtype); - ret=-1; + return -1; } /* here "right" is set to the str we compare with */ r_expop.str=*right;

13 years, 11 months

[tracker] Task opened: dispatcher pseudo variables

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Klaus Darilion (klaus3000) Attached to Project - sip-router Summary - dispatcher pseudo variables Task Type - Feature Request Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - It would be great if dispatcher module would export dispatcher lists and status as pseudo, variables, e.g: read-only pseudo variable: $disp(list=>key) list: name of the dispatcher list, e.g. 1 key: key to be queried - count: number of entries in this dispatcher list - uri[n] - flags[n] - priority[n] - attributes[n] n: n-th entry in the list, starting from 0 to count-1 Examples: get the number of gateways in list 3: $disp(3=>count) get the uri of entry 2 (third) in list 3: $disp(3=>uri[2]) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=111 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.

13 years, 11 months

[tracker] Assignee added: dispatcher pseudo variables

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#111 - dispatcher pseudo variables User who did this - Klaus Darilion (klaus3000) http://sip-router.org/tracker/index.php?do=details&task_id=111 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.

13 years, 11 months

git:carstenbock/ims: - missed to remove method from the method list

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: d116ee50179d6486a2f9a9a06694ffaf83bea18b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d116ee5… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 23:54:37 2011 +0100 - missed to remove method from the method list --- modules/pcscf/mod.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/pcscf/mod.c b/modules/pcscf/mod.c index fe9f3a1..88b574a 100644 --- a/modules/pcscf/mod.c +++ b/modules/pcscf/mod.c @@ -347,8 +347,6 @@ static cmd_export_t pcscf_cmds[]={ {"P_process_notification", P_process_notification, 0, 0, REQUEST_ROUTE}, - {"P_remove_route", P_remove_route, 1, 0, REQUEST_ROUTE}, - {"P_NAT_relay", P_NAT_relay, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"P_SDP_manipulate", P_SDP_manipulate, 1, 0, REQUEST_ROUTE | ONREPLY_ROUTE },

13 years, 11 months

git:carstenbock/ims: - removed unnecessary functions

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 1c1a86d88078fe5fd63be59a6f153e8d6b9b6125 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c1a86d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 23:25:53 2011 +0100 - removed unnecessary functions --- modules/pcscf/mod.c | 8 ---- modules/pcscf/registration.c | 79 ------------------------------------------ modules/pcscf/registration.h | 4 -- 3 files changed, 0 insertions(+), 91 deletions(-) diff --git a/modules/pcscf/mod.c b/modules/pcscf/mod.c index 3fee583..fe9f3a1 100644 --- a/modules/pcscf/mod.c +++ b/modules/pcscf/mod.c @@ -278,10 +278,6 @@ uint32_t gg_af_port = 0; * * - P_process_notification() - process a NOTIFY for the reg event * - * - P_mobile_terminating() - checks if the request contains the Routes indicating a terminating case, - * as specified in the Path header at registration - * - P_remove_route() - remove a route header - deprecated, loose_route() should do the job - * * - P_NAT_relay() - forward a message through a NAT * - P_SDP_manipulate() - manipulate a SDP to pipe the media through the RTP Proxy (for NAT) * @@ -303,9 +299,6 @@ uint32_t gg_af_port = 0; * * - P_trans_in_processing() - checks if the transaction is already in processing * - * - P_check_via_sent_by() - checks if the sent-by parameter in the first Via header equals the source IP address of the message - * - P_add_via_received() - adds a received parameter to the first via header with the srouce IP address - * * - P_follows_via_list() - checks if a response coming from a UE contains the same Via headers sent in the corresponding request * - P_enforce_via_list() - enforce a response coming from a UE to contain the same Via headers sent in the corresponding request * @@ -354,7 +347,6 @@ static cmd_export_t pcscf_cmds[]={ {"P_process_notification", P_process_notification, 0, 0, REQUEST_ROUTE}, - {"P_mobile_terminating", P_mobile_terminating, 0, 0, REQUEST_ROUTE}, {"P_remove_route", P_remove_route, 1, 0, REQUEST_ROUTE}, {"P_NAT_relay", P_NAT_relay, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, diff --git a/modules/pcscf/registration.c b/modules/pcscf/registration.c index 1b9151c..ae65c18 100644 --- a/modules/pcscf/registration.c +++ b/modules/pcscf/registration.c @@ -728,85 +728,6 @@ error: return ret; } - -/** - * Determines if this is the Mobile Terminating case. - * uses the indication in the first Route header - * @param msg - the SIP message - * @param str1 - not used - * @param str2 - not used - * @returns #CSCF_RETURN_TRUE if terminating case, #CSCF_RETURN_FALSE if not - */ -int P_mobile_terminating(struct sip_msg *msg,char *str1,char *str2) -{ - int ret=CSCF_RETURN_FALSE; - str route={0,0}; - int i; - - route = cscf_get_first_route(msg,0,0); - if (!route.len){ - LOG(L_DBG,"DBG:"M_NAME":P_mobile_terminating: No Route header.\n"); - goto done; - } - i=0; - while(i<route.len && (route.s[i]==' ' ||route.s[i]=='\t'||route.s[i]=='<')) - i++; - route.s += i; - route.len -= i; - i=0; - while(route.s[i]!=';' && route.s[i]!='>' && i<route.len) - i++; - route.len = i; - - if (route.len == pcscf_path_str.len && - strncasecmp(route.s,pcscf_path_str.s,pcscf_path_str.len)==0) - { - LOG(L_DBG,"DBG:"M_NAME":P_mobile_terminating: Term indication found.\n"); - ret = CSCF_RETURN_TRUE; - goto done; - }else{ - LOG(L_DBG,"DBG:"M_NAME":P_mobile_terminating: Term indication not found in <%.*s> as <%.*s>.\n", - route.len,route.s,pcscf_path_str.len,pcscf_path_str.s); - } - - -done: - return ret; -} - - -/** - * \deprecated - * Removes header pointing to itself. - * @param msg - the SIP message - * @param str1 - if not empty, will look and remove this value instead - * @param str2 - not used - * @returns #CSCF_RETURN_TRUE if ok, #CSCF_RETURN_FALSE if not - */ -int P_remove_route(struct sip_msg *msg,char *str1,char *str2) -{ - int ret=CSCF_RETURN_FALSE; - str x; - - if (str1 && strlen(str1)){ - x.s = str1; - x.len =strlen(str1); - if (cscf_remove_first_route(msg,x)) - ret = CSCF_RETURN_TRUE; - else - ret = CSCF_RETURN_FALSE; - }else{ - if (cscf_remove_first_route(msg,pcscf_path_str)+cscf_remove_first_route(msg,pcscf_name_str)) - ret = CSCF_RETURN_TRUE; - else - ret = CSCF_RETURN_FALSE; - } - - return ret; -} - - - /** * Checks if the message follows Service-Route imposed at registration. * @param msg - the SIP message diff --git a/modules/pcscf/registration.h b/modules/pcscf/registration.h index 55d72d7..cc7e299 100644 --- a/modules/pcscf/registration.h +++ b/modules/pcscf/registration.h @@ -85,10 +85,6 @@ int P_assert_called_identity(struct sip_msg *msg,char *str1,char *str2); int P_process_notification(struct sip_msg *msg,char *str1,char *str2); -int P_mobile_terminating(struct sip_msg *msg,char *str1,char *str2); - -int P_remove_route(struct sip_msg *msg,char *str1,char *str2); - int P_NAT_relay(struct sip_msg *msg,char *str1,char *str2); int P_security_relay(struct sip_msg *msg,char *str1,char *str2);

13 years, 11 months

git:carstenbock/ims: - Made another method from the pcscf-module obsolete

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: c70e5c8247b429d81f6650b68167dcc156c23c03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c70e5c8… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 23:43:09 2011 +0100 - Made another method from the pcscf-module obsolete --- modules/pcscf/pcscf.cfg | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/pcscf/pcscf.cfg b/modules/pcscf/pcscf.cfg index 668f420..0b76e71 100644 --- a/modules/pcscf/pcscf.cfg +++ b/modules/pcscf/pcscf.cfg @@ -40,6 +40,11 @@ #!define WITH_NAT #!define WITH_ANTIFLOOD +#!define HOSTNAME "pcscf" +#!define HOSTNAME_ESC "pcscf" +#!define NETWORKNAME "ng-voice.com" +#!define NETWORKNAME_ESC "ng-voice\.com" + ####### Defined Values ######### #!ifdef WITH_RX @@ -282,11 +287,8 @@ route { route(NOTIFY); break; } - - xlog("L_ERR", "Record-Route-URI: $route_uri\n"); - - if (!P_mobile_terminating()){ + if !($route_uri =~ "sip:term@"+HOSTNAME_ESC+"."+NETWORKNAME_ESC+".*") { # Request Initiated by the UE

13 years, 11 months

git:carstenbock/ims: - changed the PV-Type to PV_OTHER

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 20ac1ac58c41dd11ce4c8e98bf2d9c0af81c368a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20ac1ac… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 23:13:31 2011 +0100 - changed the PV-Type to PV_OTHER --- modules_k/rr/rr_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/rr/rr_mod.c b/modules_k/rr/rr_mod.c index 7608e04..3e23eab 100644 --- a/modules_k/rr/rr_mod.c +++ b/modules_k/rr/rr_mod.c @@ -119,8 +119,8 @@ static param_export_t params[] ={ * \brief Exported Pseudo variables */ static pv_export_t mod_pvs[] = { - {{"route_uri", (sizeof("route_uri")-1)}, /* number of records routes */ - PVT_CONTEXT, pv_get_route_uri_f, 0, 0, 0, 0, 0}, + {{"route_uri", (sizeof("route_uri")-1)}, /* URI of the first Route-Header */ + PVT_OTHER, pv_get_route_uri_f, 0, 0, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} };

13 years, 11 months

git:carstenbock/ims: - Need to call "parse_rr()" in order to retrieve the parsed content ; -)

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 59206b14e1cbd4c3f62c53ae1978dba89af2bade URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59206b1… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 23:01:21 2011 +0100 - Need to call "parse_rr()" in order to retrieve the parsed content ;-) --- modules_k/rr/rr_mod.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules_k/rr/rr_mod.c b/modules_k/rr/rr_mod.c index 9f2ccba..7608e04 100644 --- a/modules_k/rr/rr_mod.c +++ b/modules_k/rr/rr_mod.c @@ -318,7 +318,12 @@ pv_get_route_uri_f(struct sip_msg *msg, pv_param_t *param, rr_t* rt; str uri; - /* Parse the header until the First-Route-Header: */ + if (!msg) { + LM_ERR("No message?!?\n"); + return -1; + } + + /* Parse the message until the First-Route-Header: */ if (parse_headers(msg, HDR_ROUTE_F, 0) == -1) { LM_ERR("while parsing message\n"); return -1; @@ -328,9 +333,16 @@ pv_get_route_uri_f(struct sip_msg *msg, pv_param_t *param, LM_INFO("No route header present.\n"); return -1; } + hdr = msg->route; + + /* Parse the contents of the header: */ + if (parse_rr(hdr) == -1) { + LM_ERR("Error while parsing Route header\n"); + return -1; + } + /* Retrieve the Route-Header */ - hdr = msg->route; rt = (rr_t*)hdr->parsed; uri = rt->nameaddr.uri;

13 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011