sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
204 discussions

git:master:5272c8a2: tm: free proxy structure in latest kemi export

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5272c8a2ec910e5d9e37067e94089a42a5198fd9 URL: https://github.com/kamailio/kamailio/commit/5272c8a2ec910e5d9e37067e94089a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-14T07:34:07+01:00 tm: free proxy structure in latest kemi export --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/5272c8a2ec910e5d9e37067e94089a4… Patch: https://github.com/kamailio/kamailio/commit/5272c8a2ec910e5d9e37067e94089a4… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index fcc312aeb6..4113743f3f 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2927,7 +2927,8 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int { int proto = PROTO_NONE; - struct proxy_l *proxy; + proxy_l_t *proxy = NULL; + int ret = -1; if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { if (strncasecmp(sproto->s, "UDP", 3) == 0) { @@ -2947,7 +2948,10 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int host->s, port ); return E_BAD_ADDRESS; } - return _w_t_relay_to(msg, proxy, proto); + ret = _w_t_relay_to(msg, proxy, proto); + free_proxy(proxy); + pkg_free(proxy); + return ret; } /**

3 years, 4 months

[kamailio/kamailio] Kamailio-5.4.: Crashs from keepalive module (#2476)

by zhangyang

### Description I just update kamailio 5.2.1 to 5.4.1. then there are some crashs from keepalive module. ### Troubleshooting ![image](https://user-images.githubusercontent.com/16113837/93066033-08c29880-f6ac-11ea-8660-12348f8881ab.png) #### Reproduction #### Debugging Data ``` Thread 1 (Thread 0x2b4d0df90d00 (LWP 30239)): #0 0x00000000004ef1a7 in atomic_cmpxchg_int (var=0x0, old=0, new_v=1) at core/mem/../atomic/atomic_x86.h:224 #1 0x00000000004ef21a in futex_get (lock=0x0) at core/mem/../futexlock.h:99 #2 0x00000000004f339a in timer_add_safe (tl=0x2b4d13af7928, delta=8) at core/timer.c:543 #3 0x00002b4d133b32c3 in ka_add_dest (uri=0x7ffe571d1440, owner=0x7ffe571d1430, flags=0, ping_interval=3, statechanged_clb=0x0, response_clb=0x0, user_attr=0x0) at keepalive_api.c:120 #4 0x00002b4d133b95ff in ka_mod_add_destination (type=2147483649, val=0x2b4d0ed29300) at keepalive_mod.c:244 #5 0x00000000006615b8 in set_mod_param_regex (regex=0x2b4d0ed29130 "keepalive", name=0x2b4d0ed29218 "destination", type=1, val=0x2b4d0ed29300) at core/modparam.c:125 #6 0x00000000007becec in yyparse () at core/cfg.y:1842 #7 0x000000000042f216 in main (argc=5, argv=0x7ffe571d2578) at main.c:2320 #3 0x00002b4d133b32c3 in ka_add_dest (uri=0x7ffe571d1440, owner=0x7ffe571d1430, flags=0, ping_interval=3, statechanged_clb=0x0, response_clb=0x0, user_attr=0x0) at keepalive_api.c:120 120 if(timer_add(dest->timer, MS_TO_TICKS(KA_FIRST_TRY_DELAY)) < 0){ $2 = {next = 0x0, prev = 0x0, expire = 0, initial_timeout = 0, data = 0x2b4d13af7738, f = 0x2b4d133b4fbf <ka_check_timer>, flags = 0, slow_idx = 0} _uri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x2b4d13af783c "172.18.67.47", len = 12}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = SIP_URI_T, flags = (unknown: 0), transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = { s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}} dest = 0x2b4d13af7738 hollow = 0x0 __FUNCTION__ = "ka_add_dest" #2 0x00000000004f339a in timer_add_safe (tl=0x2b4d13af7928, delta=8) at core/timer.c:543 543 LOCK_TIMER_LIST(); ret = 0 __FUNCTION__ = "timer_add_safe" ``` #### Log Messages ``` Sep 14 15:49:34 localhost kamailio: INFO: pv [pv_shv.c:60]: shvar_init_locks(): locks array size 16 Sep 14 15:49:34 localhost kernel: kamailio[30186]: segfault at 0 ip 00000000004ef1a7 sp 00007ffdd2db9170 error 6 in kamailio[400000+4ae000] ``` #### SIP Traffic ``` (paste your sip traffic here) ``` ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**: ``` Linux version 3.10.0-327.el7.x86_64 (builder(a)kbuilder.dev.centos.org) (gcc version 4.8.3 20140911 (Red Hat 4.8.3-9) (GCC) ) #1 SMP Thu Nov 19 22:10:57 UTC 2015 ``` -- 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/issues/2476

3 years, 4 months

git:5.4:0dffe40c: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.4 Commit: 0dffe40c25f59ba796edab7653633fe6c0773dc8 URL: https://github.com/kamailio/kamailio/commit/0dffe40c25f59ba796edab7653633fe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-11T21:01:26+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0dffe40c25f59ba796edab7653633fe… Patch: https://github.com/kamailio/kamailio/commit/0dffe40c25f59ba796edab7653633fe…

3 years, 4 months

git: new commits in branch 5.4

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/4851f0318bf049ccef93390f6ac0fdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:39:20+01:00 tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send() (cherry picked from commit aa6e9963b2725c1b6b7e5ff995a77c222d95fa3c) - URL: https://github.com/kamailio/kamailio/commit/66f5cc9d021eca4a9acfbca935e991c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:40:25+01:00 misc/examples: note that sr is exported by app_lua_sr - hint for lua syntax check (cherry picked from commit 889431746d24c73eeff73705fab36a0e154116a9) - URL: https://github.com/kamailio/kamailio/commit/c5793f508aa115146e10c2f32691a29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:41:11+01:00 misc/examples/kemi: filter on user agent matching friendly, scanner and sipvicious (cherry picked from commit e15c90d31fd0444f41cb862408f77399123c0191) - URL: https://github.com/kamailio/kamailio/commit/fba5f6172932c7925dce1ee49fbfeb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:41:24+01:00 etc/kamailio.cfg: split to filter on both friendly and scanner - some scanning scripts use a different format for the user agent (cherry picked from commit 454c4653409a69ef115de5ee748524d36e147246) - URL: https://github.com/kamailio/kamailio/commit/0744976d1ab80caf09f80b7594d2c76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:41:59+01:00 misc/examples/kemi: fixed function name to get From-URI (cherry picked from commit 6035c30aea72d06bf08883677d45f4eb0019f189) - URL: https://github.com/kamailio/kamailio/commit/d610f27185eafe275e98c567f1c1781… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-12-11T20:42:32+01:00 smsops: fix len calc for a concatenated sms - fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16 (cherry picked from commit d90f29b3b03386add989aebe3865bdc78dff8fbe) - URL: https://github.com/kamailio/kamailio/commit/5c6ddfea8845cd2d76bd15ec5511d15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:43:29+01:00 dispatcher: removed unnecessary return (cherry picked from commit 721d533317c735d7ddbd16ad94684b483468c010) - URL: https://github.com/kamailio/kamailio/commit/7c7fc27eb10372fda305a65c2dacea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:44:23+01:00 core: check if the tcp clone rcv buffer is set when applying changes (cherry picked from commit aa13720e5d78dde5ae5235c13399848cb8f5a0cc) - URL: https://github.com/kamailio/kamailio/commit/4b5f58be3101c4efe745f37e286bf84… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-11T20:45:23+01:00 lost: fixed typo (cherry picked from commit 87f363f7fa0bf8f1897a3d6de13a09d6ec3812b9) - URL: https://github.com/kamailio/kamailio/commit/e7f616df3f68bd7c53150ad20a8ec5a… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-11T20:45:37+01:00 lost: removed extra `"` symbol in example (cherry picked from commit 124499c12db185d85805e5c71d5cc4222e608b68) - URL: https://github.com/kamailio/kamailio/commit/7ef04a11c4b92a49dcf94dade5bb0a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:46:39+01:00 auth_diameter: init variable and check before freeing (cherry picked from commit 04dc5d6c66c85d0d411aa23b27bc6be00258eff6) - URL: https://github.com/kamailio/kamailio/commit/f72f1effb079f66714f4399b12eaba0… Author: Patrick Wakano <patrick.wakano(a)ipscape.com> Date: 2020-12-11T20:46:56+01:00 dialog: access dialog table entry by reference for dmq_send_all_dlgs - avoid race conditions to get and release the lock when entry structure is copied in local variable - GH #2570, GH #2547 (cherry picked from commit 4183b860e8af6d65074ab98a996c187211aebc7f) - URL: https://github.com/kamailio/kamailio/commit/cb6d5b577aa9eb3d60cb71a60133dd4… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-11T20:47:18+01:00 lost: trimed spaces before reolving locationURI value fixes GH2569 (#2569). Allow parse exmaples from RFC7840 (cherry picked from commit f9d424ac426dc0547c7233902dfa44ad1287e077) - URL: https://github.com/kamailio/kamailio/commit/bded4ca0918a4a48e7d1001bc924b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:47:37+01:00 pv: use static buffer for ctime_r() output and check its return - fixed $TF output, regression introduced when switching to thread safe time function (cherry picked from commit 02fc919e4f177cc3ab9c5d53eb9ea2019c572bd9) - URL: https://github.com/kamailio/kamailio/commit/bec3650b51342a9b093ca92134c3b22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:48:18+01:00 core: tcp - debug messages merged, print bytes read and flags (cherry picked from commit efb9c5f83b37c316b848ae7b6dc829e2f8ca6275) - URL: https://github.com/kamailio/kamailio/commit/834bca2dab19fd1a63386e28955428c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:48:37+01:00 core: tcp - log connection state and flags on debug message (cherry picked from commit 41040a0420ee48f51901bf32e29526c8948ecea0) - URL: https://github.com/kamailio/kamailio/commit/24666d2223c8e718ed9abe949a74d43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:48:51+01:00 dispacher: docs - more details about weight and rweight attributes - cross reference sections that have info about weight and rweight attributes (cherry picked from commit db55715003cd9af5ef3d32b51b5246643eea10d1)

3 years, 4 months

git:master:7811f2df: pv: new var $defn(name)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7811f2dfa8b2465bb9c5b962038b03c50c1d399c URL: https://github.com/kamailio/kamailio/commit/7811f2dfa8b2465bb9c5b962038b03c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T14:21:53+01:00 pv: new var $defn(name) - return the value of a define converted to numbaer (signed int) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/7811f2dfa8b2465bb9c5b962038b03c… Patch: https://github.com/kamailio/kamailio/commit/7811f2dfa8b2465bb9c5b962038b03c… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index bd80bafed7..67f42c227d 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -196,8 +196,10 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, - {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, + {{"def", (sizeof("def")-1)}, PVT_OTHER, pv_get_def, 0, pv_parse_def_name, 0, 0, 0}, + {{"defn", (sizeof("defn")-1)}, PVT_OTHER, pv_get_defn, 0, + pv_parse_defn_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index e569a393e8..681e6beab1 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3797,3 +3797,29 @@ int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +int pv_parse_defn_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +int pv_get_defn(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + int n = 0; + str *val = pp_define_get(param->pvn.u.isname.name.s.len, + param->pvn.u.isname.name.s.s); + + if (val) { + str2sint(val, &n); + return pv_get_intstrval(msg, param, res, n, val); + } else { + return pv_get_sintval(msg, param, res, n); + } +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 29ec9f25a4..afcaa1f84a 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -397,5 +397,8 @@ int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, int pv_parse_def_name(pv_spec_p sp, str *in); int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_defn_name(pv_spec_p sp, str *in); +int pv_get_defn(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif

3 years, 4 months

git:master:ba27633c: dispatcher: info log message when adding extra weight or rweight percentages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba27633ca22bcfc18fd4bb7d62c2f5bb32e56962 URL: https://github.com/kamailio/kamailio/commit/ba27633ca22bcfc18fd4bb7d62c2f5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-10T17:07:30+01:00 dispatcher: info log message when adding extra weight or rweight percentages --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ba27633ca22bcfc18fd4bb7d62c2f5b… Patch: https://github.com/kamailio/kamailio/commit/ba27633ca22bcfc18fd4bb7d62c2f5b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index c1f4dbfd8f..c0a6d22fc0 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -653,6 +653,10 @@ int dp_init_relative_weights(ds_set_t *dset) /* if the array was not completely filled (i.e., the sum of rweights is * less than 100 due to truncated), then use last address to fill the rest */ last_insert = t > 0 ? dset->rwlist[t - 1] : (unsigned int)(dset->nr - 1); + if(t < 100) { + LM_INFO("extra rweight %d for last active destination in group %d\n", + (100-t), dset->id); + } for(j = t; j < 100; j++) dset->rwlist[j] = last_insert; @@ -706,6 +710,10 @@ int dp_init_weights(ds_set_t *dset) } /* if the array was not completely filled (i.e., the sum of weights is * less than 100), then use last address to fill the rest */ + if(t < 100) { + LM_INFO("extra weight %d for last destination in group %d\n", + (100-t), dset->id); + } for(; t < 100; t++) dset->wlist[t] = (unsigned int)(dset->nr - 1); randomize:

3 years, 4 months

git:master:547f0678: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 547f06785187a0af5e10ff71c3ed91a1ee300528 URL: https://github.com/kamailio/kamailio/commit/547f06785187a0af5e10ff71c3ed91a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-10T16:46:14+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/547f06785187a0af5e10ff71c3ed91a… Patch: https://github.com/kamailio/kamailio/commit/547f06785187a0af5e10ff71c3ed91a… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 27d35e78cc..5b029903f4 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1719,18 +1719,20 @@ kamctl rpc dispatcher.hash 4 bob server.com for new calls until an exiting call via that gateway is terminated. If set to 0, then no active call limit is used.> * 'weight' - used for weight based load distribution. It must be set - to a positive integer value beteen 0 and 100. The value represents - the percent of calls to be sent to that gateways. The sum must not - exceed 100, otherwise the destinations whose weight added to the - sum go over 100 are ignored. If the sum is less than 100, then the - last destination is used to fill the missing percentage. See also - the description of the corresponding algorithm parameter for - ds_select_dst(). + to a positive integer value beteen 1 and 100 (inclusive the + limits), otherwise the destination address is ignored (its weight + set to 0). The value represents the percent of calls to be sent to + that gateways. The sum must not exceed 100, otherwise the + destinations whose weight added to the sum go over 100 are ignored. + If the sum is less than 100, then the last destination is used to + fill the missing percentage. See also the description of the + corresponding algorithm parameter for ds_select_dst(). * 'rweight' - used for relative weight based load distribution. It must be set to a positive integer value between 1 and 100 - (otherwise host will be excluded from relative weight distribution - type). See also the description of the corresponding algorithm - parameter for ds_select_dst(). + (inclusive the limits) otherwise host will be excluded from + relative weight distribution type - its rweight is set to 0. See + also the description of the corresponding algorithm parameter for + ds_select_dst(). * 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives. * 'sockname' - used to set by name the sending socket for the

3 years, 4 months

git:master:15a535c7: dispacher: docs - note that the range for weights include the limits

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 15a535c7eae5a4954d51667c8ec8d7900a7d26fe URL: https://github.com/kamailio/kamailio/commit/15a535c7eae5a4954d51667c8ec8d79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-10T16:41:18+01:00 dispacher: docs - note that the range for weights include the limits --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/15a535c7eae5a4954d51667c8ec8d79… Patch: https://github.com/kamailio/kamailio/commit/15a535c7eae5a4954d51667c8ec8d79… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 53eea613ce..45f93a3121 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2147,20 +2147,21 @@ kamctl rpc dispatcher.hash 4 bob server.com </listitem> <listitem> <para>'weight' - used for weight based load distribution. It must be set - to a positive integer value beteen 0 and 100. The value represents - the percent of calls to be sent to that gateways. The sum must not - exceed 100, otherwise the destinations whose weight added to the - sum go over 100 are ignored. If the sum is less than 100, then the - last destination is used to fill the missing percentage. See also - the description of the corresponding algorithm parameter for + to a positive integer value beteen 1 and 100 (inclusive the limits), + otherwise the destination address is ignored (its weight set to 0). + The value represents the percent of calls to be sent to that gateways. + The sum must not exceed 100, otherwise the destinations whose weight + added to the sum go over 100 are ignored. If the sum is less than 100, + then the last destination is used to fill the missing percentage. See + also the description of the corresponding algorithm parameter for ds_select_dst().</para> </listitem> <listitem> <para>'rweight' - used for relative weight based load distribution. It - must be set to a positive integer value between 1 and 100 (otherwise - host will be excluded from relative weight distribution - type). See also the description of the corresponding algorithm - parameter for ds_select_dst().</para> + must be set to a positive integer value between 1 and 100 (inclusive + the limits) otherwise host will be excluded from relative weight + distribution type - its rweight is set to 0. See also the description + of the corresponding algorithm parameter for ds_select_dst().</para> </listitem> <listitem> <para>'socket' - used to set the sending socket for the gateway. It is

3 years, 4 months

git:master:e00f6102: dispatcher: check weight value to be in expected range

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e00f610203fee957a22afc5f8103c1482a925138 URL: https://github.com/kamailio/kamailio/commit/e00f610203fee957a22afc5f8103c14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-10T16:41:18+01:00 dispatcher: check weight value to be in expected range --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e00f610203fee957a22afc5f8103c14… Patch: https://github.com/kamailio/kamailio/commit/e00f610203fee957a22afc5f8103c14… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index e52ffdeae8..c1f4dbfd8f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -284,7 +284,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) param_hooks_t phooks; param_t *pit = NULL; str param; - int tmp_rweight = 0; + int tmp_ival = 0; str sattrs; if(vattrs == NULL || vattrs->len <= 0) { @@ -319,7 +319,15 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) str2sint(&pit->body, &dest->attrs.congestion_control); } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "weight", 6) == 0) { - str2sint(&pit->body, &dest->attrs.weight); + tmp_ival = 0; + str2sint(&pit->body, &tmp_ival); + if(tmp_ival >= 1 && tmp_ival <= 100) { + dest->attrs.weight = tmp_ival; + } else { + dest->attrs.weight = 0; + LM_ERR("weight %d not in 1-100 range - ignoring destination", + tmp_ival); + } } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "latency", 7) == 0) { int initial_latency = 0; @@ -336,12 +344,13 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.sockname = pit->body; } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "rweight", 7) == 0) { - tmp_rweight = 0; - str2sint(&pit->body, &tmp_rweight); - if(tmp_rweight >= 1 && tmp_rweight <= 100) { - dest->attrs.rweight = tmp_rweight; + tmp_ival = 0; + str2sint(&pit->body, &tmp_ival); + if(tmp_ival >= 1 && tmp_ival <= 100) { + dest->attrs.rweight = tmp_ival; } else { - LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); + dest->attrs.rweight = 0; + LM_WARN("rweight %d not in 1-100 range - ignoring", tmp_ival); } } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) {

3 years, 4 months

git:master:7fa61a98: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7fa61a98a52723ee6f990e9cc3aee252f23d433a URL: https://github.com/kamailio/kamailio/commit/7fa61a98a52723ee6f990e9cc3aee25… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-10T16:31:24+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/7fa61a98a52723ee6f990e9cc3aee25… Patch: https://github.com/kamailio/kamailio/commit/7fa61a98a52723ee6f990e9cc3aee25… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 7db3838dec..27d35e78cc 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1063,8 +1063,8 @@ modparam("dispatcher", "reload_delta", 1) (serial forking ordered by priority). + “9” - use weight based load distribution. You have to set the attribute 'weight' for each address (gateway) in destination - set. For more see the description of the 'weight' attribute in - the 'Special Attributes' section. + set. See also the description of the 'weight' attribute in the + 'Special Attributes' section. + “10” - use call load distribution. You have to set the attribute 'duid' (as an unique string id) per each address in destination set. Also, you must set the parameter @@ -1086,10 +1086,14 @@ modparam("dispatcher", "reload_delta", 1) active host rweights in destination group). The major difference from the weight distribution is the probability recalculation according to rweight value in case - of host enabling/disabling - 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. + of destinations being active or inactive. + For example, 100 calls in 3-destinations group with rweight + params 1/2/1 will be distributed as 25/50/25. If the third + destination becomes inactive, the distribution is changed to + 33/67/0. If the computation of percentage per destination is + not an exact integer number, the value is trucated and the + last destination is used to fill the remaining percentage till + 100. Using this algorithm, you can also enable congestion control by setting the attribute 'cc=1', when 'cc' is enabled the 'weight' attribute will also be used to control congestion @@ -1102,6 +1106,8 @@ modparam("dispatcher", "reload_delta", 1) above their congestion threshold(weight), the load distribution is instead done using the ratio of estimated congestion ms. + See also the description of the 'rweight' attribute in the + 'Special Attributes' section. + “12” - dispatch to all destination in setid at once (parallel forking). Note that the XAVPs are no longer set with the values of the destination records, no re-routing making sense @@ -1714,11 +1720,17 @@ kamctl rpc dispatcher.hash 4 bob server.com If set to 0, then no active call limit is used.> * 'weight' - used for weight based load distribution. It must be set to a positive integer value beteen 0 and 100. The value represents - the percent of calls to be sent to that gateways.> + the percent of calls to be sent to that gateways. The sum must not + exceed 100, otherwise the destinations whose weight added to the + sum go over 100 are ignored. If the sum is less than 100, then the + last destination is used to fill the missing percentage. See also + the description of the corresponding algorithm parameter for + ds_select_dst(). * 'rweight' - used for relative weight based load distribution. It must be set to a positive integer value between 1 and 100 (otherwise host will be excluded from relative weight distribution - type). + type). See also the description of the corresponding algorithm + parameter for ds_select_dst(). * 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives. * 'sockname' - used to set by name the sending socket for the

3 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
20
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2020