sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:master: Fix ul.dump q output value
by Daniel-Constantin Mierla 16 May '13

16 May '13

Module: sip-router Branch: master Commit: c454e4b0129695c7647f6af8e42a38d785d58a7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c454e4b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 2 16:56:45 2013 +0200 Fix ul.dump q output value --- modules/usrloc/ul_rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/usrloc/ul_rpc.c b/modules/usrloc/ul_rpc.c index d737a93..f21bbbf 100644 --- a/modules/usrloc/ul_rpc.c +++ b/modules/usrloc/ul_rpc.c @@ -107,7 +107,7 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) socket_str.s = c->sock->sock_str.s; socket_str.len = c->sock->sock_str.len; } - if(rpc->struct_add(vh, "f", "Q", c->q)<0) + if(rpc->struct_add(vh, "f", "Q", q2double(c->q))<0) { rpc->fault(ctx, 500, "Internal error adding q"); return -1;

1 0

[tracker] Comment added: tm:branch-failure event_route is not executed on all branch failures
by sip-router 16 May '13

16 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Daniel-Constantin Mierla (miconda) ---------- Just checked a bit and variants can be: 1) execute branch failure route immediately it is discovered a tcp connection is not available, but this means kind of blocking to execute the actions from the branch failure route and then the next branch will be generated 2) add the branch in a dummy timer mode that will trigger a timeout event - there will be no attempt to send it, the branch will be put in a "suspended" state, the rest of the branches will be generated and the timer will end up firing at some point The 2nd is more like what would happen if the request is sent over udp, from the point of view of timings. This option might be easier to do and should also end up in failure_route execution if all branches fail. Again, just few thought on quick check, it may need more than that, though. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=296#comment867 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

mysql driver support for presence notifier processes?
by Juha Heinanen 16 May '13

16 May '13

i asked on dev irc meeting if mysql driver now (4.0 or master) supports the features needed by presence notifier processes. this was discussed in march on thread: http://lists.sip-router.org/pipermail/sr-dev/2013-March/018946.html i'm also a bit puzzled, why there is no DB_CAPABILITY that would tell if the required features are implemented by the underlying db driver. now it seems to be possible to have notifier_processes > 0 even if the underlying db driver cannot handle them properly. does anyone know what the current status of this is? -- juha

1 0

IRC Development Meeting
by Daniel-Constantin Mierla 16 May '13

16 May '13

Hello, it's probably the time to have a IRC development meeting to set the targets for the next major release as well as discuss what is needed these days around the project. I proposed next week on Thursday, May 16, at 14:00GMT (16:00 Berlin time). I created a page to collect the topics, only few from my list being added for now: * http://www.kamailio.org/wiki/devel/irc-meetings/2013a Feel free to add topics there. Also, I would be available on Tuesday at the same time if proves to be more convenient for more people. If none of these dates suit for majority, we can look for other alternatives -- just propose and we can start a poll. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, San Francisco, USA - June 24-27, 2013 * http://asipto.com/u/katu *

3 4

git:master: modules:uac updated README after avoiding quotes in display.
by Vicente Hernando 16 May '13

16 May '13

Module: sip-router Branch: master Commit: f66912d541403dc2b7e2ed0846a553ff76cec3ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f66912d… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Thu May 16 12:11:36 2013 +0200 modules:uac updated README after avoiding quotes in display. --- modules/uac/README | 282 ++++++++++++++++++++-------------------------------- 1 files changed, 109 insertions(+), 173 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f66…

1 0

git:master: modules/uac: avoid adding double quotes in uac_replace_* functions
by Vicente Hernando 16 May '13

16 May '13

Module: sip-router Branch: master Commit: 251c0218e7d5e09f43a2b834a5450c20bb4f6d60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=251c021… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Thu May 16 12:06:55 2013 +0200 modules/uac: avoid adding double quotes in uac_replace_* functions - updated uac doc with a note and examples. --- modules/uac/doc/uac_admin.xml | 14 +++++++++- modules/uac/uac.c | 50 +--------------------------------------- 2 files changed, 14 insertions(+), 50 deletions(-) diff --git a/modules/uac/doc/uac_admin.xml b/modules/uac/doc/uac_admin.xml index 3610f12..05dc713 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -484,6 +484,10 @@ modparam("uac", "reg_contact_addr", "192.168.1.2:5080") <para> This function can be used from REQUEST_ROUTE and from BRANCH_ROUTE. </para> + <para>NOTE: Previous versions of this function added double quotes automatically to + display variable. That is no longer the case, if you expect that behavior, you will + have to add the quotes by yourself. + </para> <para> If you set restore_mode to AUTO, the URI will be modified automatically in all subsequent requests and replies in that dialog. @@ -512,7 +516,8 @@ modparam("uac", "reg_contact_addr", "192.168.1.2:5080") # replace both display and uri uac_replace_from("$avp(s:display)","$avp(s:uri)"); # replace only display and do not touch uri -uac_replace_from("batman",""); +uac_replace_from("batman",""); # display is replaced with: batman +uac_replace_from("\"batman\"",""); # display is replaced with: "batman" # remove display and replace uri uac_replace_from("","sip:robin@gotham.org"); # remove display and do not touch uri @@ -580,6 +585,10 @@ uac_restore_from(); <para> This function can be used from REQUEST_ROUTE and from BRANCH_ROUTE. </para> + <para>NOTE: Previous versions of this function added double quotes automatically to + display variable. That is no longer the case, if you expect that behavior, you will + have to add the quotes by yourself. + </para> <example> <title><function>uac_replace_to</function> usage</title> <programlisting format="linespecific"> @@ -587,7 +596,8 @@ uac_restore_from(); # replace both display and uri uac_replace_to("$avp(display)","$avp(uri)"); # replace only display and do not touch uri -uac_replace_to("batman",""); +uac_replace_to("batman",""); # display is replaced with: batman +uac_replace_to("\"batman\"",""); # display is replaced with: "batman" # remove display and replace uri uac_replace_to("","sip:robin@gotham.org"); # remove display and do not touch uri diff --git a/modules/uac/uac.c b/modules/uac/uac.c index a7cd414..5142e03 100644 --- a/modules/uac/uac.c +++ b/modules/uac/uac.c @@ -98,7 +98,6 @@ static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); static int fixup_replace_uri(void** param, int param_no); -static int fixup_replace_disp_uri(void** param, int param_no); static int mod_init(void); static void mod_destroy(void); static int child_init(int rank); @@ -114,13 +113,13 @@ static pv_export_t mod_pvs[] = { /* Exported functions */ static cmd_export_t cmds[]={ - {"uac_replace_from", (cmd_function)w_replace_from, 2, fixup_replace_disp_uri, 0, + {"uac_replace_from", (cmd_function)w_replace_from, 2, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_replace_from", (cmd_function)w_replace_from, 1, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_restore_from", (cmd_function)w_restore_from, 0, 0, 0, REQUEST_ROUTE }, - {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_replace_disp_uri, 0, + {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_replace_to", (cmd_function)w_replace_to, 1, fixup_replace_uri, 0, REQUEST_ROUTE | BRANCH_ROUTE }, @@ -415,51 +414,6 @@ static int fixup_replace_uri(void** param, int param_no) return 0; } - -static int fixup_replace_disp_uri(void** param, int param_no) -{ - pv_elem_t *model; - char *p; - str s; - - /* convert to str */ - s.s = (char*)*param; - s.len = strlen(s.s); - - model=NULL; - if (param_no==1) - { - if (s.len) - { - /* put " around display name */ - p = (char*)pkg_malloc(s.len+3); - if (p==0) - { - LM_CRIT("no more pkg mem\n"); - return E_OUT_OF_MEM; - } - p[0] = '\"'; - memcpy(p+1, s.s, s.len); - p[s.len+1] = '\"'; - p[s.len+2] = '\0'; - pkg_free(s.s); - s.s = p; - s.len += 2; - } - } - if(pv_parse_format(&s ,&model)<0) - { - LM_ERR("wrong format [%s] for param no %d!\n", s.s, param_no); - pkg_free(s.s); - return E_UNSPEC; - } - *param = (void*)model; - - return 0; -} - - - /************************** wrapper functions ******************************/ static int w_restore_from(struct sip_msg *msg)

1 0

redirecting irc channel #sip-router to #kamailio
by Daniel-Constantin Mierla 16 May '13

16 May '13

Hello, already suggested on the irc channels, I plan to redirect #sip-router to #kamailio to group in a single place and have consistency with the name of the project. That means making #sip-router an invite-only channel and automatically redirecting those that want to join to #kamailio. Hope is ok with everyone, invite-only flag can be removed later. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, San Francisco, USA - June 24-27, 2013 * http://asipto.com/u/katu *

1 0

git:master: pv: clone result of several string transformations
by Daniel-Constantin Mierla 15 May '13

15 May '13

Module: sip-router Branch: master Commit: fe7e4a5152674aa9c81c09dd2fc9938d9e9e762e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe7e4a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 15 22:45:18 2013 +0200 pv: clone result of several string transformations - it is safer for assigning back to the same variable on which the transformation was applied - reported by Martin Mikkelsen --- modules/pv/pv_trans.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 1e553f1..e4e5455 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -95,6 +95,15 @@ char *tr_set_crt_buffer(void) return _tr_buffer; } +#define tr_string_clone_result do { \ + if(val->rs.len>TR_BUFFER_SIZE-1) { \ + LM_ERR("result is too big\n"); \ + return -1; \ + } \ + strncpy(_tr_buffer, val->rs.s, val->rs.len); \ + val->rs.s = _tr_buffer; \ + } while(0); + /*! * \brief Evaluate string transformations * \param msg SIP message @@ -350,6 +359,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { /* to end */ val->rs.s += i; val->rs.len -= i; + tr_string_clone_result; break; } val->rs.s += i; @@ -367,10 +377,12 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { /* to end */ val->rs.s += val->rs.len-i; val->rs.len = i; + tr_string_clone_result; break; } val->rs.s += val->rs.len-i; val->rs.len = j; + tr_string_clone_result; break; case TR_S_SELECT: @@ -441,6 +453,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = _tr_empty; } } + tr_string_clone_result; break; case TR_S_TOLOWER: @@ -516,6 +529,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(subtype==TR_S_STRIP) val->rs.s += i; val->rs.len -= i; + tr_string_clone_result; break; @@ -557,6 +571,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } val->rs.s += i; val->rs.len -= i; + tr_string_clone_result; break; case TR_S_PREFIXES:

1 0

git:admorten/sca: misc_radius: documented common_response parameter
by Andrew Mortensen 15 May '13

15 May '13

Module: sip-router Branch: admorten/sca Commit: 8c24f45c76dcd3f8f09a9f14554480e1dbad49b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c24f45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed May 15 19:02:58 2013 +0200 misc_radius: documented common_response parameter --- modules/misc_radius/README | 57 ++++++++++++++++--------- modules/misc_radius/doc/misc_radius_admin.xml | 17 +++++++ 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/modules/misc_radius/README b/modules/misc_radius/README index 4398814..50d6008 100644 --- a/modules/misc_radius/README +++ b/modules/misc_radius/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2004-2008 Juha Heinanen + Copyright � 2004-2008 Juha Heinanen __________________________________________________________________ Table of Contents @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 3.8. group_extra (string) 3.9. uri_extra (string) 3.10. use_sip_uri_host (integer) + 3.11. common_response (integer) 4. Functions @@ -46,7 +47,7 @@ Daniel-Constantin Mierla List of Examples - 1.1. “SIP-AVP” RADIUS AVP exmaples + 1.1. "SIP-AVP" RADIUS AVP exmaples 1.2. radius_config parameter usage 1.3. caller_service_type parameter usage 1.4. callee_service_type parameter usage @@ -57,11 +58,12 @@ Daniel-Constantin Mierla 1.9. group_extra parameter usage 1.10. uri_extra parameter usage 1.11. use_sip_uri_host parameter usage - 1.12. radius_load_caller_avps() usage - 1.13. radius_load_callee_avps() usage - 1.14. radius_is_user_in() usage - 1.15. radius_does_uri_exist() usage - 1.16. radius_does_uri_user_exist() usage + 1.12. common_response parameter usage + 1.13. radius_load_caller_avps() usage + 1.14. radius_load_callee_avps() usage + 1.15. radius_is_user_in() usage + 1.16. radius_does_uri_exist() usage + 1.17. radius_does_uri_user_exist() usage Chapter 1. Admin Guide @@ -85,6 +87,7 @@ Chapter 1. Admin Guide 3.8. group_extra (string) 3.9. uri_extra (string) 3.10. use_sip_uri_host (integer) + 3.11. common_response (integer) 4. Functions @@ -109,7 +112,7 @@ Chapter 1. Admin Guide * SIP_AVP_NAME = STRING_NAME | '#'ID_NUMBER * SIP_AVP_VALUE = ':'STRING_VALUE | '#'NUMBER_VALUE - Example 1.1. “SIP-AVP” RADIUS AVP exmaples + Example 1.1. "SIP-AVP" RADIUS AVP exmaples .... "email:joe@yahoo.com" -> STRING NAME AVP (email) with STRING VALUE (joe(a)yahoo.com) @@ -122,7 +125,7 @@ Chapter 1. Admin Guide .... Unlike in old avp_radius module, functions radius_load_calle[re]_avps() - do not prefix string names of AVPs by string “caller_” or “callee_” + do not prefix string names of AVPs by string "caller_" or "callee_" depending if caller's or callee's attributes were loaded. If you need these prefixes, make your RADIUS server to prepend them into attribute names when it constructs reply items. @@ -161,13 +164,14 @@ Chapter 1. Admin Guide 3.8. group_extra (string) 3.9. uri_extra (string) 3.10. use_sip_uri_host (integer) + 3.11. common_response (integer) 3.1. radius_config (string) This is the location of the configuration file of radius client libraries. - Default value is “/usr/local/etc/radiusclient-ng/radiusclient.conf”. + Default value is "/usr/local/etc/radiusclient-ng/radiusclient.conf". Example 1.2. radius_config parameter usage ... @@ -178,7 +182,7 @@ modparam("misc_radius", "radius_config", "/etc/radiusclient.conf") This is the value of the Service-Type radius attribute to be used, when caller's attributes are loaded. - Default value is dictionary value of “SIP-Caller-AVPs” Service-Type. + Default value is dictionary value of "SIP-Caller-AVPs" Service-Type. Example 1.3. caller_service_type parameter usage ... @@ -189,7 +193,7 @@ modparam("misc_radius", "caller_service_type", 18) This is the value of the Service-Type radius attribute to be used, when callee's attributes are loaded. - Default value is dictionary value of “SIP-Callee-AVPs” Service-Type. + Default value is dictionary value of "SIP-Callee-AVPs" Service-Type. Example 1.4. callee_service_type parameter usage ... @@ -200,7 +204,7 @@ modparam("misc_radius", "callee_service_type", 19) This is the value of Service-Type RADIUS attribute to be used, when radius_is_user_in() function is called. - Default value is dictionary value of “Group-Check” Service-Type. + Default value is dictionary value of "Group-Check" Service-Type. Example 1.5. group_service_type parameter usage ... @@ -211,7 +215,7 @@ modparam("misc_radius", "group_service_type", 20) This is the value of Service-Type RADIUS attribute to be used, when radius_does_uri[_user]_exist() function is called. - Default value is dictionary value of “Call-Check” Service-Type. + Default value is dictionary value of "Call-Check" Service-Type. Example 1.6. uri_service_type parameter usage ... @@ -286,6 +290,17 @@ modparam("misc_radius", "uri_extra", "Called-Station-Id=$tu") ... modparam("misc_radius", "use_sip_uri_host", 1) +3.11. common_response (integer) + + Set it to 1 if you need common radius response attributes to be added + as AVPs. + + Default value is "0". + + Example 1.12. common_response parameter usage +... +modparam("misc_radius", "common_response", 21) + 4. Functions 4.1. radius_load_caller_avps(caller) @@ -297,12 +312,12 @@ modparam("misc_radius", "use_sip_uri_host", 1) 4.1. radius_load_caller_avps(caller) The functions loads caller's attributes from radius and stores them - into AVPs. Parameter “caller” is a string that may contain pseudo + into AVPs. Parameter "caller" is a string that may contain pseudo variables. It indicates the user, whose attributes are loaded. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.12. radius_load_caller_avps() usage + Example 1.13. radius_load_caller_avps() usage ... radius_load_caller_avps("$fU@$fd"); # take caller from From URI ... @@ -312,12 +327,12 @@ radius_load_caller_avps("$au@$ar"); # take caller from Authorization 4.2. radius_load_callee_avps(callee) The functions loads callee's attributes from radius and stores them - into AVPs. Parameter “callee” is a string that may contain pseudo + into AVPs. Parameter "callee" is a string that may contain pseudo variables. It indicates the user, whose attributes are loaded. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.13. radius_load_callee_avps() usage + Example 1.14. radius_load_callee_avps() usage ... radius_load_callee_avps("$rU@$rd"); # take callee from Request-URI ... @@ -332,7 +347,7 @@ radius_load_callee_avps("$rU@$rd"); # take callee from Request-URI This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. - Example 1.14. radius_is_user_in() usage + Example 1.15. radius_is_user_in() usage ... radius_is_user_in("$rU@$rd", "1"); # take user from Request-URI ... @@ -347,7 +362,7 @@ radius_is_user_in("$au@$ar", "group_x");# take user from credentials This function can be used from REQUEST_ROUTE and LOCAL_ROUTE. - Example 1.15. radius_does_uri_exist() usage + Example 1.16. radius_does_uri_exist() usage ... if (radius_does_uri_exist()) ... # check Request-URI ... @@ -364,7 +379,7 @@ if (radius_does_uri_exist("$avp(i:99)")) ... # check URI in $avp(i:99) This function can be used from REQUEST_ROUTE and LOCAL_ROUTE. - Example 1.16. radius_does_uri_user_exist() usage + Example 1.17. radius_does_uri_user_exist() usage ... if (radius_does_uri_user_exist()) ... # check Request-URI userpart ... diff --git a/modules/misc_radius/doc/misc_radius_admin.xml b/modules/misc_radius/doc/misc_radius_admin.xml index 5e57749..aff0973 100644 --- a/modules/misc_radius/doc/misc_radius_admin.xml +++ b/modules/misc_radius/doc/misc_radius_admin.xml @@ -303,6 +303,23 @@ modparam("misc_radius", "use_sip_uri_host", 1) </programlisting> </example> </section> + <section> + <title><varname>common_response</varname> (integer)</title> + <para> + Set it to 1 if you need common radius response attributes to + be added as AVPs. + </para> + <para> + Default value is <quote>0</quote>. + </para> + <example> + <title><varname>common_response</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("misc_radius", "common_response", 21) +</programlisting> + </example> + </section> </section>

1 0

git:admorten/sca: modules/sca: reconcile Contact and From URIs in ACK callback.
by Andrew Mortensen 15 May '13

15 May '13

Module: sip-router Branch: admorten/sca Commit: 0794a8ebc69771f8c0ffcc72d7eaca13f2e6e566 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0794a8e… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed May 15 16:13:23 2013 -0400 modules/sca: reconcile Contact and From URIs in ACK callback. - fix Music-on-Hold in Polycoms when SCA caller has MoH enabled and SCA callee does SCA hold/pickup with identical To & From URIs. Previously, module would end up looking up an appearance for callee in ACK callback instead of caller. --- modules/sca/sca_call_info.c | 77 +++++++++++++++--------------------------- modules/sca/sca_util.c | 71 +++++++++++++++++++++++++++++++++++++++ modules/sca/sca_util.h | 2 + 3 files changed, 101 insertions(+), 49 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 83ac855..344ea27 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1441,7 +1441,6 @@ done: void sca_call_info_ack_cb( struct cell *t, int type, struct tmcb_params *params ) { - struct to_body *from; struct to_body *to; str from_aor = STR_NULL; str to_aor = STR_NULL; @@ -1450,24 +1449,18 @@ sca_call_info_ack_cb( struct cell *t, int type, struct tmcb_params *params ) return; } - if ( sca_get_msg_from_header( params->req, &from ) < 0 ) { - LM_ERR( "sca_call_info_ack_cb: failed to get From-header" ); - return; - } - if ( sca_uri_extract_aor( &from->uri, &from_aor ) < 0 ) { - LM_ERR( "sca_call_info_ack_cb: failed to extract From AoR from %.*s", - STR_FMT( &from->uri )); + if ( sca_create_canonical_aor( params->req, &from_aor ) < 0 ) { return; } if ( sca_get_msg_to_header( params->req, &to ) < 0 ) { LM_ERR( "sca_call_info_ack_cb: failed to get To-header" ); - return; + goto done; } if ( sca_uri_extract_aor( &to->uri, &to_aor ) < 0 ) { LM_ERR( "sca_call_info_ack_cb: failed to extract To AoR from %.*s", STR_FMT( &to->uri )); - return; + goto done; } sca_call_info_ack_from_handler( params->req, &from_aor, &to_aor ); @@ -1475,15 +1468,19 @@ sca_call_info_ack_cb( struct cell *t, int type, struct tmcb_params *params ) if ( !sca_uri_is_shared_appearance( sca, &to_aor )) { LM_DBG( "sca_call_info_ack_cb: %.*s is not a shared appearance", STR_FMT( &to_aor )); - return; + goto done; } if ( sca_notify_call_info_subscribers( sca, &to_aor ) < 0 ) { LM_ERR( "sca_call_info_ack_cb: failed to call-info " "NOTIFY %.*s subscribers", STR_FMT( &to_aor )); - return; + goto done; } +done: + if ( from_aor.s != NULL ) { + pkg_free( from_aor.s ); + } } static int @@ -1939,45 +1936,27 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) } /* reconcile mismatched Contact users and To/From URIs */ - if ( sca_uri_extract_aor( &from->uri, &from_aor ) < 0 ) { - LM_ERR( "sca_uri_extract_aor failed to extract AoR from From URI %.*s", - STR_FMT( &from->uri )); - goto done; - } - if ( sca_uri_extract_aor( &to->uri, &to_aor ) < 0 ) { - LM_ERR( "sca_uri_extract_aor failed to extract AoR from To URI %.*s", - STR_FMT( &to->uri )); - goto done; - } - - if ( !SCA_STR_EMPTY( &c_uri.user )) { - if ( msg->first_line.type == SIP_REQUEST ) { - if ( !SCA_STR_EQ( &c_uri.user, &GET_FROM_PURI( msg )->user )) { - if ( sca_aor_create_from_info( &from_aor, c_uri.type, - &c_uri.user, &GET_FROM_PURI( msg )->host, - &GET_FROM_PURI( msg )->port ) < 0 ) { - LM_ERR( "sca_aor_create_from_info from Contact %.*s " - "and From URI %.*s failed", - STR_FMT( &contact_uri ), STR_FMT( &from->uri )); - goto done; - } - - aor_flags |= SCA_CALL_INFO_UPDATE_FLAG_FROM_ALLOC; - } - } else { - if ( !SCA_STR_EQ( &c_uri.user, &GET_TO_PURI( msg )->user )) { - if ( sca_aor_create_from_info( &to_aor, c_uri.type, - &c_uri.user, &GET_TO_PURI( msg )->host, - &GET_TO_PURI( msg )->port ) < 0 ) { - LM_ERR( "sca_aor_create_from_info from Contact %.*s " - "and To URI %.*s failed", STR_FMT( &contact_uri ), - STR_FMT( &from->uri )); - goto done; - } + if ( msg->first_line.type == SIP_REQUEST ) { + if ( sca_create_canonical_aor( msg, &from_aor ) < 0 ) { + return( -1 ); + } + aor_flags |= SCA_CALL_INFO_UPDATE_FLAG_FROM_ALLOC; - aor_flags |= SCA_CALL_INFO_UPDATE_FLAG_TO_ALLOC; - } + if ( sca_uri_extract_aor( &to->uri, &to_aor ) < 0 ) { + LM_ERR( "Failed to extract AoR from To URI %.*s", + STR_FMT( &to->uri )); + goto done; + } + } else { + if ( sca_uri_extract_aor( &from->uri, &from_aor ) < 0 ) { + LM_ERR( "Failed to extract AoR from From URI %.*s", + STR_FMT( &from->uri )); + goto done; + } + if ( sca_create_canonical_aor( msg, &to_aor ) < 0 ) { + return( -1 ); } + aor_flags |= SCA_CALL_INFO_UPDATE_FLAG_TO_ALLOC; } /* early check to see if we're dealing with any SCA endpoints */ diff --git a/modules/sca/sca_util.c b/modules/sca/sca_util.c index ad050bc..a9f959e 100644 --- a/modules/sca/sca_util.c +++ b/modules/sca/sca_util.c @@ -339,6 +339,77 @@ sca_aor_create_from_info( str *aor, uri_type type, str *user, str *domain, return( aor->len ); } + int +sca_create_canonical_aor( sip_msg_t *msg, str *c_aor ) +{ + struct to_body *tf = NULL; + sip_uri_t c_uri; + str tf_aor = STR_NULL; + str contact_uri = STR_NULL; + int rc = -1; + + assert( msg != NULL ); + assert( c_aor != NULL ); + + memset( c_aor, 0, sizeof( str )); + + if ( msg->first_line.type == SIP_REQUEST ) { + if ( sca_get_msg_from_header( msg, &tf ) < 0 ) { + LM_ERR( "sca_create_canonical_aor: failed to get From header" ); + goto done; + } + } else { + if ( sca_get_msg_to_header( msg, &tf ) < 0 ) { + LM_ERR( "sca_create_canonical_aor: failed to get To header" ); + goto done; + } + } + + if ( sca_uri_extract_aor( &tf->uri, &tf_aor ) < 0 ) { + LM_ERR( "sca_create_canonical_aor: failed to extract AoR from " + "URI <%.*s>", STR_FMT( &tf->uri )); + goto done; + } + + memset( &c_uri, 0, sizeof( sip_uri_t )); + if (( rc = sca_get_msg_contact_uri( msg, &contact_uri )) < 0 ) { + LM_ERR( "sca_create_canonical_aor: failed to get contact URI from " + "Contact <%.*s>", STR_FMT( &msg->contact->body )); + goto done; + } + if ( rc > 0 ) { + if ( parse_uri( contact_uri.s, contact_uri.len, &c_uri ) < 0 ) { + LM_ERR( "sca_create_canonical_aor: failed to parse Contact URI " + "<%.*s>", STR_FMT( &contact_uri )); + rc = -1; + goto done; + } + } + + if ( SCA_STR_EMPTY( &c_uri.user ) || + SCA_STR_EQ( &c_uri.user, &tf->parsed_uri.user )) { + /* empty contact header or Contact user matches To/From AoR */ + c_aor->s = (char *)pkg_malloc( tf_aor.len ); + c_aor->len = tf_aor.len; + memcpy( c_aor->s, tf_aor.s, tf_aor.len ); + } else { + /* Contact user and To/From user mismatch */ + if ( sca_aor_create_from_info( c_aor, c_uri.type, + &c_uri.user, &tf->parsed_uri.host, + &tf->parsed_uri.port ) < 0 ) { + LM_ERR( "sca_create_canonical_aor: failed to create AoR from " + "Contact <%.*s> and URI <%.*s>", + STR_FMT( &contact_uri ), STR_FMT( &tf_aor )); + goto done; + } + } + + rc = 1; + +done: + return( rc ); +} + /* XXX this considers any held stream to mean the call is on hold. correct? */ int sca_call_is_held( sip_msg_t *msg ) diff --git a/modules/sca/sca_util.h b/modules/sca/sca_util.h index 30dcf78..012148b 100644 --- a/modules/sca/sca_util.h +++ b/modules/sca/sca_util.h @@ -55,6 +55,8 @@ int sca_uri_build_aor( str *, int, str *, str * ); int sca_aor_create_from_info( str *, uri_type, str *, str *, str * ); +int sca_create_canonical_aor( sip_msg_t *, str * ); + /* convenient call hold detection */ int sca_call_is_held( sip_msg_t * );

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
32
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 2013