[sr-dev] git:master:e4f3849f: drouting: fix crush for empty username in ruri
Module: kamailio Branch: master Commit: e4f3849f35ae556e317c365d56b14212e48d1dab URL: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b14212e48d1dab Author: Dmitri Savolainen Committer: Henning Westerholt Date: 2018-08-23T19:59:30+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b14212e48d1dab.diff Patch: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b14212e48d1dab.patch --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 099c402dec..9ce8d04bc6 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -98,7 +98,7 @@ rt_info_t *get_prefix(ptree_t *ptree, str *prefix, unsigned int rgid) if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:7ab0b1c0: drouting: fix crush for empty username in ruri
Module: kamailio Branch: 5.0 Commit: 7ab0b1c0fa4028d7d4abb1b621b364584ae0f4b9 URL: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b364584ae0f4b9 Author: Dmitri Savolainen Committer: Henning Westerholt Date: 2018-08-23T20:00:58+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio (cherry picked from commit e4f3849f35ae556e317c365d56b14212e48d1dab) --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b364584ae0f4b9.diff Patch: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b364584ae0f4b9.patch --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 07bd518d64..305ed4f14b 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -115,7 +115,7 @@ get_prefix( if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:ff36d82d: drouting: fix crush for empty username in ruri
Module: kamailio Branch: 5.1 Commit: ff36d82d8861ed50adf91b9e314c29ef8ee3e745 URL: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29ef8ee3e745 Author: Dmitri Savolainen Committer: Henning Westerholt Date: 2018-08-23T20:00:40+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio (cherry picked from commit e4f3849f35ae556e317c365d56b14212e48d1dab) --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29ef8ee3e745.diff Patch: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29ef8ee3e745.patch --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 099c402dec..9ce8d04bc6 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -98,7 +98,7 @@ rt_info_t *get_prefix(ptree_t *ptree, str *prefix, unsigned int rgid) if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] drouting: fix crush for empty username in ruri (#1625)
Merged #1625 into master. -- 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/1625#event-1805951914___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] drouting: fix crush for empty username in ruri (#1625)
Thank you, I will merge and also backport. -- 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/1625#issuecomment-415512290___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f8220f53: modules: readme files regenerated - misc_radius ... [skip ci]
Module: kamailio Branch: master Commit: f8220f53da4494d88e3b371d4cfc6a6b3baca909 URL: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6b3baca909 Author: Kamailio Dev Committer: Kamailio Dev Date: 2018-08-23T17:16:52+02:00 modules: readme files regenerated - misc_radius ... [skip ci] --- Modified: src/modules/misc_radius/README --- Diff: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6b3baca909.diff Patch: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6b3baca909.patch --- diff --git a/src/modules/misc_radius/README b/src/modules/misc_radius/README index 129ca733c7..ec165d9cdd 100644 --- a/src/modules/misc_radius/README +++ b/src/modules/misc_radius/README @@ -326,16 +326,16 @@ radius_load_caller_avps($fU); Sending Access-Accept of id 60 to 192.168.25.32 port 59736 Session-Timeout = 4261674 next-hop-ip = "SIP/00111222333444@cisco-out" -SIP-AVP = "email:sr-us...@lists.sip-router.org session-timeout#161 next-hop- -ip:h323/0001...@myvoip-gate.kamailio.org" +SIP-AVP = "email:sr-us...@lists.kamailio.org session-timeout#161 next-hop-ip +:h323/0001...@myvoip-gate.kamailio.org" session-protocol = "SIP" ... $avp(Session-Timeout) has integer value 4261674 $avp(next-hop-ip) has string value "SIP/00777888@cisco-out" $avp(session-protocol) has string value "SIP" -$avp(SIP-AVP) has string value "email:sr-us...@lists.sip-router.org session-tim -eout#161 next-hop-ip:h323/0001...@myvoip-gate.kamailio.org" +$avp(SIP-AVP) has string value "email:sr-us...@lists.kamailio.org session-timeo +ut#161 next-hop-ip:h323/0001...@myvoip-gate.kamailio.org" ... When receiving negative response, check appropriate avp's: ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b2b2b981: update mailing list URL
Module: kamailio Branch: master Commit: b2b2b981e641eb3b83dd9afd09c8668b8a239741 URL: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668b8a239741 Author: Victor Seva Committer: Victor Seva Date: 2018-08-23T16:59:11+02:00 update mailing list URL --- Modified: .github/ISSUE_TEMPLATE.md Modified: INSTALL Modified: ISSUES Modified: doc/README.md Modified: doc/man/kamailio.8 Modified: doc/man/kamailio.cfg.5 Modified: doc/tutorials/presence/trouble.xml Modified: etc/sip-router.cfg Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/scscf/kamailio.cfg Modified: misc/examples/kemi/kamailio-basic-kemi.cfg Modified: misc/examples/pkg/sip-router-basic.cfg Modified: misc/examples/pkg/sip-router-oob.cfg Modified: misc/tls-ca/README Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/xenial/copyright Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg Modified: src/modules/db_cassandra/kamailio_cassa.cfg Modified: src/modules/dispatcher/doc/dispatcher.cfg Modified: src/modules/ims_ocs/examples/full/kamailio.cfg Modified: src/modules/ims_ocs/examples/simple/kamailio.cfg Modified: src/modules/misc_radius/doc/misc_radius_admin.xml Modified: src/modules/smsops/examples/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668b8a239741.diff Patch: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668b8a239741.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] debian pkg missing dependency on docbook2x (#1624)
Victor Seva writes: > We have no problems with the nightly builds, example: > https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=amd64,distribution=stretch,label=slave/1171/consoleText For sure you have. Exactly the same problem that I described: mkdir -p /tmp/buildd/kamailio-5.2.0~dev6+0~20180823005931.1186+stretch/debian/kamailio/usr/share/man//man5 s ../../../doc/stylesheets/serdoc2man.xsl auth.xml make[3]: s: Command not found ../../Makefile.modules:283: recipe for target 'auth.7' failed make[3]: [auth.7] Error 127 (ignored) s ../../../doc/stylesheets/serdoc2man.xsl avp.xml make[3]: s: Command not found ../../Makefile.modules:283: recipe for target 'avp.7' failed make[3]: [avp.7] Error 127 (ignored) -- 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/issues/1624#issuecomment-415392440___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] debian pkg missing dependency on docbook2x (#1624)
We have no problems with the nightly builds, example: https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=amd64,distribution=stretch,label=slave/1171/consoleText -- 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/issues/1624#issuecomment-415364350___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] drouting: fix crush for empty username in ruri (#1625)
- uri like sip:@host crushed kamailio 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 - [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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue # (replace with an open issue number) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1625 -- Commit Summary -- * drouting: fix crush for empty username in ruri -- File Changes -- M src/modules/drouting/prefix_tree.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1625.patch https://github.com/kamailio/kamailio/pull/1625.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/1625 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] debian pkg missing dependency on docbook2x (#1624)
Kamailio master build on Debian Stretch fails due to missing dependency on docbook2x. See https://lists.kamailio.org//pipermail/sr-dev/2018-August/047549.html for more info. -- 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/issues/1624___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:26449dc2: modules/auth: fixed path in auth.xml
Module: kamailio Branch: master Commit: 26449dc2da3b47dd71265e8103de5957bd2245f4 URL: https://github.com/kamailio/kamailio/commit/26449dc2da3b47dd71265e8103de5957bd2245f4 Author: Juha Heinanen Committer: Juha Heinanen Date: 2018-08-23T11:53:34+03:00 modules/auth: fixed path in auth.xml --- Modified: src/modules/auth/auth.xml --- Diff: https://github.com/kamailio/kamailio/commit/26449dc2da3b47dd71265e8103de5957bd2245f4.diff Patch: https://github.com/kamailio/kamailio/commit/26449dc2da3b47dd71265e8103de5957bd2245f4.patch --- diff --git a/src/modules/auth/auth.xml b/src/modules/auth/auth.xml index 6f5f001d1c..1470f7c9d9 100644 --- a/src/modules/auth/auth.xml +++ b/src/modules/auth/auth.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [ - + %docentities; ]> ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:e2994b6a: ims_ipsec_pcscf: Fix memory leaks in cmd.c
Module: kamailio
Branch: master
Commit: e2994b6ac4846c869894a2783304782854f96f57
URL:
https://github.com/kamailio/kamailio/commit/e2994b6ac4846c869894a2783304782854f96f57
Author: Tsvetomir Dimitrov
Committer: Tsvetomir Dimitrov
Date: 2018-08-23T10:57:44+03:00
ims_ipsec_pcscf: Fix memory leaks in cmd.c
---
Modified: src/modules/ims_ipsec_pcscf/cmd.c
---
Diff:
https://github.com/kamailio/kamailio/commit/e2994b6ac4846c869894a2783304782854f96f57.diff
Patch:
https://github.com/kamailio/kamailio/commit/e2994b6ac4846c869894a2783304782854f96f57.patch
---
diff --git a/src/modules/ims_ipsec_pcscf/cmd.c
b/src/modules/ims_ipsec_pcscf/cmd.c
index b5741e30d8..46056b9214 100644
--- a/src/modules/ims_ipsec_pcscf/cmd.c
+++ b/src/modules/ims_ipsec_pcscf/cmd.c
@@ -161,7 +161,7 @@ static int fill_contact(struct pcontact_info* ci, struct
sip_msg* m)
cb = cscf_parse_contacts(req);
if (!cb || (!cb->contacts)) {
LM_ERR("fill_contact(): No contact headers\n");
-return -3;
+return -1;
}
// populate CI with bare minimum
@@ -172,8 +172,11 @@ static int fill_contact(struct pcontact_info* ci, struct
sip_msg* m)
}
-char* srcip;
-srcip = pkg_malloc(50);
+char* srcip = NULL;
+if((srcip = pkg_malloc(50)) == NULL) {
+LM_ERR("Error allocating memory for source IP address\n");
+return -1;
+}
ci->received_host.len = ip_addr2sbuf(>rcv.src_ip, srcip, 50);
ci->received_host.s = srcip;
@@ -386,6 +389,7 @@ int add_security_server_header(struct sip_msg* m, ipsec_t*
s)
// copy to the header and add
if((sec_header->s = pkg_malloc(sec_header->len)) == NULL) {
LM_ERR("Error allocating pkg memory for security header payload\n");
+pkg_free(sec_header);
return -1;
}
memcpy(sec_header->s, sec_hdr_buf, sec_header->len);
@@ -393,6 +397,8 @@ int add_security_server_header(struct sip_msg* m, ipsec_t*
s)
// add security-server header in reply
if(cscf_add_header(m, sec_header, HDR_OTHER_T) != 1) {
LM_ERR("Error adding security header to reply!\n");
+pkg_free(sec_header->s);
+pkg_free(sec_header);
return -1;
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:62e0af09: pua_reginfo: fix crash and issue during high load
Module: kamailio
Branch: master
Commit: 62e0af0957a6c7e3c2ea9711cf64ad51f4b2e594
URL:
https://github.com/kamailio/kamailio/commit/62e0af0957a6c7e3c2ea9711cf64ad51f4b2e594
Author: lasseo
Committer: lasseo
Date: 2018-08-21T22:10:04Z
pua_reginfo: fix crash and issue during high load
- do not release a already deleted entry, as this causes a crash
- use sruid_next_safe instead of sruid_next as it has been seen during load
that same sruid returned on multiple threads
---
Modified: src/modules/pua_reginfo/notify.c
---
Diff:
https://github.com/kamailio/kamailio/commit/62e0af0957a6c7e3c2ea9711cf64ad51f4b2e594.diff
Patch:
https://github.com/kamailio/kamailio/commit/62e0af0957a6c7e3c2ea9711cf64ad51f4b2e594.patch
---
diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c
index 754a2ed099..ea50f2db65 100644
--- a/src/modules/pua_reginfo/notify.c
+++ b/src/modules/pua_reginfo/notify.c
@@ -111,7 +111,7 @@ int process_contact(udomain_t * domain, urecord_t **
ul_record, str aor, str cal
ci.expires = time(0) + expires;
/* set ruid */
- if(sruid_next(&_reginfo_sruid) < 0) {
+ if(sruid_next_safe(&_reginfo_sruid) < 0) {
LM_ERR("failed to generate ruid");
} else {
ci.ruid = _reginfo_sruid.uid;
@@ -306,9 +306,15 @@ int process_body(str notify_body, udomain_t * domain) {
}
ul_contact = ul_contact->next;
}
+
if (ul.delete_urecord(domain, _key,
ul_record) < 0) {
LM_ERR("failed to remove record from
usrloc\n");
- }
+ }
+
+ /* Record deleted, and should not be used
anymore */
+ ul_record = NULL;
+
+
/* If already a registration with contacts was
found, then keep that result.
otherwise the result is now "No contacts
found" */
if (final_result != RESULT_CONTACTS_FOUND)
final_result = RESULT_NO_CONTACTS;
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
