Module: kamailio
Branch: master
Commit: c2bde271f9d606e6cef987a223f746092c59d306
URL: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2024-06-07T12:02:04+02:00
dispatcher: docs for algorithm 64 - round robin with overload control
---
Modified: src/modules/dispatcher/doc/dispatcher_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460…
Patch: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460…
---
diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml
index 83ef06285a0..979b59798af 100644
--- a/src/modules/dispatcher/doc/dispatcher_admin.xml
+++ b/src/modules/dispatcher/doc/dispatcher_admin.xml
@@ -1418,6 +1418,13 @@ With congestion control the formula becomes :
</programlisting>
</example>
</listitem>
+ <listitem>
+ <para>
+ <quote>64</quote> - round-robin (next destination) with over
+ load control (destination record is skipped based on over
+ load control rate).
+ </para>
+ </listitem>
<listitem>
<para>
<quote>X</quote> - if the algorithm is not implemented, the
@@ -2388,6 +2395,14 @@ kamctl rpc dispatcher.hash 4 bob server.com
<listitem>
<para>'latency' - latency_stats initialization in ms.</para>
</listitem>
+ <listitem>
+ <para>'ocmin' - minimum limit for over load control rate
+ (value between 0 and 100, default 10).</para>
+ </listitem>
+ <listitem>
+ <para>'ocrate' - over load control rate
+ (value between 0 and 100, default 100).</para>
+ </listitem>
</itemizedlist>
</para>
</section>
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;
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [X] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
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.patchhttps://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>