sr-dev February 2014

sr-dev@lists.kamailio.org

38 participants
236 discussions

git:master: examples/config: added p-asserted-identity logic on P-CSCF and add Called-Party_ID AVP on S-CSCF
by Richard Good 12 Feb '14

12 Feb '14

Module: sip-router Branch: master Commit: 71f2247cf4dc6f8d3a0b148461322f6b680f1174 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71f2247… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Feb 11 09:42:27 2014 +0200 examples/config: added p-asserted-identity logic on P-CSCF and add Called-Party_ID AVP on S-CSCF --- examples/pcscf/kamailio.cfg | 46 ++++++++++++++++++++++++++++++++++-------- examples/scscf/kamailio.cfg | 12 +++++++--- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index 9925089..6185310 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -857,6 +857,22 @@ route[Orig_Initial] send_reply("403","Forbidden - You must register first with a S-CSCF"); break; } + + #asserted identity header + if (is_present_hf("P-Preferred-Identity") && pcscf_assert_identity("location", "$hdr(P-Preferred-Identity)")) { + xlog("L_DBG", "P-Preferred-Identity is asserted " + "$hdr(P-Preferred-Identity)"); + append_hf("P-Asserted-Identity: $hdr(P-Preferred-Identity)\r\n"); + } else { + xlog("L_DBG", "P-Preferred-Identity not asserted - using default " + "$pcscf_asserted_identity"); + append_hf("P-Asserted-Identity: <$pcscf_asserted_identity>\r\n"); + } + if(is_present_hf("P-Preferred-Identity")) { + remove_hf("P-Preferred-Identity"); + } + + msg_apply_changes(); + + if (!pcscf_follows_service_routes("location")){ #Variant 1 - deny access to the network #send_reply("400","Bad Request - Not following indicated service routes"); @@ -879,15 +895,6 @@ route[Orig_Initial] $avp(RR_CUSTOM_USER_AVP)="mo"; record_route(); - if (is_present_hf("P-Preferred-Identity") && pcscf_assert_identity("location", "$hdr(P-Preferred-Identity)")) { - remove_hf("P-Preferred-Identity"); - append_hf("P-Asserted-Identity: $hdr(P-Preferred-Identity)\r\n"); - } else if (pcscf_assert_identity("location", "$fu")) { - append_hf("P-Asserted-Identity: <$fu>\r\n"); - } else { - append_hf("P-Asserted-Identity: <$pcscf_asserted_identity>\r\n"); - } - # Do RTP-Relaying, if necessary: route(RTPPROXY_ORIG); @@ -1092,6 +1099,27 @@ route[Term_Initial] ###################################################################### onreply_route[Term_Initial_reply] { + + if (t_check_status("183")||t_check_status("200")){ + if (!pcscf_is_registered("location")) { + xlog("L_DBG", "IMS: INSIDE TERM_INITIAL_REPLY: can't find contact [$ct] in P-CSCF usrloc\n"); + send_reply("403","Forbidden - not registered with P-CSCF"); + break; + } + + #asserted identity header + if (pcscf_assert_called_identity("location")) { + xlog("L_DBG", "P-Called-Party-ID asserted"); + } else { + xlog("L_DBG", "P-Called-Party-ID not asserted - using default " + "$pcscf_asserted_identity"); + append_hf("P-Asserted-Identity: <$pcscf_asserted_identity>\r\n"); + } + if(is_present_hf("P-Preferred-Identity")) { + remove_hf("P-Preferred-Identity"); + } + msg_apply_changes(); + } + #!ifdef WITH_RX if (t_check_status("180|183|200")){ xlog("L_DBG","Diameter Term authorizing media via Rx\n"); diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index 24670d8..aea60b2 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -717,6 +717,10 @@ route[orig] record_route(); } + if (is_method("INVITE|MESSAGE")) { + append_hf("P-Called-Party-ID: <$ruri>\r\n"); + } + #!ifdef WITH_RO # before we allow call - lets check credit if (is_method("INVITE")) { @@ -737,10 +741,10 @@ route[orig] exit; } - if (!isc_from_as("orig")) { - remove_hf("P-Asserted-Identity"); - append_hf("P-Asserted-Identity: <sip:$fU@$fd>\r\n"); - } + #if (!isc_from_as("orig")) { + # remove_hf("P-Asserted-Identity"); + # append_hf("P-Asserted-Identity: <sip:$fU@$fd>\r\n"); + #} # Check for PSTN destinations: if (is_method("INVITE")) {

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Richard Good 12 Feb '14

12 Feb '14

Module: sip-router Branch: master Commit: ec24f51a8efc31864c560054a039aa0c2cd5ab62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec24f51… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Feb 12 08:56:37 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:master: modules/lcr: fixed name of ping_inactivate_threshold param in README
by Juha Heinanen 12 Feb '14

12 Feb '14

Module: sip-router Branch: master Commit: 289c33fcaf2cc93dfad517c8b7bb2a9fcfb4b773 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=289c33f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Feb 12 05:11:03 2014 +0200 modules/lcr: fixed name of ping_inactivate_threshold param in README --- modules/lcr/README | 8 ++++---- modules/lcr/doc/lcr_admin.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 733f59d..58268cf 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -64,7 +64,7 @@ Juha Heinanen 3.37. dont_strip_or_tag_flag (integer) 3.38. fetch_rows (integer) 3.39. ping_interval (integer) - 3.40. ping_inactive_threshold (integer) + 3.40. ping_inactivate_threshold (integer) 3.41. ping_valid_reply_codes (string) 3.42. ping_from (string) 3.43. ping_socket (string) @@ -199,7 +199,7 @@ Chapter 1. Admin Guide 3.37. dont_strip_or_tag_flag (integer) 3.38. fetch_rows (integer) 3.39. ping_interval (integer) - 3.40. ping_inactive_threshold (integer) + 3.40. ping_inactivate_threshold (integer) 3.41. ping_valid_reply_codes (string) 3.42. ping_from (string) 3.43. ping_socket (string) @@ -351,7 +351,7 @@ Chapter 1. Admin Guide 3.37. dont_strip_or_tag_flag (integer) 3.38. fetch_rows (integer) 3.39. ping_interval (integer) - 3.40. ping_inactive_threshold (integer) + 3.40. ping_inactivate_threshold (integer) 3.41. ping_valid_reply_codes (string) 3.42. ping_from (string) 3.43. ping_socket (string) @@ -831,7 +831,7 @@ modparam("lcr", "fetch_rows", 3000) modparam("lcr", "ping_interval", 15) ... -3.40. ping_inactive_threshold (integer) +3.40. ping_inactivate_threshold (integer) Tells after how many failures (= inactivate_gw() function calls) a gateway is marked as inactive. diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 8271cfe..fcd8d55 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -1032,7 +1032,7 @@ modparam("lcr", "ping_interval", 15) </section> <section> - <title><varname>ping_inactive_threshold</varname> (integer)</title> + <title><varname>ping_inactivate_threshold</varname> (integer)</title> <para> Tells after how many failures (= inactivate_gw() function calls) a gateway is marked as inactive. @@ -1040,16 +1040,16 @@ modparam("lcr", "ping_interval", 15) <para> <emphasis> Default value is <quote>1</quote>, i.e., gateway is - marked inactive after first failure. + inactivated after first failure. </emphasis> </para> <example> <title> - Set <varname>ping_inactive_threshold</varname> parameter + Set <varname>ping_inactivate_threshold</varname> parameter </title> <programlisting format="linespecific"> ... -modparam("lcr", "ping_inactive_threshold", 3) +modparam("lcr", "ping_inactivate_threshold", 3) ... </programlisting> </example>

1 0

git.sip-router.org down?
by Richard Good 11 Feb '14

11 Feb '14

Hi I'm getting connection timed out when trying to do any git operations - is this just me or is git.sip-router.org unavailable? Regards Richard. This email is subject to the disclaimer of Smile Communications at http://www.smilecoms.com/disclaimer

3 7

git:master: modules/ims_registrar_pcscf: Added new exported function pcscf_assert_called_identity
by Richard Good 11 Feb '14

11 Feb '14

Module: sip-router Branch: master Commit: b1d0d33276071f6c69d5cb2215a7b2b1e044764d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1d0d33… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Feb 11 08:49:44 2014 +0200 modules/ims_registrar_pcscf: Added new exported function pcscf_assert_called_identity pcscf_assert_called_identity function used to assert the identity for SIP responses Function retrieves Called-Party-ID AVP from SIP request and adds to SIP response as P-Asserted-Identity as per TS 24.229 section 5.2.6.4.4 --- modules/ims_registrar_pcscf/reg_mod.c | 8 ++- modules/ims_registrar_pcscf/save.h | 1 + modules/ims_registrar_pcscf/service_routes.c | 85 ++++++++++++++++++++++--- modules/ims_registrar_pcscf/service_routes.h | 5 ++ 4 files changed, 87 insertions(+), 12 deletions(-) diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index 7aa000f..ff622ff 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -104,6 +104,7 @@ static int w_is_registered(struct sip_msg* _m, char* _d, char* _foo); static int w_reginfo_handle_notify(struct sip_msg* _m, char* _d, char* _foo); static int w_assert_identity(struct sip_msg* _m, char* _d, char* _preferred_uri); +static int w_assert_called_identity(struct sip_msg* _m, char* _d, char* _foo); /*! \brief Fixup functions */ static int domain_fixup(void** param, int param_no); @@ -131,9 +132,10 @@ static cmd_export_t cmds[] = { {"pcscf_follows_service_routes", (cmd_function)w_follows_service_routes, 1, save_fixup2, 0, REQUEST_ROUTE }, {"pcscf_force_service_routes", (cmd_function)w_force_service_routes, 1, save_fixup2, 0, REQUEST_ROUTE }, - {"pcscf_is_registered", (cmd_function)w_is_registered, 1, save_fixup2, 0, REQUEST_ROUTE }, + {"pcscf_is_registered", (cmd_function)w_is_registered, 1, save_fixup2, 0, REQUEST_ROUTE|ONREPLY_ROUTE }, {"pcscf_assert_identity", (cmd_function)w_assert_identity, 2, assert_identity_fixup, 0, REQUEST_ROUTE }, + {"pcscf_assert_called_identity", (cmd_function)w_assert_called_identity, 1, assert_identity_fixup, 0, ONREPLY_ROUTE }, {"reginfo_handle_notify", (cmd_function)w_reginfo_handle_notify, 1, domain_fixup, 0, REQUEST_ROUTE}, @@ -416,6 +418,10 @@ static int w_assert_identity(struct sip_msg* _m, char* _d, char* _preferred_uri) return assert_identity( _m, (udomain_t*)_d, identity); } +static int w_assert_called_identity(struct sip_msg* _m, char* _d, char* _foo) { + return assert_called_identity( _m, (udomain_t*)_d); +} + /* * Get the asserted Identity for the current user */ diff --git a/modules/ims_registrar_pcscf/save.h b/modules/ims_registrar_pcscf/save.h index f400145..d11d84b 100644 --- a/modules/ims_registrar_pcscf/save.h +++ b/modules/ims_registrar_pcscf/save.h @@ -56,6 +56,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags); int save_pending(struct sip_msg* _m, udomain_t* _d); int unregister(struct sip_msg* _m, char* _d, char* _uri); +struct sip_msg* get_request_from_reply(struct sip_msg* reply); #endif /* SAVE_H */ diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 937d152..452548a 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -22,6 +22,7 @@ #include "service_routes.h" #include "reg_mod.h" +#include "save.h" #include "../../data_lump.h" #include "../../lib/ims/ims_getters.h" @@ -418,25 +419,31 @@ str * get_asserted_identity(struct sip_msg* _m) { } /** - * Add proper asserted identies based on registration + * checked if passed identity is an asserted identity */ int assert_identity(struct sip_msg* _m, udomain_t* _d, str identity) { // Public identities of this contact struct ppublic * p; - + //remove <> braces if there are + if(identity.s[0]=='<' && identity.s[identity.len-1]=='>') { + identity.s++; + identity.len -= 2; + } + LM_DBG("Identity to assert: %.*s\n", identity.len, identity.s); + if (getContactP(_m, _d) != NULL) { for (p = c->head; p; p = p->next) { LM_DBG("Public identity: %.*s\n", p->public_identity.len, p->public_identity.s); - /* Check length: */ - if (identity.len == p->public_identity.len) { - /* Check contents: */ - if (strncasecmp(identity.s, p->public_identity.s, identity.len) == 0) { - LM_DBG("Match!\n"); - return 1; - } - } else LM_DBG("Length does not match.\n"); + /* Check length: */ + if (identity.len == p->public_identity.len) { + /* Check contents: */ + if (strncasecmp(identity.s, p->public_identity.s, identity.len) == 0) { + LM_DBG("Match!\n"); + return 1; + } + } else LM_DBG("Length does not match.\n"); + } } - } LM_WARN("Contact not found based on Contact, trying IP/Port/Proto\n"); str received_host = {0, 0}; char srcip[50]; @@ -449,3 +456,59 @@ int assert_identity(struct sip_msg* _m, udomain_t* _d, str identity) { return 1; } + +/** + * Add proper asserted identities based on registration + */ + +static str p_asserted_identity_s={"P-Asserted-Identity: ",21}; +static str p_asserted_identity_m={"<",1}; +static str p_asserted_identity_e={">\r\n",3}; + +int assert_called_identity(struct sip_msg* _m, udomain_t* _d) { + + int ret=CSCF_RETURN_FALSE; + str called_party_id={0,0},x={0,0}; + struct sip_msg* req; + struct hdr_field *h=0; + + //get request from reply + req = get_request_from_reply(_m); + if (!req) { + LM_ERR("Unable to get request from reply for REGISTER. No transaction\n"); + goto error; + } + + called_party_id = cscf_get_called_party_id(req, &h); + + + if (!called_party_id.len){ + goto error; + }else{ + LM_DBG("Called Party ID from request: %.*s\n", called_party_id.len, called_party_id.s); + x.len = p_asserted_identity_s.len+p_asserted_identity_m.len+called_party_id.len+p_asserted_identity_e.len; + x.s = pkg_malloc(x.len); + if (!x.s){ + LM_ERR("P_assert_called_identity: Error allocating %d bytes\n", x.len); + x.len=0; + goto error; + } + x.len=0; + STR_APPEND(x,p_asserted_identity_s); + STR_APPEND(x,p_asserted_identity_m); + STR_APPEND(x,called_party_id); + STR_APPEND(x,p_asserted_identity_e); + + if (cscf_add_header(_m,&x,HDR_OTHER_T)) + ret = CSCF_RETURN_TRUE; + else + goto error; + } + + return ret; + +error: + ret=CSCF_RETURN_FALSE; + return ret; +} + diff --git a/modules/ims_registrar_pcscf/service_routes.h b/modules/ims_registrar_pcscf/service_routes.h index dc7aef7..f9db932 100644 --- a/modules/ims_registrar_pcscf/service_routes.h +++ b/modules/ims_registrar_pcscf/service_routes.h @@ -51,4 +51,9 @@ str * get_asserted_identity(struct sip_msg* _m); */ int assert_identity(struct sip_msg* _m, udomain_t* _d, str identity); +/** + * Assert a given called identity of a user + */ +int assert_called_identity(struct sip_msg* _m, udomain_t* _d); + #endif /* SERVICE_ROUTES_H */

1 0

git:master: lib/ims: added function to get Called-Party_ID AVP from message
by Richard Good 11 Feb '14

11 Feb '14

Module: sip-router Branch: master Commit: 12d0feed38cd036cbc0e7c9f0c0c540d0e9eca4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12d0fee… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Feb 11 08:48:34 2014 +0200 lib/ims: added function to get Called-Party_ID AVP from message --- lib/ims/ims_getters.c | 38 ++++++++++++++++++++++++++++++++++++++ lib/ims/ims_getters.h | 8 ++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index a41cd31..fb8598c 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -1473,3 +1473,41 @@ int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr) return nr; } +static str s_called_party_id={"P-Called-Party-ID",17}; +/** + * Looks for the P-Called-Party-ID header and extracts its content. + * @param msg - the sip message + * @param hr - ptr to return the found hdr_field + * @returns the P-Called_Party-ID + */ +str cscf_get_called_party_id(struct sip_msg *msg,struct hdr_field **hr) +{ + str id={0,0}; + struct hdr_field *h; + if (hr) *hr=0; + if (!msg) return id; + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + return id; + } + h = msg->headers; + while(h) + { + if (h->name.len == s_called_party_id.len && + strncasecmp(h->name.s,s_called_party_id.s,s_called_party_id.len)==0) + { + id = h->body; + while(id.len && (id.s[0]==' ' || id.s[0]=='\t' || id.s[0]=='<')){ + id.s = id.s+1; + id.len --; + } + while(id.len && (id.s[id.len-1]==' ' || id.s[id.len-1]=='\t' || id.s[id.len-1]=='>')){ + id.len--; + } + if (hr) *hr = h; + return id; + } + h = h->next; + } + return id; +} + diff --git a/lib/ims/ims_getters.h b/lib/ims/ims_getters.h index e78310f..0b01ffc 100644 --- a/lib/ims/ims_getters.h +++ b/lib/ims/ims_getters.h @@ -418,5 +418,13 @@ int cscf_add_header_rpl(struct sip_msg *msg, str *hdr); */ int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr); +/** + * Looks for the P-Called-Party-ID header and extracts its content. + * @param msg - the sip message + * @param hr - ptr to return the found hdr_field + * @returns the P-Called_Party-ID + */ +str cscf_get_called_party_id(struct sip_msg *msg,struct hdr_field **hr); + #endif

1 0

git:master: modules/ims_charging: allow E164 to be used as subscription-type in CCR requests
by Richard Good 11 Feb '14

11 Feb '14

Module: sip-router Branch: master Commit: b6abf075448de90a7b135dfa42e58fa61255ca2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6abf07… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Feb 11 08:44:26 2014 +0200 modules/ims_charging: allow E164 to be used as subscription-type in CCR requests --- modules/ims_charging/ims_ro.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 72a6fe5..da2e3d8 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -458,10 +458,15 @@ Ro_CCR_t * dlg_create_ro_session(struct sip_msg * req, struct sip_msg * reply, A event_type = 0; time_stamps = 0; - subscr.type = Subscription_Type_IMPU; + subscr.id.s = from_uri.s; subscr.id.len = from_uri.len; - + if (strncasecmp(subscr.id.s,"tel:",4)==0) { + subscr.type = Subscription_Type_MSISDN; + }else{ + subscr.type = Subscription_Type_IMPU; //default is END_USER_SIP_URI + } + ro_ccr_data = new_Ro_CCR(acc_record_type, &user_name, ims_info, &subscr); if (!ro_ccr_data) { LM_ERR("dlg_create_ro_session: no memory left for generic\n");

1 0

git:master: modules/ims_qos: use asserted_identity for subscription-id and allow e164 as subscription type
by Richard Good 11 Feb '14

11 Feb '14

Module: sip-router Branch: master Commit: 532459374af8354c030fdce8ff837beab793be6c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5324593… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Feb 11 08:41:27 2014 +0200 modules/ims_qos: use asserted_identity for subscription-id and allow e164 as subscription type use p_asserted_identity as default subscription-id for AAR requests allow E164 to be used as subscription type for AAR requests --- modules/ims_qos/rx_aar.c | 54 ++++++++++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index b5e7293..69d04c0 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -412,8 +412,9 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, AAAMessage* aar = 0; - - //AAAMessage* aaa = 0; + + str identifier; + int identifier_type; AAA_AVP* avp = 0; @@ -488,15 +489,38 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, } LM_DBG("Adding subscription id...\n"); - /* Add Subscription ID AVP*/ - int identifier_type = AVP_Subscription_Id_Type_SIP_URI; //we only do IMPU now - //to get the SIP URI I use the dlg direction - if its mo I get the from uri from the req, if its mt I get the to uri from the req - str identifier; + //if its mo we use p_asserted_identity in request - if that not there we use from_uri + //if its mt we use p_asserted_identity in reply - if that not there we use to_uri + if (dlg_direction == DLG_MOBILE_ORIGINATING) { - cscf_get_from_uri(req, &identifier); + LM_DBG("originating direction\n"); + if ((identifier = cscf_get_asserted_identity(req)).len == 0) { + LM_DBG("No P-Asserted-Identity hdr found in request. Using From hdr in req"); + + if (!cscf_get_from_uri(req, &identifier)) { + LM_ERR("Error assigning P-Asserted-Identity using From hdr in req"); + goto error; + } + } } else { - cscf_get_to_uri(req, &identifier); - } + LM_DBG("terminating direction\n"); + if ((identifier = cscf_get_asserted_identity(res)).len == 0) { + LM_DBG("No P-Asserted-Identity hdr found in response. Using To hdr in resp"); + + if (!cscf_get_to_uri(res, &identifier)) { + LM_ERR("Error assigning P-Asserted-Identity using To hdr in resp"); + goto error; + } + } + } + + if (strncasecmp(identifier.s,"tel:",4)==0) { + identifier_type = AVP_Subscription_Id_Type_E164; // + }else{ + identifier_type = AVP_Subscription_Id_Type_SIP_URI; //default is END_USER_SIP_URI + } + + rx_add_subscription_id_avp(aar, identifier, identifier_type); LM_DBG("Adding reservation priority...\n"); @@ -552,14 +576,6 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, return ret; - // LM_DBG("sending AAR to PCRF\n"); - // if (rx_forced_peer.len) - // aaa = cdpb.AAASendRecvMessageToPeer(aar, &rx_forced_peer); - // else - // aaa = cdpb.AAASendRecvMessage(aar); - // - // return aaa; - error: LM_ERR("unexpected error\n"); if (aar) @@ -587,6 +603,7 @@ int rx_send_aar_register(struct sip_msg *msg, AAASession* auth, str *ip, int ret = 0; AAA_AVP* avp = 0; char x[4]; + str identifier; LM_DBG("Send AAR register\n"); @@ -614,8 +631,9 @@ int rx_send_aar_register(struct sip_msg *msg, AAASession* auth, str *ip, } /* Add Subscription ID AVP*/ - str identifier; - cscf_get_from_uri(msg, &identifier); + + identifier = cscf_get_public_identity(msg); + int identifier_type = AVP_Subscription_Id_Type_SIP_URI; //we only do IMPU now rx_add_subscription_id_avp(aar, identifier, identifier_type);

1 0

git:master: modules/ims_usrloc_pcscf: added new hash storage based on IP: PORT. backwards compatible with original scheme using new modparam
by Jason Penton 11 Feb '14

11 Feb '14

Module: sip-router Branch: master Commit: 5b7255d8861d699903692f1457e3e60d9f39837c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b7255d… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Feb 11 07:52:50 2014 +0200 modules/ims_usrloc_pcscf: added new hash storage based on IP:PORT. backwards compatible with original scheme using new modparam - new modparam is hashing_type - see module documentation --- .../doc/ims_usrloc_pcscf_admin.xml | 50 ++++++++++++++++ modules/ims_usrloc_pcscf/pcontact.c | 13 ++++- modules/ims_usrloc_pcscf/pcontact.h | 3 + modules/ims_usrloc_pcscf/udomain.c | 55 ++++++++++++++++- modules/ims_usrloc_pcscf/ul_mod.c | 4 +- modules/ims_usrloc_pcscf/usrloc.c | 61 ++++++++++++++++++++ modules/ims_usrloc_pcscf/usrloc.h | 2 + 7 files changed, 182 insertions(+), 6 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5b7…

1 0

git:4.0: htable: fix crash if key_value is not string
by Ovidiu Sas 11 Feb '14

11 Feb '14

Module: sip-router Branch: 4.0 Commit: 9c2b372615705199805186b6bc3346fbbfaea670 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c2b372… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Feb 10 19:41:20 2014 -0500 htable: fix crash if key_value is not string (cherry picked from commit 065439c0fbabe2806fcd615cec5e2445db59beec) --- modules/htable/ht_db.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index 0dc512a..280e08a 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -261,6 +261,11 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) hname = kname; } vtype = RES_ROWS(db_res)[i].values[2].val.int_val; + if (RES_ROWS(db_res)[i].values[3].type != DB1_STRING) { + LM_ERR("Wrong db type [%d] for key_value column\n", + RES_ROWS(db_res)[i].values[3].type); + goto error; + } kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); if(kvalue.s==NULL) { LM_ERR("null value in row %d\n", i);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2014