sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
237 discussions

[tracker] Task opened: Possible memory leak in srdb1
by sip-router 26 Jun '13

26 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Konstantin (Konstantin) Attached to Project - sip-router Summary - Possible memory leak in srdb1 Task Type - Bug Report Category - libsrdb1 (kamailio) Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - Hi, I found that inside function db_free_columns in the file lib\srdb1\db_res.c there is no memory free for RES_NAMES(_r)[col]->s structure member pointer. It could be a memory leak. The RES_NAMES(_r)[col]->s points to a dynamically allocated memory and it should be deallocated with all other structures inside db1_res_t. I found it in version 3.1.5 and I checked that the issue exists in the latest version as well. Best regards, Konstantin. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=319 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/ims_auth: updated documentation
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: master Commit: 8f1904fd0a0b305b2c528df0d1d3c27d5eef0c7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f1904f… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 15:41:42 2013 +0200 modules/ims_auth: updated documentation - updated documentation to use route blocks after async diameter --- modules/ims_auth/doc/ims_auth_admin.xml | 68 +++++++++++++++++++++++++++---- 1 files changed, 60 insertions(+), 8 deletions(-) diff --git a/modules/ims_auth/doc/ims_auth_admin.xml b/modules/ims_auth/doc/ims_auth_admin.xml index 56eb972..3357cc9 100644 --- a/modules/ims_auth/doc/ims_auth_admin.xml +++ b/modules/ims_auth/doc/ims_auth_admin.xml @@ -274,8 +274,6 @@ modparam("ims_auth", "max_nonce_reuse", 1) </example> </section> - </section> - <section> <title><varname>add_authinfo_hdr</varname> (integer)</title> @@ -404,8 +402,8 @@ modparam("ims_auth", "av_check_only_impu", 1) <programlisting format="linespecific"> ... if (!www_authorize("kamailio.org", "subscriber")) { - www_challenge("kamailio.org", "1"); -}; + www_challenge(""REG_MAR_REPLY"", "kamailio.org", "1"); +}; ... </programlisting> </example> @@ -421,7 +419,7 @@ if (!www_authorize("kamailio.org", "subscriber")) { </section> <section> - <title><function moreinfo="none">ims_www_challenge(realm, + <title><function moreinfo="none">ims_www_challenge(route_block, realm, table)</function></title> <para>Name alias: proxy_authorize(realm, table)</para> @@ -442,6 +440,9 @@ if (!www_authorize("kamailio.org", "subscriber")) { <itemizedlist> <listitem> + <para>Route block to resume after async MAR Diameter reply.</para> + </listitem> + <listitem> <para><emphasis>realm</emphasis> - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server @@ -472,15 +473,39 @@ if (!www_authorize("kamailio.org", "subscriber")) { <programlisting format="linespecific"> ... if (!proxy_authorize("$fd", "subscriber)) { - proxy_challenge("$fd", "1"); # Realm will be autogenerated + proxy_challenge(""REG_MAR_REPLY","$fd"); # Realm will be autogenerated }; ... + ... +route[REG_MAR_REPLY] +{ + #this is async so to know status we have to check the reply avp + xlog("L_DBG","maa_return code is $avp(s:maa_return_code)\n"); + + switch ($avp(s:maa_return_code)){ + case 1: #success + xlog("L_DBG", "MAR success - 401/407 response sent from module\n"); + break; + case -1: #failure + xlog("L_ERR", "MAR failure - error response sent from module\n"); + break; + case -2: #error + xlog("L_ERR", "MAR error - sending error response now\n"); + t_reply("500", "MAR failed"); + break; + default: + xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:uaa_return_code)]\n"); + t_reply("500", "Unknown response code from MAR"); + break; + } + exit; +} </programlisting> </example> </section> <section> - <title><function moreinfo="none">ims_proxy_challenge(realm, + <title><function moreinfo="none">ims_proxy_challenge(route_block, realm, table)</function></title> <para>Name alias: proxy_authorize(realm, table)</para> @@ -501,6 +526,9 @@ if (!proxy_authorize("$fd", "subscriber)) { <itemizedlist> <listitem> + <para>Route block to resume after async MAR Diameter reply.</para> + </listitem> + <listitem> <para><emphasis>realm</emphasis> - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server @@ -531,9 +559,33 @@ if (!proxy_authorize("$fd", "subscriber)) { <programlisting format="linespecific"> ... if (!proxy_authorize("$fd", "subscriber)) { - proxy_challenge("$fd", "1"); # Realm will be autogenerated + proxy_challenge("REG_MAR_REPLY","$fd", "1"); # Realm will be autogenerated }; ... +route[REG_MAR_REPLY] +{ + #this is async so to know status we have to check the reply avp + xlog("L_DBG","maa_return code is $avp(s:maa_return_code)\n"); + + switch ($avp(s:maa_return_code)){ + case 1: #success + xlog("L_DBG", "MAR success - 401/407 response sent from module\n"); + break; + case -1: #failure + xlog("L_ERR", "MAR failure - error response sent from module\n"); + break; + case -2: #error + xlog("L_ERR", "MAR error - sending error response now\n"); + t_reply("500", "MAR failed"); + break; + default: + xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:uaa_return_code)]\n"); + t_reply("500", "Unknown response code from MAR"); + break; + } + exit; +} +... </programlisting> </example> </section>

1 0

git:master: modules/ims_icscf: updated documentation
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: master Commit: 811ed09b1c8cff014d3135967c8a3cda1bec569d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=811ed09… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 15:42:44 2013 +0200 modules/ims_icscf: updated documentation - updated documentation to use route blocks after async diameter --- modules/ims_icscf/doc/ims_icscf_admin.xml | 107 ++++++++++++++++++++--------- 1 files changed, 75 insertions(+), 32 deletions(-) diff --git a/modules/ims_icscf/doc/ims_icscf_admin.xml b/modules/ims_icscf/doc/ims_icscf_admin.xml index fdb0b98..aa5573d 100644 --- a/modules/ims_icscf/doc/ims_icscf_admin.xml +++ b/modules/ims_icscf/doc/ims_icscf_admin.xml @@ -189,7 +189,7 @@ if (I_scscf_select("0")) { t_relay(); } ... -</programlisting> + </programlisting> </example> </section> @@ -215,7 +215,7 @@ I_scscf_drop(); <section> <title><function - moreinfo="none">I_perform_user_authorization_request(capabalities)</function></title> + moreinfo="none">I_perform_user_authorization_request(route_block, capabalities)</function></title> <para>Perform a UAR on Diameter CXDX interface. This function will build a list of SCSCFs to be used and populate the SCSCF list for the request. @@ -224,6 +224,9 @@ I_scscf_drop(); <itemizedlist> <listitem> + <para>Route block to resume after async UAR Diameter reply.</para> + </listitem> + <listitem> <para>capabilities - whether to request capabilities or not "1" - with capabilities, "0" - no capabilities.</para> </listitem> @@ -239,58 +242,98 @@ I_scscf_drop(); <programlisting format="linespecific"> ... - I_perform_user_authorization_request("0"); #0=REG/DEREG; 1=REG+Capabilities - #this is async so to know status we have to check the reply avp - switch ($avp(s:uaa_return_code)){ - case 1: #success +I_perform_user_authorization_request("REG_UAR_REPLY","0"); #0=REG/DEREG; 1=REG+Capabilities +exit; +... +route[REG_UAR_REPLY] +{ + #this is async so to know status we have to check the reply avp + switch ($avp(s:uaa_return_code)){ + case 1: #success if (I_scscf_select("0")){ - t_on_failure("register_failure"); - t_on_reply("register_reply"); - if (!t_relay()) { - t_reply("500", "Error forwarding to SCSCF"); - } + t_on_failure("register_failure"); + t_on_reply("register_reply"); + #now relay to appropriate SCSCF + if (!t_relay()) { + t_reply("500", "Error forwarding to SCSCF"); + } } else {#select failed - I_scscf_drop(); - t_reply("500", "Server error on SCSCF Select (UAR)"); - } + I_scscf_drop(); + t_reply("500", "Server error on SCSCF Select (UAR)"); + } + break; + case -1: #failure + xlog("L_ERR", "UAR failure - error response sent from module\n"); break; - case -1: #failure - xlog("L_ERR", "UAR failure - error response sent from module"); - break; - case -2: #error - xlog("L_ERR", "UAR error - sending error response now"); + case -2: #error + xlog("L_ERR", "UAR error - sending error response now\n"); t_reply("500", "UAR failed"); break; - default: - xlog("L_ERR", "Unknown return code from UAR, value is [$avp(s:uaa_return_code)]"); - t_reply("500", "Unknown response code from UAR"); + default: + xlog("L_ERR", "Unknown return code from UAR, value is [$avp(s:uaa_return_code)]\n"); + t_reply("500", "Unknown response code from UAR"); break; - } -... -</programlisting> + } +} +... + </programlisting> </example> </section> <section> <title><function - moreinfo="none">I_perform_location_information_request()</function></title> + moreinfo="none">I_perform_location_information_request(route_block)</function></title> + + <para>Perform a LIR on Diameter CXDX interface.</para> + + <itemizedlist> + <listitem> + <para>Route block to resume after async LIR Diameter reply.</para> + </listitem> + </itemizedlist> <para>This function can be used from REQUEST_ROUTE.</para> + <para>p.s. this is executed asynchronously. See example on how to + retrieve return value</para> + <example> - <title>proxy_authorize usage</title> + <title>I_perform_location_information_request()</title> <programlisting format="linespecific"> ... -if (!proxy_authorize("$fd", "subscriber)) { -proxy_challenge("$fd", "1"); # Realm will be autogenerated -}; +I_perform_location_information_request("SESSION_LIR_REPLY","0"); +exit; ... -</programlisting> +route[SESSION_LIR_REPLY] +{ + if ($avp(lia_return_code) == 1) { + if (I_scscf_select("0")) { + append_branch(); + t_on_reply("initial_request_reply"); + t_on_failure("initial_request_failure"); + if (!t_relay()) { + t_reply("500","Error forwarding towards S-CSCF"); + break; + } + break; + } else { + xlog("L_DBG", "dropping scscf list on initial request\n"); + I_scscf_drop(); + t_reply("500", "Server error on LIR select S-CSCF"); + break; + } + } else { + t_reply("500", "Server error on LIR"); + break; + } + break; +} +... + </programlisting> </example> </section> </section> - <section> <title>Statistics</title>

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 7eabeb5ecd12d647e927cd08d5e7e887f18ab9ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7eabeb5… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 14:16:02 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

(no subject)
by Consultoria TI Cesar 25 Jun '13

25 Jun '13

1 0

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 969377018a770af6032109514205f3aa8e9bcfc9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9693770… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 14:15:02 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

git:master: IMS example config files: update icscf and scscf config files to correctly use async route blocks
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: master Commit: bf08aa1a3859766caf0842fdd30b9fc2f4a4ff43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf08aa1… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 14:11:13 2013 +0200 IMS example config files: update icscf and scscf config files to correctly use async route blocks - This fix updates the example ICSCF and SCSCF config files to correctly use route blocks for the replies of any asynchronous Diameter messages --- examples/icscf/kamailio.cfg | 53 +++++++++++------ examples/scscf/kamailio.cfg | 130 ++++++++++++++++++++++++++++++++---------- 2 files changed, 133 insertions(+), 50 deletions(-) diff --git a/examples/icscf/kamailio.cfg b/examples/icscf/kamailio.cfg index c66cb25..6a0de63 100644 --- a/examples/icscf/kamailio.cfg +++ b/examples/icscf/kamailio.cfg @@ -312,29 +312,44 @@ route[register] #free this from the failed I_scscf_select call I_scscf_drop(); # Do an asynchronous UAR: - I_perform_user_authorization_request("0"); - if ($avp(uaa_return_code) == 1) { - if (I_scscf_select("0")) { - t_on_reply("register_reply"); - t_on_failure("register_failure"); - if (!t_relay()) { - t_reply("500","Error forwarding towards S-CSCF"); - break; - } - break; - } else { - I_scscf_drop(); - t_reply("500", "Server error on UAR select S-CSCF"); - break; - } - } else { - t_reply("500", "Server error on UAR select S-CSCF"); - break; - } + I_perform_user_authorization_request("REG_UAR_REPLY","0"); #0=REG/DEREG; 1=REG+Capabilities + exit; } break; } +route[REG_UAR_REPLY] +{ + #this is async so to know status we have to check the reply avp + switch ($avp(s:uaa_return_code)){ + case 1: #success + if (I_scscf_select("0")){ + t_on_failure("register_failure"); + t_on_reply("register_reply"); + #now relay to appropriate SCSCF + if (!t_relay()) { + t_reply("500", "Error forwarding to SCSCF"); + } + } else {#select failed + I_scscf_drop(); + t_reply("500", "Server error on SCSCF Select (UAR)"); + } + break; + case -1: #failure + xlog("L_ERR", "UAR failure - error response sent from module\n"); + break; + case -2: #error + xlog("L_ERR", "UAR error - sending error response now\n"); + t_reply("500", "UAR failed"); + break; + default: + xlog("L_ERR", "Unknown return code from UAR, value is [$avp(s:uaa_return_code)]\n"); + t_reply("500", "Unknown response code from UAR"); + break; + } +} + + ###################################################################### # Replies to REGISTER requests, ###################################################################### diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index f3b3cac..b8c9f1b 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -353,7 +353,8 @@ route { if (uri=~"sip:(.*)@"+NETWORKNAME_ESC +"(.*)" || uri=~"tel:.*") { if (!term_impu_registered("location")) { xlog("L_ERR", "We need to do an UNREG server SAR assignemnt"); - assign_server_unreg("location", "term"); + assign_server_unreg("UNREG_SAR_REPLY", "location", "term"); + exit; } } else { sl_send_reply("403","Forbidden - Dialog not found on S-CSCF or Terminating user not suitable for unregistered services"); @@ -364,6 +365,28 @@ route { } } +route[UNREG_SAR_REPLY] +{ + xlog("L_DBG","saa_return code is $avp(s:saa_return_code)\n"); + switch ($avp(s:saa_return_code)){ + case 1: #success + xlog("L_DBG", "SAR success - will route message\n"); + route(term); + break; + case -1: #failure + xlog("L_ERR", "SAR failure - error response sent from module\n"); + break; + case -2: #error + xlog("L_ERR", "SAR error - error response sent from module\n"); + break; + default: + xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:saa_return_code)]\n"); + break; + } + exit; +} + + ###################################################################### # Helper routes (Basic-Checks, NAT-Handling/RTP-Control, XML-RPC) ###################################################################### @@ -458,26 +481,7 @@ route[REGISTER] { } else { #user has not been authenticated. Lets send a challenge via 401 Unauthorized xlog("L_DBG","About to challenge! auth_ims\n"); - ims_www_challenge("$td"); - #this is async so to know status we have to check the reply avp - xlog("L_DBG","maa_return code is $avp(s:maa_return_code)\n"); - - switch ($avp(s:maa_return_code)){ - case 1: #success - xlog("L_DBG", "MAR success - 401/407 response sent from module"); - break; - case -1: #failure - xlog("L_ERR", "MAR failure - error response sent from module"); - break; - case -2: #error - xlog("L_ERR", "MAR error - sending error response now"); - t_reply("500", "MAR failed"); - break; - default: - xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:uaa_return_code)]"); - t_reply("500", "Unknown response code from MAR"); - break; - } + ims_www_challenge("REG_MAR_REPLY", "$td"); exit; } } else { @@ -485,21 +489,85 @@ route[REGISTER] { # We need to check if this user is registered or not if (!impu_registered("location")) { xlog("L_ERR", "Not REGISTERED\n"); - save("location"); - if ($avp(saa_return_code) == 1) { - isc_match_filter_reg("0","location"); - exit; - } + save("PRE_REG_SAR_REPLY","location"); + exit; } else { - save("location"); - if($avp(saa_return_code) == 1) { - isc_match_filter_reg("1","location"); - exit; - } + isc_match_filter_reg("1","location"); + save("REG_SAR_REPLY","location"); + exit; } } } +route[REG_MAR_REPLY] +{ + #this is async so to know status we have to check the reply avp + xlog("L_DBG","maa_return code is $avp(s:maa_return_code)\n"); + + switch ($avp(s:maa_return_code)){ + case 1: #success + xlog("L_DBG", "MAR success - 401/407 response sent from module\n"); + break; + case -1: #failure + xlog("L_ERR", "MAR failure - error response sent from module\n"); + break; + case -2: #error + xlog("L_ERR", "MAR error - sending error response now\n"); + t_reply("500", "MAR failed"); + break; + default: + xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:uaa_return_code)]\n"); + t_reply("500", "Unknown response code from MAR"); + break; + } + exit; +} + +route[PRE_REG_SAR_REPLY] +{ + xlog("L_DBG","saa_return code is $avp(s:saa_return_code)\n"); + #this is async so to know status we have to check the reply avp + xlog("L_DBG","saa_return code (for scscf_save on register) is $avp(s:saa_return_code)\n"); + switch ($avp(s:saa_return_code)){ + case 1: #success + xlog("L_DBG", "SAR success - 200 response sent from module\n"); + isc_match_filter_reg("0","location"); + exit; + case -1: #failure + xlog("L_ERR", "SAR failure - error response sent from module\n"); + break; + case -2: #error + xlog("L_ERR", "SAR error - error response sent from module\n"); + break; + default: + xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:uaa_return_code)]\n"); + break; + } + exit; +} + +route[REG_SAR_REPLY] +{ + xlog("L_DBG","saa_return code is $avp(s:saa_return_code)\n"); + #this is async so to know status we have to check the reply avp + xlog("L_DBG","saa_return code (for scscf_save on register) is $avp(s:saa_return_code)\n"); + switch ($avp(s:saa_return_code)){ + case 1: #success + xlog("L_DBG", "SAR success - 200 response sent from module\n"); + exit; + case -1: #failure + xlog("L_ERR", "SAR failure - error response sent from module\n"); + break; + case -2: #error + xlog("L_ERR", "SAR error - error response sent from module\n"); + break; + default: + xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:uaa_return_code)]\n"); + break; + } + exit; +} + ###################################################################### # Apply privacy, if requested ######################################################################

1 0

git:master: modules/ims_auth: execute route block on async reply on REG MAR
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: master Commit: 6af810edde27d087c86432f42d9aec0636b3a740 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6af810e… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 14:07:12 2013 +0200 modules/ims_auth: execute route block on async reply on REG MAR - changed this to make the use of async CDP cleaner - Fixes inconsistencies we are experiencing with async TM and not using route blocks - Note this fix is for REG MAR called from ims_www_challenge() --- modules/ims_auth/authims_mod.c | 51 +++++++++++++++++++++++++-------------- modules/ims_auth/authorize.c | 32 ++++++++++++++++++------ modules/ims_auth/authorize.h | 4 +- modules/ims_auth/cxdx_mar.h | 6 ---- 4 files changed, 59 insertions(+), 34 deletions(-) diff --git a/modules/ims_auth/authims_mod.c b/modules/ims_auth/authims_mod.c index 0e94f69..a23e7ce 100644 --- a/modules/ims_auth/authims_mod.c +++ b/modules/ims_auth/authims_mod.c @@ -67,7 +67,8 @@ static void destroy(void); static int mod_init(void); static int auth_fixup(void** param, int param_no); -static int challenge_fixup(void** param, int param_no); +static int auth_fixup_async(void** param, int param_no); +static int challenge_fixup_async(void** param, int param_no); struct cdp_binds cdpb; @@ -117,9 +118,9 @@ int ignore_failed_auth = 0; */ static cmd_export_t cmds[] = { {"ims_www_authenticate", (cmd_function) www_authenticate, 1, auth_fixup, 0, REQUEST_ROUTE}, - {"ims_www_challenge", (cmd_function) www_challenge, 1, challenge_fixup, 0, REQUEST_ROUTE}, + {"ims_www_challenge", (cmd_function) www_challenge, 2, challenge_fixup_async, 0, REQUEST_ROUTE}, {"ims_proxy_authenticate", (cmd_function) proxy_authenticate, 1, auth_fixup, 0, REQUEST_ROUTE}, - {"ims_proxy_challenge", (cmd_function) proxy_challenge, 1, auth_fixup, 0, REQUEST_ROUTE}, + {"ims_proxy_challenge", (cmd_function) proxy_challenge, 2, auth_fixup_async, 0, REQUEST_ROUTE}, {"bind_ims_auth", (cmd_function) bind_ims_auth, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -268,30 +269,22 @@ static void destroy(void) { /* * Convert the char* parameters */ -static int challenge_fixup(void** param, int param_no) { +static int challenge_fixup_async(void** param, int param_no) { if (strlen((char*) *param) <= 0) { LM_ERR("empty parameter %d not allowed\n", param_no); return -1; } - if (param_no == 1) { + if (param_no == 1) { //route name - static or dynamic string (config vars) + if (fixup_spve_null(param, param_no) < 0) + return -1; + return 0; + } else if (param_no == 2) { if (fixup_var_str_12(param, 1) == -1) { LM_ERR("Erroring doing fixup on challenge"); return -1; } - mar_param_t *ap; - ap = (mar_param_t*) pkg_malloc(sizeof (mar_param_t)); - if (ap == NULL) { - LM_ERR("no more pkg\n"); - return -1; - } - memset(ap, 0, sizeof (mar_param_t)); - ap->paction = get_action_from_param(param, param_no); - - ap->param = (char*) *param; - - *param = (void*) ap; } return 0; @@ -307,7 +300,29 @@ static int auth_fixup(void** param, int param_no) { } if (param_no == 1) { - //return fixup_var_str_12(param, 1); + if (fixup_var_str_12(param, 1) == -1) { + LM_ERR("Erroring doing fixup on auth"); + return -1; + } + } + + return 0; +} + +/* + * Convert the char* parameters + */ +static int auth_fixup_async(void** param, int param_no) { + if (strlen((char*) *param) <= 0) { + LM_ERR("empty parameter %d not allowed\n", param_no); + return -1; + } + + if (param_no == 1) { //route name - static or dynamic string (config vars) + if (fixup_spve_null(param, param_no) < 0) + return -1; + return 0; + } else if (param_no == 2) { if (fixup_var_str_12(param, 1) == -1) { LM_ERR("Erroring doing fixup on auth"); return -1; diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c index 7f3e753..9f58554 100644 --- a/modules/ims_auth/authorize.c +++ b/modules/ims_auth/authorize.c @@ -270,22 +270,38 @@ int proxy_authenticate(struct sip_msg* _m, char* _realm, char* _table) { return digest_authenticate(_m, &srealm, &stable, HDR_PROXYAUTH_T); } */ -int challenge(struct sip_msg* msg, char* str1, char* str2, int is_proxy_auth) { +int challenge(struct sip_msg* msg, char* str1, char* str2, int is_proxy_auth, char *route) { str realm = {0, 0}; unsigned int aud_hash; str private_identity, public_identity, auts = {0, 0}, nonce = {0, 0}; auth_vector *av = 0; int algo_type; + + str route_name; saved_transaction_t* saved_t; tm_cell_t *t = 0; cfg_action_t* cfg_action; - mar_param_t* ap = (mar_param_t*) str1; - cfg_action = ap->paction->next; + if (fixup_get_svalue(msg, (gparam_t*) route, &route_name) != 0) { + LM_ERR("no async route block for assign_server_unreg\n"); + return -1; + } + + LM_DBG("Looking for route block [%.*s]\n", route_name.len, route_name.s); + int ri = route_get(&main_rt, route_name.s); + if (ri < 0) { + LM_ERR("unable to find route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } + cfg_action = main_rt.rlist[ri]; + if (cfg_action == NULL) { + LM_ERR("empty action lists in route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } - if (get_str_fparam(&realm, msg, (fparam_t*) ap->param) < 0) { + if (get_str_fparam(&realm, msg, (fparam_t*) str1) < 0) { LM_ERR("failed to get realm value\n"); return CSCF_RETURN_ERROR; } @@ -455,12 +471,12 @@ int challenge(struct sip_msg* msg, char* str1, char* str2, int is_proxy_auth) { return CSCF_RETURN_BREAK; } -int www_challenge(struct sip_msg* msg, char* str1, char* str2) { - return challenge(msg, str1, str2, 0); +int www_challenge(struct sip_msg* msg, char* _route, char* str1, char* str2) { + return challenge(msg, str1, str2, 0, _route); } -int proxy_challenge(struct sip_msg* msg, char* str1, char* str2) { - return challenge(msg, str1, str2, 1); +int proxy_challenge(struct sip_msg* msg, char* _route, char* str1, char* str2) { + return challenge(msg, str1, str2, 1, _route); } /** diff --git a/modules/ims_auth/authorize.h b/modules/ims_auth/authorize.h index 084fe60..7f4beef 100644 --- a/modules/ims_auth/authorize.h +++ b/modules/ims_auth/authorize.h @@ -133,13 +133,13 @@ void auth_db_close(void); * Authorize using Proxy-Authorization header field */ int proxy_authenticate(struct sip_msg* _msg, char* _realm, char* _table); -int proxy_challenge(struct sip_msg* msg, char* _realm, char* str2); +int proxy_challenge(struct sip_msg* msg, char* route, char* _realm, char* str2); /* * Authorize using WWW-Authorization header field */ int www_authenticate(struct sip_msg* _msg, char* _realm, char* _table); -int www_challenge(struct sip_msg* msg, char* _realm, char* str2); +int www_challenge(struct sip_msg* msg, char* route, char* _realm, char* str2); /* diff --git a/modules/ims_auth/cxdx_mar.h b/modules/ims_auth/cxdx_mar.h index 7f1733a..9a930ec 100644 --- a/modules/ims_auth/cxdx_mar.h +++ b/modules/ims_auth/cxdx_mar.h @@ -57,12 +57,6 @@ extern str cxdx_forced_peer; /**< FQDN of the Diameter peer to send requests to extern str cxdx_dest_realm; extern struct tm_binds tmb; -typedef struct mar_param { - int type; - char* param; - cfg_action_t *paction; -} mar_param_t; - typedef struct saved_transaction { unsigned int tindex; unsigned int tlabel;

1 0

git:master: modules/ims_icscf: execute route block on async reply to UAR and LIR
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: master Commit: 0d5622531d71d0b0ab3fb25a13c3ea1f46581512 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d56225… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 14:09:00 2013 +0200 modules/ims_icscf: execute route block on async reply to UAR and LIR - Changed this to make the use of async CDP cleaner - Fixes inconsistencies we are experiencing with async TM and not using route blocks - Note this fix is for UAR replies called from I_perform_user_authorization_request() and LIR replies called from I_perform_location_information_request() --- modules/ims_icscf/cxdx_lir.h | 5 --- modules/ims_icscf/cxdx_uar.h | 6 ---- modules/ims_icscf/location.c | 23 +++++++++++++-- modules/ims_icscf/location.h | 2 +- modules/ims_icscf/mod.c | 59 ++++++++++++++++++-------------------- modules/ims_icscf/registration.c | 28 ++++++++++++++---- modules/ims_icscf/registration.h | 2 +- 7 files changed, 72 insertions(+), 53 deletions(-) diff --git a/modules/ims_icscf/cxdx_lir.h b/modules/ims_icscf/cxdx_lir.h index 6e43923..6389d46 100644 --- a/modules/ims_icscf/cxdx_lir.h +++ b/modules/ims_icscf/cxdx_lir.h @@ -57,11 +57,6 @@ extern str cxdx_dest_realm; struct sip_msg; -typedef struct lir_param { - int type; - cfg_action_t *paction; -} lir_param_t; - typedef struct saved_lir_transaction { unsigned int tindex; unsigned int tlabel; diff --git a/modules/ims_icscf/cxdx_uar.h b/modules/ims_icscf/cxdx_uar.h index c2f20f4..1a00557 100644 --- a/modules/ims_icscf/cxdx_uar.h +++ b/modules/ims_icscf/cxdx_uar.h @@ -52,12 +52,6 @@ extern struct cdp_binds cdpb; /**< Structure with pointers to cdp funcs */ extern str cxdx_forced_peer; /**< FQDN of the Diameter peer to send requests to */ extern str cxdx_dest_realm; -typedef struct uar_param { - int type; - gparam_t *ivalue; - cfg_action_t *paction; -} uar_param_t; - typedef struct saved_transaction { unsigned int tindex; unsigned int tlabel; diff --git a/modules/ims_icscf/location.c b/modules/ims_icscf/location.c index 92d50cb..3d0f09a 100644 --- a/modules/ims_icscf/location.c +++ b/modules/ims_icscf/location.c @@ -45,6 +45,7 @@ #include "location.h" #include "../../action.h" /* run_actions */ +#include "../../mod_fix.h" #include "cxdx_lir.h" extern int route_lir_user_unknown_no; @@ -54,17 +55,33 @@ extern int route_lir_user_unknown_no; * @param msg - sip message * @returns 1 on success or 0 on failure */ -int I_perform_location_information_request(struct sip_msg* msg, char* str1, char* str2) { +int I_perform_location_information_request(struct sip_msg* msg, char* route, char* str1, char* str2) { str public_identity = {0, 0}; int orig = 0; tm_cell_t *t = 0; saved_lir_transaction_t* saved_t; + str route_name; + cfg_action_t* cfg_action; - lir_param_t* ap = (lir_param_t*) str1; - cfg_action = ap->paction->next; + if (fixup_get_svalue(msg, (gparam_t*) route, &route_name) != 0) { + LM_ERR("no async route block for assign_server_unreg\n"); + return -1; + } + + LM_DBG("Looking for route block [%.*s]\n", route_name.len, route_name.s); + int ri = route_get(&main_rt, route_name.s); + if (ri < 0) { + LM_ERR("unable to find route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } + cfg_action = main_rt.rlist[ri]; + if (cfg_action == NULL) { + LM_ERR("empty action lists in route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } LM_DBG("DBG:I_LIR: Starting ...\n"); /* check if we received what we should */ diff --git a/modules/ims_icscf/location.h b/modules/ims_icscf/location.h index 8ccc7bc..eccd734 100644 --- a/modules/ims_icscf/location.h +++ b/modules/ims_icscf/location.h @@ -60,7 +60,7 @@ extern struct cdp_binds cdpb;//cdp binds functions * @param msg - sip message * @returns 1 on success or 0 on failure */ -int I_perform_location_information_request(struct sip_msg* msg, char* str1, char* str2); +int I_perform_location_information_request(struct sip_msg* msg, char* route, char* str1, char* str2); #endif diff --git a/modules/ims_icscf/mod.c b/modules/ims_icscf/mod.c index 6066741..f9d0fe8 100644 --- a/modules/ims_icscf/mod.c +++ b/modules/ims_icscf/mod.c @@ -106,8 +106,8 @@ static int fixup_uar(void** param, int param_no); static int fixup_lir(void** param, int param_no); static cmd_export_t cmds[] = { - {"I_perform_user_authorization_request", (cmd_function) I_perform_user_authorization_request, 1, fixup_uar, 0, REQUEST_ROUTE}, - {"I_perform_location_information_request", (cmd_function) I_perform_location_information_request, 1, fixup_lir, 0, REQUEST_ROUTE}, + {"I_perform_user_authorization_request", (cmd_function) I_perform_user_authorization_request, 2, fixup_uar, 0, REQUEST_ROUTE}, + {"I_perform_location_information_request", (cmd_function) I_perform_location_information_request, 2, fixup_lir, 0, REQUEST_ROUTE}, {"I_scscf_select", (cmd_function) I_scscf_select, 1, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"I_scscf_drop", (cmd_function) I_scscf_drop, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, { 0, 0, 0, 0, 0, 0} @@ -274,38 +274,35 @@ static int mod_init(void) { static int fixup_uar(void** param, int param_no) { - uar_param_t *ap; - if(param_no!=1) - return 0; - ap = (uar_param_t*)pkg_malloc(sizeof(uar_param_t)); - if(ap==NULL) - { - LM_ERR("no more pkg\n"); - return -1; - } - memset(ap, 0, sizeof(uar_param_t)); - ap->paction = get_action_from_param(param, param_no); - if(fixup_igp_null(param, param_no)<0) - return -1; - ap->ivalue = (gparam_t*)(*param); - *param = (void*)ap; - return 0; + if (strlen((char*) *param) <= 0) { + LM_ERR("empty parameter %d not allowed\n", param_no); + return -1; + } + + if (param_no == 1) { //route name - static or dynamic string (config vars) + if (fixup_spve_null(param, param_no) < 0){ + LM_ERR("fixup spve failed on %d\n", param_no); + return -1; + } + return 0; + } + return 0; + } static int fixup_lir(void** param, int param_no) { - lir_param_t *ap; - if(param_no!=1) - return 0; - ap = (lir_param_t*)pkg_malloc(sizeof(lir_param_t)); - if(ap==NULL) - { - LM_ERR("no more pkg\n"); - return -1; - } - memset(ap, 0, sizeof(lir_param_t)); - ap->paction = get_action_from_param(param, param_no); - *param = (void*)ap; - return 0; + if (strlen((char*) *param) <= 0) { + LM_ERR("empty parameter %d not allowed\n", param_no); + return -1; + } + + if (param_no == 1) { //route name - static or dynamic string (config vars) + if (fixup_spve_null(param, param_no) < 0) + return -1; + return 0; + } + return 0; + } diff --git a/modules/ims_icscf/registration.c b/modules/ims_icscf/registration.c index 6a6fe57..9412511 100644 --- a/modules/ims_icscf/registration.c +++ b/modules/ims_icscf/registration.c @@ -46,6 +46,7 @@ #include "registration.h" #include "../../action.h" /* run_actions */ +#include "../../mod_fix.h" #include "cxdx_uar.h" extern int route_uar_user_unknown_no; @@ -54,11 +55,9 @@ extern int route_uar_user_unknown_no; * Perform User Authorization Request. * creates and send the user authorization query * @param msg - the SIP message - * @param str1 - the realm - * @param str2 - if to do capabilities * @returns true if OK, false if not */ -int I_perform_user_authorization_request(struct sip_msg* msg, char* str1, char* str2) { +int I_perform_user_authorization_request(struct sip_msg* msg, char* route, char* str1, char* str2) { str private_identity, public_identity, visited_network_id; int authorization_type = AVP_IMS_UAR_REGISTRATION; int expires = 3600; @@ -72,13 +71,30 @@ int I_perform_user_authorization_request(struct sip_msg* msg, char* str1, char* tm_cell_t *t = 0; int intvalue_param; cfg_action_t* cfg_action; + + str route_name; - uar_param_t* ap = (uar_param_t*) str1; - if (fixup_get_ivalue(msg, ap->ivalue, &intvalue_param) != 0) { + if (fixup_get_ivalue(msg, (gparam_t*) str1, &intvalue_param) != 0) { LM_ERR("no int value param passed\n"); return CSCF_RETURN_ERROR; } - cfg_action = ap->paction->next; + if (fixup_get_svalue(msg, (gparam_t*) route, &route_name) != 0) { + LM_ERR("no async route block for assign_server_unreg\n"); + return -1; + } + + LM_DBG("Looking for route block [%.*s]\n", route_name.len, route_name.s); + int ri = route_get(&main_rt, route_name.s); + if (ri < 0) { + LM_ERR("unable to find route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } + cfg_action = main_rt.rlist[ri]; + if (cfg_action == NULL) { + LM_ERR("empty action lists in route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } + realm = cscf_get_realm_from_ruri(msg); diff --git a/modules/ims_icscf/registration.h b/modules/ims_icscf/registration.h index 6cf52cd..b7ebbc6 100644 --- a/modules/ims_icscf/registration.h +++ b/modules/ims_icscf/registration.h @@ -61,7 +61,7 @@ extern struct cdp_binds cdpb; * @param str2 - if to do capabilities * @returns true if OK, false if not */ -int I_perform_user_authorization_request(struct sip_msg* msg, char* str1, char* str2); +int I_perform_user_authorization_request(struct sip_msg* msg, char* route, char* str1, char* str2);

1 0

git:master: modules/ims_registrar_scscf: execute route block on async reply on REG SAR
by Richard Good 25 Jun '13

25 Jun '13

Module: sip-router Branch: master Commit: 87ea473c15454742fc9f3a0cedd46cf09c663f3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87ea473… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 14:04:46 2013 +0200 modules/ims_registrar_scscf: execute route block on async reply on REG SAR - changed this to make the use of async CDP cleaner - Fixes inconsistencies we are experiencing with async TM and not using route blocks - Note this fix is REG SAR called from save() --- modules/ims_registrar_scscf/cxdx_sar.h | 8 ----- modules/ims_registrar_scscf/reg_mod.c | 49 ++----------------------------- modules/ims_registrar_scscf/save.c | 30 +++++++++++++++---- modules/ims_registrar_scscf/save.h | 2 +- 4 files changed, 29 insertions(+), 60 deletions(-) diff --git a/modules/ims_registrar_scscf/cxdx_sar.h b/modules/ims_registrar_scscf/cxdx_sar.h index 2f9a8a8..77b0d3d 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.h +++ b/modules/ims_registrar_scscf/cxdx_sar.h @@ -47,14 +47,6 @@ #define CXDX_SAR_H -typedef struct sar_param { - int type; - udomain_t* param; - cfg_action_t *paction; -} sar_param_t; - - - extern struct cdp_binds cdpb; extern str cxdx_forced_peer; /**< FQDN of the Diameter peer to send requests to */ extern str cxdx_dest_realm; diff --git a/modules/ims_registrar_scscf/reg_mod.c b/modules/ims_registrar_scscf/reg_mod.c index 4e2a31e..1347a07 100644 --- a/modules/ims_registrar_scscf/reg_mod.c +++ b/modules/ims_registrar_scscf/reg_mod.c @@ -107,16 +107,13 @@ str scscf_serviceroute_uri_str; /* Service Route URI */ static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_save(struct sip_msg* _m, char* _d, char* mode, char* _cflags); +static int w_save(struct sip_msg* _m, char * _route, char* _d, char* mode, char* _cflags); static int w_assign_server_unreg(struct sip_msg* _m, char* _route, char* _d, char* _direction); static int w_lookup(struct sip_msg* _m, char* _d, char* _p2); /*! \brief Fixup functions */ static int domain_fixup(void** param, int param_no); -static int assign_save_fixup3(void** param, int param_no); static int assign_save_fixup3_async(void** param, int param_no); -//static int save_fixup2(void** param, int param_no); -//static int assign_fixup2(void** param, int param_no); static int unreg_fixup(void** param, int param_no); static int fetchc_fixup(void** param, int param_no); /*! \brief Functions */ @@ -187,7 +184,7 @@ static pv_export_t mod_pvs[] = { * Exported functions */ static cmd_export_t cmds[] = { - {"save", (cmd_function) w_save, 1, assign_save_fixup3, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"save", (cmd_function) w_save, 2, assign_save_fixup3_async, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, {"lookup", (cmd_function) w_lookup, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"term_impu_registered", (cmd_function) term_impu_registered, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"impu_registered", (cmd_function) impu_registered, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -511,9 +508,8 @@ static int child_init(int rank) { /*! \brief * Wrapper to save(location) */ -static int w_save(struct sip_msg* _m, char* _d, char* mode, char* _cflags) { - //return save(_m, (udomain_t*)_d); - return save(_m, _d); +static int w_save(struct sip_msg* _m, char* _route, char* _d, char* mode, char* _cflags) { + return save(_m, _d, _route); } static int w_assign_server_unreg(struct sip_msg* _m, char* _route, char* _d, char* _direction) { @@ -565,43 +561,6 @@ static int unreg_fixup(void** param, int param_no) { /* * Convert the char* parameters */ -static int assign_save_fixup3(void** param, int param_no) { - - if (strlen((char*) *param) <= 0) { - LM_ERR("empty parameter %d not allowed\n", param_no); - return -1; - } - - if (param_no == 1) { - udomain_t* d; - - if (ul.register_udomain((char*) *param, &d) < 0) { - LM_ERR("Erroring doing fixup on assign save"); - return -1; - } - - *param = (void*) d; - - sar_param_t *ap; - ap = (sar_param_t*) pkg_malloc(sizeof (sar_param_t)); - if (ap == NULL) { - LM_ERR("no more pkg\n"); - return -1; - } - memset(ap, 0, sizeof (sar_param_t)); - ap->paction = get_action_from_param(param, param_no); - - ap->param = (udomain_t*) * param; - - *param = (void*) ap; - } - - return 0; -} - -/* - * Convert the char* parameters - */ static int assign_save_fixup3_async(void** param, int param_no) { if (strlen((char*) *param) <= 0) { diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 605fb76..7602bf9 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -1060,7 +1060,7 @@ error: */ //int save(struct sip_msg* msg, udomain_t* _d) { -int save(struct sip_msg* msg, char* str1) { +int save(struct sip_msg* msg, char* str1, char *route) { int expires; int require_user_data = 0; int data_available; @@ -1068,6 +1068,9 @@ int save(struct sip_msg* msg, char* str1) { int st; str public_identity, private_identity, realm; int sar_assignment_type = AVP_IMS_SAR_NO_ASSIGNMENT; + str route_name; + + udomain_t* _d = (udomain_t*) str1; rerrno = R_FINE; get_act_time(); @@ -1079,8 +1082,22 @@ int save(struct sip_msg* msg, char* str1) { contact_for_header_t* contact_header = 0; - sar_param_t* ap = (sar_param_t*) str1; - cfg_action = ap->paction->next; + if (fixup_get_svalue(msg, (gparam_t*) route, &route_name) != 0) { + LM_ERR("no async route block for assign_server_unreg\n"); + return -1; + } + + LM_DBG("Looking for route block [%.*s]\n", route_name.len, route_name.s); + int ri = route_get(&main_rt, route_name.s); + if (ri < 0) { + LM_ERR("unable to find route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } + cfg_action = main_rt.rlist[ri]; + if (cfg_action == NULL) { + LM_ERR("empty action lists in route block [%.*s]\n", route_name.len, route_name.s); + return -1; + } //check which route block we are in - if not request then we fail out. if (!is_route_type(REQUEST_ROUTE)) { @@ -1123,7 +1140,7 @@ int save(struct sip_msg* msg, char* str1) { expires = cscf_get_max_expires(msg, 0); //check all contacts for max expires if (expires != 0) { //if <0 then no expires was found in which case we treat as reg/re-reg with default expires. - if (is_impu_registered((udomain_t*) ap->param, &public_identity)) { + if (is_impu_registered(_d, &public_identity)) { LM_DBG("preparing for SAR assignment for RE-REGISTRATION <%.*s>\n", public_identity.len, public_identity.s); sar_assignment_type = AVP_IMS_SAR_RE_REGISTRATION; } else { @@ -1152,7 +1169,7 @@ int save(struct sip_msg* msg, char* str1) { //unregister the requested contacts, if none left at the end then send a SAR, otherwise return successfully LM_DBG("need to unregister contacts\n"); //lets update the contacts - we need to know if all were deleted or not for the public identity - int res = update_contacts_new(msg, (udomain_t*) ap->param, &public_identity, sar_assignment_type, 0, 0, 0, 0, 0, &contact_header); + int res = update_contacts_new(msg, _d, &public_identity, sar_assignment_type, 0, 0, 0, 0, 0, &contact_header); if (res <= 0) { LM_ERR("Error processing REGISTER for de-registration\n"); free_contact_buf(contact_header); @@ -1207,7 +1224,8 @@ int save(struct sip_msg* msg, char* str1) { saved_t->expires = expires; saved_t->require_user_data = require_user_data; saved_t->sar_assignment_type = sar_assignment_type; - saved_t->domain = (udomain_t*) ap->param; + + saved_t->domain = _d; saved_t->public_identity.s = (char*) shm_malloc(public_identity.len + 1); if (!saved_t->public_identity.s) { diff --git a/modules/ims_registrar_scscf/save.h b/modules/ims_registrar_scscf/save.h index 85ec2ce..ac064aa 100644 --- a/modules/ims_registrar_scscf/save.h +++ b/modules/ims_registrar_scscf/save.h @@ -58,7 +58,7 @@ */ int assign_server_unreg(struct sip_msg* _m, char* str1, str* direction, char* route); -int save(struct sip_msg* msg, char* str1); +int save(struct sip_msg* msg, char* str1, char* route); int unregister(struct sip_msg* _m, char* _d, char* _uri);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013