<!-- 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 -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2426
-- Commit Summary --
* ims_usrloc_pcscf: added a reverse searchin get_pcontact * ims_registrar_pcscf: update_contacts get received from req * ims_qos: extend get_pcontact with the new parameter. * ims_ipsec_pcscf: extend get_pcontact with the new parameter.
-- File Changes --
M src/modules/ims_ipsec_pcscf/cmd.c (7) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (5) M src/modules/ims_qos/cdpeventprocessor.c (2) M src/modules/ims_qos/ims_qos_mod.c (2) M src/modules/ims_qos/rx_aar.c (2) M src/modules/ims_registrar_pcscf/notify.c (2) M src/modules/ims_registrar_pcscf/save.c (20) M src/modules/ims_registrar_pcscf/service_routes.c (8) M src/modules/ims_usrloc_pcscf/udomain.c (20) M src/modules/ims_usrloc_pcscf/udomain.h (2) M src/modules/ims_usrloc_pcscf/usrloc.h (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2426.patch https://github.com/kamailio/kamailio/pull/2426.diff
@henningw commented on this pull request.
@@ -76,6 +76,7 @@ extern usrloc_api_t ul;
extern struct tm_binds tmb;
#define IPSEC_SEND_FORCE_SOCKET 0x01 /* if set - set send force socket for request messages */ +#define IPSEC_REVERSE_SEARCH 0x02 /* if set - start seraching from the last element */
small spelling issue - searching
@@ -196,10 +196,24 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma
ci.searchflag = SEARCH_RECEIVED; } } - } + } else { + char* srcip = NULL; + if((srcip = pkg_malloc(50)) == NULL) {
It is necessary to allocate new pkg memory here? The save_pending function just uses a char[50] array for a somewhat similar logic. Just wondered. :-)
@alexyosifov pushed 1 commit.
3b74c1c88f0f16e4560c1141eb9bf2621c9ce875 Update save.c
@alexyosifov pushed 1 commit.
c6d5937c6187193f04a6e772b94b7a2c2e356462 Update cmd.c
Thank you. I will merge it manually to adapt the wrong commit message in the two latest commits.
Merged #2426 into master.
Thanks for the fix, merged