Module: sip-router Branch: master Commit: e68230ddb4ad8f5b5befef73cc42466355cc279c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e68230d… Author: Carsten Bock &lt;carsten(a)bock.info&gt; Committer: Carsten Bock &lt;carsten(a)bock.info&gt; Date: Mon Mar 7 21:06:37 2011 +0100 - When calling ds_mark_dst("a"), reset the failure counter as-well - updated docs --- modules_k/dispatcher/dispatch.c | 2 +- modules_k/dispatcher/dispatcher.c | 4 ++-- modules_k/dispatcher/doc/dispatcher.xml | 4 ++-- modules_k/dispatcher/doc/dispatcher_admin.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index d49b4dc..36a362c 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1995,7 +1995,7 @@ int ds_mark_dst(struct sip_msg *msg, int mode) if(mode==1) { ret = ds_set_state(group, &avp_value.s, - DS_INACTIVE_DST|DS_PROBING_DST, 0); + DS_INACTIVE_DST|DS_PROBING_DST|DS_RESET_FAIL_DST, 0); } else if(mode==2) { ret = ds_set_state(group, &avp_value.s, DS_PROBING_DST, 1); if (ret == 0) ret = ds_set_state(group, &avp_value.s, diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 8ed44bc..0b8b8c8 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -170,9 +170,9 @@ static cmd_export_t cmds[]={ {"ds_next_domain", (cmd_function)w_ds_next_domain, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_mark_dst", (cmd_function)w_ds_mark_dst0, 0, - ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, {"ds_mark_dst", (cmd_function)w_ds_mark_dst1, 1, - ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list0, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list1, 1, diff --git a/modules_k/dispatcher/doc/dispatcher.xml b/modules_k/dispatcher/doc/dispatcher.xml index 821f263..29c0105 100644 --- a/modules_k/dispatcher/doc/dispatcher.xml +++ b/modules_k/dispatcher/doc/dispatcher.xml @@ -26,9 +26,9 @@ <editor> <firstname>Carsten</firstname> <surname>Bock</surname> - <affiliation><orgname>BASIS AudioNet GmbH</orgname></affiliation> + <affiliation><orgname>ng-voice.com</orgname></affiliation> <address> - &lt;email&gt;bock(a)basis-audionet.de&lt;/email&gt; + &lt;email&gt;carsten(a)ng-voice.com&lt;/email&gt; </address> </editor> </authorgroup> diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index 960832d..47cc96c 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -905,7 +905,7 @@ ds_select_dst("1", "$var(a)"); </listitem> <listitem> <para><emphasis>"a", "A" or "1"</emphasis> - the last destination - should be set to active.</para> + should be set to active and the error-counter should set to "0".</para> </listitem> <listitem> <para><emphasis>"p", "P" or "2"</emphasis> - the last destination