<!-- 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 -->
- [ ] Commit message has the format required by CONTRIBUTING guide
- [ ] Commits are split per component (core, individual modules, libs, utils, ...)
- [ ] Each component has a single commit (if not, squash them into one commit)
- [ ] 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)
- [ ] 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
- [ ] 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/2001
-- Commit Summary --
* ims_ipsec_pcscf: support for multiple TCP connections
* ims_registrar_pcscf: update contacts with user callbacks
* ims_usrloc_pcscf: added a new match key for ipsec location tbl
* kamctl: added new fields in ims_usrloc_pcscf db
-- File Changes --
M src/modules/ims_ipsec_pcscf/cmd.c (230)
M src/modules/ims_ipsec_pcscf/cmd.h (12)
M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (28)
M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (244)
M src/modules/ims_ipsec_pcscf/ipsec.c (166)
M src/modules/ims_ipsec_pcscf/ipsec.h (11)
A src/modules/ims_ipsec_pcscf/port_gen.c (145)
A src/modules/ims_ipsec_pcscf/port_gen.h (40)
A src/modules/ims_ipsec_pcscf/sec_agree.c (264)
A src/modules/ims_ipsec_pcscf/sec_agree.h (35)
M src/modules/ims_ipsec_pcscf/spi_gen.c (3)
M src/modules/ims_ipsec_pcscf/spi_list.c (2)
M src/modules/ims_ipsec_pcscf/spi_list_tests.c (32)
M src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c (15)
M src/modules/ims_registrar_pcscf/save.c (42)
M src/modules/ims_usrloc_pcscf/udomain.c (101)
M src/modules/ims_usrloc_pcscf/udomain.h (1)
M src/modules/ims_usrloc_pcscf/ul_callback.c (44)
M src/modules/ims_usrloc_pcscf/ul_callback.h (1)
M src/modules/ims_usrloc_pcscf/usrloc.c (1)
M src/modules/ims_usrloc_pcscf/usrloc.h (4)
M src/modules/ims_usrloc_pcscf/usrloc_db.c (119)
M src/modules/ims_usrloc_pcscf/usrloc_db.h (4)
M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2001.patchhttps://github.com/kamailio/kamailio/pull/2001.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/2001
The setting "keep_proxy_rr" will add the Record-Route headers added by the
proxy to the route_set stored in the dialog. When in use, sending locally
generated in-dialog requests will loop back to the proxy with a proper
Record-Route header, including any parameters.
<!-- 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 on 5.1, compile tested on master
- [ ] 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/1832
-- Commit Summary --
* dialog: Add setting to loop BYE through proxy
-- File Changes --
M src/modules/dialog/dialog.c (9)
M src/modules/dialog/dlg_handlers.c (29)
M src/modules/dialog/dlg_handlers.h (2)
M src/modules/dialog/dlg_hash.c (82)
M src/modules/dialog/dlg_hash.h (9)
M src/modules/dialog/doc/dialog_admin.xml (36)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1832.patchhttps://github.com/kamailio/kamailio/pull/1832.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/1832
Module: kamailio
Branch: master
Commit: 0b3562ace82e089e904fbe63ee0aeb3e06c4105c
URL: https://github.com/kamailio/kamailio/commit/0b3562ace82e089e904fbe63ee0aeb3…
Author: Alex Hermann <alex(a)speakup.nl>
Committer: Henning Westerholt <henningw(a)users.noreply.github.com>
Date: 2019-07-15T21:15:57+02:00
dialog: Add setting to loop BYE through proxy
The setting "keep_proxy_rr" will add the Record-Route headers added by the
proxy to the route_set stored in the dialog. When in use, sending locally
generated in-dialog requests will loop back to the proxy with a proper
Record-Route header, including any parameters.
---
Modified: src/modules/dialog/dialog.c
Modified: src/modules/dialog/dlg_handlers.c
Modified: src/modules/dialog/dlg_handlers.h
Modified: src/modules/dialog/dlg_hash.c
Modified: src/modules/dialog/dlg_hash.h
Modified: src/modules/dialog/doc/dialog_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/0b3562ace82e089e904fbe63ee0aeb3…
Patch: https://github.com/kamailio/kamailio/commit/0b3562ace82e089e904fbe63ee0aeb3…
Module: kamailio
Branch: master
Commit: ad5a346c13c20603f732b6a0a0988746850cfbaf
URL: https://github.com/kamailio/kamailio/commit/ad5a346c13c20603f732b6a0a098874…
Author: Henning Westerholt <hw(a)skalatan.de>
Committer: Henning Westerholt <hw(a)skalatan.de>
Date: 2019-07-15T20:37:46+02:00
ims_registrar_pcscf: remove commented out code after merge 57961c9f
---
Modified: src/modules/ims_registrar_pcscf/save.c
---
Diff: https://github.com/kamailio/kamailio/commit/ad5a346c13c20603f732b6a0a098874…
Patch: https://github.com/kamailio/kamailio/commit/ad5a346c13c20603f732b6a0a098874…
---
diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c
index 9773477131..50d1fb2333 100644
--- a/src/modules/ims_registrar_pcscf/save.c
+++ b/src/modules/ims_registrar_pcscf/save.c
@@ -204,18 +204,7 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma
LM_DBG("This is a de-registration for contact <%.*s> but contact is not in usrloc - ignore\n", c->uri.len, c->uri.s);
goto next_contact;
}
-
- LM_DBG("We don't add contact from the 200OK that did not go through us (ie, not present in explicit REGISTER that went through us\n");
-// LM_DBG("Adding pcontact: <%.*s>, expires: %d which is in %d seconds\n", c->uri.len, c->uri.s, expires, expires-local_time_now);
-// ci.reg_state = PCONTACT_REGISTERED;
-// if (ul.insert_pcontact(_d, &c->uri, &ci, &pcontact) != 0) {
-// LM_ERR("Failed inserting new pcontact\n");
-// } else {
-// //register for callbacks on this contact so we can send PUBLISH to SCSCF should status change
-// LM_DBG("registering for UL callback\n");
-// ul.register_ulcb(pcontact, PCSCF_CONTACT_DELETE | PCSCF_CONTACT_EXPIRE, callback_pcscf_contact_cb, NULL);
-// //we also need to subscribe to reg event of this contact at SCSCF
-// }
+ LM_DBG("We don't add contact from the 200OK that did not go through us (ie, not present in explicit REGISTER that went through us\n");
} else { //contact already exists - update
LM_DBG("contact already exists and is in state (%d) : [%s]\n",pcontact->reg_state, reg_state_to_string(pcontact->reg_state));
if ((expires-local_time_now)<=0) { //remove contact - de-register