2
0
Эх сурвалжийг харах

cores: new function via_reply_add_xavp_params()

- enable adding parameters to top via of replies from xavp fields
Daniel-Constantin Mierla 2 жил өмнө
parent
commit
1880737b92

+ 35 - 0
src/modules/corex/corex_mod.c

@@ -70,6 +70,7 @@ static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2);
 static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2);
 static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2);
 static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2);
 static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2);
 static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *p2);
 static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *p2);
+static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2);
 static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2);
 static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2);
 static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2);
 static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2);
 
 
@@ -156,6 +157,8 @@ static cmd_export_t cmds[] = {{"forward_reply", (cmd_function)w_forward_reply,
 				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
 				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
 		{"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1,
 		{"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1,
 				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
 				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+		{"via_reply_add_xavp_params", (cmd_function)w_via_reply_add_xavp_params, 1,
+				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
 		{"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE},
 		{"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE},
 		{"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null,
 		{"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null,
 				fixup_free_spve_null, ANY_ROUTE},
 				fixup_free_spve_null, ANY_ROUTE},
@@ -1114,6 +1117,33 @@ static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *s2)
 	return ki_via_use_xavp_fields(msg, fval);
 	return ki_via_use_xavp_fields(msg, fval);
 }
 }
 
 
+/**
+ *
+ */
+static int ki_via_reply_add_xavp_params(sip_msg_t *msg, int fval)
+{
+	if(msg == NULL)
+		return -1;
+	if(fval) {
+		msg->msg_flags |= FL_ADD_XAVP_VIA_REPLY_PARAMS;
+	} else {
+		msg->msg_flags &= ~(FL_ADD_XAVP_VIA_REPLY_PARAMS);
+	}
+	return 1;
+}
+
+/**
+ *
+ */
+static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2)
+{
+	int fval = 0;
+	if(fixup_get_ivalue(msg, (gparam_t *)pflags, &fval) != 0) {
+		LM_ERR("no flag value\n");
+		return -1;
+	}
+	return ki_via_reply_add_xavp_params(msg, fval);
+}
 
 
 /**
 /**
  *
  *
@@ -1317,6 +1347,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = {
 		{ SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,
 		{ SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,
 			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
 			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
 	},
 	},
+	{ str_init("corex"), str_init("via_reply_add_xavp_params"),
+		SR_KEMIP_INT, ki_via_reply_add_xavp_params,
+		{ SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,
+			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+	},
 	{ str_init("corex"), str_init("has_ruri_user"),
 	{ str_init("corex"), str_init("has_ruri_user"),
 		SR_KEMIP_INT, ki_has_ruri_user,
 		SR_KEMIP_INT, ki_has_ruri_user,
 		{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
 		{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,