Module: kamailio
Branch: master
Commit: 3741a8abb4b867a6a758be11d27b3d6906978b18
URL: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-09T00:09:14+02:00
docs: remove documentation about removed dns related defines as well
---
Modified: doc/tutorials/dns.txt
---
Diff: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6…
Patch: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6…
---
diff --git a/doc/tutorials/dns.txt b/doc/tutorials/dns.txt
index a4243087bf..6112954a5e 100644
--- a/doc/tutorials/dns.txt
+++ b/doc/tutorials/dns.txt
@@ -170,12 +170,6 @@ DNS Resolver Compile Options
NAPTR support still has to be enabled from Kamailio's config file (it's
off by default).
- RESOLVE_DBG - if defined, the resolver will be very verbose: it will log
- a lot of debugging information at L_DBG level.
-
- NAPTR_DBG - if defined the NAPTR related resolver functions will be very
- verbose.
-
DNS Cache and Failover Config Variables
---------------------------------------
@@ -307,9 +301,6 @@ DNS Cache Compile Options
If this option is not defined (experimental), everything in the AR
section will be added to the cache.
- DNS_CACHE_DEBUG - if defined the DNS cache will be very verbose (it will
- log lots of messages at the L_DBG levell).
-
Note: To remove a compile options, edit Kamailio's Makefile.defs and remove it
from DEFS list. To add a compile options add it to the make command line,
e.g.: make proper; make all extra_defs=-DUSE_DNS_FAILOVER
#### 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 - _probably_
- [ ] Tested changes locally (_not applicable_)
- [ ] Related to issue #XXXX (_not applicable_)
#### Description
There is a number of occurrences in `pkg/kamailio/obs/kamailio.spec` of `%bcond_with|without rebbitmq`. Note the `e` in `rebbitmq`.
Since the condition to include the `rabbitmq` package (line 633) is `%if %{with rabbitmq}` (with an `a`), this conditional statement would not have the intended effect.
If this was not a deliberate typo for some reason, this commit addresses the issue by changing all `%bcond_with|without` occurrences of `rebbitmq` to `rabbitmq`.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1559
-- Commit Summary --
* packaging: Fix typo in kamailio.spec
-- File Changes --
M pkg/kamailio/obs/kamailio.spec (16)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1559.patchhttps://github.com/kamailio/kamailio/pull/1559.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/1559
Module: kamailio
Branch: 5.1
Commit: 538ac2c5eeb9f2df1d896adf0661e5e35fadb504
URL: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-08T21:20:54+02:00
core: make dns name to IP conversion more robust for IPv4 and IPv6
(cherry picked from commit 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc)
---
Modified: src/core/resolve.h
---
Diff: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e…
Patch: https://github.com/kamailio/kamailio/commit/538ac2c5eeb9f2df1d896adf0661e5e…
---
diff --git a/src/core/resolve.h b/src/core/resolve.h
index fad783e4e6..30cce19581 100644
--- a/src/core/resolve.h
+++ b/src/core/resolve.h
@@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st)
static struct ip_addr ip;
unsigned char* s;
+ /* just in case that e.g. the VIA parser get confused */
+ if(unlikely(!st->s || st->len <= 0)) {
+ LM_ERR("invalid name, no conversion to IP address possible\n");
+ }
s=(unsigned char*)st->s;
/*init*/
@@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st)
unsigned char* limit;
unsigned char* s;
+ /* just in case that e.g. the VIA parser get confused */
+ if(unlikely(!st->s || st->len <= 0)) {
+ LM_ERR("invalid name, no conversion to IP address possible\n");
+ }
/* init */
if ((st->len) && (st->s[0]=='[')){
/* skip over [ ] */
Module: kamailio
Branch: 5.0
Commit: 11300211d6562aafc654a778f25657f001a39790
URL: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-08T21:20:32+02:00
core: make dns name to IP conversion more robust for IPv4 and IPv6
(cherry picked from commit 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc)
---
Modified: src/core/resolve.h
---
Diff: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f…
Patch: https://github.com/kamailio/kamailio/commit/11300211d6562aafc654a778f25657f…
---
diff --git a/src/core/resolve.h b/src/core/resolve.h
index fad783e4e6..30cce19581 100644
--- a/src/core/resolve.h
+++ b/src/core/resolve.h
@@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st)
static struct ip_addr ip;
unsigned char* s;
+ /* just in case that e.g. the VIA parser get confused */
+ if(unlikely(!st->s || st->len <= 0)) {
+ LM_ERR("invalid name, no conversion to IP address possible\n");
+ }
s=(unsigned char*)st->s;
/*init*/
@@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st)
unsigned char* limit;
unsigned char* s;
+ /* just in case that e.g. the VIA parser get confused */
+ if(unlikely(!st->s || st->len <= 0)) {
+ LM_ERR("invalid name, no conversion to IP address possible\n");
+ }
/* init */
if ((st->len) && (st->s[0]=='[')){
/* skip over [ ] */
Module: kamailio
Branch: master
Commit: 4a55a2b40b91f282d7fd8f0e3c3ae22bcf56d9dc
URL: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-08T21:16:51+02:00
core: make dns name to IP conversion more robust for IPv4 and IPv6
---
Modified: src/core/resolve.h
---
Diff: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22…
Patch: https://github.com/kamailio/kamailio/commit/4a55a2b40b91f282d7fd8f0e3c3ae22…
---
diff --git a/src/core/resolve.h b/src/core/resolve.h
index fad783e4e6..30cce19581 100644
--- a/src/core/resolve.h
+++ b/src/core/resolve.h
@@ -229,6 +229,10 @@ static inline struct ip_addr* str2ip(str* st)
static struct ip_addr ip;
unsigned char* s;
+ /* just in case that e.g. the VIA parser get confused */
+ if(unlikely(!st->s || st->len <= 0)) {
+ LM_ERR("invalid name, no conversion to IP address possible\n");
+ }
s=(unsigned char*)st->s;
/*init*/
@@ -281,6 +285,10 @@ static inline struct ip_addr* str2ip6(str* st)
unsigned char* limit;
unsigned char* s;
+ /* just in case that e.g. the VIA parser get confused */
+ if(unlikely(!st->s || st->len <= 0)) {
+ LM_ERR("invalid name, no conversion to IP address possible\n");
+ }
/* init */
if ((st->len) && (st->s[0]=='[')){
/* skip over [ ] */
Module: kamailio
Branch: master
Commit: 94e7a4d862909886ef9ed9426532eee32f0262d9
URL: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2018-06-08T11:01:48+02:00
modules: readme files regenerated - sdpops ... [skip ci]
---
Modified: src/modules/sdpops/README
---
Diff: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee…
Patch: https://github.com/kamailio/kamailio/commit/94e7a4d862909886ef9ed9426532eee…
---
diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README
index 5986d445e0..7e029018f9 100644
--- a/src/modules/sdpops/README
+++ b/src/modules/sdpops/README
@@ -481,7 +481,8 @@ if(sdp_with_ice()) {
Store the search part of SDP body message with line beginning with
'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error
- and -2 if there is no SDP part in the message body.
+ and -2 if there is no SDP part in the message body. The second
+ parameter can contain psudeo-variables.
This function can be used from ANY_ROUTE.