sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

git:master: modules/ims_usrloc_pcscf: added new parameter to contact match using only URI host and port

by Richard Good

Module: sip-router Branch: master Commit: 0161257895fe421a0c9ee413a8b89d038007ba0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0161257… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 9 15:08:22 2014 +0200 modules/ims_usrloc_pcscf: added new parameter to contact match using only URI host and port --- .../doc/ims_usrloc_pcscf_admin.xml | 28 ++++++++++++++++++++ modules/ims_usrloc_pcscf/udomain.c | 17 +++++++++++- modules/ims_usrloc_pcscf/ul_mod.c | 2 + 3 files changed, 46 insertions(+), 1 deletions(-) diff --git a/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml b/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml index c904b53..165ba41 100644 --- a/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml +++ b/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml @@ -235,6 +235,34 @@ modparam("ims_usrloc_pcscf", "lookup_check_received", 0) </programlisting> </example> </section> + <section> + <title>match_contact_host_port (int)</title> + + <para>If set to 1 (default), the contact is matched using only host + and port in the contact URI.</para> + + <itemizedlist> + <listitem> + <para>0 - When matching contact do full contact match procedure.</para> + </listitem> + + <listitem> + <para>1 - When matching contact compare only host and port of the contact URI.</para> + </listitem> + </itemizedlist> + + <para><emphasis>Default value is 1.</emphasis></para> + + <example> + <title>Set match_contact_host_port parameter</title> + + <programlisting format="linespecific">... +modparam("ims_usrloc_pcscf", "match_contact_host_port", 0) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index 23e1213..f213c89 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -64,6 +64,7 @@ extern int db_mode; extern unsigned int hashing_type; extern int lookup_check_received; +extern int match_contact_host_port; #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) @@ -477,7 +478,21 @@ int get_pcontact(udomain_t* _d, str* _contact, struct pcontact** _c) { *_c = c; return 0; } - + + if(match_contact_host_port) { + LM_DBG("Comparing needle user@host:port [%.*s@%.*s:%d] and contact_user@contact_host:port [%.*s@%.*s:%d]\n", needle_uri.user.len, needle_uri.user.s, + needle_uri.host.len, needle_uri.host.s, needle_uri.port_no, + c->contact_user.len, c->contact_user.s, c->contact_host.len, c->contact_host.s, c->contact_port); + + if((needle_uri.user.len == c->contact_user.len && (memcmp(needle_uri.user.s, c->contact_user.s, needle_uri.user.len) ==0)) && + (needle_uri.host.len == c->contact_host.len && (memcmp(needle_uri.host.s, c->contact_host.s, needle_uri.host.len) ==0)) && + (needle_uri.port_no == c->contact_port)) { + LM_DBG("Match!!\n"); + *_c = c; + return 0; + } + } + LM_DBG("Searching for [%.*s] and comparing to [%.*s]\n", _contact->len, _contact->s, c->aor.len, c->aor.s); /* hosts HAVE to match */ diff --git a/modules/ims_usrloc_pcscf/ul_mod.c b/modules/ims_usrloc_pcscf/ul_mod.c index 3fbab3c..11079da 100644 --- a/modules/ims_usrloc_pcscf/ul_mod.c +++ b/modules/ims_usrloc_pcscf/ul_mod.c @@ -86,6 +86,7 @@ int ul_fetch_rows = 2000; int hashing_type = 0; /*!< has type for storing P-CSCF contacts - 0 - use full contact AOR, 1 - use IP:PORT only */ int lookup_check_received = 1; /*!< Should we check received on lookup? */ +int match_contact_host_port = 1; /*!< Should we match contact just based on rui host and port*/ db1_con_t* ul_dbh = 0; db_func_t ul_dbf; @@ -112,6 +113,7 @@ static param_export_t params[] = { {"db_mode", INT_PARAM, &db_mode }, {"hashing_type", INT_PARAM, &hashing_type }, {"lookup_check_received", INT_PARAM, &lookup_check_received }, + {"match_contact_host_port", INT_PARAM, &match_contact_host_port }, {0, 0, 0} };

10 years, 2 months

git:master: modules/ims_charging: updated ims_charging documentation for new trunk parameter

by Richard Good

Module: sip-router Branch: master Commit: 885a468af97b4de25256d3c193a61890f616c128 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=885a468… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 9 14:22:23 2014 +0200 modules/ims_charging: updated ims_charging documentation for new trunk parameter --- modules/ims_charging/doc/ims_charging_admin.xml | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml index a77f03d..4bdf9b4 100644 --- a/modules/ims_charging/doc/ims_charging_admin.xml +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -737,7 +737,7 @@ modparam("ims_charging", "service_context_id_release", "262") <section> <title><function moreinfo="none">Ro_CCR(route_name, direction, - charge_type, unit_type, reservation_units, domain</function></title> + charge_type, unit_type, reservation_units, domain, trunk_id</function></title> <para>Perform a CCR on Diameter Ro interface for Charging</para> @@ -745,17 +745,17 @@ modparam("ims_charging", "service_context_id_release", "262") <itemizedlist> <listitem> - <para><emphasis>route_name</emphasis>route to be executed upon + <para><emphasis>route_name</emphasis> route to be executed upon reception of charging requests</para> </listitem> <listitem> - <para><emphasis>direction</emphasis>"orig"inating or + <para><emphasis>direction</emphasis> "orig"inating or "term"inating</para> </listitem> <listitem> - <para><emphasis>charge_type</emphasis>"IEC" = Immediate Event + <para><emphasis>charge_type</emphasis> "IEC" = Immediate Event Charging, "ECUR" - Event Charging with Unit Reservation or "SCUR" - Session Charging with Unit Reservation.</para> @@ -763,21 +763,26 @@ modparam("ims_charging", "service_context_id_release", "262") </listitem> <listitem> - <para><emphasis>unit_type</emphasis>Types of the unit to be + <para><emphasis>unit_type</emphasis> Types of the unit to be requested</para> <emphasis>(unused at the moment)</emphasis> </listitem> <listitem> - <para><emphasis>reservation_units</emphasis>how many units (at the + <para><emphasis>reservation_units</emphasis> how many units (at the moment seconds) should be reservated at the moment.</para> </listitem> <listitem> - <para><emphasis>domain</emphasis>- Logical domain within + <para><emphasis>domain</emphasis> Logical domain within registrar.</para> </listitem> + + <listitem> + <para><emphasis>trunk_id</emphasis> Identifies to trunk group from + which this originates or terminates.</para> + </listitem> </itemizedlist> <para>This function can be used from REQUEST_ROUTE.</para> @@ -791,7 +796,7 @@ modparam("ims_charging", "service_context_id_release", "262") <programlisting format="linespecific"> ... xlog("L_DBG","Sending initial CCR Request for call\n"); - Ro_CCR("CHARGING_CCR_REPLY", "orig", "SCUR", "", "30"); + Ro_CCR("CHARGING_CCR_REPLY", "orig", "SCUR", "", "30","1"); } route[CHARGING_CCR_REPLY] @@ -914,4 +919,4 @@ route[CHARGING_CCR_REPLY] <para>Number of calls that were killed due to lack of credit.</para> </section> </section> -</chapter> +</chapter> \ No newline at end of file

10 years, 2 months

git:master: modules/ims_charging: added support for trunk ID in Ro CCR

by Jason Penton

Module: sip-router Branch: master Commit: 46e5cc861cec11c7d9ddfbbec7a0c986c95fc5e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46e5cc8… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 9 14:18:29 2014 +0200 modules/ims_charging: added support for trunk ID in Ro CCR --- modules/ims_charging/mod.c | 51 +++++++++++++++++++++++++-------- modules/ims_charging/ro_db_handler.c | 24 ++++++++++++--- modules/ims_charging/ro_db_handler.h | 5 ++- 3 files changed, 61 insertions(+), 19 deletions(-) diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index 82def69..10d4fee 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -91,7 +91,7 @@ static int mod_init(void); static int mod_child_init(int); static void mod_destroy(void); -static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* charge_type, str* unit_type, int reservation_units, str* trunk_id); +static int w_ro_ccr(struct sip_msg *msg, char* route_name, char* direction, char* charge_type, char* unit_type, int reservation_units, char* trunk_id); //void ro_session_ontimeout(struct ro_tl *tl); static int ro_fixup(void **param, int param_no); @@ -346,7 +346,7 @@ static void mod_destroy(void) { } -static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* charge_type, str* unit_type, int reservation_units, str* trunk_id) { +static int w_ro_ccr(struct sip_msg *msg, char* c_route_name, char* c_direction, char* c_charge_type, char* c_unit_type, int reservation_units, char* c_trunk_id) { /* PSEUDOCODE/NOTES * 1. What mode are we in - terminating or originating * 2. check request type - IEC - Immediate Event Charging @@ -377,12 +377,37 @@ static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* c struct ro_session *ro_session = 0; int free_contact = 0; - LM_DBG("Ro CCR initiated: direction:%.*s, charge_type:%.*s, unit_type:%.*s, reservation_units:%i, route_name:%.*s", - direction->len, direction->s, - charge_type->len, charge_type->s, - unit_type->len, unit_type->s, + str s_route_name, s_direction, s_charge_type, s_unit_type, s_trunk_id; + + if (get_str_fparam(&s_route_name, msg, (fparam_t*) c_route_name) < 0) { + LM_ERR("failed to get s_route_name\n"); + return RO_RETURN_ERROR; + } + if (get_str_fparam(&s_direction, msg, (fparam_t*) c_direction) < 0) { + LM_ERR("failed to get s_direction\n"); + return RO_RETURN_ERROR; + } + if (get_str_fparam(&s_charge_type, msg, (fparam_t*) c_charge_type) < 0) { + LM_ERR("failed to get s_charge_type\n"); + return RO_RETURN_ERROR; + } + if (get_str_fparam(&s_unit_type, msg, (fparam_t*) c_unit_type) < 0) { + LM_ERR("failed to get s_unit_type\n"); + return RO_RETURN_ERROR; + } + if (get_str_fparam(&s_trunk_id, msg, (fparam_t*) c_trunk_id) < 0) { + LM_ERR("failed to get s_trunk_id\n"); + return RO_RETURN_ERROR; + } + + LM_DBG("Ro CCR initiated: direction:%.*s, charge_type:%.*s, unit_type:%.*s, reservation_units:%i, route_name:%.*s, trunk_id:%.*s\n", + s_direction.len, s_direction.s, + s_charge_type.len, s_charge_type.s, + s_unit_type.len, s_unit_type.s, reservation_units, - route_name->len, route_name->s); + s_route_name.len, s_route_name.s, + s_trunk_id.len, s_trunk_id.s); + if (msg->first_line.type != SIP_REQUEST) { LM_ERR("Ro_CCR() called from SIP reply."); @@ -397,7 +422,7 @@ static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* c return RO_RETURN_ERROR; } - dir = get_direction_as_int(direction); + dir = get_direction_as_int(&s_direction); if (dir == RO_ORIG_DIRECTION) { //get caller IMPU from asserted identity @@ -482,18 +507,18 @@ send_ccr: goto done; } - LM_DBG("Looking for route block [%.*s]\n", route_name->len, route_name->s); + LM_DBG("Looking for route block [%.*s]\n", s_route_name.len, s_route_name.s); - int ri = route_get(&main_rt, route_name->s); + int ri = route_get(&main_rt, s_route_name.s); if (ri < 0) { - LM_ERR("unable to find route block [%.*s]\n", route_name->len, route_name->s); + LM_ERR("unable to find route block [%.*s]\n", s_route_name.len, s_route_name.s); ret = RO_RETURN_ERROR; goto done; } cfg_action = main_rt.rlist[ri]; if (!cfg_action) { - LM_ERR("empty action lists in route block [%.*s]\n", route_name->len, route_name->s); + LM_ERR("empty action lists in route block [%.*s]\n", s_route_name.len, s_route_name.s); ret = RO_RETURN_ERROR; goto done; } @@ -521,7 +546,7 @@ send_ccr: goto done; } - ret = Ro_Send_CCR(msg, dlg, dir, charge_type, unit_type, reservation_units, trunk_id, cfg_action, tindex, tlabel); + ret = Ro_Send_CCR(msg, dlg, dir, &s_charge_type, &s_unit_type, reservation_units, &s_trunk_id, cfg_action, tindex, tlabel); if(ret < 0){ LM_ERR("Failed to send CCR\n"); diff --git a/modules/ims_charging/ro_db_handler.c b/modules/ims_charging/ro_db_handler.c index e3cb05f..631ad4b 100644 --- a/modules/ims_charging/ro_db_handler.c +++ b/modules/ims_charging/ro_db_handler.c @@ -19,6 +19,9 @@ str last_event_ts_column = str_init(LAST_EVENT_TS_COL); str reserved_sec_column = str_init(RESERVED_SECS_COL); str valid_for_column = str_init(VALID_FOR_COL); str state_column = str_init(STATE_COL); +str trunk_id_column = str_init(TRUNK_ID_COL); +str rating_group_column = str_init(RATING_GROUP_COL); +str service_identifier_column = str_init(SERVICE_IDENTIFIER_COL); typedef enum ro_session_field_idx { ID_COL_IDX = 0, @@ -34,7 +37,11 @@ typedef enum ro_session_field_idx { LAST_EVENT_TS_COL_IDX, RESERVED_SECS_COL_IDX, VALID_FOR_COL_IDX, - STATE_COL_IDX + STATE_COL_IDX, + TRUNK_ID_COL_IDX, + RATING_GROUP_COL_IDX, + SERVICE_IDENTIFIER_COL_IDX + } ro_session_field_idx_t; #define GET_FIELD_IDX(_val, _idx)\ @@ -157,7 +164,7 @@ int update_ro_dbinfo_unsafe(struct ro_session* ro_session) { db_key_t insert_keys[RO_SESSION_TABLE_COL_NUM] = { &id_column, &h_entry_column, &h_id_column, &session_id_column, &dlg_h_entry_column, &dlg_h_id_column, &direction_column, &asserted_column, &callee_column, &start_time_col, &last_event_ts_column, - &reserved_sec_column, &valid_for_column, &state_column + &reserved_sec_column, &valid_for_column, &state_column, &trunk_id_column, &rating_group_column, &service_identifier_column }; VAL_TYPE(GET_FIELD_IDX(values, ID_COL_IDX)) = DB1_INT; @@ -176,6 +183,10 @@ int update_ro_dbinfo_unsafe(struct ro_session* ro_session) { db_set_int_val(values, RESERVED_SECS_COL_IDX, ro_session->reserved_secs); db_set_int_val(values, VALID_FOR_COL_IDX, ro_session->valid_for); db_set_int_val(values, STATE_COL_IDX, ro_session->active); + db_set_str_val(values, TRUNK_ID_COL_IDX, &ro_session->trunk_id); + db_set_int_val(values, RATING_GROUP_COL_IDX, ro_session->rating_group); + db_set_int_val(values, SERVICE_IDENTIFIER_COL_IDX, ro_session->service_identifier); + LM_DBG("Inserting ro_session into database\n"); if ((ro_dbf.insert(ro_db_handle, insert_keys, values, RO_SESSION_TABLE_COL_NUM)) != 0) { @@ -187,11 +198,11 @@ int update_ro_dbinfo_unsafe(struct ro_session* ro_session) { } else if ((ro_session->flags & RO_SESSION_FLAG_CHANGED) != 0 && (ro_session->flags & RO_SESSION_FLAG_INSERTED) != 0) { - db_val_t values[13]; - db_key_t update_keys[13] = { + db_val_t values[RO_SESSION_TABLE_COL_NUM-1]; + db_key_t update_keys[RO_SESSION_TABLE_COL_NUM-1] = { &h_entry_column, &h_id_column, &session_id_column, &dlg_h_entry_column, &dlg_h_id_column, &direction_column, &asserted_column, &callee_column, &start_time_col, &last_event_ts_column, - &reserved_sec_column, &valid_for_column, &state_column + &reserved_sec_column, &valid_for_column, &state_column, &trunk_id_column, &rating_group_column, &service_identifier_column }; db_set_int_val(values, HASH_ENTRY_COL_IDX - 1, ro_session->h_entry); @@ -207,6 +218,9 @@ int update_ro_dbinfo_unsafe(struct ro_session* ro_session) { db_set_int_val(values, RESERVED_SECS_COL_IDX - 1, ro_session->reserved_secs); db_set_int_val(values, VALID_FOR_COL_IDX - 1, ro_session->valid_for); db_set_int_val(values, STATE_COL_IDX - 1, ro_session->active); + db_set_str_val(values, TRUNK_ID_COL_IDX - 1, &ro_session->trunk_id); + db_set_int_val(values, RATING_GROUP_COL_IDX - 1, ro_session->rating_group); + db_set_int_val(values, SERVICE_IDENTIFIER_COL_IDX - 1, ro_session->service_identifier); LM_DBG("Updating ro_session in database\n"); if ((ro_dbf.update(ro_db_handle, update_keys/*match*/, 0/*match*/, values/*match*/, update_keys/*update*/, values/*update*/, 3/*match*/, 13/*update*/)) != 0) { diff --git a/modules/ims_charging/ro_db_handler.h b/modules/ims_charging/ro_db_handler.h index c8b2029..fc56ccc 100644 --- a/modules/ims_charging/ro_db_handler.h +++ b/modules/ims_charging/ro_db_handler.h @@ -14,7 +14,7 @@ #define RO_TABLE_VERSION 1 #define RO_SESSION_TABLE_NAME "ro_session" -#define RO_SESSION_TABLE_COL_NUM 14 +#define RO_SESSION_TABLE_COL_NUM 17 #define ID_COL "id" #define HASH_ENTRY_COL "hash_entry" @@ -30,6 +30,9 @@ #define RESERVED_SECS_COL "reserved_secs" #define VALID_FOR_COL "valid_for" #define STATE_COL "state" +#define RATING_GROUP_COL "rating_group" +#define SERVICE_IDENTIFIER_COL "service_identifier" +#define TRUNK_ID_COL "trunk_id" int init_ro_db(const str *db_url, int dlg_hash_size , int db_update_period, int fetch_num_rows); int load_ro_info_from_db(int hash_size, int fetch_num_rows);

10 years, 2 months

git:master: modules/ims_charging: Added SRDB link to Makefile for DB Support

by Jason Penton

Module: sip-router Branch: master Commit: f5b463f39024414f1ca9cc25b6ae620721b3ce08 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5b463f… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 9 14:10:00 2014 +0200 modules/ims_charging: Added SRDB link to Makefile for DB Support --- modules/ims_charging/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/ims_charging/Makefile b/modules/ims_charging/Makefile index 0dbcd19..244eba0 100644 --- a/modules/ims_charging/Makefile +++ b/modules/ims_charging/Makefile @@ -14,6 +14,7 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 ifneq ($(OS),darwin) LIBS += -lrt

10 years, 2 months

git:master: modules/ims_charging: added realtime DB support for Ro sessions

by Jason Penton

Module: sip-router Branch: master Commit: efcd3421c4733a51ded1fb74ff35c7425d426596 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efcd342… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 9 14:01:35 2014 +0200 modules/ims_charging: added realtime DB support for Ro sessions --- modules/ims_charging/Ro_data.c | 8 +- modules/ims_charging/Ro_data.h | 5 +- modules/ims_charging/ccr.c | 15 ++ modules/ims_charging/dialog.c | 47 +++++- modules/ims_charging/ims_ro.c | 132 ++++++++++------- modules/ims_charging/ims_ro.h | 3 +- modules/ims_charging/mod.c | 86 ++++++++---- modules/ims_charging/mod.h | 12 +- modules/ims_charging/ro_db_handler.c | 251 ++++++++++++++++++++++++++++++++ modules/ims_charging/ro_db_handler.h | 41 +++++ modules/ims_charging/ro_session_hash.c | 14 ++- modules/ims_charging/ro_session_hash.h | 17 ++- modules/ims_charging/ro_timer.c | 11 ++- 13 files changed, 539 insertions(+), 103 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=efc…

10 years, 2 months

git:master: modules/ims_qos: Rx_reg use received IP for framed_ip_address AVP

by Richard Good

Module: sip-router Branch: master Commit: 35fe10d9a88d3c3f9a42d1ec891f7f62a2fc26a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35fe10d… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 9 11:59:59 2014 +0200 modules/ims_qos: Rx_reg use received IP for framed_ip_address AVP Previous reg_reg used contact IP for framed_ip_address AVP but NAT breaks this Using received IP instead works for NAT and non-NAT scenarios --- modules/ims_qos/mod.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index 3dc9496..a3923e6 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -374,7 +374,7 @@ void callback_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params * para //getting auth session auth = cdpb.AAAGetAuthSession(*rx_session_id); if (!auth) { - LM_DBG("Could not get Auth Session for session id: [%.*s] - this is fine as this might have been started by already sending an STR\n", rx_session_id->len, rx_session_id->s); + LM_DBG("Could not get Auth Session for session id: [%.*s]\n", rx_session_id->len, rx_session_id->s); goto error; } @@ -414,7 +414,7 @@ void callback_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params * para //getting auth session auth = cdpb.AAAGetAuthSession(*rx_session_id); if (!auth) { - LM_DBG("Could not get Auth Session for session id: [%.*s] - this is fine as this might have been started by already sending an STR\n", rx_session_id->len, rx_session_id->s); + LM_DBG("Could not get Auth Session for session id: [%.*s]\n", rx_session_id->len, rx_session_id->s); goto error; } @@ -848,6 +848,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* int aar_sent = 0; saved_transaction_local_t* local_data = 0; //data to be shared across all async calls saved_transaction_t* saved_t_data = 0; //data specific to each contact's AAR async call + str ip; if (fixup_get_svalue(msg, (gparam_t*) route, &route_name) != 0) { LM_ERR("no async route block for assign_server_unreg\n"); @@ -977,25 +978,20 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* LM_DBG("Contact [%.*s] exists and is in state PCONTACT_REG_PENDING or PCONTACT_REGISTERED\n" , pcontact->aor.len, pcontact->aor.s); - //get IP address from contact - struct sip_uri puri; - if (parse_uri(c->uri.s, c->uri.len, &puri) < 0) { - LM_ERR("failed to parse Contact\n"); - ul.unlock_udomain(domain_t, &c->uri); - lock_release(saved_t_data->lock); - goto error; - - } - LM_DBG("Parsed URI of from host is [%.*s]\n", puri.host.len, puri.host.s); - uint16_t ip_version = AF_INET; //TODO IPv6!!!? + //we use the received IP address for the framed_ip_address + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip_addr2a(&msg->rcv.src_ip)); + LM_DBG("Message received IP address is: [%.*s]\n", ip.len, ip.s); + uint16_t ip_version = AF_INET; //TODO IPv6!!!? + //check for existing Rx session if (pcontact->rx_session_id.len > 0 && pcontact->rx_session_id.s && (auth = cdpb.AAAGetAuthSession(pcontact->rx_session_id))) { LM_DBG("Rx session already exists for this user\n"); if (memcmp(pcontact->rx_session_id.s, auth->id.s, auth->id.len) != 0) { - LM_ERR("Rx session mismatch when URI is [%.*s].......Aborting\n", puri.host.len, puri.host.s); + LM_ERR("Rx session mismatch for rx_session_id [%.*s].......Aborting\n", pcontact->rx_session_id.len, pcontact->rx_session_id.s); if (auth) cdpb.AAASessionsUnlock(auth->hash); lock_release(saved_t_data->lock); goto error; @@ -1007,7 +1003,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* LM_DBG("Creating new Rx session for contact <%.*s>\n", pcontact->aor.len, pcontact->aor.s); int ret = create_new_regsessiondata(domain_t->name, &pcontact->aor, &rx_regsession_data_p); if (!ret) { - LM_ERR("Unable to create regsession data parcel when URI is [%.*s]...Aborting\n", puri.host.len, puri.host.s); + LM_ERR("Unable to create regsession data parcel for rx_session_id [%.*s]...Aborting\n", pcontact->rx_session_id.len, pcontact->rx_session_id.s); ul.unlock_udomain(domain_t, &c->uri); if (rx_regsession_data_p) { shm_free(rx_regsession_data_p); @@ -1018,7 +1014,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* } auth = cdpb.AAACreateClientAuthSession(1, callback_for_cdp_session, rx_regsession_data_p); //returns with a lock if (!auth) { - LM_ERR("Rx: unable to create new Rx Reg Session when URI is [%.*s]\n", puri.host.len, puri.host.s); + LM_ERR("Rx: unable to create new Rx Reg Session for rx_session_id is [%.*s]\n", pcontact->rx_session_id.len, pcontact->rx_session_id.s); if (rx_regsession_data_p) { shm_free(rx_regsession_data_p); rx_regsession_data_p = 0; @@ -1068,7 +1064,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* //TODOD remove - no longer user AOR parm //ret = rx_send_aar_register(msg, auth, &puri.host, &ip_version, &c->uri, local_data); //returns a locked rx auth object - ret = rx_send_aar_register(msg, auth, &puri.host, &ip_version, local_data); //returns a locked rx auth object + ret = rx_send_aar_register(msg, auth, &ip, &ip_version, local_data); //returns a locked rx auth object ul.unlock_udomain(domain_t, &c->uri);

10 years, 2 months

git:master: modules/ims_qos: Added feature to Rx_reg check if session has been opened before acting on termination

by Richard Good

Module: sip-router Branch: master Commit: 2e821613a2fac7b3a6b7ec28a314b462f18f5bc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e82161… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 9 11:57:56 2014 +0200 modules/ims_qos: Added feature to Rx_reg check if session has been opened before acting on termination When Rx signalling session is terminated only remove user from user loc if rx signalling session was successfully opened --- modules/ims_qos/cdpeventprocessor.c | 37 ++++++++++++++++++---------------- modules/ims_qos/rx_aar.c | 27 ++++++++++++++++++++++-- modules/ims_qos/rx_authdata.c | 2 + modules/ims_qos/rx_authdata.h | 1 + 4 files changed, 47 insertions(+), 20 deletions(-) diff --git a/modules/ims_qos/cdpeventprocessor.c b/modules/ims_qos/cdpeventprocessor.c index 409009e..1cf322e 100644 --- a/modules/ims_qos/cdpeventprocessor.c +++ b/modules/ims_qos/cdpeventprocessor.c @@ -230,23 +230,26 @@ void cdp_cb_event_process() { LM_DBG("This is a subscription to signalling bearer session"); //instead of removing the contact from usrloc_pcscf we just change the state of the contact to TERMINATE_PENDING_NOTIFY //pcscf_registrar sees this, sends a SIP PUBLISH and on SIP NOTIFY the contact is deleted - - if (ul.register_udomain(p_session_data->domain.s, &domain) - < 0) { - LM_DBG("Unable to register usrloc domain....aborting\n"); - return; - } - ul.lock_udomain(domain, &p_session_data->registration_aor); - if (ul.get_pcontact(domain, &p_session_data->registration_aor, - &pcontact) != 0) { - LM_DBG("no contact found for terminated Rx reg session..... ignoring\n"); - } else { - LM_DBG("Updating contact [%.*s] after Rx reg session terminated, setting state to PCONTACT_DEREG_PENDING_PUBLISH\n", pcontact->aor.len, pcontact->aor.s); - ci.reg_state = PCONTACT_DEREG_PENDING_PUBLISH; - ci.num_service_routes = 0; - ul.update_pcontact(domain, &ci, pcontact); - } - ul.unlock_udomain(domain, &p_session_data->registration_aor); + //note we only send SIP PUBLISH if the session has been successfully opened + + if(p_session_data->session_has_been_opened) { + if (ul.register_udomain(p_session_data->domain.s, &domain) + < 0) { + LM_DBG("Unable to register usrloc domain....aborting\n"); + return; + } + ul.lock_udomain(domain, &p_session_data->registration_aor); + if (ul.get_pcontact(domain, &p_session_data->registration_aor, + &pcontact) != 0) { + LM_DBG("no contact found for terminated Rx reg session..... ignoring\n"); + } else { + LM_DBG("Updating contact [%.*s] after Rx reg session terminated, setting state to PCONTACT_DEREG_PENDING_PUBLISH\n", pcontact->aor.len, pcontact->aor.s); + ci.reg_state = PCONTACT_DEREG_PENDING_PUBLISH; + ci.num_service_routes = 0; + ul.update_pcontact(domain, &ci, pcontact); + } + ul.unlock_udomain(domain, &p_session_data->registration_aor); + } } else { LM_DBG("This is a media bearer session session"); diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 028d6cd..c3482fc 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -94,7 +94,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps struct cell *t = 0; unsigned int cdp_result; int result = CSCF_RETURN_ERROR; - + LM_DBG("Received AAR callback\n"); saved_transaction_t* data = (saved_transaction_t*) param; @@ -135,9 +135,9 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps if (cdp_result >= 2000 && cdp_result < 3000) { LM_DBG("Success, received code: [%i] from PCRF for AAR request\n", cdp_result); - - LM_DBG("Auth session ID [%.*s]", aaa->sessionId->data.len, aaa->sessionId->data.s); + LM_DBG("Auth session ID [%.*s]", aaa->sessionId->data.len, aaa->sessionId->data.s); + if(!data->aar_update) { LM_DBG("This is an AAA response to an initial AAR"); str * passed_rx_session_id = shm_malloc(sizeof (struct _str)); @@ -181,6 +181,8 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e struct pcontact_info ci; udomain_t* domain_t; int finalReply = 0; + AAASession *auth = 0; + rx_authsessiondata_t* p_session_data = 0; int result = CSCF_RETURN_ERROR; LM_DBG("Received AAR callback\n"); @@ -245,6 +247,25 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e create_return_code(result); goto done; } + //need to set Rx auth data to say this session has been successfully opened + //This is used elsewhere to prevent acting on termination events when the session has not been opened + //getting auth session + auth = cdpb.AAAGetAuthSession(aaa->sessionId->data); + if (!auth) { + LM_DBG("Could not get Auth Session for session id: [%.*s]\n", aaa->sessionId->data.len, aaa->sessionId->data.s); + goto error; + } + //getting session data + p_session_data = (rx_authsessiondata_t*) auth->u.auth.generic_data; + if (!p_session_data) { + LM_DBG("Could not get session data on Auth Session for session id: [%.*s]\n", aaa->sessionId->data.len, aaa->sessionId->data.s); + if (auth) cdpb.AAASessionsUnlock(auth->hash); + goto error; + } + p_session_data->session_has_been_opened = 1; + if (auth) cdpb.AAASessionsUnlock(auth->hash); + + LM_DBG("Success, received code: [%i] from PCRF for AAR request (contact: [%.*s]), (auth session id: %.*s)\n", cdp_result, local_data->contact.len, local_data->contact.s, local_data->auth_session_id.len, local_data->auth_session_id.s); diff --git a/modules/ims_qos/rx_authdata.c b/modules/ims_qos/rx_authdata.c index 1de9b40..86e8fca 100644 --- a/modules/ims_qos/rx_authdata.c +++ b/modules/ims_qos/rx_authdata.c @@ -81,6 +81,8 @@ int create_new_regsessiondata(str* domain, str* aor, rx_authsessiondata_t** sess p_session_data->subscribed_to_signaling_path_status = 1; p_session_data->must_terminate_dialog = 0; /*irrelevent for reg session data this will always be 0 */ + p_session_data->session_has_been_opened = 0; /*0 has not been opened 1 has been opened*/ + char* p = (char*)(p_session_data + 1); p_session_data->domain.s = p; memcpy(p, domain->s, domain->len); diff --git a/modules/ims_qos/rx_authdata.h b/modules/ims_qos/rx_authdata.h index 3332997..2264664 100644 --- a/modules/ims_qos/rx_authdata.h +++ b/modules/ims_qos/rx_authdata.h @@ -84,6 +84,7 @@ typedef struct rx_authsessiondata { int ip_version; //for registration session int subscribed_to_signaling_path_status; // 0 not subscribed 1 is subscribed + int session_has_been_opened; // 0 has not been opened 1 has been opened str domain; //the domain the registration aor belongs to (for registration) str registration_aor; //the aor if this rx session is a subscription to signalling status int must_terminate_dialog; //0 means when this session terminates it must not terminate the relevant dialog, 1 means it must terminate the dialog

10 years, 2 months

git:master: modules/cdp, cdpavp: added support for Incoming and Outgoing Trunk-Group AVPs

by Richard Good

Module: sip-router Branch: master Commit: 333ff6fad046da64996084cc7644d16e40cc60d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=333ff6f… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 9 11:55:57 2014 +0200 modules/cdp,cdpavp: added support for Incoming and Outgoing Trunk-Group AVPs --- modules/cdp/diameter_epc_code_avp.h | 3 +++ modules/cdp_avp/epcapp.h | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/cdp/diameter_epc_code_avp.h b/modules/cdp/diameter_epc_code_avp.h index dad3026..ef4d561 100644 --- a/modules/cdp/diameter_epc_code_avp.h +++ b/modules/cdp/diameter_epc_code_avp.h @@ -146,6 +146,9 @@ enum { AVP_EPC_Served_Party_IP_Address = 848, AVP_EPC_Authorized_QoS = 849, AVP_EPC_Application_Server_Information = 850, + AVP_EPC_Trunk_Group_Id = 851, + AVP_EPC_Incoming_Trunk_Group_Id = 852, + AVP_EPC_Outgoing_Trunk_Group_Id = 853, AVP_EPC_Bearer_Service = 854, AVP_EPC_Service_ID = 855, AVP_EPC_Associated_URI = 856, diff --git a/modules/cdp_avp/epcapp.h b/modules/cdp_avp/epcapp.h index c76d09a..484164f 100644 --- a/modules/cdp_avp/epcapp.h +++ b/modules/cdp_avp/epcapp.h @@ -654,7 +654,7 @@ cdp_avp_ptr (Called_Asserted_Identity, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MAND cdp_avp_ptr (Called_Party_Address, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, UTF8String, str) cdp_avp_ptr (Calling_Party_Address, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, UTF8String, str) - + cdp_avp (Cause_Code, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, Integer32, int32_t) cdp_avp_ptr (Content_Disposition, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, UTF8String, str) @@ -766,6 +766,14 @@ cdp_avp_add_ptr (Time_Stamps, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, cdp_avp_get (Time_Stamps, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, Grouped, AAA_AVP_LIST) cdp_avp_ptr (User_Session_Id, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, UTF8String, str) + +cdp_avp_add_ptr (Trunk_Group_Id, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, Grouped, AAA_AVP_LIST*) +cdp_avp_get (Trunk_Group_Id, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, Grouped, AAA_AVP_LIST) + + +cdp_avp_ptr (Incoming_Trunk_Group_Id, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, UTF8String, str) + +cdp_avp_ptr (Outgoing_Trunk_Group_Id, EPC_vendor_id_3GPP, AAA_AVP_FLAG_MANDATORY, UTF8String, str)

10 years, 2 months

git:master: modules/ims_registrar_scscf: fixed asserted identity comparison to path to not include "sip:"

by Richard Good

Module: sip-router Branch: master Commit: d2b06ddb70ee8edfd0456fb0697167560d608f44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2b06dd… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 9 11:52:15 2014 +0200 modules/ims_registrar_scscf: fixed asserted identity comparison to path to not include "sip:" --- modules/ims_registrar_scscf/registrar_notify.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index 8e80bcf..09e83ef 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -371,9 +371,9 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { while (c) { if (c->path.len) { - for (i = 0; i < c->path.len - asserted_id.len; i++) - LM_DBG("Path: <%.*s>.\n", + LM_DBG("Path: <%.*s>.\n", c->path.len, c->path.s); + for (i = 0; i < c->path.len - (asserted_id.len-4); i++) //we compare the asserted_id without "sip:" to the path if (strncasecmp(c->path.s + i, asserted_id.s+4, asserted_id.len-4) == 0) { LM_DBG("Identity found in Path <%.*s>\n",

10 years, 2 months

git:master: modules/ims_icscf: Added new module param use_preferred_scscf_uri

by Richard Good

Module: sip-router Branch: master Commit: 15f27e65c9bd4ac50c91672d1b355d9e75f8972f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15f27e6… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Oct 9 11:48:04 2014 +0200 modules/ims_icscf: Added new module param use_preferred_scscf_uri This allows ICSCF to have a preferred S-CSCF is HSS returns a list Usually ICSCF uses SCSCFs in the order in which HSS provides them This gives another level of priority control to SCSCF selection at the ICSCF --- modules/ims_icscf/doc/ims_icscf_admin.xml | 45 +++++++++++++++++++++++- modules/ims_icscf/mod.c | 5 +++ modules/ims_icscf/scscf_list.c | 53 ++++++++++++++++++++++++----- 3 files changed, 92 insertions(+), 11 deletions(-) diff --git a/modules/ims_icscf/doc/ims_icscf_admin.xml b/modules/ims_icscf/doc/ims_icscf_admin.xml index 4712bbb..dfd9a9c 100644 --- a/modules/ims_icscf/doc/ims_icscf_admin.xml +++ b/modules/ims_icscf/doc/ims_icscf_admin.xml @@ -140,7 +140,7 @@ modparam("ims_icscf", "cxdx_forced_peer", "hss.ims.smilecoms.com") <para><emphasis> Default value is "ims.smilecoms.com".</emphasis></para> <example> - <title><varname>version_table</varname> parameter usage</title> + <title><varname>cxdx_dest_realm</varname> parameter usage</title> <programlisting format="linespecific"> ... @@ -149,6 +149,47 @@ modparam("ims_icscf", "cxdx_dest_realm", "ims.smilecoms.com") </programlisting> </example> </section> + + <section> + <title><varname>use_preferred_scscf_uri</varname> (int)</title> + + <para>Whether or not this ICSCF has a preferred S-CSCF to use when the + HSS returns a list of SCSCFs. 0 means this I-CSCF has no preferred + SCSCF. 1 means it has a preferred S-CSCF.</para> + + <para><emphasis> Default value is 0.</emphasis></para> + + <example> + <title><varname>use_preferred_scscf_uri</varname> parameter usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_icscf", "use_preferred_scscf_uri", 1) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>preferred_scscf_uri</varname> (string)</title> + + <para>If use_preferred_scscf_uri is set then this is the URI of the preferred + SCSCF.</para> + + <para><emphasis> Default value is "".</emphasis></para> + + <example> + <title><varname>preferred_scscf_uri</varname> parameter usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_icscf", "preferred_scscf_uri", "sip:scscf.ims.smilecoms.com:6060") +... + </programlisting> + </example> + </section> + + </section> <section> @@ -299,7 +340,7 @@ route[REG_UAR_REPLY] retrieve return value</para> <example> - <title>I_perform_location_information_request()</title> + <title>I_perform_location_information_request</title> <programlisting format="linespecific"> ... diff --git a/modules/ims_icscf/mod.c b/modules/ims_icscf/mod.c index ce67903..04ccd19 100644 --- a/modules/ims_icscf/mod.c +++ b/modules/ims_icscf/mod.c @@ -76,6 +76,9 @@ int scscf_entry_expiry = 300; char* cxdx_dest_realm_s = "ims.smilecoms.com"; str cxdx_dest_realm; +str preferred_scscf_uri = str_init("sip:scscf.ims.smilecoms.com:4060"); +int use_preferred_scscf_uri = 0; + //Only used if we want to force the Rx peer //Usually this is configured at a stack level and the first request uses realm routing char* cxdx_forced_peer_s = ""; @@ -123,6 +126,8 @@ static param_export_t params[] = { {"db_capabilities_table", PARAM_STRING, &ims_icscf_db_capabilities_table}, {"cxdx_forced_peer", PARAM_STR, &cxdx_forced_peer}, {"cxdx_dest_realm", PARAM_STR, &cxdx_dest_realm}, + {"preferred_scscf_uri", PARAM_STR, &preferred_scscf_uri}, + {"use_preferred_scscf_uri", INT_PARAM, &use_preferred_scscf_uri}, {0, 0, 0} }; diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index f5655c5..1d21ba3 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -56,6 +56,9 @@ extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list extern struct tm_binds tmb; //Structure with pointers to tm funcs +extern int use_preferred_scscf_uri; +extern str preferred_scscf_uri; + int i_hash_size; i_hash_slot *i_hash_table = 0; @@ -427,19 +430,51 @@ out_of_memory: str take_scscf_entry(str call_id) { str scscf = {0, 0}; scscf_list *l = 0; + scscf_entry *scscf_entry = 0; unsigned int hash = get_call_id_hash(call_id, i_hash_size); + LM_DBG("Getting scscf entry from list\n"); + i_lock(hash); l = i_hash_table[hash].head; - while (l) { - if (l->call_id.len == call_id.len && - strncasecmp(l->call_id.s, call_id.s, call_id.len) == 0) { - if (l->list) { - scscf = l->list->scscf_name; - } - break; - } - l = l->next; + + //if use_preferred_scscf_uri then check the table for the preferred scscf set + if(use_preferred_scscf_uri) { + LM_DBG("use_preferred_scscf_uri is set so will check for preferred_scscf_uri first [%.*s]\n", preferred_scscf_uri.len, preferred_scscf_uri.s); + while (l) { + if (l->call_id.len == call_id.len && + strncasecmp(l->call_id.s, call_id.s, call_id.len) == 0) { + scscf_entry = l->list; + while (scscf_entry) { + LM_DBG("scscf_entry [%.*s]\n", scscf_entry->scscf_name.len, scscf_entry->scscf_name.s); + if (strncasecmp(scscf_entry->scscf_name.s, preferred_scscf_uri.s, preferred_scscf_uri.len) == 0) { + LM_DBG("scscf_entry matches\n"); + scscf = scscf_entry->scscf_name; + break; + } + scscf_entry = scscf_entry->next; + } + + break; + } + l = l->next; + } + } + + // if scscf has not yet been set then find the first scscf that matches + if(scscf.len <= 0 ) { + LM_DBG("scscf has not been set so we just look for first match\n"); + while (l) { + if (l->call_id.len == call_id.len && + strncasecmp(l->call_id.s, call_id.s, call_id.len) == 0) { + if (l->list) { + LM_DBG("scscf_entry [%.*s]\n", l->list->scscf_name.len, l->list->scscf_name.s); + scscf = l->list->scscf_name; + } + break; + } + l = l->next; + } } i_unlock(hash); return scscf;

10 years, 2 months

← Newer
1
...
22
23
24
25
26
27
28
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014