sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
225 discussions

git:master:199f7cc4: dispatcher: set DS_ALG_OVERLOAD to 64 to be able to use as a flag
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 199f7cc4f29e6bab5f462d0db1942a8a583f8a67 URL: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T11:40:17+02:00 dispatcher: set DS_ALG_OVERLOAD to 64 to be able to use as a flag --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… Patch: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0466f09d9d4..d3ddb81ee82 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,7 +79,7 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 #define DS_ALG_LATENCY 13 -#define DS_ALG_OVERLOAD 14 +#define DS_ALG_OVERLOAD 64 /* 2^6 - can be also used as a flag */ #define DS_HN_SIZE 256 @@ -2618,7 +2618,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) return -1; xavp_filled = 1; break; - case DS_ALG_OVERLOAD: /* 14 - round robin with overload control */ + case DS_ALG_OVERLOAD: /* 64 - round robin with overload control */ lock_get(&idx->lock); hash = idx->last; idx->last = (idx->last + 1) % idx->nr;

1 0

git:master:42998ac2: dispatcher: function to set oc rate for destination records
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 42998ac2b33ec9fd47d3b1491b48f4d75d842e55 URL: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T11:09:58+02:00 dispatcher: function to set oc rate for destination records --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d… Patch: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d…

1 0

git:master:b7d7c6e2: core: fixup helpers for int-str-int params
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: b7d7c6e24a906ed4f58bda603ec4574786919caf URL: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T10:50:28+02:00 core: fixup helpers for int-str-int params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… Patch: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index bba3a469028..ec4e016ed88 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1029,3 +1029,35 @@ int fixup_free_ssii(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +int fixup_isi(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + return fixup_igp_null(param, 1); + case 2: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_isi(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + return fixup_free_igp_null(param, 1); + case 2: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index d3f954fb1c2..aafb3a4cbff 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -184,4 +184,7 @@ int fixup_free_sssi(void **param, int param_no); int fixup_ssii(void **param, int param_no); int fixup_free_ssii(void **param, int param_no); +int fixup_isi(void **param, int param_no); +int fixup_free_isi(void **param, int param_no); + #endif

1 0

git:master:f900e332: dispatcher: round robin with overload control algorithm
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: f900e3325eb80ce8a266663e5fc251537436d449 URL: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T07:44:33+02:00 dispatcher: round robin with overload control algorithm --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… Patch: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8a225f35418..02e1f6e4a83 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -421,6 +421,25 @@ void ds_oc_prepare(ds_dest_t *dp) shuffle_uint100array(dp->ocdist); } +/** + * + */ +static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) +{ + int ret = 0; + + if(alg != DS_ALG_OVERLOAD) { + return 0; + } + + if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { + ret = 0; + } + dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; + + return ret; +} + /** * */ @@ -2556,6 +2575,14 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) return -1; xavp_filled = 1; break; + case DS_ALG_OVERLOAD: /* 14 - round robin with overload control */ + lock_get(&idx->lock); + hash = idx->last; + idx->last = (idx->last + 1) % idx->nr; + vlast = idx->last; + lock_release(&idx->lock); + ulast = 1; + break; default: LM_WARN("algo %d not implemented - using first entry...\n", rstate->alg); @@ -2571,7 +2598,9 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) i = hash; /* if selected address is inactive, find next active */ - while(!xavp_filled && ds_skip_dst(idx->dlist[i].flags)) { + while(!xavp_filled + && (ds_skip_dst(idx->dlist[i].flags) + || ds_oc_skip(idx, rstate->alg, i))) { if(ds_use_default != 0 && idx->nr != 1) i = (i + 1) % (idx->nr - 1); else @@ -2580,7 +2609,8 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) /* back to start -- looks like no active dst */ if(ds_use_default != 0) { i = idx->nr - 1; - if(ds_skip_dst(idx->dlist[i].flags)) + if(ds_skip_dst(idx->dlist[i].flags) + || ds_oc_skip(idx, rstate->alg, i)) return -1; break; } else {

1 0

git:master:f7c41e66: dispatcher: prepare oc-based distribution
by Daniel-Constantin Mierla 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: f7c41e6602f397987470d4ff8a50b51ff16dd521 URL: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-06T20:32:36+02:00 dispatcher: prepare oc-based distribution --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… Patch: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d22188ada1f..8a225f35418 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -409,6 +409,18 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) return 0; } +/** + * + */ +void ds_oc_prepare(ds_dest_t *dp) +{ + int i; + for(i = 0; i < dp->attrs.ocrate; i++) { + dp->ocdist[i] = 1; + } + shuffle_uint100array(dp->ocdist); +} + /** * */ @@ -562,6 +574,8 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) } } + ds_oc_prepare(dp); + return dp; err: if(dp != NULL) {

1 0

git:master:b6cd84b9: dispatcher: new set of attributes oc-based routing
by Daniel-Constantin Mierla 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: b6cd84b999030acb2db03ce9ff9d3de4d942fff9 URL: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-06T20:32:36+02:00 dispatcher: new set of attributes oc-based routing - ocmin, ocmax and ocrate --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… Patch: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9e27f998c25..d22188ada1f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,7 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 #define DS_ALG_LATENCY 13 +#define DS_ALG_OVERLOAD 14 #define DS_HN_SIZE 256 @@ -376,8 +377,33 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "obproxy", 7) == 0) { dest->attrs.obproxy = pit->body; + } else if(pit->name.len == 5 + && strncasecmp(pit->name.s, "ocmin", 5) == 0) { + str2int(&pit->body, &dest->attrs.ocmin); + } else if(pit->name.len == 5 + && strncasecmp(pit->name.s, "ocmax", 5) == 0) { + str2int(&pit->body, &dest->attrs.ocmax); + } else if(pit->name.len == 6 + && strncasecmp(pit->name.s, "ocrate", 6) == 0) { + str2int(&pit->body, &dest->attrs.ocmin); } } + if(dest->attrs.ocmax <= 0 || dest->attrs.ocmax > 100) { + dest->attrs.ocmax = 100; + } + if(dest->attrs.ocmin <= 0 || dest->attrs.ocmin > 100) { + dest->attrs.ocmin = 10; + } + if(dest->attrs.ocrate <= 0 || dest->attrs.ocrate > 100) { + dest->attrs.ocrate = 10; + } + if(dest->attrs.ocrate < dest->attrs.ocmin) { + dest->attrs.ocrate = dest->attrs.ocmin; + } + if(dest->attrs.ocrate > dest->attrs.ocmax) { + dest->attrs.ocrate = dest->attrs.ocmax; + } + if(params_list) free_params(params_list); return 0; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index a887c555932..296097b7e97 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -204,6 +204,9 @@ typedef struct _ds_attrs { str ping_from; str obproxy; int rpriority; + uint32_t ocmin; + uint32_t ocmax; + uint32_t ocrate; } ds_attrs_t; typedef struct _ds_latency_stats { @@ -236,6 +239,8 @@ typedef struct _ds_dest { unsigned short int proto; /*!< protocol of the URI */ int message_count; struct timeval dnstime; + uint32_t ocidx; + uint32_t ocdist[100]; struct _ds_dest *next; } ds_dest_t;

1 0

git:master:388cc4fc: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: 388cc4fc7531f803cdd401384b9d6baaa0d81054 URL: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-06T11:46:10+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… Patch: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index ae0702db5bd..335d02e2efd 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -631,6 +631,7 @@ modparam("p_usrloc", "default_db_type", "cluster") * 0 uses the old style using aor, contact and call-id * 1 uses ruid value * 2 uses the new style using aor, contact and call-id + * 3 uses contact uniq value + ruid value Default value is 0

1 0

[kamailio/kamailio] p_usrloc: Add update/delete based on uniq (PR #3865)
by Stefan Mititelu 06 Jun '24

06 Jun '24

#### 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 - [ ] 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  Add a new update/delete function based on contact's uniq uniq. Some devices may use same uniq for multiple contacts, so I needed to restrain it further based on ruid value. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3865 -- Commit Summary -- * p_usrloc: Add update/delete based on uniq -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (5) M src/modules/p_usrloc/ucontact.c (307) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3865.patch https://github.com/kamailio/kamailio/pull/3865.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3865 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3865(a)github.com>

2 2

git:master:8b6b3881: p_usrloc: Add update/delete based on uniq
by Stefan Mititelu 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: 8b6b3881594b4f2ac1b50b9c83cd0e1dac3ec321 URL: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-06-06T12:34:14+03:00 p_usrloc: Add update/delete based on uniq --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Patch: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1…

1 0

[kamailio/kamailio] pdb: make 'timeout' runtime configurable (PR #3850)
by Stefan Mititelu 05 Jun '24

05 Jun '24

#### 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 - [ ] 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  Make timeout modparam runtime configurable. Also update timout execeded logs from NOTICE to ERR and add more info to them. Also update utils/pdbt.c query tool to allow 0 carrier id. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3850 -- Commit Summary -- * pdb: make 'timeout' runtime configurable -- File Changes -- A src/modules/pdb/config.c (42) A src/modules/pdb/config.h (37) M src/modules/pdb/pdb.c (40) M utils/pdbt/pdbt.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3850.patch https://github.com/kamailio/kamailio/pull/3850.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3850 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3850(a)github.com>

3 5

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024