sr-dev May 2010

sr-dev@lists.kamailio.org

18 participants
140 discussions

[tracker] Task opened: SDP parsing when dealing with multi-part bodies
by sip-router 17 May '10

17 May '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Pascal Maugeri (pmaugeri) Attached to Project - sip-router Summary - SDP parsing when dealing with multi-part bodies Task Type - Bug Report 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 - I got the following error when dealing with SIP INVITE with multi-part when the client is behind NAT: May 12 15:27:04 test /usr/sbin/kamailio[1792]: ERROR: nathelper [nathelper.c:2954]: can't extract body from the message The SIP INVITE message looks like: INVITE sip:toto@test.net SIP/2.0 [...] Content-Type: multipart/mixed;boundary=gnkr Content-Length: 659 --gnkr Content-Type: application/sdp Content-Length: 330 v=0 o=pascal 1273565967736 1273565967737 IN IP4 10.1.1.226 [...] It looks the Content-length within the multi-part is not accepted. I fixed it changing the source code of parser/sdp/sdp_helpr_funcs.c, in get_sdp_hdr_field() function: switch(hdr->type){ case HDR_CONTENTTYPE_T: case HDR_CONTENTDISPOSITION_T: replaced with: switch(hdr->type){ case HDR_CONTENTTYPE_T: case HDR_CONTENTDISPOSITION_T: case HDR_CONTENTLENGTH_T: (I'm using kamailio 3.0.1) Cheers Pascal More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=73 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

[tracker] Assignee added: SDP parsing when dealing with multi-part bodies
by sip-router 17 May '10

17 May '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#73 - SDP parsing when dealing with multi-part bodies User who did this - Pascal Maugeri (pmaugeri) http://sip-router.org/tracker/index.php?do=details&task_id=73 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: pkg: updated kamailio spec file for CentOS
by Ovidiu Sas 17 May '10

17 May '10

Module: sip-router Branch: master Commit: 0acd8963f76a4854e101210db17854ca8062ff61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0acd896… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 31 14:05:51 2010 -0400 pkg: updated kamailio spec file for CentOS - updated kamailio spec file for CentOS along with default and init scripts. --- pkg/kamailio/rpm/kamailio.default | 25 ++ pkg/kamailio/rpm/kamailio.init | 88 ++++- pkg/kamailio/rpm/kamailio.spec.CenOS | 633 ++++++++++++++++++++++++++++++++++ 3 files changed, 733 insertions(+), 13 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0ac…

2 2

[tracker] Assignee added: allow rewriting request uri also in failure route
by sip-router 17 May '10

17 May '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#72 - allow rewriting request uri also in failure route User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=72 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

[tracker] Task opened: allow rewriting request uri also in failure route
by sip-router 17 May '10

17 May '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - allow rewriting request uri also in failure route Task Type - Improvement Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - in order to make life of module and script writer easier, allow rewriting of request uri also in failure route similar to what has been done in opensips 1.5: There is no need to call "append_branch()" function in failure_route in order to use the RURI - you still need to use it only if you want to do parallel forking. Ex: # in 1.4.x failure_route[2] if (t_check_status("408")) { # set new RURI rewritehostport("my_voicemail.com:5060"); append_branch(); t_relay(); } } -> # in 1.5.x failure_route[2] if (t_check_status("408")) { # set new RURI rewritehostport("my_voicemail.com:5060"); t_relay(); } } -- juha More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=72 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: modules/lcr: caller_uri argument of load_gws() is now optional
by Juha Heinanen 16 May '10

16 May '10

Module: sip-router Branch: master Commit: de490ed1559028ba737b0dea81eaba50a6e72852 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de490ed… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 16 19:25:13 2010 +0300 modules/lcr: caller_uri argument of load_gws() is now optional - If not given, it defaults to empty string. --- modules/lcr/README | 11 +++++---- modules/lcr/doc/lcr_admin.xml | 5 ++- modules/lcr/lcr_mod.c | 44 +++++++++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index ce1ffb4..2e5a025 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -59,7 +59,7 @@ Juha Heinanen 4. Exported Functions - 4.1. load_gws(lcr_id, caller_uri) + 4.1. load_gws(lcr_id[, caller_uri]) 4.2. next_gw() 4.3. defunct_gw(period) 4.4. from_gw(lcr_id [, ip_addr]) @@ -162,7 +162,7 @@ Chapter 1. Admin Guide 4. Exported Functions - 4.1. load_gws(lcr_id, caller_uri) + 4.1. load_gws(lcr_id[, caller_uri]) 4.2. next_gw() 4.3. defunct_gw(period) 4.4. from_gw(lcr_id [, ip_addr]) @@ -625,7 +625,7 @@ modparam("lcr", "fetch_rows", 3000) 4. Exported Functions - 4.1. load_gws(lcr_id, caller_uri) + 4.1. load_gws(lcr_id[, caller_uri]) 4.2. next_gw() 4.3. defunct_gw(period) 4.4. from_gw(lcr_id [, ip_addr]) @@ -633,13 +633,14 @@ modparam("lcr", "fetch_rows", 3000) 4.6. to_gw(lcr_id [, ip_addr]) 4.7. to_any_gw([ip_addr]) -4.1. load_gws(lcr_id, caller_uri) +4.1. load_gws(lcr_id[, caller_uri]) Loads URI schemes, IP addresses, hostnames, ports, params, and transports of matching gateways to gw_uri_avp (see Overview section). Argument lcr_id specifies the used LCR instance. It can be an integer or a pseudo variable containing an integer value. Caller's URI is given - by caller_uri argument, which must be a pseudo variable. + by caller_uri argument, which must be a pseudo variable. If caller_uri + argument is omitted, it defaults to empty string. Returns 1 if at least one matching gateway was found, 2 if no matching gateways was found, and -1 on error. diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 04ba61c..55d5cfd 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -765,7 +765,7 @@ modparam("lcr", "fetch_rows", 3000) <title>Exported Functions</title> <section> <title> - <function moreinfo="none">load_gws(lcr_id, caller_uri)</function> + <function moreinfo="none">load_gws(lcr_id[, caller_uri])</function> </title> <para> Loads URI schemes, IP addresses, hostnames, ports, @@ -775,7 +775,8 @@ modparam("lcr", "fetch_rows", 3000) LCR instance. It can be an integer or a pseudo variable containing an integer value. Caller's URI is given by caller_uri argument, which - must be a pseudo variable. + must be a pseudo variable. If caller_uri argument is + omitted, it defaults to empty string. </para> <para> Returns 1 if at least one matching gateway was found, 2 diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 13fb7e0..add81d9 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -246,7 +246,8 @@ struct lcr_info ***lcrtp = (struct lcr_info ***)NULL; /* * Functions that are defined later */ -static int load_gws(struct sip_msg* _m, char* _s1, char* _s2); +static int load_gws_1(struct sip_msg* _m, char* _s1, char* _s2); +static int load_gws_2(struct sip_msg* _m, char* _s1, char* _s2); static int next_gw(struct sip_msg* _m, char* _s1, char* _s2); static int defunct_gw(struct sip_msg* _m, char* _s1, char* _s2); static int from_gw_1(struct sip_msg* _m, char* _s1, char* _s2); @@ -262,7 +263,9 @@ static int to_any_gw_1(struct sip_msg* _m, char* _s1, char* _s2); * Exported functions */ static cmd_export_t cmds[] = { - {"load_gws", (cmd_function)load_gws, 2, fixup_igp_pvar, + {"load_gws", (cmd_function)load_gws_1, 1, fixup_igp_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"load_gws", (cmd_function)load_gws_2, 2, fixup_igp_pvar, fixup_free_igp_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, {"next_gw", (cmd_function)next_gw, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -1536,7 +1539,7 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, /* * Load info of matching GWs into gw_uri_avps */ -static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) +static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, fparam_t *_from_uri) { str ruri_user, from_uri; int i, j, lcr_id; @@ -1548,7 +1551,7 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) char *hostname; /* Get and check parameter values */ - if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { + if (get_int_fparam(&lcr_id, _m, _lcr_id) != 0) { LM_ERR("no lcr_id param value\n"); return -1; } @@ -1556,14 +1559,18 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } - - if (get_str_fparam(&from_uri, _m, (fparam_t *)_from_uri) != 0) { - LM_ERR("no from_uri parameter value\n"); - return -1; - } - if (from_uri.len == 0) { - LM_ERR("empry from_uri param value\n"); - return -1; + if (_from_uri) { + if (get_str_fparam(&from_uri, _m, _from_uri) != 0) { + LM_ERR("no from_uri parameter value\n"); + return -1; + } + if (from_uri.len == 0) { + LM_ERR("empty from_uri parameter value\n"); + return -1; + } + } else { + from_uri.len = 0; + from_uri.s = (char *)0; } /* Use gws and lcr rules with index lcr_id */ @@ -1677,6 +1684,18 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) } +static int load_gws_1(struct sip_msg* _m, char *_lcr_id, char *_s2) +{ + return load_gws(_m, (fparam_t *)_lcr_id, (fparam_t *)0); +} + + +static int load_gws_2(struct sip_msg* _m, char *_lcr_id, char *_from_uri) +{ + return load_gws(_m, (fparam_t *)_lcr_id, (fparam_t *)_from_uri); +} + + /* Generate Request-URI and Destination URI */ static int generate_uris(char *r_uri, str *r_uri_user, unsigned int *r_uri_len, char *dst_uri, unsigned int *dst_uri_len, @@ -1938,6 +1957,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) if (dst_uri_len > 0) { uri_str.s = dst_uri; uri_str.len = dst_uri_len; + LM_DBG("setting du to <%.*s>\n", uri_str.len, uri_str.s); rval = set_dst_uri(_m, &uri_str); if (rval != 0) { LM_ERR("calling do_action failed with return value <%d>\n", rval);

1 0

git:kamailio_3.0: sdp parser: fix sdp payload attributes cloning
by Ovidiu Sas 14 May '10

14 May '10

Module: sip-router Branch: kamailio_3.0 Commit: a65b81983cf8ab90a4c40c8698ad1033bcdf205e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a65b819… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri May 14 15:05:17 2010 -0400 sdp parser: fix sdp payload attributes cloning - ptime attribute was not computed while allocating space for the cloned attributes (cherry picked from commit f1944ead66d854c349fca67da2b13d2be3c7fc33) --- parser/sdp/sdp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 4a6697f..eab972f 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -916,7 +916,8 @@ sdp_payload_attr_t * clone_sdp_payload_attr(sdp_payload_attr_t *attr) attr->rtp_enc.len + attr->rtp_clock.len + attr->rtp_params.len + - attr->sendrecv_mode.len; + attr->sendrecv_mode.len + + attr->ptime.len; clone_attr = (sdp_payload_attr_t*)shm_malloc(len); if (clone_attr == NULL) { LM_ERR("no more shm mem (%d)\n",len);

1 0

git:master: sdp parser: fix sdp payload attributes cloning
by Ovidiu Sas 14 May '10

14 May '10

Module: sip-router Branch: master Commit: f1944ead66d854c349fca67da2b13d2be3c7fc33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1944ea… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri May 14 15:05:17 2010 -0400 sdp parser: fix sdp payload attributes cloning - ptime attribute was not computed while allocating space for the cloned attributes --- parser/sdp/sdp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 07ca839..3f0f6dc 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -894,7 +894,8 @@ sdp_payload_attr_t * clone_sdp_payload_attr(sdp_payload_attr_t *attr) attr->rtp_enc.len + attr->rtp_clock.len + attr->rtp_params.len + - attr->sendrecv_mode.len; + attr->sendrecv_mode.len + + attr->ptime.len; clone_attr = (sdp_payload_attr_t*)shm_malloc(len); if (clone_attr == NULL) { LM_ERR("no more shm mem (%d)\n",len);

1 0

git:master: registrar(k): reset dst uri in lookup
by Daniel-Constantin Mierla 13 May '10

13 May '10

Module: sip-router Branch: master Commit: 53bb79cef5eb70e98472903ef84b5585cc798e65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53bb79c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 13 11:41:06 2010 +0200 registrar(k): reset dst uri in lookup - upon lookup, dst uri is reset if no new dst uri is set from received or path, otherwise the coordinates of selected contact are not effective - reported by Andreas Granig --- modules_k/registrar/lookup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index c758c84..4a573d1 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -105,6 +105,9 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) goto done; } + /* reset next hop address */ + reset_dst_uri(_m); + /* If a Path is present, use first path-uri in favour of * received-uri because in that case the last hop towards the uac * has to handle NAT. - agranig */

1 0

git:master: sdp parser: remove dead code
by Ovidiu Sas 13 May '10

13 May '10

Module: sip-router Branch: master Commit: 1dec97e86e473574d0b767af21ad6757fa4d1342 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1dec97e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed May 12 20:06:12 2010 -0400 sdp parser: remove dead code - remove dead code from sdp.c --- parser/sdp/sdp.c | 26 ++------------------------ 1 files changed, 2 insertions(+), 24 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 4a6697f..07ca839 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -313,31 +313,9 @@ sdp_stream_cell_t* get_sdp_stream_sdp(struct sdp_info* sdp, int session_num, int sdp_stream_cell_t* get_sdp_stream(struct sip_msg* _m, int session_num, int stream_num) { - sdp_info_t* sdp; - sdp_session_cell_t *session; - sdp_stream_cell_t *stream; - + if (_m->body == NULL) return NULL; + if (_m->body->type != MSG_BODY_SDP) return NULL; return get_sdp_stream_sdp((sdp_info_t*)_m->body, session_num, stream_num); - - sdp = (sdp_info_t*)_m->body; - if (sdp == NULL) return NULL; - if (sdp->type != MSG_BODY_SDP) return NULL; - if (session_num > sdp->sessions_num) return NULL; - - session = sdp->sessions; - while (session) { - if (session->session_num == session_num) { - stream = session->streams; - while (stream) { - if (stream->stream_num == stream_num) return stream; - stream = stream->next; - } - } else { - session = session->next; - } - } - - return NULL; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2010