sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:master:49e80dbe: app_squirrel: updated squirrel interpreter to latest git version

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 49e80dbe4b47f3252445fbad6e12d7150304f5a3 URL: https://github.com/kamailio/kamailio/commit/49e80dbe4b47f3252445fbad6e12d71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-07T19:17:32+02:00 app_squirrel: updated squirrel interpreter to latest git version --- Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp --- Diff: https://github.com/kamailio/kamailio/commit/49e80dbe4b47f3252445fbad6e12d71… Patch: https://github.com/kamailio/kamailio/commit/49e80dbe4b47f3252445fbad6e12d71… --- diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp index 7f7599bbfb..919bd9e924 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp +++ b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp @@ -181,7 +181,7 @@ static SQInteger _string_printf(HSQUIRRELVM v) return -1; SQPRINTFUNCTION printfunc = sq_getprintfunc(v); - if(printfunc) printfunc(v,dest); + if(printfunc) printfunc(v,_SC("%s"),dest); return 0; } diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp index b008a44d5e..d326be1af9 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp +++ b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp @@ -19,6 +19,10 @@ #define scremove remove #define screname rename #endif +#ifdef IOS + #include <spawn.h> + extern char **environ; +#endif static SQInteger _system_getenv(HSQUIRRELVM v) { @@ -30,18 +34,22 @@ static SQInteger _system_getenv(HSQUIRRELVM v) return 0; } - static SQInteger _system_system(HSQUIRRELVM v) { const SQChar *s; if(SQ_SUCCEEDED(sq_getstring(v,2,&s))){ - sq_pushinteger(v,scsystem(s)); + #ifdef IOS + pid_t pid; + posix_spawn(&pid, s, NULL, NULL, NULL, environ); + sq_pushinteger(v, 0); + #else + sq_pushinteger(v,scsystem(s)); + #endif return 1; } return sq_throwerror(v,_SC("wrong param")); } - static SQInteger _system_clock(HSQUIRRELVM v) { sq_pushfloat(v,((SQFloat)clock())/(SQFloat)CLOCKS_PER_SEC); diff --git a/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp b/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp index b39be72a77..dcf823d735 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp +++ b/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp @@ -671,7 +671,7 @@ bool SQVM::IsFalse(SQObjectPtr &o) #if !defined(SQUSEDOUBLE) || (defined(SQUSEDOUBLE) && defined(_SQ64)) || (_integer(o) == 0) ) //OT_NULL|OT_INTEGER|OT_BOOL #else - || (((type(o) != OT_FLOAT) && (_integer(o) == 0))) ) //OT_NULL|OT_INTEGER|OT_BOOL + || (((sq_type(o) != OT_FLOAT) && (_integer(o) == 0))) ) //OT_NULL|OT_INTEGER|OT_BOOL #endif { return true; @@ -1605,6 +1605,7 @@ SQInteger prevstackbase = _stackbase; } break; default: + Raise_Error(_SC("attempt to call '%s'"), GetTypeName(closure)); return false; } #ifdef _DEBUG

4 years, 6 months

git:master:120e87d4: app_jsdt: regenerated the static exports table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 120e87d465c7093f24414718cd01fbda944a1a03 URL: https://github.com/kamailio/kamailio/commit/120e87d465c7093f24414718cd01fbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-07T19:17:32+02:00 app_jsdt: regenerated the static exports table --- Modified: src/modules/app_jsdt/app_jsdt_kemi_export.c Modified: src/modules/app_jsdt/app_jsdt_kemi_export.h --- Diff: https://github.com/kamailio/kamailio/commit/120e87d465c7093f24414718cd01fbd… Patch: https://github.com/kamailio/kamailio/commit/120e87d465c7093f24414718cd01fbd…

4 years, 6 months

git:master:cb55929b: app_jsdt: utils/app_jsdt_ctl - increase the static table size to 1536

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb55929b8ce39aee2af193e59034e43af7a44781 URL: https://github.com/kamailio/kamailio/commit/cb55929b8ce39aee2af193e59034e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-07T19:17:32+02:00 app_jsdt: utils/app_jsdt_ctl - increase the static table size to 1536 --- Modified: src/modules/app_jsdt/utils/app_jsdt_ctl --- Diff: https://github.com/kamailio/kamailio/commit/cb55929b8ce39aee2af193e59034e43… Patch: https://github.com/kamailio/kamailio/commit/cb55929b8ce39aee2af193e59034e43… --- diff --git a/src/modules/app_jsdt/utils/app_jsdt_ctl b/src/modules/app_jsdt/utils/app_jsdt_ctl index 26e37aa4ca..ee859f1812 100755 --- a/src/modules/app_jsdt/utils/app_jsdt_ctl +++ b/src/modules/app_jsdt/utils/app_jsdt_ctl @@ -2,7 +2,7 @@ # generate the .h file -KEMI_MAX_SIZE=1024 +KEMI_MAX_SIZE=1536 cat > ../app_jsdt_kemi_export.h <<EOF /**

4 years, 6 months

[kamailio/kamailio] acc: skip cdr generation for certain calls (#2348)

by Carlos Cruz Luengo

### Description I haven't found a way to skip CDR generation per call once [cdr_enable modparam](http://kamailio.org/docs/modules/devel/modules/acc.html#acc.p.cdr… is enabled. ### Expected behavior I have implemented via irontec/kamailio@38964a31d6c0158b7c9bb3abb4e9eb72aa8cd960 adding a new modparam with the dlg_var name that will prevent CDR generation for calls with that dlg_var set. #### Actual observed behavior Once CDR generation is enabled with [cdr_enable modparam](http://kamailio.org/docs/modules/devel/modules/acc.html#acc.p.cdr… all calls generate CDR. ### Additional Information I can make a PR adapting that patch and documenting new modparam, as long as there is no way of achieving it that I have missed and if you find it useful. Thank you and regards, -- 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/2348

4 years, 6 months

[kamailio/kamailio] dispatcher: don't reset load table when adding/removing a destination… (#2342)

by Federico Cabiddu

… or reloading the list   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 When a destination is added/removed or the whole list is reloaded, the calls that are being routed to another destination will fail. This because ds_load_replace is returning an error not finding in the table the entry for the call being rerouted. Another side effect of this is that when adding/removing destinations the actual load of the endpoints will be wrong since the current calls will never be deleted. I've removed the calls to ds_clean_slots and modified ds_load_replace to not exit when the old destination is not found (the endpoint could have been removed after the failover list had been created) and to return a new error code (-2) when the new destination is not found (for the same reason). Finally I've modified ds_update_dst to skip the current selected destination and select the next if ds_load_replace returns -2. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2342 -- Commit Summary -- * dispatcher: don't reset load table when adding/removing a destination or reloading the list -- File Changes -- M src/modules/dispatcher/dispatch.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2342.patch https://github.com/kamailio/kamailio/pull/2342.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/2342

4 years, 6 months

git:5.3:88676c2f: dispatcher: don't reset load table when adding/removing a destination or reloading the list

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 88676c2f083c2d7e52ae6b42f5cbe83f64357865 URL: https://github.com/kamailio/kamailio/commit/88676c2f083c2d7e52ae6b42f5cbe83… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:13:21Z dispatcher: don't reset load table when adding/removing a destination or reloading the list (cherry picked from commit 4099a6caf856c9af4d7d89aec73db143efbcd40b) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/88676c2f083c2d7e52ae6b42f5cbe83… Patch: https://github.com/kamailio/kamailio/commit/88676c2f083c2d7e52ae6b42f5cbe83… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 36cf884b48..d66a48e919 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -870,7 +870,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1118,7 +1118,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1609,22 +1608,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2317,6 +2318,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2329,6 +2331,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2376,12 +2379,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; } @@ -2432,7 +2441,7 @@ int ds_add_dst(int group, str *address, int flags) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -2487,7 +2496,7 @@ int ds_remove_dst(int group, str *address) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0;

4 years, 6 months

git:5.3:ac47ce90: dispatcher: sync on load management operations

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: ac47ce9019616ffda2d206f42fbecb142a5fc55d URL: https://github.com/kamailio/kamailio/commit/ac47ce9019616ffda2d206f42fbecb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:13:14Z dispatcher: sync on load management operations - use locks to increment/decrement call load and get least loaded dst - GH #2322 (cherry picked from commit d14833d9d1ad6cc92c65e279b7dd89b3b922f129) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ac47ce9019616ffda2d206f42fbecb1… Patch: https://github.com/kamailio/kamailio/commit/ac47ce9019616ffda2d206f42fbecb1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index aaa7b4a2d5..36cf884b48 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,22 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 +/* increment call load */ +#define DS_LOAD_INC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + (dgrp)->dlist[didx].dload++; \ + lock_release(&(dgrp)->lock); \ + } while(0) + +/* decrement call load */ +#define DS_LOAD_DEC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + if(likely((dgrp)->dlist[didx].dload > 0)) { \ + (dgrp)->dlist[didx].dload--; \ + } \ + lock_release(&(dgrp)->lock); \ + } while(0) + static int _ds_table_version = DS_TABLE_VERSION; static ds_ht_t *_dsht_load = NULL; @@ -1506,6 +1522,7 @@ int ds_get_leastloaded(ds_set_t *dset) k = -1; t = 0x7fffffff; /* high load */ + lock_get(&dset->lock); \ for(j = 0; j < dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) && (dset->dlist[j].attrs.maxload == 0 @@ -1517,6 +1534,7 @@ int ds_get_leastloaded(ds_set_t *dset) } } } + lock_release(&dset->lock); \ return k; } @@ -1538,7 +1556,7 @@ int ds_load_add(struct sip_msg *msg, ds_set_t *dset, int setid, int dst) msg->callid->body.s); return -1; } - dset->dlist[dst].dload++; + DS_LOAD_INC(dset, dst); return 0; } @@ -1606,8 +1624,7 @@ int ds_load_replace(struct sip_msg *msg, str *duid) ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -1646,8 +1663,7 @@ int ds_load_remove_byid(int set, str *duid) return -1; } - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); return 0; }

4 years, 6 months

git:5.2:c9ad77e7: dispatcher: don't reset load table when adding/removing a destination or reloading the list

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: c9ad77e7d0ff7fb6ff4b9763cdea9b84f5ba739e URL: https://github.com/kamailio/kamailio/commit/c9ad77e7d0ff7fb6ff4b9763cdea9b8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:20:48Z dispatcher: don't reset load table when adding/removing a destination or reloading the list - manual backport from 4099a6caf856c9a --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ad77e7d0ff7fb6ff4b9763cdea9b8… Patch: https://github.com/kamailio/kamailio/commit/c9ad77e7d0ff7fb6ff4b9763cdea9b8… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 4561649ebc..77294c7782 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -851,7 +851,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1096,7 +1096,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1587,22 +1586,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2310,6 +2311,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2322,6 +2324,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2369,12 +2372,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; }

4 years, 6 months

git:5.2:75fdcec6: dispatcher: sync on load management operations

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 75fdcec6241fc4439805f7781114d1f44cbe2528 URL: https://github.com/kamailio/kamailio/commit/75fdcec6241fc4439805f7781114d1f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:16:04Z dispatcher: sync on load management operations - use locks to increment/decrement call load and get least loaded dst - GH #2322 - manual backport of d14833d9d1a --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/75fdcec6241fc4439805f7781114d1f… Patch: https://github.com/kamailio/kamailio/commit/75fdcec6241fc4439805f7781114d1f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 71bbb6239f..4561649ebc 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,22 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 +/* increment call load */ +#define DS_LOAD_INC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + (dgrp)->dlist[didx].dload++; \ + lock_release(&(dgrp)->lock); \ + } while(0) + +/* decrement call load */ +#define DS_LOAD_DEC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + if(likely((dgrp)->dlist[didx].dload > 0)) { \ + (dgrp)->dlist[didx].dload--; \ + } \ + lock_release(&(dgrp)->lock); \ + } while(0) + static int _ds_table_version = DS_TABLE_VERSION; static ds_ht_t *_dsht_load = NULL; @@ -1484,6 +1500,7 @@ int ds_get_leastloaded(ds_set_t *dset) k = -1; t = 0x7fffffff; /* high load */ + lock_get(&dset->lock); \ for(j = 0; j < dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) && (dset->dlist[j].attrs.maxload == 0 @@ -1495,6 +1512,7 @@ int ds_get_leastloaded(ds_set_t *dset) } } } + lock_release(&dset->lock); \ return k; } @@ -1516,7 +1534,7 @@ int ds_load_add(struct sip_msg *msg, ds_set_t *dset, int setid, int dst) msg->callid->body.s); return -1; } - dset->dlist[dst].dload++; + DS_LOAD_INC(dset, dst); return 0; } @@ -1584,8 +1602,7 @@ int ds_load_replace(struct sip_msg *msg, str *duid) ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -1673,8 +1690,7 @@ int ds_load_remove_byid(int set, str *duid) return -1; } - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); return 0; }

4 years, 6 months

git:5.2:50f60972: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: 50f60972abbde849c3e637cece7b08777ff3a515 URL: https://github.com/kamailio/kamailio/commit/50f60972abbde849c3e637cece7b087… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T19:46:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/50f60972abbde849c3e637cece7b087… Patch: https://github.com/kamailio/kamailio/commit/50f60972abbde849c3e637cece7b087… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 69b4fb247d..d7c1a25a5f 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -424,7 +424,8 @@ modparam("siptrace", "trace_delayed", 1) The local interface in the form of SIP URI from where to send the duplicated traffic. In the absence of this parameter Kamailio - automatically picks an interface. + automatically picks an interface. This parameter is only used for HEP + forwarding, not for SIP forwarding mode. Example 1.17. Set force_send_sock parameter ...

4 years, 6 months

← Newer
1
...
31
32
33
34
35
36
37
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020