@@ -57,11 +57,6 @@ extern str cxdx_dest_realm;

 struct sip_msg;

-typedef struct lir_param {

-	int type;

-	cfg_action_t *paction;

-} lir_param_t;

-

 typedef struct saved_lir_transaction {

 	unsigned int tindex;

 	unsigned int tlabel;

@@ -52,12 +52,6 @@ extern struct cdp_binds cdpb; /**< Structure with pointers to cdp funcs 		*/

 extern str cxdx_forced_peer; /**< FQDN of the Diameter peer to send requests to */

 extern str cxdx_dest_realm;

-typedef struct uar_param {

-	int type;

-	gparam_t *ivalue;

-	cfg_action_t *paction;

-} uar_param_t;

-

 typedef struct saved_transaction {

 	unsigned int tindex;

 	unsigned int tlabel;

@@ -45,6 +45,7 @@

 #include "location.h"

 #include "../../action.h" /* run_actions */

+#include "../../mod_fix.h"

 #include "cxdx_lir.h"

 extern int route_lir_user_unknown_no; 

@@ -54,17 +55,33 @@ extern int route_lir_user_unknown_no;

  * @param msg - sip message

  * @returns 1 on success or 0 on failure

  */

-int I_perform_location_information_request(struct sip_msg* msg, char* str1, char* str2) {

+int I_perform_location_information_request(struct sip_msg* msg, char* route, char* str1, char* str2) {

     str public_identity = {0, 0};

     int orig = 0;

     tm_cell_t *t = 0;

     saved_lir_transaction_t* saved_t;

+    str route_name;

+    

      cfg_action_t* cfg_action;

-    lir_param_t* ap = (lir_param_t*) str1;

-    cfg_action = ap->paction->next;

+     if (fixup_get_svalue(msg, (gparam_t*) route, &route_name) != 0) {

+        LM_ERR("no async route block for assign_server_unreg\n");

+        return -1;

+    }

+    

+    LM_DBG("Looking for route block [%.*s]\n", route_name.len, route_name.s);

+    int ri = route_get(&main_rt, route_name.s);

+    if (ri < 0) {

+        LM_ERR("unable to find route block [%.*s]\n", route_name.len, route_name.s);

+        return -1;

+    }

+    cfg_action = main_rt.rlist[ri];

+    if (cfg_action == NULL) {

+        LM_ERR("empty action lists in route block [%.*s]\n", route_name.len, route_name.s);

+        return -1;

+    }

     LM_DBG("DBG:I_LIR: Starting ...\n");

     /* check if we received what we should */

@@ -60,7 +60,7 @@ extern struct cdp_binds cdpb;//cdp binds functions

  * @param msg - sip message

  * @returns 1 on success or 0 on failure

  */

-int I_perform_location_information_request(struct sip_msg* msg, char* str1, char* str2);

+int I_perform_location_information_request(struct sip_msg* msg, char* route, char* str1, char* str2);

 #endif

@@ -106,8 +106,8 @@ static int fixup_uar(void** param, int param_no);

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

 static cmd_export_t cmds[] = {

-    {"I_perform_user_authorization_request", (cmd_function) I_perform_user_authorization_request, 1, fixup_uar, 0, REQUEST_ROUTE},

-    {"I_perform_location_information_request", (cmd_function) I_perform_location_information_request, 1, fixup_lir, 0, REQUEST_ROUTE},

+    {"I_perform_user_authorization_request", (cmd_function) I_perform_user_authorization_request, 2, fixup_uar, 0, REQUEST_ROUTE},

+    {"I_perform_location_information_request", (cmd_function) I_perform_location_information_request, 2, fixup_lir, 0, REQUEST_ROUTE},

     {"I_scscf_select", (cmd_function) I_scscf_select, 1, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE},

     {"I_scscf_drop", (cmd_function) I_scscf_drop, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE},

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

@@ -274,38 +274,35 @@ static int mod_init(void) {

 static int fixup_uar(void** param, int param_no)

 {

-	uar_param_t *ap;

-	if(param_no!=1)

-		return 0;

-	ap = (uar_param_t*)pkg_malloc(sizeof(uar_param_t));

-	if(ap==NULL)

-	{

-		LM_ERR("no more pkg\n");

-		return -1;

-	}

-	memset(ap, 0, sizeof(uar_param_t));

-	ap->paction = get_action_from_param(param, param_no);

-	if(fixup_igp_null(param, param_no)<0)

-		return -1;

-	ap->ivalue = (gparam_t*)(*param);

-	*param = (void*)ap;

-	return 0;

+    if (strlen((char*) *param) <= 0) {

+        LM_ERR("empty parameter %d not allowed\n", param_no);

+        return -1;

+    }

+

+    if (param_no == 1) {        //route name - static or dynamic string (config vars)

+        if (fixup_spve_null(param, param_no) < 0){

+            LM_ERR("fixup spve failed on %d\n", param_no);

+            return -1;

+        }

+        return 0;

+    }

+    return 0;

+    

 }

 static int fixup_lir(void** param, int param_no)

 {

-	lir_param_t *ap;

-	if(param_no!=1)

-		return 0;

-	ap = (lir_param_t*)pkg_malloc(sizeof(lir_param_t));

-	if(ap==NULL)

-	{

-		LM_ERR("no more pkg\n");

-		return -1;

-	}

-	memset(ap, 0, sizeof(lir_param_t));

-	ap->paction = get_action_from_param(param, param_no);

-	*param = (void*)ap;

-	return 0;

+	if (strlen((char*) *param) <= 0) {

+        LM_ERR("empty parameter %d not allowed\n", param_no);

+        return -1;

+        }

+

+        if (param_no == 1) {        //route name - static or dynamic string (config vars)

+            if (fixup_spve_null(param, param_no) < 0)

+                return -1;

+            return 0;

+        } 

+        return 0;

+    

 }

@@ -46,6 +46,7 @@

 #include "registration.h"

 #include "../../action.h" /* run_actions */

+#include "../../mod_fix.h"

 #include "cxdx_uar.h"

 extern int route_uar_user_unknown_no;

@@ -54,11 +55,9 @@ extern int route_uar_user_unknown_no;

  * Perform User Authorization Request.

  * creates and send the user authorization query

  * @param msg - the SIP message

- * @param str1 - the realm

- * @param str2 - if to do capabilities

  * @returns true if OK, false if not

  */

-int I_perform_user_authorization_request(struct sip_msg* msg, char* str1, char* str2) {

+int I_perform_user_authorization_request(struct sip_msg* msg, char* route, char* str1, char* str2) {

     str private_identity, public_identity, visited_network_id;

     int authorization_type = AVP_IMS_UAR_REGISTRATION;

     int expires = 3600;

@@ -72,13 +71,30 @@ int I_perform_user_authorization_request(struct sip_msg* msg, char* str1, char*

     tm_cell_t *t = 0;

     int intvalue_param;

     cfg_action_t* cfg_action;

+    

+    str route_name;

-    uar_param_t* ap = (uar_param_t*) str1;

-    if (fixup_get_ivalue(msg, ap->ivalue, &intvalue_param) != 0) {

+    if (fixup_get_ivalue(msg, (gparam_t*) str1, &intvalue_param) != 0) {

         LM_ERR("no int value param passed\n");

         return CSCF_RETURN_ERROR;

     }

-    cfg_action = ap->paction->next;

+    if (fixup_get_svalue(msg, (gparam_t*) route, &route_name) != 0) {

+        LM_ERR("no async route block for assign_server_unreg\n");

+        return -1;

+    }

+    

+    LM_DBG("Looking for route block [%.*s]\n", route_name.len, route_name.s);

+    int ri = route_get(&main_rt, route_name.s);

+    if (ri < 0) {

+        LM_ERR("unable to find route block [%.*s]\n", route_name.len, route_name.s);

+        return -1;

+    }

+    cfg_action = main_rt.rlist[ri];

+    if (cfg_action == NULL) {

+        LM_ERR("empty action lists in route block [%.*s]\n", route_name.len, route_name.s);

+        return -1;

+    }

+

     realm = cscf_get_realm_from_ruri(msg);

@@ -61,7 +61,7 @@ extern struct cdp_binds cdpb;

  * @param str2 - if to do capabilities

  * @returns true if OK, false if not

  */

-int I_perform_user_authorization_request(struct sip_msg* msg, char* str1, char* str2);

+int I_perform_user_authorization_request(struct sip_msg* msg, char* route, char* str1, char* str2);