dispatcher: provide ping_from and ping_method per partition

modules/dispatcher/dispatch.c

@@ -2771,7 +2771,9 @@ void ds_check_timer(unsigned int ticks, void* param)
 
 			/* Execute the Dialog using the "request"-Method of the
 			 * TM-Module.*/
-			if (tmb.new_auto_dlg_uac(&ds_ping_from,
+			if (tmb.new_auto_dlg_uac((partition->ping_from.len?
+							&partition->ping_from:
+							&ds_ping_from),
 			&pack->params.uri, NULL, NULL,
 			pack->sock?pack->sock:probing_sock,
 			&dlg) != 0 ) {
@@ -2787,7 +2789,9 @@ void ds_check_timer(unsigned int ticks, void* param)
 			dlg->avps = pack->avps;
 			pack->avps = NULL;
 
-			if (tmb.t_request_within(&ds_ping_method,
+			if (tmb.t_request_within((partition->ping_method.len?
+							&partition->ping_method:
+							&ds_ping_method),
 					NULL,
 					NULL,
 					dlg,

modules/dispatcher/dispatch.h

@@ -115,6 +115,8 @@ typedef struct _ds_partition
 	str name;              /* Partition name */
 	str table_name;        /* Table name */
 	str db_url;            /* DB url */
+	str ping_from;
+	str ping_method;
 	int persistent_state;
 
 	db_con_t **db_handle;

modules/dispatcher/dispatcher.c

@@ -95,6 +95,8 @@ typedef struct _ds_db_head
 	str attrs_avp;
 	str script_attrs_avp;
 
+	str ping_from;
+	str ping_method;
 	str persistent_state;
 
 	struct _ds_db_head *next;
@@ -106,14 +108,17 @@ ds_db_head_t default_db_head = {
 	{NULL, -1},
 	{NULL, -1},
 
-
 	{NULL, -1},
 	{NULL, -1},
 	{NULL, -1},
 	{NULL, -1},
+	{NULL, -1},
+	{NULL, -1},
+
 	{NULL, -1},
 	{NULL, -1},
 	{"1", 1},
+
 	NULL
 };
 ds_db_head_t *ds_db_heads = NULL;
@@ -412,6 +417,8 @@ DEF_GETTER_FUNC(cnt_avp);
 DEF_GETTER_FUNC(sock_avp);
 DEF_GETTER_FUNC(attrs_avp);
 DEF_GETTER_FUNC(script_attrs_avp);
+DEF_GETTER_FUNC(ping_from);
+DEF_GETTER_FUNC(ping_method);
 DEF_GETTER_FUNC(persistent_state);
 
 static partition_specific_param_t partition_params[] = {
@@ -423,6 +430,8 @@ static partition_specific_param_t partition_params[] = {
 	PARTITION_SPECIFIC_PARAM (sock_avp, "$avp(ds_sock_failover)"),
 	PARTITION_SPECIFIC_PARAM (attrs_avp, ""),
 	PARTITION_SPECIFIC_PARAM (script_attrs_avp, ""),
+	PARTITION_SPECIFIC_PARAM (ping_from, ""),
+	PARTITION_SPECIFIC_PARAM (ping_method, ""),
 	PARTITION_SPECIFIC_PARAM (persistent_state, "1"),
 };
 
@@ -740,6 +749,15 @@ static int partition_init(ds_db_head_t *db_head, ds_partition_t *partition)
 		partition->script_attrs_avp_name = -1;
 		partition->script_attrs_avp_type = 0;
 	}
+
+	if (db_head->ping_from.s && db_head->ping_from.len > 0) {
+		if (pkg_str_dup(&partition->ping_from, &db_head->ping_from) < 0)
+			LM_ERR("cannot duplicate ping_from\n");
+	}
+	if (db_head->ping_method.s && db_head->ping_method.len > 0) {
+		if (pkg_str_dup(&partition->ping_method, &db_head->ping_method) < 0)
+			LM_ERR("cannot duplicate ping_method\n");
+	}
 	partition->persistent_state = ds_persistent_state;
 	if (str_strcmp(&db_head->persistent_state, const_str("0")) ||
 			str_strcmp(&db_head->persistent_state, const_str("no")) ||

modules/dispatcher/doc/dispatcher_admin.xml

@@ -25,9 +25,9 @@
 		Starting with version 2.1, the dispatcher module keeps its destination sets 
 		into different partitions. Each partition is described by its own
 		"db_url", "table_name", "dst_avp", "grp_avp", "cnt_avp", "sock_avp",
-		"attr_avp", "blacklists" and "persistent_state" set of attributes.
-		Setting any of these module parameters will only alter the "default"
-		partition's properties.
+                "attr_avp", "blacklists", "ping_from", "ping_method" and
+                "persistent_state" set of attributes. Setting any of these
+                module parameters will only alter the "default" partition's properties.
 	</para>
 	<para>
 		In order to create a new partition, the <xref linkend="param_partition"/>
@@ -275,6 +275,10 @@ modparam("dispatcher", "setid_pvar", "$var(setid)")
 		the probing of failed gateways enabled.
 		</para>
 		<para>
+		Use the 'partition' parameter if you want to define the ping method
+		other partitions.
+		</para>
+		<para>
 		<emphasis>
 			Default value is <quote>OPTIONS</quote>.
 		</emphasis>
@@ -297,6 +301,10 @@ modparam("dispatcher", "ds_ping_method", "INFO")
 		compiled with the probing of failed gateways enabled.
 		</para>
 		<para>
+		Use the 'partition' parameter if you want to define the "From:"
+		ping header of other partitions.
+		</para>
+		<para>
 		<emphasis>
 			Default value is <quote>sip:dispatcher@localhost</quote>.
 		</emphasis>