sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

git:master:31726783: core: parse uri - converted log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 31726783dfba54c7c84b680ddd0bae879c0ee9d3 URL: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-06T09:06:08+02:00 core: parse uri - converted log macros --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8… Patch: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8…

7 years, 3 months

git:master:475ef89d: tls: updated log macros for config code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 475ef89d6fc5780673c7e0091a78036e74f819db URL: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-05T09:45:18+02:00 tls: updated log macros for config code --- Modified: src/modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036… Patch: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036…

7 years, 3 months

git:master:20af8da0: modules: readme files regenerated - websocket ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 20af8da05513345ccb3d372e097c71a115ebe5a7 URL: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-04T15:16:23+02:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… Patch: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 3541db94fb..158248654a 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -33,6 +33,7 @@ Peter Dunkley 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 5. Functions @@ -68,10 +69,11 @@ Peter Dunkley 1.8. Set sub_protocols parameter 1.9. Set cors_mode parameter 1.10. Set verbose_list parameter - 1.11. ws_handle_handshake usage - 1.12. ws_close usage - 1.13. event_route[websocket:closed] usage - 1.14. $ws_conid usage + 1.11. Set event_callback parameter + 1.12. ws_handle_handshake usage + 1.13. ws_close usage + 1.14. event_route[websocket:closed] usage + 1.15. $ws_conid usage Chapter 1. Admin Guide @@ -99,6 +101,7 @@ Chapter 1. Admin Guide 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 5. Functions @@ -341,6 +344,7 @@ onreply_route[WS_REPLY] { 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 4.1. keepalive_mechanism (integer) @@ -457,6 +461,28 @@ modparam("websocket", "cors_mode", 2) modparam("websocket", "verbose_list", 1) ... +4.9. event_callback (str) + + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks specific for websocket module. + + The function has one string parameter, the value is the name of the + event_route block, respectively "websocket:closed". + + Default value is 'empty' (no function is executed for events). + + Example 1.11. Set event_callback parameter +... +modparam("websocket", "event_callback", "ksr_websocket_event") +... +-- event callback function implemented in Lua +function ksr_websocket_event(evname) + KSR.info("===== websocket module triggered event: " .. evname .. "\n"); + return 1; +end +... + 5. Functions 5.1. ws_handle_handshake() @@ -476,7 +502,7 @@ Note This function returns 0, stopping all further processing of the request, when there is a problem. - Example 1.11. ws_handle_handshake usage + Example 1.12. ws_handle_handshake usage ... ws_handle_handshake(); ... @@ -501,7 +527,7 @@ Note This function can be used from ANY_ROUTE. - Example 1.12. ws_close usage + Example 1.13. ws_close usage ... ws_close(4000, "Because I say so"); ... @@ -615,7 +641,7 @@ kamcmd ws.enable connection closes. The connection may be identified using the the $si and $sp pseudo-variables. - Example 1.13. event_route[websocket:closed] usage + Example 1.14. event_route[websocket:closed] usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); @@ -631,7 +657,7 @@ event_route[websocket:closed] { Connection id of closed websocket connection. Can only be used in websocket:closed event route. - Example 1.14. $ws_conid usage + Example 1.15. $ws_conid usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection with id $ws_conid has closed\n");

7 years, 3 months

git:master:921c2f6a: websocket: documentation for event_callback parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 921c2f6a53108ac4ddc3e262a479a46650412bce URL: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T15:10:50+02:00 websocket: documentation for event_callback parameter --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… Patch: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index c887c05158..055498862e 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -445,6 +445,37 @@ modparam("websocket", "verbose_list", 1) </programlisting> </example> </section> + <section id="websocket.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks specific for websocket module. + </para> + <para> + The function has one string parameter, the value is the name of + the event_route block, respectively "websocket:closed". + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "event_callback", "ksr_websocket_event") +... +-- event callback function implemented in Lua +function ksr_websocket_event(evname) + KSR.info("===== websocket module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section>

7 years, 3 months

git:master:e15f8d34: websocket: new parameter event_callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e15f8d34c5cdf83e0b3560873cd5909de99d3f97 URL: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T15:06:09+02:00 websocket: new parameter event_callback - allow setting the name of kemi function to be executed for event_route --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… Patch: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index ec2833d839..b7c6e5e1fb 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -70,6 +70,8 @@ static int ws_keepalive_processes = DEFAULT_KEEPALIVE_PROCESSES; int ws_verbose_list = 0; +str ws_event_callback = STR_NULL; + static cmd_export_t cmds[] = { /* ws_frame.c */ { "ws_close", (cmd_function)w_ws_close0, @@ -105,6 +107,8 @@ static param_export_t params[] = { { "keepalive_processes", INT_PARAM, &ws_keepalive_processes }, { "verbose_list", PARAM_INT, &ws_verbose_list }, + { "event_callback", PARAM_STR, &ws_event_callback}, + { 0, 0, 0 } }; diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 3fd9207dcf..9fedf33f7b 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -29,6 +29,7 @@ #include "../../core/tcp_conn.h" #include "../../core/fmsg.h" #include "../../core/counters.h" +#include "../../core/kemi.h" #include "../../core/mem/mem.h" #include "ws_conn.h" #include "websocket.h" @@ -37,6 +38,7 @@ #define MAX_WS_CONNS_DUMP 50 extern int ws_verbose_list; +extern str ws_event_callback; ws_connection_t **wsconn_id_hash = NULL; #define wsconn_listadd tcpconn_listadd @@ -276,14 +278,25 @@ static void wsconn_run_route(ws_connection_t *wsc) int rt, backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + str evrtname = str_init("websocket:closed"); LM_DBG("wsconn_run_route event_route[websocket:closed]\n"); - rt = route_lookup(&event_rt, "websocket:closed"); + rt = route_lookup(&event_rt, evrtname.s); if (rt < 0 || event_rt.rlist[rt] == NULL) { - LM_DBG("route does not exist"); - return; + if(ws_event_callback.len<=0 || ws_event_callback.s==NULL) { + LM_DBG("event route does not exist"); + return; + } + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event route callback engine does not exist"); + return; + } else { + rt = -1; + } } if (faked_msg_init() < 0) @@ -297,9 +310,18 @@ static void wsconn_run_route(ws_connection_t *wsc) fmsg->rcv = wsc->rcv; backup_rt = get_route_type(); - set_route_type(REQUEST_ROUTE); + set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if(rt<0) { + /* kemi script event route callback */ + if(keng && keng->froute(fmsg, EVENT_ROUTE, + &ws_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + /* native cfg event route */ + run_top_route(event_rt.rlist[rt], fmsg, 0); + } set_route_type(backup_rt); }

7 years, 3 months

git:master:6752351b: websocket: use route_lookup() instead of route_get()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6752351b69cd991cd11f389f80cf73bd68ff5bb9 URL: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T14:36:42+02:00 websocket: use route_lookup() instead of route_get() - avoid creating an empty route block structure if not defined in cfg --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… Patch: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index ad3d216a83..3fd9207dcf 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -279,7 +279,7 @@ static void wsconn_run_route(ws_connection_t *wsc) LM_DBG("wsconn_run_route event_route[websocket:closed]\n"); - rt = route_get(&event_rt, "websocket:closed"); + rt = route_lookup(&event_rt, "websocket:closed"); if (rt < 0 || event_rt.rlist[rt] == NULL) { LM_DBG("route does not exist"); @@ -291,7 +291,7 @@ static void wsconn_run_route(ws_connection_t *wsc) LM_ERR("faked_msg_init() failed\n"); return; } - + fmsg = faked_msg_next(); wsc->rcv.proto_reserved1 = wsc->id; fmsg->rcv = wsc->rcv;

7 years, 3 months

git:master:1c7fc2fe: misc/examples/kemi: fixed setting the failure route callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c7fc2feccba9ae1ad1f97e6fdd296f83dd5b097 URL: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T13:50:32+02:00 misc/examples/kemi: fixed setting the failure route callback --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… Patch: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 3d434893b4..5a051ad19f 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -102,7 +102,7 @@ function ksr_route_relay() if (METHOD=="INVITE") { if (KSR.tm.t_is_set("failure_route")<0) { - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); } } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 6a1b8d1f44..e92f4ec995 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -104,7 +104,7 @@ function ksr_route_relay() if KSR.pv.get("$rm")=="INVITE" then if KSR.tm.t_is_set("failure_route")<0 then - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); end end diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 00b9bfa9f9..fa3c4707d6 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -131,7 +131,7 @@ def ksr_route_relay(self, msg): if KSR.pv.get("$rm")=="INVITE" : if KSR.tm.t_is_set("failure_route")<0 : - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); if KSR.tm.t_relay()<0 : KSR.sl.sl_reply_error(); diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index 2e4d44f4fc..9bf6c81f7a 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -105,7 +105,7 @@ function ksr_route_relay() if (METHOD=="INVITE") { if (KSR.tm.t_is_set("failure_route")<0) { - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); } }

7 years, 3 months

git:master:61d72c90: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 61d72c90a1a3fe34aad3cedb87a3e68529be34ac URL: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-03T21:31:22+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… Patch: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 4be5d66028..6c35f29858 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -911,6 +911,10 @@ end For example, 100 calls in 3-hosts group with rweight params 1/2/1 will be distributed as 25/50/25. After third host failing distribution will be changed to 33/67/0. + + “12” - dispatch to all destination in setid at once (parallel + forking). Note that the AVPs are no longer set with the values + of the destination records, no re-routing making sense in this + case. + “X” - if the algorithm is not implemented, the first entry in set is chosen. * limit - the maximum number of items to be stored in AVP list for

7 years, 3 months

git:master:e84ee3be: dispatcher: documentation for parallel dispatching algorithm

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e84ee3becbf59a5afc63510596cd62bae36d1962 URL: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T19:05:59+02:00 dispatcher: documentation for parallel dispatching algorithm --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… Patch: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b5315acc2d..a0d35eec8a 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1040,6 +1040,14 @@ end </listitem> <listitem> <para> + <quote>12</quote> - dispatch to all destination in setid at + once (parallel forking). Note that the AVPs are no longer set + with the values of the destination records, no re-routing + making sense in this case. + </para> + </listitem> + <listitem> + <para> <quote>X</quote> - if the algorithm is not implemented, the first entry in set is chosen. </para>

7 years, 3 months

git:master:2ce57c44: dispatcher: new algorithm - parallel dispatching (12)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2ce57c44fee4eef112163e5dd6c712a0c68c79af URL: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T19:05:59+02:00 dispatcher: new algorithm - parallel dispatching (12) - send the request to all destinations from the setid at once - aka parallel forking to all address, so the AVPs are no longer set, not being needed for a re-routing --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… Patch: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 90d670d8b7..0acf264618 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -75,6 +75,7 @@ #define DS_ALG_WEIGHT 9 #define DS_ALG_CALLLOAD 10 #define DS_ALG_RELWEIGHT 11 +#define DS_ALG_PARALLEL 12 static int _ds_table_version = DS_TABLE_VERSION; @@ -1693,6 +1694,86 @@ static inline int ds_update_dst( /** * */ +int ds_add_branches(sip_msg_t *msg, ds_set_t *idx, unsigned int hash, int mode) +{ + unsigned int i = 0; + str ruri = STR_NULL; + sip_uri_t *puri = NULL; + char buri[MAX_URI_SIZE]; + + if(hash+1>=idx->nr) { + /* nothing to add */ + return 0; + } + + if(mode==1) { + /* ruri updates */ + LM_DBG("adding branches with ruri\n"); + if(parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse sip msg uri\n"); + return -1; + } + puri = &msg->parsed_uri; + } else { + /* duri updates */ + LM_DBG("adding branches with duri\n"); + } + for(i=hash+1; i<idx->nr; i++) { + if(mode==1) { + /* ruri updates */ + if(puri->user.len<=0) { + /* no username to preserve */ + if(append_branch(msg, &idx->dlist[i].uri, NULL, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with ruri\n"); + return -1; + } + } else { + /* new uri from ruri username and dispatcher uri */ + if(idx->dlist[i].uri.len<6) { + LM_WARN("invalid dispatcher uri - skipping (%u)\n", i); + continue; + } + if(strncmp(idx->dlist[i].uri.s, "sips:", 5)==0) { + ruri.len = snprintf(buri, MAX_URI_SIZE, "sips:%.*s@%.*s", + puri->user.len, puri->user.s, + idx->dlist[i].uri.len-5, idx->dlist[i].uri.s+5); + } else { + if(strncmp(idx->dlist[i].uri.s, "sip:", 4)==0) { + ruri.len = snprintf(buri, MAX_URI_SIZE, "sip:%.*s@%.*s", + puri->user.len, puri->user.s, + idx->dlist[i].uri.len-4, idx->dlist[i].uri.s+4); + } else { + LM_WARN("unsupported protocol schema - ignoring\n"); + continue; + } + } + ruri.s = buri; + if(append_branch(msg, &ruri, NULL, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with user ruri\n"); + return -1; + } + } + } else { + /* duri updates */ + if(append_branch(msg, GET_RURI(msg), &idx->dlist[i].uri, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with duri\n"); + return -1; + } + } + + } + return 0; +} + +/** + * + */ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) { return ds_select_dst_limit(msg, set, alg, 0, mode); @@ -1839,6 +1920,9 @@ int ds_select_dst_limit( hash = idx->rwlist[idx->rwlast]; idx->rwlast = (idx->rwlast + 1) % 100; break; + case DS_ALG_PARALLEL: /* 12 - parallel dispatching */ + hash = 0; + break; default: LM_WARN("algo %d not implemented - using first entry...\n", alg); hash = 0; @@ -1887,6 +1971,15 @@ int ds_select_dst_limit( LM_DBG("selected [%d-%d/%d] <%.*s>\n", alg, set, hash, idx->dlist[hash].uri.len, idx->dlist[hash].uri.s); + if(alg == DS_ALG_PARALLEL) { + if(ds_add_branches(msg, idx, hash, mode)<0) { + LM_ERR("failed to add additional branches\n"); + /* one destination was already set - return success anyhow */ + return 2; + } + return 1; + } + if(!(ds_flags & DS_FAILOVER_ON)) return 1;

7 years, 3 months

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017