Module: kamailio
Branch: master
Commit: b31efd5526cf11eded7823c6e93370024f5d2863
URL: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2021-07-22T15:46:15+02:00
modules: readme files regenerated - sworker ... [skip ci]
---
Modified: src/modules/sworker/README
---
Diff: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700…
Patch: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700…
---
diff --git a/src/modules/sworker/README b/src/modules/sworker/README
index 241b077ab6..c5d571a179 100644
--- a/src/modules/sworker/README
+++ b/src/modules/sworker/README
@@ -115,7 +115,7 @@ request_route {
that, 'drop' must be used so processing of the message does not
continue to request_route or reply_route in the same process, it is
going to be done by the delegated group of workers. It returns -1
- (false) in case there was a proble delegating the processing.
+ (false) in case there was a problem delegating the processing.
This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.
<!-- 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
- [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:
<!-- 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, testet against local branch of 5.1.6
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
Until this fix, only the function record_route() considered the
value of the custom user AVP (if present). The functions
record_route_preset() and record_route_advertised_address(),
on the other hand, ignored the value of the custom user AVP,
even if it was presnt.
Now all three functions, record_route(), record_route_preset()
and record_route_advertised_address(), consider the value of the
custom user VP, if it is present.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2804
-- Commit Summary --
* rr: all "record_route_...()" functions consider custom user AVP
-- File Changes --
M src/modules/rr/record.c (18)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2804.patchhttps://github.com/kamailio/kamailio/pull/2804.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/2804
Module: kamailio
Branch: master
Commit: fc62ceeb6d625acda6952486031efa1fe2945768
URL: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-07-22T15:34:48+02:00
sworker: docs - fixed small typo
---
Modified: src/modules/sworker/doc/sworker_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1…
Patch: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1…
---
diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml
index 9656ff1071..2110998f2f 100644
--- a/src/modules/sworker/doc/sworker_admin.xml
+++ b/src/modules/sworker/doc/sworker_admin.xml
@@ -109,7 +109,7 @@ request_route {
'drop' must be used so processing of the message does not continue to
request_route or reply_route in the same process, it is going to be done
by the delegated group of workers. It returns -1 (false) in case there
- was a proble delegating the processing.
+ was a problem delegating the processing.
</para>
<para>
This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.
Module: kamailio
Branch: master
Commit: f3a031a53fb413369ddf96de74ac43cd6831db5a
URL: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c…
Author: valentin <christoph.valentin(a)kontron.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-07-22T15:32:21+02:00
rr: all "record_route_...()" functions consider custom user AVP
Until this fix, only the function record_route() considered the
value of the custom user AVP (if present). The functions
record_route_preset() and record_route_advertised_address(),
on the other hand, ignored the value of the custom user AVP,
even if it was presnt.
Now all three functions, record_route(), record_route_preset()
and record_route_advertised_address(), consider the value of the
custom user VP, if it is present.
---
Modified: src/modules/rr/record.c
---
Diff: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c…
Patch: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c…
---
diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c
index 8624ee5e13..b6178cade3 100644
--- a/src/modules/rr/record.c
+++ b/src/modules/rr/record.c
@@ -527,9 +527,12 @@ int record_route_preset(struct sip_msg* _m, str* _data)
}
if (add_username) {
- if (get_username(_m, &user) < 0) {
- LM_ERR("failed to extract username\n");
- return -1;
+ /* check if there is a custom user set */
+ if (get_custom_user(_m, &user) < 0) {
+ if (get_username(_m, &user) < 0) {
+ LM_ERR("failed to extract username\n");
+ return -1;
+ }
}
} else if (use_ob == 1) {
if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) {
@@ -814,9 +817,12 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data)
user.s = 0;
if (add_username) {
- if (get_username(_m, &user) < 0) {
- LM_ERR("failed to extract username\n");
- return -1;
+ /* check if there is a custom user set */
+ if (get_custom_user(_m, &user) < 0) {
+ if (get_username(_m, &user) < 0) {
+ LM_ERR("failed to extract username\n");
+ return -1;
+ }
}
} else if (use_ob == 1) {
if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) {