#### 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.
<!--
Kamailio Project uses GitHub Issues only for bugs in the code or feature requests.
If you have questions about using Kamailio or related to its configuration file,
ask on sr-users mailing list:
* http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users
If you have questions about developing extensions to Kamailio or its existing
C code, ask on sr-dev mailing list
* http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Please try to fill this template as much as possible for any issue. It helps the
developers to troubleshoot the issue.
If you submit a feature request (or enhancement), you can delete the text of
the template and only add the description of what you would like to be added.
If there is no content to be filled in a section, the entire section can be removed.
You can delete the comments from the template sections when filling.
You can delete next line and everything above before submitting (it is a comment).
-->
### Description
log_prefix do not work in failure_route
### Troubleshooting
#### Reproduction
log_prefix="{$mt $hdr(CSeq) $ci} "
...
...
failure_route[RTF_LCR_ROUTE]
{
if (t_is_canceled()) {
exit;
}
xlog("L_INFO", "--- SCRIPT: failure_route - RTF_LCR_ROUTE\n");
if (t_check_status("408|50[0-4]") or (t_branch_timeout() and !t_branch_replied())) {
if(!next_gw()) {
send_reply("503", "No more LCR gateways");
exit;
}
xlog("L_INFO", "flag $avp(lcr_flag) \n");
t_on_failure("RTF_LCR_ROUTE");
t_set_retr(0, 4000);
route(RELAY);
exit;
}
}
#### Debugging Data
<!--
If you got a core dump, use gdb to extract troubleshooting data - full backtrace,
local variables and the list of the code at the issue location.
gdb /path/to/kamailio /path/to/corefile
bt full
info locals
list
If you are familiar with gdb, feel free to attach more of what you consider to
be relevant.
-->
```
(paste your debugging data here)
```
#### Log Messages
<!--
Check the syslog file and if there are relevant log messages printed by Kamailio, add them next, or attach to issue, or provide a link to download them (e.g., to a pastebin site).
-->
```
INFO: <script>: --- SCRIPT: failure_route - RTF_LCR_ROUTE
```
#### SIP Traffic
<!--
If the issue is exposed by processing specific SIP messages, grab them with ngrep or save in a pcap file, then add them next, or attach to issue, or provide a link to download them (e.g., to a pastebin site).
-->
```
(paste your sip traffic here)
```
### Possible Solutions
<!--
If you found a solution or workaround for the issue, describe it. Ideally, provide a pull request with a fix.
-->
### Additional Information
* **Kamailio Version** - output of `kamailio -v`
```
version: kamailio 4.4.7 (x86_64/linux) 35d8ab
flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES
ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB
poll method support: poll, epoll_lt, epoll_et, sigio_rt, select.
id: 35d8ab
compiled on 11:55:20 Mar 19 2018 with gcc 6.3.0
```
* **Operating System**:
<!--
Details about the operating system, the type: Linux (e.g.,: Debian 8.4, Ubuntu 16.04, CentOS 7.1, ...), MacOS, xBSD, Solaris, ...;
Kernel details (output of `uname -a`)
-->
```
Linux kamailio 4.13.0-37-generic #42~16.04.1-Ubuntu SMP Wed Mar 7 16:03:28 UTC 2018 x86_64 GNU/Linux
```
--
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/1531