Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 274899c8d84c1767b4376939fe33ee3a334343f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=274899c… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Mar 19 20:11:58 2013 +0200 modules/ims_ro: removed unused/hardwired test variables --- modules/ims_ro/Ro_data.h | 4 +--- modules/ims_ro/ims_ro.c | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/ims_ro/Ro_data.h b/modules/ims_ro/Ro_data.h index 17deb88..c469582 100644 --- a/modules/ims_ro/Ro_data.h +++ b/modules/ims_ro/Ro_data.h @@ -4,7 +4,7 @@ #include "../cdp/diameter.h" #include "../cdp/diameter_epc.h" -#ifndef WHARF + /** * Allocate and blank a memory area */ @@ -148,8 +148,6 @@ do{\ #define str_list_t_copy(dst,src,mem) \ str_dup((dst)->data,(src)->data,mem) -#endif /* WHARF */ - typedef struct { str *sip_method; str *event; diff --git a/modules/ims_ro/ims_ro.c b/modules/ims_ro/ims_ro.c index 5385808..7d373aa 100644 --- a/modules/ims_ro/ims_ro.c +++ b/modules/ims_ro/ims_ro.c @@ -511,8 +511,8 @@ void send_ccr_interim(struct ro_session* ro_session, str* from_uri, str *to_uri, subscr.type = Subscription_Type_IMPU; //TODO: need to check which direction. for ORIG we use from_uri. for TERM we use to_uri - subscr.id.s = from_uri.s; - subscr.id.len = from_uri.len; + subscr.id.s = from_uri->s; + subscr.id.len = from_uri->len; acc_record_type = AAA_ACCT_INTERIM; @@ -558,7 +558,7 @@ void send_ccr_interim(struct ro_session* ro_session, str* from_uri, str *to_uri, LM_ERR("Problem adding User-Equipment data\n"); } - if (!Ro_add_subscription_id(acr, AVP_EPC_Subscription_Id_Type_End_User_SIP_URI, from_uri)) { + if (!Ro_add_subscription_id(acr, AVP_EPC_Subscription_Id_Type_End_User_SIP_URI, &(subscr.id))) { LM_ERR("Problem adding Subscription ID data\n"); }