February 2011 - sr-dev - kamailio.org

git:master: dispatcher(k): enhanced the cfg example in docs
by Daniel-Constantin Mierla 01 Feb '11

01 Feb '11

Module: sip-router Branch: master Commit: 8bddb971122d9f7ae20bd4ed123771e5a6d0c800 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bddb97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 31 01:58:00 2011 +0100 dispatcher(k): enhanced the cfg example in docs --- modules_k/dispatcher/README | 51 ++++++++++++++++++++++------ modules_k/dispatcher/doc/dispatcher.cfg | 55 +++++++++++++++++++++++------- 2 files changed, 82 insertions(+), 24 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index ea38560..0261325 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -953,26 +953,55 @@ mpath="/usr/local/lib/kamailio/modules/" loadmodule "maxfwd.so" loadmodule "sl.so" loadmodule "dispatcher.so" - -# loadmodule "modules/tm/tm.so" +loadmodule "tm.so" # ----------------- setting module-specific parameters --------------- -# -- dispatcher params -- -modparam("dispatcher", "list_file", "../etc/dispatcher.list") -# modparam("dispatcher", "force_dst", 1) +# -- dispatcher params -- +modparam("dispatcher", "list_file", "/usr/local/etc/kamailio/dispatcher.list") +modparam("dispatcher", "flags", 2) +modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") +modparam("dispatcher", "grp_avp", "$avp(AVP_GRP)") +modparam("dispatcher", "cnt_avp", "$avp(AVP_CNT)") -route{ +# main request routing block +route { if ( !mf_process_maxfwd_header("10") ) { sl_send_reply("483","To Many Hops"); - drop(); - }; + exit; + } - ds_select_dst("2", "0"); + # select from first dst group by round-robin + if(!ds_select_dst("1", "4")) + { + sl_send_reply("500", "No destination available"); + exit; + } - forward(); - # t_relay(); + t_on_failure("RTF_DISPATCH"); + if(!t_relay()) + { + sl_reply_error(); + exit; + } +} + +# dispatcher failure routing block +failure_route[RTF_DISPATCH] { + if (t_is_canceled()) { + exit; + } + # select next destination only for local timeout + if (t_branch_timeout() && !t_branch_replied()) + { + if(ds_next_dst()) + { + t_on_failure("RTF_DISPATCH"); + t_relay(); + exit; + } + } } ... diff --git a/modules_k/dispatcher/doc/dispatcher.cfg b/modules_k/dispatcher/doc/dispatcher.cfg index 84087a2..a7258f4 100644 --- a/modules_k/dispatcher/doc/dispatcher.cfg +++ b/modules_k/dispatcher/doc/dispatcher.cfg @@ -19,24 +19,53 @@ mpath="/usr/local/lib/kamailio/modules/" loadmodule "maxfwd.so" loadmodule "sl.so" loadmodule "dispatcher.so" - -# loadmodule "modules/tm/tm.so" +loadmodule "tm.so" # ----------------- setting module-specific parameters --------------- -# -- dispatcher params -- -modparam("dispatcher", "list_file", "../etc/dispatcher.list") -# modparam("dispatcher", "force_dst", 1) +# -- dispatcher params -- +modparam("dispatcher", "list_file", "/usr/local/etc/kamailio/dispatcher.list") +modparam("dispatcher", "flags", 2) +modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") +modparam("dispatcher", "grp_avp", "$avp(AVP_GRP)") +modparam("dispatcher", "cnt_avp", "$avp(AVP_CNT)") -route{ +# main request routing block +route { if ( !mf_process_maxfwd_header("10") ) { sl_send_reply("483","To Many Hops"); - drop(); - }; - - ds_select_dst("2", "0"); - - forward(); - # t_relay(); + exit; + } + + # select from first dst group by round-robin + if(!ds_select_dst("1", "4")) + { + sl_send_reply("500", "No destination available"); + exit; + } + + t_on_failure("RTF_DISPATCH"); + if(!t_relay()) + { + sl_reply_error(); + exit; + } +} + +# dispatcher failure routing block +failure_route[RTF_DISPATCH] { + if (t_is_canceled()) { + exit; + } + # select next destination only for local timeout + if (t_branch_timeout() && !t_branch_replied()) + { + if(ds_next_dst()) + { + t_on_failure("RTF_DISPATCH"); + t_relay(); + exit; + } + } }

1 0

git:master: dispatcher(k): mi ds_list prints combined flags
by Daniel-Constantin Mierla 01 Feb '11

01 Feb '11

Module: sip-router Branch: master Commit: 5319d08db206b92b21df646e63415dd1cfd7a6e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5319d08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 31 01:39:17 2011 +0100 dispatcher(k): mi ds_list prints combined flags --- modules_k/dispatcher/dispatch.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 34124d0..d49b4dc 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2206,7 +2206,7 @@ int ds_print_mi_list(struct mi_node* rpl) { int len, j; char* p; - char c; + char c[3]; str data; ds_set_t *list; struct mi_node* node = NULL; @@ -2238,16 +2238,25 @@ int ds_print_mi_list(struct mi_node* rpl) if(node == NULL) return -1; - if (list->dlist[j].flags & DS_INACTIVE_DST) c = 'I'; - else if (list->dlist[j].flags & DS_PROBING_DST) c = 'P'; - else c = 'A'; + memset(&c, 0, sizeof(c)); + if (list->dlist[j].flags & DS_INACTIVE_DST) + c[0] = 'I'; + else if (list->dlist[j].flags & DS_DISABLED_DST) + c[0] = 'D'; + else + c[0] = 'A'; - attr = add_mi_attr (node, MI_DUP_VALUE, "flag",4, &c, 1); - if(attr == 0) + if (list->dlist[j].flags & DS_PROBING_DST) + c[1] = 'P'; + else + c[1] = 'X'; + + attr = add_mi_attr (node, MI_DUP_VALUE, "flags", 5, c, 2); + if(attr == 0) return -1; data.s = int2str(list->dlist[j].priority, &data.len); - attr = add_mi_attr (node, MI_DUP_VALUE, "priority", 8, + attr = add_mi_attr (node, MI_DUP_VALUE, "priority", 8, data.s, data.len); if(attr == 0) return -1;

1 0

git:master: dispatcher(k): documented disabled state
by Daniel-Constantin Mierla 01 Feb '11

01 Feb '11

Module: sip-router Branch: master Commit: c7787aceddc3026675039801055f3cb974b4a010 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7787ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 31 01:30:25 2011 +0100 dispatcher(k): documented disabled state --- modules_k/dispatcher/README | 4 +++- modules_k/dispatcher/doc/dispatcher_admin.xml | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index d027958..ea38560 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -833,7 +833,9 @@ onreply_route { * _state_ : state of the destination address + “a”: active + “i”: inactive - + “p”: probing + + “d”: disabled + The states “a” or “i” can be followed by “p” to set probing mode + (e.g. 'ap' or 'ip') * _group_: destination group id * _address_: address of the destination in the _group_ diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index 4be1f55..960832d 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -1025,10 +1025,13 @@ onreply_route { <itemizedlist> <listitem><para>_state_ : state of the destination address</para> <itemizedlist> - <listitem><para> <quote>a</quote>: active </para></listitem> - <listitem><para> <quote>i</quote>: inactive </para></listitem> - <listitem><para> <quote>p</quote>: probing </para></listitem> + <listitem><para> <quote>a</quote>: active</para></listitem> + <listitem><para> <quote>i</quote>: inactive</para></listitem> + <listitem><para> <quote>d</quote>: disabled</para></listitem> </itemizedlist> + <para>The states <quote>a</quote> or <quote>i</quote> can be + followed by <quote>p</quote> to set probing mode (e.g. 'ap' + or 'ip')</para> </listitem> <listitem><para>_group_: destination group id</para></listitem>

1 0

git:master: dispatcher(k): force_dst set default to 1
by Daniel-Constantin Mierla 01 Feb '11

01 Feb '11

Module: sip-router Branch: master Commit: 9a5bc6b1554227920075f361bc3d7780a0eef935 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a5bc6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 31 00:20:46 2011 +0100 dispatcher(k): force_dst set default to 1 - readme updated --- modules_k/dispatcher/README | 7 ++++--- modules_k/dispatcher/dispatcher.c | 2 +- modules_k/dispatcher/doc/dispatcher_admin.xml | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index 1c747c9..d027958 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -336,10 +336,11 @@ modparam("dispatcher", "priority_col", "dstpriority") 3.8. force_dst (int) - If set to 1, force overwriting of destination address when that is - already set. + If set to 1, force overwriting of destination address (outbound proxy) + when that is already set. If set to 0, will return error when the + destination address is already set. - Default value is “0”. + Default value is “1”. Example 1.8. Set the “force_dst” parameter ... diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index ab412a6..6f61edf 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -79,7 +79,7 @@ MODULE_VERSION /** parameters */ char *dslistfile = CFG_DIR"dispatcher.list"; -int ds_force_dst = 0; +int ds_force_dst = 1; int ds_flags = 0; int ds_use_default = 0; static str dst_avp_param = {NULL, 0}; diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index ae857fd..4be1f55 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -223,12 +223,13 @@ modparam("dispatcher", "priority_col", "dstpriority") <section> <title><varname>force_dst</varname> (int)</title> <para> - If set to 1, force overwriting of destination address when that is - already set. + If set to 1, force overwriting of destination address (outbound proxy) + when that is already set. If set to 0, will return error when the + destination address is already set. </para> <para> <emphasis> - Default value is <quote>0</quote>. + Default value is <quote>1</quote>. </emphasis> </para> <example>

1 0

git:master: dispatcher(k): option to disable destionation
by Daniel-Constantin Mierla 01 Feb '11

01 Feb '11

Module: sip-router Branch: master Commit: 241a05bc65b786084de4c3a93cd22d790ce77148 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=241a05b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 31 01:19:23 2011 +0100 dispatcher(k): option to disable destionation - new flag per destination address to allow disabling destination address completely, so that if auto-pinging is enabled will not be brought back in active state - seting disable state and back to active/inactive mode is possible via mi/rpc commands --- modules_k/dispatcher/dispatch.c | 44 +++++++++++++++++++++++++++++++++++++ modules_k/dispatcher/dispatch.h | 4 ++- modules_k/dispatcher/dispatcher.c | 31 +++++++++++++++++-------- 3 files changed, 68 insertions(+), 11 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 19b5fab..34124d0 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2012,6 +2012,9 @@ int ds_mark_dst(struct sip_msg *msg, int mode) return (ret==0)?1:-1; } +/** + * + */ int ds_set_state(int group, str *address, int state, int type) { int i=0; @@ -2075,6 +2078,44 @@ int ds_set_state(int group, str *address, int state, int type) return -1; } +/** + * + */ +int ds_reinit_state(int group, str *address, int state) +{ + int i=0; + ds_set_t *idx = NULL; + + if(_ds_list==NULL || _ds_list_nr<=0) + { + LM_ERR("the list is null\n"); + return -1; + } + + /* get the index of the set */ + if(ds_get_index(group, &idx)!=0) + { + LM_ERR("destination set [%d] not found\n", group); + return -1; + } + + for(i=0; i<idx->nr; i++) + { + if(idx->dlist[i].uri.len==address->len + && strncasecmp(idx->dlist[i].uri.s, address->s, + address->len)==0) + { + idx->dlist[i].flags |= state; + return 0; + } + } + LM_ERR("destination address [%d : %.*s] not found\n", group, + address->len, address->s); + return -1; +} +/** + * + */ int ds_print_list(FILE *fout) { int j; @@ -2298,6 +2339,9 @@ void ds_check_timer(unsigned int ticks, void* param) { for(j=0; j<list->nr; j++) { + /* skip addresses set in disabled state by admin */ + if((list->dlist[j].flags&DS_DISABLED_DST) != 0) + continue; /* If the Flag of the entry has "Probing set, send a probe: */ if (ds_probing_mode==1 || (list->dlist[j].flags&DS_PROBING_DST) != 0) diff --git a/modules_k/dispatcher/dispatch.h b/modules_k/dispatcher/dispatch.h index 7f6637b..f15cfbf 100644 --- a/modules_k/dispatcher/dispatch.h +++ b/modules_k/dispatcher/dispatch.h @@ -51,7 +51,8 @@ #define DS_INACTIVE_DST 1 /*!< inactive destination */ #define DS_PROBING_DST 2 /*!< checking destination */ -#define DS_RESET_FAIL_DST 4 /*!< Reset-Failure-Counter */ +#define DS_DISABLED_DST 4 /*!< admin disabled destination */ +#define DS_RESET_FAIL_DST 8 /*!< Reset-Failure-Counter */ extern str ds_db_url; extern str ds_table_name; @@ -98,6 +99,7 @@ int ds_destroy_list(void); int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_next_dst(struct sip_msg *msg, int mode); int ds_set_state(int group, str *address, int state, int type); +int ds_reinit_state(int group, str *address, int state); int ds_mark_dst(struct sip_msg *msg, int mode); int ds_print_list(FILE *fout); int ds_print_mi_list(struct mi_node* rpl); diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 6f61edf..8ed44bc 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -640,20 +640,34 @@ static struct mi_root* ds_mi_set(struct mi_root* cmd_tree, void* param) node = cmd_tree->node.kids; if(node == NULL) - return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + return init_mi_tree(400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); sp = node->value; if(sp.len<=0 || !sp.s) { LM_ERR("bad state value\n"); - return init_mi_tree( 500, "bad state value", 15); + return init_mi_tree(500, "bad state value", 15); } - state = 1; - if(sp.s[0]=='0' || sp.s[0]=='I' || sp.s[0]=='i') - state = 0; + state = 0; + if(sp.s[0]=='0' || sp.s[0]=='I' || sp.s[0]=='i') { + /* set inactive */ + state |= DS_INACTIVE_DST; + if((sp.len>1) && (sp.s[1]=='P' || sp.s[1]=='p')) + state |= DS_PROBING_DST; + } else if(sp.s[0]=='1' || sp.s[0]=='A' || sp.s[0]=='a') { + /* set active */ + if((sp.len>1) && (sp.s[1]=='P' || sp.s[1]=='p')) + state |= DS_PROBING_DST; + } else if(sp.s[0]=='2' || sp.s[0]=='D' || sp.s[0]=='d') { + /* set disabled */ + state |= DS_DISABLED_DST; + } else { + LM_ERR("unknow state value\n"); + return init_mi_tree(500, "unknown state value", 19); + } node = node->next; if(node == NULL) - return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + return init_mi_tree(400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); sp = node->value; if(sp.s == NULL) { @@ -676,10 +690,7 @@ static struct mi_root* ds_mi_set(struct mi_root* cmd_tree, void* param) return init_mi_tree(500,"address not found", 18 ); } - if(state==1) - ret = ds_set_state(group, &sp, DS_INACTIVE_DST, 0); - else - ret = ds_set_state(group, &sp, DS_INACTIVE_DST, 1); + ret = ds_reinit_state(group, &sp, state); if(ret!=0) {

1 0