sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:master: auth_diameter: remove unused but set variable

by Ovidiu Sas

Module: sip-router Branch: master Commit: 941c48ae6909994ae090c9d52766cd4dd5d4f938 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=941c48a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:00:27 2013 -0400 auth_diameter: remove unused but set variable --- modules/auth_diameter/auth_diameter.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/modules/auth_diameter/auth_diameter.c b/modules/auth_diameter/auth_diameter.c index 5dc73ff..e17e067 100644 --- a/modules/auth_diameter/auth_diameter.c +++ b/modules/auth_diameter/auth_diameter.c @@ -212,13 +212,10 @@ int diameter_www_authorize(struct sip_msg* _msg, char* _realm, char* _s2) static int group_fixup(void** param, int param_no) { - void* ptr; str* s; if (param_no == 1) { - ptr = *param; - if (!strcasecmp((char*)*param, "Request-URI")) { *param = (void*)1; @@ -245,8 +242,6 @@ static int group_fixup(void** param, int param_no) LM_ERR("unsupported Header Field identifier\n"); return E_UNSPEC; - - //pkg_free(ptr); } if (param_no == 2) @@ -257,14 +252,12 @@ static int group_fixup(void** param, int param_no) LM_ERR("no pkg memory left\n"); return E_UNSPEC; } - ptr = *param; s->s = (char*)*param; s->len = strlen(s->s); *param = (void*)s; } end: -// pkg_free(ptr); return 0; }

11 years, 7 months

git:master: Updated example config for S-CSCF

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 94e7ae77a6674d5e6a6d025a8e85f7b1c8733057 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94e7ae7… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Mar 20 17:31:34 2013 +0100 Updated example config for S-CSCF --- examples/scscf/kamailio.cfg | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index 4fa09b0..444cd74 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -430,16 +430,38 @@ route[XMLRPC] { # Route for handling Registrations: ###################################################################### route[REGISTER] { - xlog("L_ERR", "Enter register block"); - t_newtran(); - - ims_www_authenticate(NETWORKNAME); - - #check to see if user is authenticated - ie sip header has auth information - (already challenged) - if ($avp(maa_return_code) == 1) { - # user has not been authenticated. Lets send a challenge via 401 Unauthorized - ims_www_challenge("$td"); - exit; + if (!ims_www_authenticate(NETWORKNAME)) { + if ($? == -2) { + t_reply("403", "Authentication Failed"); + exit; + } else if ($? == -3) { + t_reply("400", "Bad Request"); + exit; + } 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; + } + exit; + } } else { # We need to check if this user is registered or not if (!impu_registered("location")) {

11 years, 7 months

cfg/ compiler warnings

by Ovidiu Sas

gcc version 4.7.2 (Ubuntu/Linaro 4.7.2-2ubuntu1) CC (gcc) [kamailio] cfg/cfg_ctx.o cfg/cfg_ctx.c: In function âcfg_set_nowâ: cfg/cfg_ctx.c:490:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:494:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:565:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:584:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c: In function âcfg_commitâ: cfg/cfg_ctx.c:1125:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1133:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1190:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1225:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1228:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c: In function âcfg_add_group_instâ: cfg/cfg_ctx.c:1582:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1583:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1585:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1594:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c: In function âcfg_del_group_instâ: cfg/cfg_ctx.c:1678:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1679:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1681:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1692:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1710:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1712:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1718:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CC (gcc) [kamailio] cfg/cfg_struct.o cfg/cfg_struct.c: In function âapply_add_var_listâ: cfg/cfg_struct.c:1091:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_struct.c:1092:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

11 years, 7 months

dns_cache.c compiler warnings

by Ovidiu Sas

gcc version 4.7.2 (Ubuntu/Linaro 4.7.2-2ubuntu1) CC (gcc) [kamailio] dns_cache.o dns_cache.c: In function âdns_srv_get_nxt_rrâ: dns_cache.c:2302:5: warning: âr_sums[1].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[1].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[2].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[2].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[3].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[3].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[4].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[4].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[5].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[5].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[6].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[6].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[7].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[7].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[8].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[8].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[9].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[9].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[10].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[10].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[11].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[11].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[12].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[12].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[13].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[13].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[14].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[14].rrâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[15].r_sumâ may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: âr_sums[15].rrâ may be used uninitialized in this function [-Wuninitialized]

11 years, 7 months

git:master: modules/drouting Improvement for do_routing in failure route

by Anca Vamanu

Module: sip-router Branch: master Commit: 0d8cec6b6cd9027ef7313608db7e27667643fdf6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d8cec6… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Mar 20 15:39:12 2013 +0200 modules/drouting Improvement for do_routing in failure route Improvement for sort_order 2 : if the failure groups have repeating gateways the module will take care internally not to try again a gateway that was already tried. --- modules/drouting/README | 37 ++++++++++++++++++------------ modules/drouting/doc/drouting_admin.xml | 15 ++++++++++++ modules/drouting/drouting.c | 38 +++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 15 deletions(-) diff --git a/modules/drouting/README b/modules/drouting/README index 5fee2f2..2977033 100644 --- a/modules/drouting/README +++ b/modules/drouting/README @@ -304,18 +304,18 @@ Chapter 1. Admin Guide draft 09): Table 1.4. Time recurrence attributes - Attribute Description - dastard Start of interval (RFC 2445 DATE-TIME) - duration Length of interval (RFC 2445 DURATION) - freq Frequency of recurrence (secondly,minutely,hourly, daily,weekly, - monthly, or yearly). - until bound of recurrence (RFC 2445 DATE-TIME) - interval How often the recurrence repeats - byday List of days of the week - bymonthday List of days of the month - byyearday List of days of the year - byweekno List of weeks of the year - bymonth List of months of the year + Attribute Description + dastard Start of interval (RFC 2445 DATE-TIME) + duration Length of interval (RFC 2445 DURATION) + freq Frequency of recurrence (secondly,minutely,hourly, daily,weekly, + monthly, or yearly). + until bound of recurrence (RFC 2445 DATE-TIME) + interval How often the recurrence repeats + byday List of days of the week + bymonthday List of days of the month + byyearday List of days of the year + byweekno List of weeks of the year + bymonth List of months of the year The value stored in database has the format of: <dtstart>|<duration>|<freq>|<until>|<interval>|<byday>|<bymonthday> |<byyearday>|<byweekno>|<bymonth> @@ -570,9 +570,16 @@ modparam("drouting", "drl_table", "my_gw_lists") destinations). Ex: 1,2;3,4,5;6 -> randomizer -> (A) 2,1;4,3,5;6 -> usage 2,1,4,3,5,6 (B) 1,2;3,5,4;6 -> usage 1,2,3,5,4,6 * 2 - from each destination group, only a single destination is - randomly selected; groups do maintain their order (as given); Ex: - 1,2;3,4,5;6 -> randomizer -> (A) 2;4;6 -> usage 2,4,6 (B) 1;5;6 -> - usage 1,5,6 + randomly selected; groups do maintain their order (as given); + Ex: 1,2;3,4,5;6 -> randomizer -> + (A) 2;4;6 -> usage 2,4,6 + (B) 1;5;6 -> usage 1,5,6 + It is ok to have repeating gateways in different groups. The module + will take care internally in case of failure not to choose a + gateway that was tried already. + Ex: 1,2,3; 1,2,3; 1,2,3 -> no gateway will be choosen twice. So in + case there are 2 failures, all the three gateways (1,2,3) will be + tried in a random order. Default value is “0”. diff --git a/modules/drouting/doc/drouting_admin.xml b/modules/drouting/doc/drouting_admin.xml index 3dbcdd9..7bde362 100644 --- a/modules/drouting/doc/drouting_admin.xml +++ b/modules/drouting/doc/drouting_admin.xml @@ -942,9 +942,24 @@ modparam("drouting", "drl_table", "my_gw_lists") <emphasis>2</emphasis> - from each destination group, only a single destination is randomly selected; groups do maintain their order (as given); + <para> Ex: 1,2;3,4,5;6 -> randomizer -> + </para> + <para> (A) 2;4;6 -> usage 2,4,6 + </para> + <para> (B) 1;5;6 -> usage 1,5,6 + </para> + <para> + It is ok to have repeating gateways in different groups. The module will + take care internally in case of failure not to choose a gateway that + was tried already. + </para> + <para> + Ex: 1,2,3; 1,2,3; 1,2,3 -> no gateway will be choosen twice. So in case there + are 2 failures, all the three gateways (1,2,3) will be tried in a random order. + </para> </listitem> </itemizedlist> </para> diff --git a/modules/drouting/drouting.c b/modules/drouting/drouting.c index 43fd73e..7289085 100644 --- a/modules/drouting/drouting.c +++ b/modules/drouting/drouting.c @@ -646,6 +646,20 @@ static int use_next_gw(struct sip_msg* msg) return 1; } +int dr_already_choosen(rt_info_t* rt_info, int* local_gwlist, int lgw_size, int check) +{ + int l; + + for ( l = 0; l<lgw_size; l++ ) { + if ( rt_info->pgwl[local_gwlist[l]].pgw == rt_info->pgwl[check].pgw ) { + LM_INFO("Gateway already choosen %.*s, local_gwlist[%d]=%d, %d\n", + rt_info->pgwl[check].pgw->ip.len, rt_info->pgwl[check].pgw->ip.s, l, local_gwlist[l], check); + return 1; + } + } + + return 0; +} static int do_routing(struct sip_msg* msg, dr_group_t *drg) { @@ -806,6 +820,30 @@ again: } } } + + if ( sort_order == 2 ) { + /* check not to use the same gateway as before */ + if ( t>1 ) { + /* check if all in the current set were already chosen */ + if (i-j <= t-1) { + for( l = j; l< i; l++) { + if ( ! dr_already_choosen(rt_info, local_gwlist, t-1, l) ) + break; + } + if ( l == i ) { + LM_INFO("All gateways in group from %d - %d were already used\n", j, i); + t--; /* jump over this group, nothing to choose here */ + j=i; continue; + } + } + while ( dr_already_choosen(rt_info, local_gwlist, t-1, local_gwlist[t-1]) ) { + local_gwlist[t-1] = j + rand()%(i-j); + } + } + LM_DBG("The %d gateway is %.*s [%d]\n", t, rt_info->pgwl[local_gwlist[t-1]].pgw->ip.len, + rt_info->pgwl[local_gwlist[t-1]].pgw->ip.s, local_gwlist[t-1]); + } + /* next group starts from i */ j=i; }

11 years, 7 months

git:master: modules/carrierroute Improvement for cr_route in failure route

by Anca Vamanu

Module: sip-router Branch: master Commit: 6bb98ddd9ee4913c7a56ca5ffa57d9f74e7bc1b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6bb98dd… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Mar 20 14:27:30 2013 +0200 modules/carrierroute Improvement for cr_route in failure route Small improvement in cr_route() function - when it is called from failure_route it will take care not choose a previously choosen gateway. Added cr_reload sercmd. --- modules/carrierroute/README | 7 +- modules/carrierroute/carrierroute.c | 44 ++++++++- modules/carrierroute/carrierroute.h | 3 + modules/carrierroute/cr_func.c | 121 ++++++++++++++++++++++- modules/carrierroute/doc/carrierroute_admin.xml | 8 ++- 5 files changed, 177 insertions(+), 6 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6bb…

11 years, 7 months

[tracker] Task opened: Added Record Route Header incorrect when Request-URI contains a SIPS URI

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Hugh James (hugh.james) Attached to Project - sip-router Summary - Added Record Route Header incorrect when Request-URI contains a SIPS URI Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - High Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - The record-route header added by Kamailio to a SIPS (TLS) call using the record_route(); operation is incorrectly generated by Kamailio. Page 101 (second sentence) of RFC3261 states "If the Request-URI contains a SIPS URI [...] the URI placed into the Record-Route header field MUST be a SIPS URI." Kamailio incorrectly generates record-route headers with the sip: URI scheme. All other fields are correctly generated with the sips: URI scheme. In response to this deviation from RFC3261, a Cisco ISR rejects the call with code 403. Module rr source code in release 3.3.3 checked and problem is caused by #define RR_PREFIX "Record-Route: <sip:" in record.c possible solution is check the Request URI for SIPS URI , and use #define RR_PREFIX_SIPS "Record-Route: <sips:" instead. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=277 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.

11 years, 7 months

git:jason.penton/ims_ro_interface: modules/ims_ro: more logging improvements

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 3b33ef509f58f229e163996354fbdd2b7c4d7c9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b33ef5… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Mar 20 10:41:04 2013 +0200 modules/ims_ro: more logging improvements --- modules/ims_ro/ccr.c | 4 ++-- modules/ims_ro/ims_ro.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/ims_ro/ccr.c b/modules/ims_ro/ccr.c index 4fba04a..ef5a093 100644 --- a/modules/ims_ro/ccr.c +++ b/modules/ims_ro/ccr.c @@ -274,7 +274,7 @@ Ro_CCA_t *Ro_parse_CCA_avps(AAAMessage *cca) { mscc_avp_list_ptr = &mscc_avp_list; AAA_AVP *mscc_avp = mscc_avp_list_ptr->head; while (mscc_avp != NULL) { - LM_DBG("MSCC AVP code is [%i] and data lenght is [%i]", mscc_avp->code, mscc_avp->data.len); + LM_DBG("MSCC AVP code is [%i] and data length is [%i]", mscc_avp->code, mscc_avp->data.len); switch (mscc_avp->code) { AAA_AVP_LIST y; AAA_AVP *z; @@ -286,7 +286,7 @@ Ro_CCA_t *Ro_parse_CCA_avps(AAAMessage *cca) { case AVP_CC_Time: mscc->granted_service_unit->cc_time = get_4bytes(z->data.s); default: - LM_ERR("Unsupported Granted Service Unit.\n"); + LM_ERR("Unsupported Granted Service Unit with code:[%d]\n", z->code); } z = z->next; } diff --git a/modules/ims_ro/ims_ro.c b/modules/ims_ro/ims_ro.c index 9c34721..173b172 100644 --- a/modules/ims_ro/ims_ro.c +++ b/modules/ims_ro/ims_ro.c @@ -643,8 +643,8 @@ void send_ccr_stop(struct ro_session *ro_session) { event_type = new_event_type(&sip_method, &sip_event, 0); - LM_DBG("Sending CCR STOP request for for user [%.*s] using session id [%.*s]", - ro_session->from_uri.len, ro_session->from_uri.s, ro_session->ro_session_id.len, ro_session->ro_session_id.s); + LM_DBG("Sending CCR STOP request for for user:[%.*s] using session id:[%.*s] and units:[%d]\n", + ro_session->from_uri.len, ro_session->from_uri.s, ro_session->ro_session_id.len, ro_session->ro_session_id.s, used); req_timestamp = time(0); @@ -722,8 +722,6 @@ void send_ccr_stop(struct ro_session *ro_session) { LM_ERR("problem add Termination cause AVP to STOP record.\n"); } - LM_DBG("Sending CCR Diameter message for STOP record on Ro Sesison ID [%.*s] with charge units [%d]\n", - ro_session->ro_session_id.len, ro_session->ro_session_id.s, used); /* send sunchronously so we can respond to callplan (cfg file), so a decision can be made to process the invite */ cdp_avp->cdp->AAASessionsUnlock(auth->hash); AAAMessage *cca = cdp_avp->cdp->AAASendRecvMessageToPeer(acr, &cfg.destination_host);

11 years, 7 months

git:jason.penton/ims_ro_interface: modules/ims_ro: more logging fixes and remove hardwired testing var

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: fc94a0866e571bde3d0170d172f88d877d17dedd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc94a08… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Mar 20 10:06:28 2013 +0200 modules/ims_ro: more logging fixes and remove hardwired testing var --- modules/ims_ro/ims_ro.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/ims_ro/ims_ro.c b/modules/ims_ro/ims_ro.c index 1f43853..9c34721 100644 --- a/modules/ims_ro/ims_ro.c +++ b/modules/ims_ro/ims_ro.c @@ -643,7 +643,8 @@ void send_ccr_stop(struct ro_session *ro_session) { event_type = new_event_type(&sip_method, &sip_event, 0); - LM_DBG("Sending CCR STOP request for for user [%.*s] using session id [%.*s]", ro_session->from_uri.len, ro_session->from_uri.s, ro_session->ro_session_id.len, ro_session->ro_session_id.s); + LM_DBG("Sending CCR STOP request for for user [%.*s] using session id [%.*s]", + ro_session->from_uri.len, ro_session->from_uri.s, ro_session->ro_session_id.len, ro_session->ro_session_id.s); req_timestamp = time(0); @@ -656,8 +657,7 @@ void send_ccr_stop(struct ro_session *ro_session) { event_type = 0; subscr.type = Subscription_Type_IMPU; - subscr.id.s = "sip:jason@ims.smilecoms.com"; //from_uri.s; - subscr.id.len = strlen("sip:jason@ims.smilecoms.com"); //from_uri.len; + subscr.id = ro_session->from_uri; acc_record_type = AAA_ACCT_STOP; @@ -722,14 +722,15 @@ void send_ccr_stop(struct ro_session *ro_session) { LM_ERR("problem add Termination cause AVP to STOP record.\n"); } - LM_DBG("Sending CCR Diameter message.\n"); + LM_DBG("Sending CCR Diameter message for STOP record on Ro Sesison ID [%.*s] with charge units [%d]\n", + ro_session->ro_session_id.len, ro_session->ro_session_id.s, used); /* send sunchronously so we can respond to callplan (cfg file), so a decision can be made to process the invite */ cdp_avp->cdp->AAASessionsUnlock(auth->hash); AAAMessage *cca = cdp_avp->cdp->AAASendRecvMessageToPeer(acr, &cfg.destination_host); /* check response */ if (cca == NULL) { - LM_ERR("Error reserving credit for CCA.\n"); + LM_ERR("Error on CCR STOP Record\n"); goto error_no_cca; } @@ -740,10 +741,10 @@ void send_ccr_stop(struct ro_session *ro_session) { goto error; } if (ro_cca_data->resultcode != 2001) { - LM_ERR("Got bad CCA result code - reservation failed"); + LM_ERR("Got bad CCA result code for STOP record"); goto error; } else { - LM_DBG("Valid CCA response with time chunk of [%i] and validity [%i].\n", ro_cca_data->mscc->granted_service_unit->cc_time, ro_cca_data->mscc->validity_time); + LM_DBG("Valid CCA response for STOP record\n"); } Ro_free_CCR(ro_ccr_data); @@ -754,7 +755,7 @@ out_of_memory: error : Ro_free_CCA(ro_cca_data); error_no_cca: - LM_ERR("error Ro STOP record\n"); + LM_ERR("error on Ro STOP record\n"); Ro_free_CCR(ro_ccr_data); if (auth) {

11 years, 7 months

git:jason.penton/ims_ro_interface: modules/ims_ro: cleaned some logging

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 9878f7657b64bab94379342f86ebc9152ad3ba0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9878f76… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Mar 20 09:53:37 2013 +0200 modules/ims_ro: cleaned some logging --- modules/ims_ro/ims_ro.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ims_ro/ims_ro.c b/modules/ims_ro/ims_ro.c index 7d373aa..1f43853 100644 --- a/modules/ims_ro/ims_ro.c +++ b/modules/ims_ro/ims_ro.c @@ -312,7 +312,6 @@ int get_sip_header_info(struct sip_msg * req, str * event, uint32_t * expires, str * callid, str * from_uri, str * to_uri) { - LM_ERR("retrieving sip info\n"); sip_method->s = req->first_line.u.request.method.s; sip_method->len = req->first_line.u.request.method.len; @@ -333,7 +332,7 @@ int get_sip_header_info(struct sip_msg * req, if (!cscf_get_to_uri(req, to_uri)) goto error; - LM_ERR("retrieved sip info : sip_method %.*s acc_record_type %i, event %.*s expires %u " + LM_DBG("retrieved sip info : sip_method %.*s acc_record_type %i, event %.*s expires %u " "call_id %.*s from_uri %.*s to_uri %.*s\n", sip_method->len, sip_method->s, *acc_record_type, event->len, event->s, *expires, callid->len, callid->s, from_uri->len, from_uri->s, to_uri->len, to_uri->s); @@ -402,7 +401,8 @@ Ro_CCR_t * dlg_create_ro_session(struct sip_msg * req, struct sip_msg * reply, A /* if(!get_ims_charging_info(req, reply, &icid, &orig_ioi, &term_ioi)) goto error; */ - LM_DBG("retrieved ims charging info icid %.*s orig_ioi %.*s term_ioi %.*s\n", icid.len, icid.s, orig_ioi.len, orig_ioi.s, term_ioi.len, term_ioi.s); + LM_DBG("retrieved ims charging info icid:[%.*s] orig_ioi:[%.*s] term_ioi:[%.*s]\n", + icid.len, icid.s, orig_ioi.len, orig_ioi.s, term_ioi.len, term_ioi.s); if (!get_timestamps(req, reply, &req_timestamp, &reply_timestamp)) goto error; @@ -431,7 +431,7 @@ Ro_CCR_t * dlg_create_ro_session(struct sip_msg * req, struct sip_msg * reply, A if (strncmp(req->first_line.u.request.method.s, "INVITE", 6) == 0) { auth = cdp_avp->cdp->AAACreateClientAuthSession(1, NULL, (void *) ro_ccr_data); - LM_INFO("created Ro Session with id [%.*s]\n", auth->id.len, auth->id.s); + LM_DBG("Created Ro Session with id Session ID [%.*s]\n", auth->id.len, auth->id.s); //save_session = auth->id; }

11 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013