Merge pull request #1322 from nikbyte/master

Allow ds_select_dst and ds_select_domain in branch route (cherry picked from commit 2168cfa)
OpenSIPS · Mar 30, 2018 · 89ffe9f · 89ffe9f
1 parent acb8aa4
commit 89ffe9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/modules/dispatcher/README b/modules/dispatcher/README
@@ -771,7 +771,7 @@ modparam("dispatcher", "max_freeswitch_weight", 1000)
    position of each dispatching id in the list: first one has the
    higher priority, followed by the second one and so on.
 
-   This function can be used from REQUEST_ROUTE and FAILURE_ROUTE.
+   This function can be used from REQUEST_ROUTE, BRANCH_ROUTE and FAILURE_ROUTE.
 
    Example 1.33. ds_select_dst usage
 ...
@@ -802,7 +802,7 @@ ds_select_dst("$var(part_name):$var(setid)","$var(alg)","$var(flags)");
    can use 'ds_next_domain()' to use next address to achieve
    serial forking to all possible destinations.
 
-   This function can be used from REQUEST_ROUTE and FAILURE_ROUTE.
+   This function can be used from REQUEST_ROUTE, BRANCH_ROUTE and FAILURE_ROUTE.
 
 1.4.3.  ds_next_dst([partition_name])
 

diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c
@@ -195,16 +195,16 @@ static int set_probing_list(unsigned int type, void * val);
 static cmd_export_t cmds[]={
 	{"ds_select_dst",    (cmd_function)w_ds_select_dst, 2,
 		ds_select_fixup,  NULL,
-		REQUEST_ROUTE|FAILURE_ROUTE},
+		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
 	{"ds_select_dst",    (cmd_function)w_ds_select_dst_limited, 3,
 		ds_select_fixup,  NULL,
-		REQUEST_ROUTE|FAILURE_ROUTE},
+		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
 	{"ds_select_domain", (cmd_function)w_ds_select_domain, 2,
 		ds_select_fixup,  NULL,
-		REQUEST_ROUTE|FAILURE_ROUTE},
+		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
 	{"ds_select_domain", (cmd_function)w_ds_select_domain_limited, 3,
 		ds_select_fixup,  NULL,
-		REQUEST_ROUTE|FAILURE_ROUTE},
+		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
 	{"ds_next_dst",      (cmd_function)w_ds_next_dst,      0,
 		NULL , NULL,
 		REQUEST_ROUTE|FAILURE_ROUTE},

diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml
@@ -1014,7 +1014,7 @@ modparam("dispatcher", "max_freeswitch_weight", 1000)
 		first one has the higher priority, followed by the second one and so on.
 		</para>
 		<para>
-		This function can be used from REQUEST_ROUTE and FAILURE_ROUTE.
+		This function can be used from REQUEST_ROUTE, BRANCH_ROUTE and FAILURE_ROUTE.
 		</para>
 		<example>
 		<title><function>ds_select_dst</function> usage</title>
@@ -1054,7 +1054,7 @@ ds_select_dst("$var(part_name):$var(setid)","$var(alg)","$var(flags)");
 		destinations.
 		</para>
 		<para>
-		This function can be used from REQUEST_ROUTE and FAILURE_ROUTE.
+		This function can be used from REQUEST_ROUTE, BRANCH_ROUTE and FAILURE_ROUTE.
 		</para>
 	</section>
 	<section>