sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:master: parser/sdp: fixed freeing of ice attributes
by Juha Heinanen 02 Jan '13

02 Jan '13

Module: sip-router Branch: master Commit: 35bc07e6a13e12aba519be8bde1a1e1dc06a1d94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35bc07e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jan 2 09:13:00 2013 +0200 parser/sdp: fixed freeing of ice attributes --- parser/sdp/sdp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 93440bf..67174b5 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -810,7 +810,7 @@ void free_sdp(sdp_info_t** _sdp) while (l_stream->ice_attr) { tmp = l_stream->ice_attr->next; pkg_free(l_stream->ice_attr); - l_stream->ice_attr->next = tmp; + l_stream->ice_attr = tmp; } pkg_free(l_stream); }

1 0

git:pd/outbound: modules_k/outbound: updated example
by Peter Dunkley 01 Jan '13

01 Jan '13

Module: sip-router Branch: pd/outbound Commit: a117147b4c6563be21c0403eeeacf5ff0f3ba709 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a117147… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 1 20:46:18 2013 +0000 modules_k/outbound: updated example --- modules_k/outbound/README | 48 ++++++++++++++++++---------- modules_k/outbound/doc/outbound_admin.xml | 36 +++++++++++++++------ 2 files changed, 56 insertions(+), 28 deletions(-) diff --git a/modules_k/outbound/README b/modules_k/outbound/README index 438ebb3..8a98e0c 100644 --- a/modules_k/outbound/README +++ b/modules_k/outbound/README @@ -23,7 +23,7 @@ Peter Dunkley 3. Parameters - 3.1. force_outbound_bflag (integer) + 3.1. force_outbound_flag (integer) 3.2. flow_token_key (string) 4. Functions @@ -34,7 +34,7 @@ Peter Dunkley 1.1. Compiling Kamailio with STUN support 1.2. Edge Proxy Configuration 1.3. Registrar Configuration - 1.4. Set force_outbound_bflag parameter + 1.4. Set force_outbound_flag parameter 1.5. Set flow_token_key parameter Chapter 1. Admin Guide @@ -53,7 +53,7 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. force_outbound_bflag (integer) + 3.1. force_outbound_flag (integer) 3.2. flow_token_key (string) 4. Functions @@ -116,19 +116,33 @@ modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) ... modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") ... -###TBD### - - Example 1.3. Registrar Configuration +route { ... -#!define FLOW_TIMER 20 + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + else if (is_method("REGISTER")) + add_path(); ... -tcp_connection_lifetime=FLOW_TIMER+10 +} +... +onreply_route { + if (!t_check_trans()) { + drop; + } + + if ($rm == "REGISTER" && $rs >= 200 && $rs <= 299) + { + if ($(hdr(Require)[*])=~"outbound") + insert_hf("Flow-Timer: FLOW_TIMER\r\n", "Call-ID"); + } +} + + Example 1.3. Registrar Configuration ... loadmodule "registrar.so" ... -modparam("registrar", "flow_timer", FLOW_TIMER) +modparam("registrar", "outbound_mode", 2) ... -###TBD### 2. Dependencies @@ -148,19 +162,19 @@ modparam("registrar", "flow_timer", FLOW_TIMER) 3. Parameters - 3.1. force_outbound_bflag (integer) + 3.1. force_outbound_flag (integer) 3.2. flow_token_key (string) -3.1. force_outbound_bflag (integer) +3.1. force_outbound_flag (integer) - A branch flag which, if set for a request, will force path and rr to - add flow tokens to Path: and Record-Route: headers regardless of the - request contents. + A flag which, if set for a request, will force path and rr to add flow + tokens to Path: and Record-Route: headers regardless of the request + contents. Default value is -1. - Example 1.4. Set force_outbound_bflag parameter -modparam("outbound", "force_outbound_bflag", 1) + Example 1.4. Set force_outbound_flag parameter +modparam("outbound", "force_outbound_flag", 1) 3.2. flow_token_key (string) diff --git a/modules_k/outbound/doc/outbound_admin.xml b/modules_k/outbound/doc/outbound_admin.xml index de3e3d3..992c0c4 100644 --- a/modules_k/outbound/doc/outbound_admin.xml +++ b/modules_k/outbound/doc/outbound_admin.xml @@ -71,22 +71,36 @@ modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) ... modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") ... -###TBD### +route { +... + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + else if (is_method("REGISTER")) + add_path(); +... +} +... +onreply_route { + if (!t_check_trans()) { + drop; + } + + if ($rm == "REGISTER" && $rs >= 200 && $rs <= 299) + { + if ($(hdr(Require)[*])=~"outbound") + insert_hf("Flow-Timer: FLOW_TIMER\r\n", "Call-ID"); + } +} ]]></programlisting> </example> <example> <title>Registrar Configuration</title> <programlisting><![CDATA[ ... -#!define FLOW_TIMER 20 -... -tcp_connection_lifetime=FLOW_TIMER+10 -... loadmodule "registrar.so" ... -modparam("registrar", "flow_timer", FLOW_TIMER) +modparam("registrar", "outbound_mode", 2) ... -###TBD### ]]></programlisting> </example> </section> @@ -123,17 +137,17 @@ modparam("registrar", "flow_timer", FLOW_TIMER) <section> <title>Parameters</title> <section> - <title><varname>force_outbound_bflag</varname> (integer)</title> - <para>A branch flag which, if set for a request, will force + <title><varname>force_outbound_flag</varname> (integer)</title> + <para>A flag which, if set for a request, will force <emphasis>path</emphasis> and <emphasis>rr</emphasis> to add flow tokens to Path: and Record-Route: headers regardless of the request contents.</para> <para><emphasis>Default value is -1.</emphasis></para> <example> - <title>Set <varname>force_outbound_bflag</varname> parameter + <title>Set <varname>force_outbound_flag</varname> parameter </title> <programlisting format="linespecific"> -modparam("outbound", "force_outbound_bflag", 1) +modparam("outbound", "force_outbound_flag", 1) </programlisting> </example> </section>

1 0

git:pd/outbound: modules_k/rr: outbound fixes
by Peter Dunkley 01 Jan '13

01 Jan '13

Module: sip-router Branch: pd/outbound Commit: 0a528b23bc39eabfaaf2874a74ce529955c21ff5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a528b2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 1 20:45:49 2013 +0000 modules_k/rr: outbound fixes - Use the OUTBOUND address in RR when using outbound --- modules_k/rr/record.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules_k/rr/record.c b/modules_k/rr/record.c index 394f0a1..9ed8953 100644 --- a/modules_k/rr/record.c +++ b/modules_k/rr/record.c @@ -281,6 +281,7 @@ int record_route(struct sip_msg* _m, str *params) str user; struct to_body* from = NULL; str* tag; + int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; user.len = 0; @@ -289,7 +290,7 @@ int record_route(struct sip_msg* _m, str *params) LM_ERR("failed to extract username\n"); return -1; } - } else if (rr_obb.use_outbound && rr_obb.use_outbound(_m)) { + } else if (use_ob) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; @@ -312,7 +313,7 @@ int record_route(struct sip_msg* _m, str *params) rr_param_buf.len = 0; } - if (enable_double_rr && !(rr_obb.use_outbound && rr_obb.use_outbound(_m))) { + if (enable_double_rr && !use_ob) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -325,8 +326,7 @@ int record_route(struct sip_msg* _m, str *params) LM_ERR("failed to insert conditional lump\n"); return -6; } - if (build_rr(l, l2, &user, tag, params, OUTBOUND, - rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { + if (build_rr(l, l2, &user, tag, params, OUTBOUND, 0) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; } @@ -339,8 +339,8 @@ int record_route(struct sip_msg* _m, str *params) return -3; } - if (build_rr(l, l2, &user, tag, params, INBOUND, - rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { + if (build_rr(l, l2, &user, tag, params, use_ob ? OUTBOUND : INBOUND, + use_ob) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); return -4; } @@ -368,7 +368,8 @@ int record_route_preset(struct sip_msg* _m, str* _data) struct lump* l; char* hdr, *p; int hdr_len; - + int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; + from = 0; user.len = 0; user.s = 0; @@ -378,7 +379,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } - } else if (rr_obb.use_outbound && rr_obb.use_outbound(_m)) { + } else if (use_ob) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; @@ -591,7 +592,8 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) str *tag = NULL; struct lump* l; struct lump* l2; - + int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; + user.len = 0; user.s = 0; @@ -600,7 +602,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } - } else if (rr_obb.use_outbound && rr_obb.use_outbound(_m)) { + } else if (use_ob) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; @@ -615,7 +617,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = &((struct to_body*)_m->from->parsed)->tag_value; } - if (enable_double_rr && !(rr_obb.use_outbound && rr_obb.use_outbound(_m))) { + if (enable_double_rr && !use_ob) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -629,7 +631,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -4; } if (build_advertised_rr(l, l2, _data, &user, tag, OUTBOUND, - rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { + 0) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -5; } @@ -642,8 +644,9 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -6; } - if (build_advertised_rr(l, l2, _data, &user, tag, INBOUND, - rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { + if (build_advertised_rr(l, l2, _data, &user, tag, + use_ob ? OUTBOUND: INBOUND, + use_ob) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; }

1 0

git:pd/outbound: modules_k/outbound: fixes to use_outbound()
by Peter Dunkley 01 Jan '13

01 Jan '13

Module: sip-router Branch: pd/outbound Commit: 9b5c3a991942da005b8c56b049a1ebde5596042b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b5c3a9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 1 20:45:24 2013 +0000 modules_k/outbound: fixes to use_outbound() --- modules_k/outbound/ob_mod.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index ff5e072..b202c59 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -41,7 +41,7 @@ MODULE_VERSION static int mod_init(void); -static unsigned int ob_force_bflag = (unsigned int) -1; +static unsigned int ob_force_flag = (unsigned int) -1; static str ob_key = {0, 0}; static cmd_export_t cmds[]= @@ -54,7 +54,7 @@ static cmd_export_t cmds[]= static param_export_t params[]= { - { "force_outbound_bflag", INT_PARAM, &ob_force_bflag }, + { "force_outbound_flag", INT_PARAM, &ob_force_flag }, { "flow_token_key", STR_PARAM, &ob_key.s}, { 0, 0, 0 } }; @@ -77,13 +77,11 @@ struct module_exports exports= static int mod_init(void) { - if (ob_force_bflag == (unsigned int) -1) - ob_force_bflag = 0; - else if (ob_force_bflag >= 8 * sizeof (ob_force_bflag)) { - LM_ERR("force_outbound_bflag (%d) too big!\n", ob_force_bflag); + if (ob_force_flag != -1 && !flag_in_range(ob_force_flag)) + { + LM_ERR("bad force_outbound_flag value (%d)\n", ob_force_flag); return -1; - } else - ob_force_bflag = 1 << ob_force_bflag; + } if (ob_key.s == 0) { @@ -276,7 +274,7 @@ int use_outbound(struct sip_msg *msg) int ret; /* If Outbound is forced return success without any further checks */ - if (isbflagset(0, ob_force_bflag) > 0) + if (ob_force_flag != -1 && isflagset(msg, ob_force_flag) > 0) { LM_INFO("outbound forced\n"); return 1; @@ -299,7 +297,7 @@ int use_outbound(struct sip_msg *msg) /* Look for ;reg-id in REGISTER Contact-URIs and ;ob in any Contact-URIs */ - if (parse_headers(msg, HDR_CONTACT_F, 0) >= 0 && msg->contact) + if (msg->contact || parse_headers(msg, HDR_CONTACT_F, 0) != -1) { if (parse_contact(msg->contact) < 0) { @@ -326,7 +324,7 @@ int use_outbound(struct sip_msg *msg) if (msg->REQ_METHOD == METHOD_REGISTER && hooks.contact.reg_id) { - LM_INFO("found REGISTER with ;reg_id paramter on" + LM_INFO("found REGISTER with ;reg-id paramter on" "Contact-URI - outbound used\n"); return 1; } @@ -340,7 +338,7 @@ int use_outbound(struct sip_msg *msg) } /* Check to see if the top Route-URI is me and has a ;ob parameter */ - if (parse_headers(msg, HDR_ROUTE_F, 0) >= 0 && msg->route) + if (msg->route || parse_headers(msg, HDR_ROUTE_F, 0) != -1) { if (parse_rr(msg->route) < 0) {

1 0

[tracker] Task opened: RPC dns.delete_all doesn't deliver response
by sip-router 01 Jan '13

01 Jan '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Olle Johansson (oej) Attached to Project - sip-router Summary - RPC dns.delete_all doesn't deliver response Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Running dns.delete all in xmlrpc gives this response: <methodResponse> <params> <param> <value> </value> </param> </params> </methodResponse> More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=260 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013