@@ -22,6 +22,7 @@

 #include "ims_charging_stats.h"

 #include "ro_session_hash.h"

 #include "ims_charging_stats.h"

+#include "../../core/kemi.h"

 MODULE_VERSION

@@ -101,204 +102,209 @@ static int w_ro_set_session_id_avp(struct sip_msg *msg, char *str1, char *str2);

 static int ro_fixup(void **param, int param_no);

 static int ro_fixup_stop(void **param, int param_no);

+static int ki_ro_set_session_id_avp(sip_msg_t *msg);

+static int ki_ro_ccr_stop(sip_msg_t *msg, str* p_direction, int p_code, str* p_reason);

+static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int reservation_units, str* s_incoming_trunk_id, str* s_outgoing_trunk_id);

+

+

 static cmd_export_t cmds[] = {

-		{ "Ro_CCR", 	(cmd_function) w_ro_ccr, 5, ro_fixup, 0, REQUEST_ROUTE },

-		{ "Ro_CCR_Stop",(cmd_function) w_ro_ccr_stop, 3, ro_fixup_stop, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE},

+        { "Ro_CCR", 	(cmd_function) w_ro_ccr, 5, ro_fixup, 0, REQUEST_ROUTE },

+        { "Ro_CCR_Stop",(cmd_function) w_ro_ccr_stop, 3, ro_fixup_stop, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE},

         { "Ro_set_session_id_avp", 	(cmd_function) w_ro_set_session_id_avp, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE },

-		{ 0, 0, 0, 0, 0, 0 }

+        { 0, 0, 0, 0, 0, 0 }

 };

 static param_export_t params[] = {

-		{ "hash_size", 				INT_PARAM,			&ro_session_hash_size 		},

-		{ "interim_update_credits",	INT_PARAM,			&interim_request_credits 	},

-		{ "timer_buffer", 			INT_PARAM,			&ro_timer_buffer 			},

-		{ "ro_forced_peer", 		PARAM_STR, 			&ro_forced_peer 			},

-		{ "ro_auth_expiry",			INT_PARAM, 			&ro_auth_expiry 			},

-		{ "cdp_event_latency", 		INT_PARAM,			&cdp_event_latency 			}, /*flag: report slow processing of CDP

-																						callback events or not */

-		{ "cdp_event_threshold", 	INT_PARAM, 			&cdp_event_threshold 		}, /*time in ms above which we should

-																						report slow processing of CDP callback event*/

-		{ "cdp_event_latency_log", 	INT_PARAM, 			&cdp_event_latency_loglevel },/*log-level to use to report

-																						slow processing of CDP callback event*/

-		{ "single_ro_session_per_dialog", 	INT_PARAM, 			&single_ro_session_per_dialog },

-		{ "origin_host", 			PARAM_STR, 			&cfg.origin_host 			},

-		{ "origin_realm", 			PARAM_STR,			&cfg.origin_realm 			},

-		{ "destination_realm", 		PARAM_STR,			&cfg.destination_realm 	},

-		{ "destination_host", 		PARAM_STR,			&cfg.destination_host 		},

-		{ "service_context_id_root",PARAM_STRING,			&ro_service_context_id_root_s 	},

-		{ "service_context_id_ext", PARAM_STRING,			&ro_service_context_id_ext_s 	},

-		{ "service_context_id_mnc", PARAM_STRING,			&ro_service_context_id_mnc_s 	},

-		{ "service_context_id_mcc", PARAM_STRING,			&ro_service_context_id_mcc_s 	},

-		{ "service_context_id_release",	PARAM_STRING,			&ro_service_context_id_release_s},

-		{ "voice_service_identifier", 	INT_PARAM, 			&voice_service_identifier },/*service id for voice*/

-		{ "voice_rating_group", 	INT_PARAM, 			&voice_rating_group },/*rating group for voice*/

-		{ "video_service_identifier", 	INT_PARAM, 			&video_service_identifier },/*service id for voice*/

-		{ "video_rating_group", 	INT_PARAM, 			&video_rating_group },/*rating group for voice*/

-		{ "db_mode",			INT_PARAM,			&ro_db_mode_param		},

-		{ "db_url",			PARAM_STR,			&db_url 			},

-		{ "db_update_period",		INT_PARAM,			&db_update_period		},

-		{ "vendor_specific_chargeinfo",		INT_PARAM,	&vendor_specific_chargeinfo		}, /* VSI for extra charing info in Ro */

-		{ "vendor_specific_id",		INT_PARAM,			&vendor_specific_id		}, /* VSI for extra charing info in Ro */

-		{ "custom_user_avp",		PARAM_STR,			&custom_user_spec},

-		{ "app_provided_party_avp",	PARAM_STR,			&app_provided_party_spec},

-		{ 0, 0, 0 }

+        { "hash_size", 				INT_PARAM,			&ro_session_hash_size 		},

+        { "interim_update_credits",	INT_PARAM,			&interim_request_credits 	},

+        { "timer_buffer", 			INT_PARAM,			&ro_timer_buffer 			},

+        { "ro_forced_peer", 		PARAM_STR, 			&ro_forced_peer 			},

+        { "ro_auth_expiry",			INT_PARAM, 			&ro_auth_expiry 			},

+        { "cdp_event_latency", 		INT_PARAM,			&cdp_event_latency 			}, /*flag: report slow processing of CDP

+                                                                                        callback events or not */

+        { "cdp_event_threshold", 	INT_PARAM, 			&cdp_event_threshold 		}, /*time in ms above which we should

+                                                                                        report slow processing of CDP callback event*/

+        { "cdp_event_latency_log", 	INT_PARAM, 			&cdp_event_latency_loglevel },/*log-level to use to report

+                                                                                        slow processing of CDP callback event*/

+        { "single_ro_session_per_dialog", 	INT_PARAM, 			&single_ro_session_per_dialog },

+        { "origin_host", 			PARAM_STR, 			&cfg.origin_host 			},

+        { "origin_realm", 			PARAM_STR,			&cfg.origin_realm 			},

+        { "destination_realm", 		PARAM_STR,			&cfg.destination_realm 	},

+        { "destination_host", 		PARAM_STR,			&cfg.destination_host 		},

+        { "service_context_id_root",PARAM_STRING,			&ro_service_context_id_root_s 	},

+        { "service_context_id_ext", PARAM_STRING,			&ro_service_context_id_ext_s 	},

+        { "service_context_id_mnc", PARAM_STRING,			&ro_service_context_id_mnc_s 	},

+        { "service_context_id_mcc", PARAM_STRING,			&ro_service_context_id_mcc_s 	},

+        { "service_context_id_release",	PARAM_STRING,			&ro_service_context_id_release_s},

+        { "voice_service_identifier", 	INT_PARAM, 			&voice_service_identifier },/*service id for voice*/

+        { "voice_rating_group", 	INT_PARAM, 			&voice_rating_group },/*rating group for voice*/

+        { "video_service_identifier", 	INT_PARAM, 			&video_service_identifier },/*service id for voice*/

+        { "video_rating_group", 	INT_PARAM, 			&video_rating_group },/*rating group for voice*/

+        { "db_mode",			INT_PARAM,			&ro_db_mode_param		},

+        { "db_url",			PARAM_STR,			&db_url 			},

+        { "db_update_period",		INT_PARAM,			&db_update_period		},

+        { "vendor_specific_chargeinfo",		INT_PARAM,	&vendor_specific_chargeinfo		}, /* VSI for extra charing info in Ro */

+        { "vendor_specific_id",		INT_PARAM,			&vendor_specific_id		}, /* VSI for extra charing info in Ro */

+        { "custom_user_avp",		PARAM_STR,			&custom_user_spec},

+        { "app_provided_party_avp",	PARAM_STR,			&app_provided_party_spec},

+        { 0, 0, 0 }

 };

 /** module exports */

 struct module_exports exports = { MOD_NAME, DEFAULT_DLFLAGS, /* dlopen flags */

-		cmds, 		/* Exported functions */

-		params, 	/* Exported params */

-		0, 			/* exported RPC methods */

-		0, 			/* exported pseudo-variables */

-		0,

-		mod_init, 	/* module initialization function */

-		mod_child_init, 	/* per-child init function */

-		mod_destroy 	/* module destroy functoin */

+        cmds, 		/* Exported functions */

+        params, 	/* Exported params */

+        0, 			/* exported RPC methods */

+        0, 			/* exported pseudo-variables */

+        0,

+        mod_init, 	/* module initialization function */

+        mod_child_init, 	/* per-child init function */

+        mod_destroy 	/* module destroy functoin */

 };

 int fix_parameters() {

-	cfg.service_context_id = shm_malloc(sizeof(str));

-	if (!cfg.service_context_id) {

-		LM_ERR("fix_parameters:not enough shm memory\n");

-		return 0;

-	}

-	cfg.service_context_id->len = strlen(ro_service_context_id_ext_s)

-			+ strlen(ro_service_context_id_mnc_s)

-			+ strlen(ro_service_context_id_mcc_s)

-			+ strlen(ro_service_context_id_release_s)

-			+ strlen(ro_service_context_id_root_s) + 5;

-	cfg.service_context_id->s =

-			pkg_malloc(cfg.service_context_id->len * sizeof (char));

-	if (!cfg.service_context_id->s) {

-		LM_ERR("fix_parameters: not enough memory!\n");

-		return 0;

-	}

-	cfg.service_context_id->len = sprintf(cfg.service_context_id->s,

-			"%s.%s.%s.%s.%s", ro_service_context_id_ext_s,

-			ro_service_context_id_mnc_s, ro_service_context_id_mcc_s,

-			ro_service_context_id_release_s, ro_service_context_id_root_s);

-	if (cfg.service_context_id->len < 0) {

-		LM_ERR("fix_parameters: error while creating service_context_id\n");

-		return 0;

-	}

-

-	if (custom_user_spec.s) {

-		if (pv_parse_spec(&custom_user_spec, &custom_user_avp) == 0

-				&& (custom_user_avp.type != PVT_AVP)) {

-			LM_ERR("malformed or non AVP custom_user "

-					"AVP definition in '%.*s'\n", custom_user_spec.len,custom_user_spec.s);

-			return -1;

-		}

-	}

-

-	if (app_provided_party_spec.s) {

-		if (pv_parse_spec(&app_provided_party_spec, &app_provided_party_avp) == 0

-				&& (app_provided_party_avp.type != PVT_AVP)) {

-			LM_ERR("malformed or non AVP app_provided_party "

-					"AVP definition in '%.*s'\n",

-					app_provided_party_spec.len,

-					app_provided_party_spec.s);

-			return -1;

-		}

-	}

-

-	init_custom_user(custom_user_spec.s ? &custom_user_avp : 0);

-	init_app_provided_party(app_provided_party_spec.s ? &app_provided_party_avp : 0);

-

-	return 1;

+    cfg.service_context_id = shm_malloc(sizeof(str));

+    if (!cfg.service_context_id) {

+        LM_ERR("fix_parameters:not enough shm memory\n");

+        return 0;

+    }

+    cfg.service_context_id->len = strlen(ro_service_context_id_ext_s)

+            + strlen(ro_service_context_id_mnc_s)

+            + strlen(ro_service_context_id_mcc_s)

+            + strlen(ro_service_context_id_release_s)

+            + strlen(ro_service_context_id_root_s) + 5;

+    cfg.service_context_id->s =

+            pkg_malloc(cfg.service_context_id->len * sizeof (char));

+    if (!cfg.service_context_id->s) {

+        LM_ERR("fix_parameters: not enough memory!\n");

+        return 0;

+    }

+    cfg.service_context_id->len = sprintf(cfg.service_context_id->s,

+            "%s.%s.%s.%s.%s", ro_service_context_id_ext_s,

+            ro_service_context_id_mnc_s, ro_service_context_id_mcc_s,

+            ro_service_context_id_release_s, ro_service_context_id_root_s);

+    if (cfg.service_context_id->len < 0) {

+        LM_ERR("fix_parameters: error while creating service_context_id\n");

+        return 0;

+    }

+

+    if (custom_user_spec.s) {

+        if (pv_parse_spec(&custom_user_spec, &custom_user_avp) == 0

+                && (custom_user_avp.type != PVT_AVP)) {

+            LM_ERR("malformed or non AVP custom_user "

+                    "AVP definition in '%.*s'\n", custom_user_spec.len,custom_user_spec.s);

+            return -1;

+        }

+    }

+

+    if (app_provided_party_spec.s) {

+        if (pv_parse_spec(&app_provided_party_spec, &app_provided_party_avp) == 0

+                && (app_provided_party_avp.type != PVT_AVP)) {

+            LM_ERR("malformed or non AVP app_provided_party "

+                    "AVP definition in '%.*s'\n",

+                    app_provided_party_spec.len,

+                    app_provided_party_spec.s);

+            return -1;

+        }

+    }

+

+    init_custom_user(custom_user_spec.s ? &custom_user_avp : 0);

+    init_app_provided_party(app_provided_party_spec.s ? &app_provided_party_avp : 0);

+

+    return 1;

 }

 static int mod_init(void) {

-	int n;

-	load_tm_f load_tm;

-

-	if (!fix_parameters()) {

-		LM_ERR("unable to set Ro configuration parameters correctly\n");

-		goto error;

-	}

-

-	/* bind to the tm module */

-	if (!(load_tm = (load_tm_f) find_export("load_tm", NO_SCRIPT, 0))) {

-		LM_ERR("Can not import load_tm. This module requires tm module\n");

-		goto error;

-	}

-	if (load_tm(&tmb) == -1)

-		goto error;

-

-	if (load_cdp_api(&cdpb) != 0) { /* load the CDP API */

-		LM_ERR("can't load CDP API\n");

-		goto error;

-	}

-

-	if (load_ims_dlg_api(&dlgb) != 0) { /* load the dialog API */

-		LM_ERR("can't load Dialog API\n");

-		goto error;

-	}

-

-	cdp_avp = load_cdp_avp(); /* load CDP_AVP API */

-	if (!cdp_avp) {

-		LM_ERR("can't load CDP_AVP API\n");

-		goto error;

-	}

+    int n;

+    load_tm_f load_tm;

+

+    if (!fix_parameters()) {

+        LM_ERR("unable to set Ro configuration parameters correctly\n");

+        goto error;

+    }

+

+    /* bind to the tm module */

+    if (!(load_tm = (load_tm_f) find_export("load_tm", NO_SCRIPT, 0))) {

+        LM_ERR("Can not import load_tm. This module requires tm module\n");

+        goto error;

+    }

+    if (load_tm(&tmb) == -1)

+        goto error;

+

+    if (load_cdp_api(&cdpb) != 0) { /* load the CDP API */

+        LM_ERR("can't load CDP API\n");

+        goto error;

+    }

+

+    if (load_ims_dlg_api(&dlgb) != 0) { /* load the dialog API */

+        LM_ERR("can't load Dialog API\n");

+        goto error;

+    }

+

+    cdp_avp = load_cdp_avp(); /* load CDP_AVP API */

+    if (!cdp_avp) {

+        LM_ERR("can't load CDP_AVP API\n");

+        goto error;

+    }

-	/* init timer lists*/

-	if (init_ro_timer(ro_session_ontimeout) != 0) {

-		LM_ERR("cannot init timer list\n");

-		return -1;

-	}

-

-	/* initialized the hash table */

-	for (n = 0; n < (8 * sizeof(n)); n++) {

-		if (ro_session_hash_size == (1 << n))

-			break;

-		if (ro_session_hash_size < (1 << n)) {

-			LM_WARN("hash_size is not a power of 2 as it should be -> rounding from %d to %d\n", ro_session_hash_size, 1 << (n - 1));

-			ro_session_hash_size = 1 << (n - 1);

-		}

-	}

-

-	if (init_ro_session_table(ro_session_hash_size) < 0) {

-		LM_ERR("failed to create ro session hash table\n");

-		return -1;

-	}

-

-	/* register global timer */

-	if (register_timer(ro_timer_routine, 0/*(void*)ro_session_list*/, 1) < 0) {

-		LM_ERR("failed to register timer \n");

-		return -1;

-	}

-	

-	if (ims_charging_init_counters() != 0) {

-	    LM_ERR("Failed to register counters for ims_charging module\n");

-	    return -1;

-	}

-	

-	/* if a database should be used to store the dialogs' information */

-	ro_db_mode = ro_db_mode_param;

-	if (ro_db_mode == DB_MODE_NONE) {

-	    db_url.s = 0;

-	    db_url.len = 0;

-	} else {

-	    if (ro_db_mode != DB_MODE_REALTIME && ro_db_mode != DB_MODE_SHUTDOWN) {

-		LM_ERR("unsupported db_mode %d\n", ro_db_mode);

-		return -1;

-	    }

-	    if (!db_url.s || db_url.len == 0) {

-		LM_ERR("db_url not configured for db_mode %d\n", ro_db_mode);

-		return -1;

-	    }

-	    if (init_ro_db(&db_url, ro_session_hash_size, db_update_period, db_fetch_rows) != 0) {

-		LM_ERR("failed to initialize the DB support\n");

-		return -1;

-	    }

+    /* init timer lists*/

+    if (init_ro_timer(ro_session_ontimeout) != 0) {

+        LM_ERR("cannot init timer list\n");

+        return -1;

+    }

+

+    /* initialized the hash table */

+    for (n = 0; n < (8 * sizeof(n)); n++) {

+        if (ro_session_hash_size == (1 << n))

+            break;

+        if (ro_session_hash_size < (1 << n)) {

+            LM_WARN("hash_size is not a power of 2 as it should be -> rounding from %d to %d\n", ro_session_hash_size, 1 << (n - 1));

+            ro_session_hash_size = 1 << (n - 1);

+        }

+    }

+

+    if (init_ro_session_table(ro_session_hash_size) < 0) {

+        LM_ERR("failed to create ro session hash table\n");

+        return -1;

+    }

+

+    /* register global timer */

+    if (register_timer(ro_timer_routine, 0/*(void*)ro_session_list*/, 1) < 0) {

+        LM_ERR("failed to register timer \n");

+        return -1;

+    }

+    

+    if (ims_charging_init_counters() != 0) {

+        LM_ERR("Failed to register counters for ims_charging module\n");

+        return -1;

+    }

+    

+    /* if a database should be used to store the dialogs' information */

+    ro_db_mode = ro_db_mode_param;

+    if (ro_db_mode == DB_MODE_NONE) {

+        db_url.s = 0;

+        db_url.len = 0;

+    } else {

+        if (ro_db_mode != DB_MODE_REALTIME && ro_db_mode != DB_MODE_SHUTDOWN) {

+        LM_ERR("unsupported db_mode %d\n", ro_db_mode);

+        return -1;

+        }

+        if (!db_url.s || db_url.len == 0) {

+        LM_ERR("db_url not configured for db_mode %d\n", ro_db_mode);

+        return -1;

+        }

+        if (init_ro_db(&db_url, ro_session_hash_size, db_update_period, db_fetch_rows) != 0) {

+        LM_ERR("failed to initialize the DB support\n");

+        return -1;

+        }

 //	    run_load_callbacks();

-	}

+    }

-	return 0;

+    return 0;

 error:

-	LM_ERR("Failed to initialise ims_charging module\n");

-	return RO_RETURN_FALSE;

+    LM_ERR("Failed to initialise ims_charging module\n");

+    return RO_RETURN_FALSE;

 }

@@ -306,20 +312,20 @@ static int mod_child_init(int rank) {

     ro_db_mode = ro_db_mode_param;

     if (((ro_db_mode == DB_MODE_REALTIME) && (rank > 0 || rank == PROC_TIMER)) ||

-	    (ro_db_mode == DB_MODE_SHUTDOWN && (rank == PROC_MAIN))) {

-	if (ro_connect_db(&db_url)) {

-	    LM_ERR("failed to connect to database (rank=%d)\n", rank);

-	    return -1;

-	}

+        (ro_db_mode == DB_MODE_SHUTDOWN && (rank == PROC_MAIN))) {

+    if (ro_connect_db(&db_url)) {

+        LM_ERR("failed to connect to database (rank=%d)\n", rank);

+        return -1;

+    }

     }

     /* in DB_MODE_SHUTDOWN only PROC_MAIN will do a DB dump at the end, so

      * for the rest of the processes will be the same as DB_MODE_NONE */

     if (ro_db_mode == DB_MODE_SHUTDOWN && rank != PROC_MAIN)

-	ro_db_mode = DB_MODE_NONE;

+    ro_db_mode = DB_MODE_NONE;

     /* in DB_MODE_REALTIME and DB_MODE_DELAYED the PROC_MAIN have no DB handle */

     if ((ro_db_mode == DB_MODE_REALTIME) && rank == PROC_MAIN)

-	ro_db_mode = DB_MODE_NONE;

+    ro_db_mode = DB_MODE_NONE;

     return 0;

 }

@@ -348,39 +354,68 @@ int create_response_avp_string(char* name, str* val) {

 //This function gets the dlg from the current msg, gets the ro_session from the dlg and sets a AVP for use in the cfg file: ro_session_id

 static int w_ro_set_session_id_avp(struct sip_msg *msg, char *str1, char *str2) {

-    struct ro_session *ro_session = 0;

-    struct dlg_cell* dlg;

-    int res = -1;

-    

-    //get dlg from msg

-    dlg = dlgb.get_dlg(msg);

-    if (!dlg) {

-            LM_ERR("Unable to find dialog and cannot do Ro charging without it\n");

-            return RO_RETURN_ERROR;

+    return ki_ro_set_session_id_avp(msg);

+}

+

+static int w_ro_ccr_stop(struct sip_msg *msg, char* c_direction, char* _code, char* _reason) {

+    str s_code, s_reason, s_direction;

+    s_direction.s = c_direction;

+    s_direction.len = strlen(c_direction);

+    unsigned int code;

+

+    if (get_str_fparam(&s_code, msg, (fparam_t*) _code) < 0) {

+        LM_ERR("failed to get code\n");

+        return RO_RETURN_ERROR;

     }

-    

-    //get ro session id from dialog

-    ro_session= lookup_ro_session(dlg->h_entry, &dlg->callid, 0, 0);

-    if(!ro_session) {

-        LM_ERR("Unable to find Ro charging data\n");

-        dlgb.release_dlg(dlg);

-            return RO_RETURN_ERROR;

+    LM_DBG("Code is [%.*s]\n", s_code.len, s_code.s);

+    if (get_str_fparam(&s_reason, msg, (fparam_t*) _reason) < 0) {

+        LM_ERR("failed to get reason\n");

+        return RO_RETURN_ERROR;

+    }

+

+    if (str2int(&s_code, &code) != 0) {

+        LM_ERR("Bad response code: [%.*s]\n", s_code.len, s_code.s);

+        return RO_RETURN_FALSE;

     }

+

+    return ki_ro_ccr_stop(msg, &s_direction, (int) code, &s_reason);

+

+}

+

+static int w_ro_ccr(struct sip_msg *msg, char* c_route_name, char* c_direction, int reservation_units, char* c_incoming_trunk_id, char* c_outgoing_trunk_id) {

+    str s_route_name, s_direction, s_incoming_trunk_id, s_outgoing_trunk_id;

-    //set avp response with session id

-    res = create_response_avp_string("ro_session_id", &ro_session->ro_session_id);

-    dlgb.release_dlg(dlg);

-    unref_ro_session(ro_session, 1, 1);

-    return res;

+    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_incoming_trunk_id, msg, (fparam_t*) c_incoming_trunk_id) < 0) {

+        LM_ERR("failed to get s_incoming_trunk_id\n");

+        return RO_RETURN_ERROR;

+    }

+    if (get_str_fparam(&s_outgoing_trunk_id, msg, (fparam_t*) c_outgoing_trunk_id) < 0) {

+        LM_ERR("failed to get s_outgoing_trunk_id\n");

+        return RO_RETURN_ERROR;

+    }

+

+    return ki_ro_ccr(msg, &s_route_name, &s_direction, reservation_units, &s_incoming_trunk_id, &s_outgoing_trunk_id);

 }

-static int w_ro_ccr_stop(struct sip_msg *msg, char* c_direction, char* _code, char* _reason) {

+static int ki_ro_ccr_stop(sip_msg_t *msg, str* p_direction, int p_code, str* p_reason) {

     struct ro_session* ro_session;

     struct ro_session_entry *ro_session_entry;

     unsigned int h_entry;

     str s_code, s_reason;

     unsigned int code;

     int dir = 0; /*any side*/

+    char *c_direction;

+    c_direction = p_direction->s;

+    s_reason = *p_reason;

+    code = (unsigned int)p_code;

     LM_DBG("Inside Ro_CCR_Stop with direction [%s]\n", c_direction);

     if (strlen(c_direction) == 4) {

@@ -399,24 +434,6 @@ static int w_ro_ccr_stop(struct sip_msg *msg, char* c_direction, char* _code, ch

         return RO_RETURN_ERROR;

     }

-    if (get_str_fparam(&s_code, msg, (fparam_t*) _code) < 0) {

-        LM_ERR("failed to get code\n");

-        dlgb.release_dlg(dlg);

-        return RO_RETURN_ERROR;

-    }

-    LM_DBG("Code is [%.*s]\n", s_code.len, s_code.s);

-    if (get_str_fparam(&s_reason, msg, (fparam_t*) _reason) < 0) {

-        LM_ERR("failed to get reason\n");

-        dlgb.release_dlg(dlg);

-        return RO_RETURN_ERROR;

-    }

-

-    if (str2int(&s_code, &code) != 0) {

-        LM_ERR("Bad response code: [%.*s]\n", s_code.len, s_code.s);

-        dlgb.release_dlg(dlg);

-        return RO_RETURN_FALSE;

-    }

-

 //    switch (code) {

 //        case 486:

 //            termcode = VS_TERMCODE_BUSYHERE;

@@ -463,193 +480,226 @@ done:

     return RO_RETURN_TRUE;

 }

-static int w_ro_ccr(struct sip_msg *msg, char* c_route_name, char* c_direction, int reservation_units, char* c_incoming_trunk_id, char* c_outgoing_trunk_id) {

-	/* PSEUDOCODE/NOTES

-	 * 1. What mode are we in - terminating or originating

-	 * 2. We assume this is SCUR in this module for now - can see event based charging in another component instead (AS for SMS for example, etc)

-	 * 4. Check a dialog exists for call, if not we fail

-	 * 5. make sure we dont already have an Ro Session for this dialog

-	 * 6. create new Ro Session

-	 * 7. register for DLG callback passing new Ro session as parameter - (if dlg torn down we know which Ro session it is associated with)

-	 *

-	 *

-	 */

-	int ret = RO_RETURN_TRUE;

-	int dir = 0;

-	str identity = {0, 0},

-	pani = {0,0},

-	contact = {0, 0};

-	struct hdr_field *h=0;

-	

-	cfg_action_t* cfg_action;

-	tm_cell_t *t;

-	unsigned int tindex = 0,

-				 tlabel = 0;

-	struct dlg_cell* dlg;

-	struct ro_session *ro_session = 0;

-	int free_contact = 0;

-	

-	str s_route_name, s_direction, s_incoming_trunk_id, s_outgoing_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_incoming_trunk_id, msg, (fparam_t*) c_incoming_trunk_id) < 0) {

-	    LM_ERR("failed to get s_incoming_trunk_id\n");

-	    return RO_RETURN_ERROR;

-	}

-	if (get_str_fparam(&s_outgoing_trunk_id, msg, (fparam_t*) c_outgoing_trunk_id) < 0) {

-	    LM_ERR("failed to get s_outgoing_trunk_id\n");

-	    return RO_RETURN_ERROR;

-	}

-	

-	LM_DBG("Ro CCR initiated: direction:%.*s, reservation_units:%i, route_name:%.*s, incoming_trunk_id:%.*s outgoing_trunk_id:%.*s\n",

-			s_direction.len, s_direction.s,

-			reservation_units,

-			s_route_name.len, s_route_name.s,

-			s_incoming_trunk_id.len, s_incoming_trunk_id.s,

-			s_outgoing_trunk_id.len, s_outgoing_trunk_id.s);

-	

-

-	if (msg->first_line.type != SIP_REQUEST) {

-	    LM_ERR("Ro_CCR() called from SIP reply.\n");

-	    return RO_RETURN_ERROR;;

-	}

-	

-	//make sure we can get the dialog! if not, we can't continue

-	

-	dlg = dlgb.get_dlg(msg);

-	if (!dlg) {

-		LM_ERR("Unable to find dialog and cannot do Ro charging without it\n");

-		return RO_RETURN_ERROR;

-	}

-	

-	dir = get_direction_as_int(&s_direction);

-	

-	if (dir == RO_ORIG_DIRECTION) {

-		//get caller IMPU from asserted identity

-		if ((identity = cscf_get_asserted_identity(msg, 0)).len == 0) {

-			LM_DBG("No P-Asserted-Identity hdr found. Using From hdr for asserted_identity\n");

-			identity = dlg->from_uri;

-		}

-		//get caller contact from contact header - if not present then skip this

-		if ((contact = cscf_get_contact(msg)).len == 0) {

-		    LM_WARN("Can not get contact from message - will not get callbacks if this IMPU is removed to terminate call\n");

-			goto send_ccr;

-		}

-		

-		pani = cscf_get_access_network_info(msg, &h);

-	} else if (dir == RO_TERM_DIRECTION){

-		//get callee IMPU from called part id - if not present then skip this

-		if ((identity = cscf_get_public_identity_from_called_party_id(msg, &h)).len == 0) {

-			LM_DBG("No P-Called-Identity hdr found - will not get callbacks if this IMPU is removed to terminate call\n");

-			goto send_ccr;

-		}

-		//get callee contact from request URI

-		contact = cscf_get_contact_from_requri(msg);

-		free_contact = 1;

-	    

-	} else {

-	    LM_CRIT("don't know what to do in unknown mode - should we even get here\n");

-	    ret = RO_RETURN_ERROR;

-	    goto done;

-	}

-	

-	LM_DBG("IMPU data to pass to usrloc:  contact <%.*s> identity <%.*s>\n", contact.len, contact.s, identity.len, identity.s);

+static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int reservation_units, str* s_incoming_trunk_id, str* s_outgoing_trunk_id) {

+    /* PSEUDOCODE/NOTES

+     * 1. What mode are we in - terminating or originating

+     * 2. We assume this is SCUR in this module for now - can see event based charging in another component instead (AS for SMS for example, etc)

+     * 4. Check a dialog exists for call, if not we fail

+     * 5. make sure we dont already have an Ro Session for this dialog

+     * 6. create new Ro Session

+     * 7. register for DLG callback passing new Ro session as parameter - (if dlg torn down we know which Ro session it is associated with)

+     *

+     *

+     */

+    int ret = RO_RETURN_TRUE;

+    int dir = 0;

+    str identity = {0, 0},

+    pani = {0,0},

+    contact = {0, 0};

+    struct hdr_field *h=0;

+    

+    cfg_action_t* cfg_action;

+    tm_cell_t *t;

+    unsigned int tindex = 0,

+                 tlabel = 0;

+    struct dlg_cell* dlg;

+    struct ro_session *ro_session = 0;

+    int free_contact = 0;

+    

+    LM_DBG("Ro CCR initiated: direction:%.*s, reservation_units:%i, route_name:%.*s, incoming_trunk_id:%.*s outgoing_trunk_id:%.*s\n",

+            s_direction->len, s_direction->s,

+            reservation_units,

+            s_route_name->len, s_route_name->s,

+            s_incoming_trunk_id->len, s_incoming_trunk_id->s,

+            s_outgoing_trunk_id->len, s_outgoing_trunk_id->s);

+    

+

+    if (msg->first_line.type != SIP_REQUEST) {

+        LM_ERR("Ro_CCR() called from SIP reply.\n");

+        return RO_RETURN_ERROR;;

+    }

+    

+    //make sure we can get the dialog! if not, we can't continue

+    

+    dlg = dlgb.get_dlg(msg);

+    if (!dlg) {

+        LM_ERR("Unable to find dialog and cannot do Ro charging without it\n");

+        return RO_RETURN_ERROR;

+    }

+    

+    dir = get_direction_as_int(&s_direction);

+    

+    if (dir == RO_ORIG_DIRECTION) {

+        //get caller IMPU from asserted identity

+        if ((identity = cscf_get_asserted_identity(msg, 0)).len == 0) {

+            LM_DBG("No P-Asserted-Identity hdr found. Using From hdr for asserted_identity\n");

+            identity = dlg->from_uri;

+        }

+        //get caller contact from contact header - if not present then skip this

+        if ((contact = cscf_get_contact(msg)).len == 0) {

+            LM_WARN("Can not get contact from message - will not get callbacks if this IMPU is removed to terminate call\n");

+            goto send_ccr;

+        }

+        

+        pani = cscf_get_access_network_info(msg, &h);

+    } else if (dir == RO_TERM_DIRECTION){

+        //get callee IMPU from called part id - if not present then skip this

+        if ((identity = cscf_get_public_identity_from_called_party_id(msg, &h)).len == 0) {

+            LM_DBG("No P-Called-Identity hdr found - will not get callbacks if this IMPU is removed to terminate call\n");

+            goto send_ccr;

+        }

+        //get callee contact from request URI

+        contact = cscf_get_contact_from_requri(msg);

+        free_contact = 1;

+        

+    } else {

+        LM_CRIT("don't know what to do in unknown mode - should we even get here\n");

+        ret = RO_RETURN_ERROR;

+        goto done;

+    }

+    

+    LM_DBG("IMPU data to pass to usrloc:  contact <%.*s> identity <%.*s>\n", contact.len, contact.s, identity.len, identity.s);

 send_ccr:

-	//check if we need to send_ccr - 

-	//we get the ro_session based on dlg->h_id and dlg->h_entry and direction 0 (so get any ro_session)

-	//if it already exists then we go to done

-	if (single_ro_session_per_dialog && (ro_session = lookup_ro_session(dlg->h_entry, &dlg->callid, 0, 0))) {

-	    LM_DBG("single_ro_session_per_dialog = 1 and ro_session already exists for this dialog -so we don't need to send another one\n");

-	    unref_ro_session(ro_session,1,1);//for the lookup ro session ref

-	    goto done;

-	}

-	

-	LM_DBG("Looking for route block [%.*s]\n", s_route_name.len, s_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", 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", s_route_name.len, s_route_name.s);

-		ret = RO_RETURN_ERROR;

-		goto done;

-	}

-

-	//before we send lets suspend the transaction

-	t = tmb.t_gett();

-	if (t == NULL || t == T_UNDEFINED) {

-		if (tmb.t_newtran(msg) < 0) {

-			LM_ERR("cannot create the transaction for CCR async\n");

-			ret = RO_RETURN_ERROR;

-			goto done;

-		}

-		t = tmb.t_gett();

-		if (t == NULL || t == T_UNDEFINED) {

-			LM_ERR("cannot lookup the transaction\n");

-			ret = RO_RETURN_ERROR;

-			goto done;

-		}

-	}

-

-	LM_DBG("Suspending SIP TM transaction\n");

-	if (tmb.t_suspend(msg, &tindex, &tlabel) != 0) {

-		LM_ERR("failed to suspend the TM processing\n");

-		ret =  RO_RETURN_ERROR;

-		goto done;

-	}

-	

-	ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, &s_incoming_trunk_id, &s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel);

-	

-	if(ret < 0){

-	    LM_ERR("Failed to send CCR\n");

-		tmb.t_cancel_suspend(tindex, tlabel);

-	}

+    //check if we need to send_ccr - 

+    //we get the ro_session based on dlg->h_id and dlg->h_entry and direction 0 (so get any ro_session)

+    //if it already exists then we go to done

+    if (single_ro_session_per_dialog && (ro_session = lookup_ro_session(dlg->h_entry, &dlg->callid, 0, 0))) {

+        LM_DBG("single_ro_session_per_dialog = 1 and ro_session already exists for this dialog -so we don't need to send another one\n");

+        unref_ro_session(ro_session,1,1);//for the lookup ro session ref

+        goto done;

+    }

+    

+    LM_DBG("Looking for route block [%.*s]\n", s_route_name->len, s_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", 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", s_route_name->len, s_route_name->s);

+        ret = RO_RETURN_ERROR;

+        goto done;

+    }

+

+    //before we send lets suspend the transaction

+    t = tmb.t_gett();

+    if (t == NULL || t == T_UNDEFINED) {

+        if (tmb.t_newtran(msg) < 0) {

+            LM_ERR("cannot create the transaction for CCR async\n");

+            ret = RO_RETURN_ERROR;

+            goto done;

+        }

+        t = tmb.t_gett();

+        if (t == NULL || t == T_UNDEFINED) {

+            LM_ERR("cannot lookup the transaction\n");

+            ret = RO_RETURN_ERROR;

+            goto done;

+        }

+    }

+

+    LM_DBG("Suspending SIP TM transaction\n");

+    if (tmb.t_suspend(msg, &tindex, &tlabel) != 0) {

+        LM_ERR("failed to suspend the TM processing\n");

+        ret =  RO_RETURN_ERROR;

+        goto done;

+    }

+    

+    ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, &s_incoming_trunk_id, &s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel);

+    

+    if(ret < 0){

+        LM_ERR("Failed to send CCR\n");

+        tmb.t_cancel_suspend(tindex, tlabel);

+    }

 done:

-	if(free_contact)  shm_free(contact.s);// shm_malloc in cscf_get_public_identity_from_requri	

+    if(free_contact)  shm_free(contact.s);// shm_malloc in cscf_get_public_identity_from_requri	

         dlgb.release_dlg(dlg);

-	return ret;

+    return ret;

 }

 static int ro_fixup(void **param, int param_no) {

-	str s;

-	unsigned int num;

-

-	if ( (param_no > 0 && param_no <= 2) || (param_no >= 4 && param_no <= 6)) {

-		return fixup_var_str_12(param, param_no);

-	} else if (param_no == 3) {

-		/*convert to int */

-		s.s = (char*)*param;

-		s.len = strlen(s.s);

-		if (str2int(&s, &num)==0) {

-			pkg_free(*param);

-			*param = (void*)(unsigned long)num;

-			return 0;

-		}

-		LM_ERR("Bad reservation units: <%s>n", (char*)(*param));

-		return E_CFG;

-	}

-	

-	return 0;

+    str s;

+    unsigned int num;

+

+    if ( (param_no > 0 && param_no <= 2) || (param_no >= 4 && param_no <= 6)) {

+        return fixup_var_str_12(param, param_no);

+    } else if (param_no == 3) {

+        /*convert to int */

+        s.s = (char*)*param;

+        s.len = strlen(s.s);

+        if (str2int(&s, &num)==0) {

+            pkg_free(*param);

+            *param = (void*)(unsigned long)num;

+            return 0;

+        }

+        LM_ERR("Bad reservation units: <%s>n", (char*)(*param));

+        return E_CFG;

+    }

+    

+    return 0;

+}

+

+static int ki_ro_set_session_id_avp(sip_msg_t *msg) {