sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
221 discussions

git:master:f7c41e66: dispatcher: prepare oc-based distribution

by Daniel-Constantin Mierla

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) {

3 months, 3 weeks

git:master:b6cd84b9: dispatcher: new set of attributes oc-based routing

by Daniel-Constantin Mierla

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;

3 months, 3 weeks

git:master:388cc4fc: modules: readme files regenerated - p_usrloc ... [skip ci]

by Kamailio Dev

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

3 months, 3 weeks

[kamailio/kamailio] p_usrloc: Add update/delete based on uniq (PR #3865)

by Stefan Mititelu

#### 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>

3 months, 3 weeks

git:master:8b6b3881: p_usrloc: Add update/delete based on uniq

by Stefan Mititelu

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…

3 months, 3 weeks

[kamailio/kamailio] pdb: make 'timeout' runtime configurable (PR #3850)

by Stefan Mititelu

#### 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 months, 3 weeks

git:master:fc07aad0: pdbt: Allow to return carrier id 0

by Henning Westerholt

Module: kamailio Branch: master Commit: fc07aad0beaae9e133ca3252b088afd9eece0c53 URL: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdbt: Allow to return carrier id 0 --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Patch: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index be670eeb7f8..d9fa0bca45d 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -628,15 +628,14 @@ int query_server(char *number, char *comment, void *data) { carrierid = query_udp(number, sdata->timeout, &(sdata->pfds), &(sdata->dstaddr), sdata->dstaddrlen); - if (carrierid<=0) { + if(carrierid < 0) { LINFO("%s: not_found: comment='%s', result=%d\n", number, comment, carrierid); if (carrierid < 0) { result = carrierid; } else { result = PDB_NOT_IN_PDB; } - } - else { + } else { LINFO("%s:%ld:%s\n", number, (long int)carrierid, carrierid2name(carrierid)); result = PDB_OK; }

3 months, 3 weeks

git:master:f57be803: pdb: make 'timeout' runtime configurable

by Henning Westerholt

Module: kamailio Branch: master Commit: f57be8030834cdeb0bb509d0d25afc89f3cca6e8 URL: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdb: make 'timeout' runtime configurable Also modify logs related to timeout from NOTICE to ERR and add a bit more info to them. --- Added: src/modules/pdb/config.c Added: src/modules/pdb/config.h Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Patch: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8…

3 months, 3 weeks

git:master:77cb0050: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 77cb0050b0e60bf42b28b77f09e6bd00d57481dd URL: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-05T20:46:10+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0… Patch: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0…

3 months, 3 weeks

git:master:d1ec2972: siputils: docs for is_sip() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d1ec29726484026c27902832a3daa052d5d68c3d URL: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-05T20:30:20+02:00 siputils: docs for is_sip() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… Patch: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index ad30a1a9f6e..dbbba7a6db6 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1131,6 +1131,27 @@ if (is_reply()) { ... } ... +</programlisting> + </example> + </section> + <section id="siputils.f.is_sip"> + <title> + <function moreinfo="none">is_sip()</function> + </title> + <para> + Return true if it is a SIP message. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_sip</function> usage</title> + <programlisting format="linespecific"> +... +if (is_sip()) { + ... +} +... </programlisting> </example> </section>

3 months, 3 weeks

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024