sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
369 discussions

git:master:6e1e7fe3: textopsx: docs - fixed example for change_reply_status()
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 6e1e7fe306ebf97fb27b8a1d9e4f57e139d418f2 URL: https://github.com/kamailio/kamailio/commit/6e1e7fe306ebf97fb27b8a1d9e4f57e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T15:21:20+01:00 textopsx: docs - fixed example for change_reply_status() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e1e7fe306ebf97fb27b8a1d9e4f57e… Patch: https://github.com/kamailio/kamailio/commit/6e1e7fe306ebf97fb27b8a1d9e4f57e… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 5412476ace..c96fb1fff9 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -76,8 +76,8 @@ if(msg_apply_changes()) <title><function>change_reply_status</function> usage</title> <programlisting> ... -onreply_route { - if (@status == "603") { +reply_route { + if (status == "603") { change_reply_status(404, "Not Found"); exit; }

1 0

git:master:9cc9785c: tcpops: documentation for tcp_get_conid()
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 9cc9785cef0a8abf3fa09de1f5da4dd52133be39 URL: https://github.com/kamailio/kamailio/commit/9cc9785cef0a8abf3fa09de1f5da4dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T12:57:16+01:00 tcpops: documentation for tcp_get_conid() --- Modified: src/modules/tcpops/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/9cc9785cef0a8abf3fa09de1f5da4dd… Patch: https://github.com/kamailio/kamailio/commit/9cc9785cef0a8abf3fa09de1f5da4dd… --- diff --git a/src/modules/tcpops/doc/functions.xml b/src/modules/tcpops/doc/functions.xml index 9f51668787..baff1bcf13 100644 --- a/src/modules/tcpops/doc/functions.xml +++ b/src/modules/tcpops/doc/functions.xml @@ -259,4 +259,39 @@ event_route[tcp:closed] { ]]></programlisting> </example> </section> + <section id="tcpops.f.tcp_get_conid"> + <title> + <function>tcp_get_conid(hostport, pvname)</function> + </title> + <para> + Get the connection id based on target host:port. The connection id + is set in the variable named by pvname parameter. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hostport</emphasis> - target "host:port" address, + the port can be ommited (default to 5060) and the parameter can + contain variables. + </para> + </listitem> + <listitem> + <para><emphasis>pvname</emphasis> - target variable name. + </para> + </listitem> + </itemizedlist> + <para>Return values:</para> + <para>1: connection was found</para> + <para>-1: connection was not found or an error occured</para> + <example> + <title><function>tcp_get_conid</function> usage</title> + <programlisting><![CDATA[ +... + if(tcp_conid_alive("127.0.0.1:5060", "$var(conid)")) { + xlog("connection id is: $var(conid)\n"); + } +... + ]]></programlisting> + </example> + </section> </section>

1 0

git:master:381dfada: tcpops: added function to get connection id based on target host:port
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 381dfada3989d86a2afa88d7c13859b073c403d7 URL: https://github.com/kamailio/kamailio/commit/381dfada3989d86a2afa88d7c13859b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T12:50:57+01:00 tcpops: added function to get connection id based on target host:port - tcp_get_connid(hostport, pvname) - connection id is set in pvar paraemter --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/381dfada3989d86a2afa88d7c13859b… Patch: https://github.com/kamailio/kamailio/commit/381dfada3989d86a2afa88d7c13859b… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 8e7fcdcacd..1e844f5ed8 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -33,6 +33,8 @@ #include "../../core/globals.h" #include "../../core/sr_module.h" #include "../../core/tcp_options.h" +#include "../../core/resolve.h" +#include "../../core/lvalue.h" #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/events.h" @@ -58,7 +60,7 @@ static int w_tcpops_enable_closed_event1(sip_msg_t* msg, char* con, char* p2); static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2); static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); - +static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); static int fixup_numpv(void** param, int param_no); @@ -81,6 +83,8 @@ static cmd_export_t cmds[]={ 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, fixup_numpv, 0, ANY_ROUTE}, + {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, + fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, fixup_numpv, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -513,6 +517,94 @@ static int fixup_numpv(void** param, int param_no) return fixup_igp_null(param, 1); } +/** + * + */ +static int ki_tcp_get_conid_helper(sip_msg_t* msg, str *saddr, pv_spec_t *pvs) +{ + int conid = 0; + sip_uri_t uaddr, *u; + dest_info_t dst; + char *p; + int ret; + ticks_t clifetime; + tcp_connection_t *c; + ip_addr_t ip; + int port; + pv_value_t val; + + if(pvs->setf==NULL) { + LM_ERR("output variable is read only\n"); + return -1; + } + + init_dest_info(&dst); + + u = &uaddr; + u->port_no = 5060; + u->host = *saddr; + /* detect ipv6 */ + p = memchr(saddr->s, ']', saddr->len); + if (p) { + p++; + p = memchr(p, ':', saddr->s + saddr->len - p); + } else { + p = memchr(saddr->s, ':', saddr->len); + } + if (p) { + u->host.len = p - saddr->s; + p++; + u->port_no = str2s(p, saddr->len - (p - saddr->s), NULL); + } + + ret = sip_hostport2su(&dst.to, &u->host, u->port_no, &dst.proto); + if(ret!=0) { + LM_ERR("failed to resolve [%.*s]\n", u->host.len, ZSW(u->host.s)); + return E_BUG; + } + + dst.proto = PROTO_TCP; + dst.id = 0; + clifetime = cfg_get(tcp, tcp_cfg, con_lifetime); + su2ip_addr(&ip, &dst.to); + port = su_getport(&dst.to); + c = tcpconn_get(dst.id, &ip, port, NULL, clifetime); + + if (unlikely(c==0)) { + goto setvalue; + } + conid = c->id; + tcpconn_put(c); + +setvalue: + memset(&val, 0, sizeof(pv_value_t)); + val.ri = conid; + val.flags = PV_VAL_INT; + if(pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val)<0) { + LM_ERR("failed to set the output var\n"); + return -1; + } + if(conid==0) { + return -1; + } + return 1; +} + +/** + * + */ +static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn) +{ + str saddr; + + if(fixup_get_svalue(msg, (gparam_t*)paddr, &saddr)<0) { + LM_ERR("failed to get address parameter\n"); + return -1; + } + + return ki_tcp_get_conid_helper(msg, &saddr, (pv_spec_t*)pvn); +} + /** * */

1 0

git:master:edb3d6d8: core: tcp - typedefed structs
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: edb3d6d848c9ccf85b077950ecf6aec7acf3e5b6 URL: https://github.com/kamailio/kamailio/commit/edb3d6d848c9ccf85b077950ecf6aec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T12:50:57+01:00 core: tcp - typedefed structs --- Modified: src/core/tcp_conn.h --- Diff: https://github.com/kamailio/kamailio/commit/edb3d6d848c9ccf85b077950ecf6aec… Patch: https://github.com/kamailio/kamailio/commit/edb3d6d848c9ccf85b077950ecf6aec… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index d966511b03..dfa3dcfb37 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -162,23 +162,23 @@ struct tcp_req{ struct tcp_connection; /* tcp port alias structure */ -struct tcp_conn_alias{ +typedef struct tcp_conn_alias { struct tcp_connection* parent; struct tcp_conn_alias* next; struct tcp_conn_alias* prev; unsigned short port; /* alias port */ unsigned short hash; /* hash index in the address hash */ -}; +} tcp_conn_alias_t; #ifdef TCP_ASYNC - struct tcp_wbuffer{ + typedef struct tcp_wbuffer { struct tcp_wbuffer* next; unsigned int b_size; char buf[1]; - }; + } tcp_wbuffer_t; - struct tcp_wbuffer_queue{ + typedef struct tcp_wbuffer_queue { struct tcp_wbuffer* first; struct tcp_wbuffer* last; ticks_t wr_timeout; /* write timeout*/ @@ -186,11 +186,11 @@ struct tcp_conn_alias{ unsigned int offset; /* offset in the first wbuffer were data starts */ unsigned int last_used; /* how much of the last buffer is used */ - }; + } tcp_wbuffer_queue_t; #endif -struct tcp_connection{ +typedef struct tcp_connection { int s; /*socket, used by "tcp main" */ int fd; /* used only by "children", don't modify it! private data! */ gen_lock_t write_lock; @@ -218,7 +218,7 @@ struct tcp_connection{ #ifdef TCP_ASYNC struct tcp_wbuffer_queue wbuf_q; #endif -}; +} tcp_connection_t; /* helper macros */

1 0

[kamailio/kamailio] Dispatcher set_state "all" (#1399)
by Timmo Verlaan 15 Jan '18

15 Jan '18

#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Adds a new option to RPC command `dispatcher.set_state` to bulk update all destinations as part of a dispatcher set. The way we use dispatcher sets this comes in handy in a few cases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1399 -- Commit Summary -- * dispatcher: add method to reinit state for all destinations in group * dispatcher: allow 'all' to update all destinations in group via RPC -- File Changes -- M src/modules/dispatcher/dispatch.c (33) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (10) M src/modules/dispatcher/doc/dispatcher_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1399.patch https://github.com/kamailio/kamailio/pull/1399.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1399

2 3

git:master:0997892b: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 0997892bc9fe93fbd78d2ce239e71c15ba6a7e9f URL: https://github.com/kamailio/kamailio/commit/0997892bc9fe93fbd78d2ce239e71c1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-15T09:02:09+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/0997892bc9fe93fbd78d2ce239e71c1… Patch: https://github.com/kamailio/kamailio/commit/0997892bc9fe93fbd78d2ce239e71c1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index faef52547c..058aa29379 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1238,12 +1238,14 @@ onreply_route { The states “a”, “i” or “t” can be followed by “p” to set probing mode (e.g. 'ap', 'ip' or 'tp'). * _group_: destination group id - * _address_: address of the destination in the _group_ + * _address_: address of the destination in the _group_ or 'all' to + update all destinations in the group Example: ... # prototype: kamcmd dispatcher.set_state _state_ _group_ _address_ kamcmd dispatcher.set_state ip 2 sip:127.0.0.1:5080 +kamcmd dispatcher.set_state ip 3 all ... 5.2. dispatcher.list

1 0

git:master:27fdee6b: dispatcher: test len for matching all token in setting the state via rpc
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 27fdee6b47ce609ee5913f9aa9355a2c01ec0458 URL: https://github.com/kamailio/kamailio/commit/27fdee6b47ce609ee5913f9aa9355a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T08:54:44+01:00 dispatcher: test len for matching all token in setting the state via rpc --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/27fdee6b47ce609ee5913f9aa9355a2… Patch: https://github.com/kamailio/kamailio/commit/27fdee6b47ce609ee5913f9aa9355a2… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 40c47c3e1f..efb3a18001 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1360,7 +1360,7 @@ static void dispatcher_rpc_set_state(rpc_t *rpc, void *ctx) return; } - if(strcmp(dest.s, "all") == 0) { + if(dest.len == 3 && strncmp(dest.s, "all", 3) == 0) { ds_reinit_state_all(group, stval); } else { if(ds_reinit_state(group, &dest, stval) < 0) {

1 0

git:master:9c6436bd: Merge pull request #1399 from tverlaan/dispatcher_update_state_all
by GitHub 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 9c6436bd52a6a4af322b908c2ceb80cd8e1dd4a9 URL: https://github.com/kamailio/kamailio/commit/9c6436bd52a6a4af322b908c2ceb80c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-15T08:52:11+01:00 Merge pull request #1399 from tverlaan/dispatcher_update_state_all Dispatcher set_state "all" --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c6436bd52a6a4af322b908c2ceb80c… Patch: https://github.com/kamailio/kamailio/commit/9c6436bd52a6a4af322b908c2ceb80c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d2d9d1c806..28b305352c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2605,6 +2605,39 @@ int ds_reinit_state(int group, str *address, int state) return -1; } +/** + * + */ +int ds_reinit_state_all(int group, 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, *crt_idx, &idx) != 0) { + LM_ERR("destination set [%d] not found\n", group); + return -1; + } + + for(i = 0; i < idx->nr; i++) { + int old_state = idx->dlist[i].flags; + /* reset the bits used for states */ + idx->dlist[i].flags &= ~(DS_STATES_ALL); + /* set the new states */ + idx->dlist[i].flags |= state; + if(idx->dlist[i].attrs.rweight > 0) { + ds_reinit_rweight_on_state_change( + old_state, idx->dlist[i].flags, idx); + } + } + return 0; +} + /** * */ diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 419e7dcc5d..2ebaa4b3d5 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -115,6 +115,7 @@ 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_update_state(sip_msg_t *msg, int group, str *address, int state); int ds_reinit_state(int group, str *address, int state); +int ds_reinit_state_all(int group, int state); int ds_mark_dst(struct sip_msg *msg, int mode); int ds_print_list(FILE *fout); int ds_log_sets(void); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 82fd0dd650..40c47c3e1f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1360,9 +1360,13 @@ static void dispatcher_rpc_set_state(rpc_t *rpc, void *ctx) return; } - if(ds_reinit_state(group, &dest, stval) < 0) { - rpc->fault(ctx, 500, "State Update Failed"); - return; + if(strcmp(dest.s, "all") == 0) { + ds_reinit_state_all(group, stval); + } else { + if(ds_reinit_state(group, &dest, stval) < 0) { + rpc->fault(ctx, 500, "State Update Failed"); + return; + } } return; diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c62385279c..9c6cdd9200 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1511,7 +1511,8 @@ onreply_route { <listitem><para>_group_: destination group id</para></listitem> - <listitem><para>_address_: address of the destination in the _group_</para></listitem> + <listitem><para>_address_: address of the destination in the _group_ + or 'all' to update all destinations in the group</para></listitem> </itemizedlist> <para> Example: @@ -1520,6 +1521,7 @@ onreply_route { ... # prototype: &sercmd; dispatcher.set_state _state_ _group_ _address_ &sercmd; dispatcher.set_state ip 2 sip:127.0.0.1:5080 +&sercmd; dispatcher.set_state ip 3 all ... </programlisting> </section>

1 0

git:master:d4003b91: dispatcher: allow 'all' to update all destinations in group via RPC
by Timmo Verlaan 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: d4003b91ec04741041b4aa2bdc5926f5aeb6f945 URL: https://github.com/kamailio/kamailio/commit/d4003b91ec04741041b4aa2bdc5926f… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-14T17:04:07+01:00 dispatcher: allow 'all' to update all destinations in group via RPC --- Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4003b91ec04741041b4aa2bdc5926f… Patch: https://github.com/kamailio/kamailio/commit/d4003b91ec04741041b4aa2bdc5926f… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 82fd0dd650..40c47c3e1f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1360,9 +1360,13 @@ static void dispatcher_rpc_set_state(rpc_t *rpc, void *ctx) return; } - if(ds_reinit_state(group, &dest, stval) < 0) { - rpc->fault(ctx, 500, "State Update Failed"); - return; + if(strcmp(dest.s, "all") == 0) { + ds_reinit_state_all(group, stval); + } else { + if(ds_reinit_state(group, &dest, stval) < 0) { + rpc->fault(ctx, 500, "State Update Failed"); + return; + } } return; diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c62385279c..9c6cdd9200 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1511,7 +1511,8 @@ onreply_route { <listitem><para>_group_: destination group id</para></listitem> - <listitem><para>_address_: address of the destination in the _group_</para></listitem> + <listitem><para>_address_: address of the destination in the _group_ + or 'all' to update all destinations in the group</para></listitem> </itemizedlist> <para> Example: @@ -1520,6 +1521,7 @@ onreply_route { ... # prototype: &sercmd; dispatcher.set_state _state_ _group_ _address_ &sercmd; dispatcher.set_state ip 2 sip:127.0.0.1:5080 +&sercmd; dispatcher.set_state ip 3 all ... </programlisting> </section>

1 0

git:master:d8cc8626: dispatcher: add method to reinit state for all destinations in group
by Timmo Verlaan 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: d8cc86263b85be448e1f5c1fe1372fd08d26434a URL: https://github.com/kamailio/kamailio/commit/d8cc86263b85be448e1f5c1fe1372fd… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-14T16:37:00+01:00 dispatcher: add method to reinit state for all destinations in group --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/d8cc86263b85be448e1f5c1fe1372fd… Patch: https://github.com/kamailio/kamailio/commit/d8cc86263b85be448e1f5c1fe1372fd… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d2d9d1c806..28b305352c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2605,6 +2605,39 @@ int ds_reinit_state(int group, str *address, int state) return -1; } +/** + * + */ +int ds_reinit_state_all(int group, 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, *crt_idx, &idx) != 0) { + LM_ERR("destination set [%d] not found\n", group); + return -1; + } + + for(i = 0; i < idx->nr; i++) { + int old_state = idx->dlist[i].flags; + /* reset the bits used for states */ + idx->dlist[i].flags &= ~(DS_STATES_ALL); + /* set the new states */ + idx->dlist[i].flags |= state; + if(idx->dlist[i].attrs.rweight > 0) { + ds_reinit_rweight_on_state_change( + old_state, idx->dlist[i].flags, idx); + } + } + return 0; +} + /** * */ diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 419e7dcc5d..2ebaa4b3d5 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -115,6 +115,7 @@ 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_update_state(sip_msg_t *msg, int group, str *address, int state); int ds_reinit_state(int group, str *address, int state); +int ds_reinit_state_all(int group, int state); int ds_mark_dst(struct sip_msg *msg, int mode); int ds_print_list(FILE *fout); int ds_log_sets(void);

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018