Module: kamailio
Branch: 4.3
Commit: 4c7e676cdec3213c27cc689bdb5e6bbb8a9ec1ea
URL: https://github.com/kamailio/kamailio/commit/4c7e676cdec3213c27cc689bdb5e6bb…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-07-29T12:12:17+02:00
tm: added note in docs for t_set_no_e2e_cancel_reason()
- it has to be used when processing the INVITE
(cherry picked from commit e5f472ca5d8d2e16adb8b5a5a316521a618c8d9f)
---
Modified: modules/tm/doc/functions.xml
---
Diff: https://github.com/kamailio/kamailio/commit/4c7e676cdec3213c27cc689bdb5e6bb…
Patch: https://github.com/kamailio/kamailio/commit/4c7e676cdec3213c27cc689bdb5e6bb…
---
diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml
index 5146d40..217a5a2 100644
--- a/modules/tm/doc/functions.xml
+++ b/modules/tm/doc/functions.xml
@@ -1665,6 +1665,10 @@ t_relay_to("0x01");
parameter) for the current transaction.
</para>
<para>
+ Note: the function has to be used when processing the INVITE
+ (not when processing the CANCEL).
+ </para>
+ <para>
See also: <varname>e2e_cancel_reason</varname>.
</para>
<example>
Module: kamailio
Branch: 4.3
Commit: cb4f55b26f51a929b2db08373c1b97a95b8ad6a6
URL: https://github.com/kamailio/kamailio/commit/cb4f55b26f51a929b2db08373c1b97a…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-07-29T12:11:51+02:00
rr: fix detecting next strict router
- a regression after adding support for sip-outbound
- more verbose debug messages
- reported by Antonio Real, GH #267
(cherry picked from commit 0c42a848258d475f57ea25458bc75e55dcee948d)
---
Modified: modules/rr/loose.c
---
Diff: https://github.com/kamailio/kamailio/commit/cb4f55b26f51a929b2db08373c1b97a…
Patch: https://github.com/kamailio/kamailio/commit/cb4f55b26f51a929b2db08373c1b97a…
---
diff --git a/modules/rr/loose.c b/modules/rr/loose.c
index de06bb3..76204c9 100644
--- a/modules/rr/loose.c
+++ b/modules/rr/loose.c
@@ -757,7 +757,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
int status = RR_DRIVEN;
str uri;
struct socket_info *si;
- int uri_is_myself, next_is_strict;
+ int uri_is_myself;
int use_ob = 0;
hdr = _m->route;
@@ -768,11 +768,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
routed_msg_id = 0;
if (parse_uri(uri.s, uri.len, &puri) < 0) {
- LM_ERR("failed to parse the first route URI\n");
+ LM_ERR("failed to parse the first route URI (%.*s)\n",
+ uri.len, ZSW(uri.s));
return RR_ERROR;
}
- next_is_strict = is_strict(&puri.params);
routed_params = puri.params;
uri_is_myself = is_myself(&puri);
@@ -815,7 +815,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
/* double route may occure due different IP and port, so force as
* send interface the one advertise in second Route */
if (parse_uri(rt->nameaddr.uri.s,rt->nameaddr.uri.len,&puri)<0) {
- LM_ERR("failed to parse the double route URI\n");
+ LM_ERR("failed to parse the double route URI (%.*s)\n",
+ rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s));
return RR_ERROR;
}
@@ -852,7 +853,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
uri = rt->nameaddr.uri;
if (parse_uri(uri.s, uri.len, &puri) < 0) {
- LM_ERR("failed to parse the first route URI\n");
+ LM_ERR("failed to parse the next route URI (%.*s)\n",
+ uri.len, ZSW(uri.s));
return RR_ERROR;
}
} else {
@@ -867,7 +869,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
}
LM_DBG("URI to be processed: '%.*s'\n", uri.len, ZSW(uri.s));
- if (next_is_strict) {
+ if (is_strict(&puri.params)) {
LM_DBG("Next URI is a strict router\n");
if (handle_sr(_m, hdr, rt) < 0) {
LM_ERR("failed to handle strict router\n");
Module: kamailio
Branch: 4.3
Commit: ff1d3f06840928aace36780ecbc898cd2e90ce0a
URL: https://github.com/kamailio/kamailio/commit/ff1d3f06840928aace36780ecbc898c…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-07-29T12:11:36+02:00
kamcmd: use NAME to build help message
(cherry picked from commit 7038d12dbb9c8db1b46c0874bfd8fce72d6e72ed)
---
Modified: utils/kamcmd/kamcmd.c
---
Diff: https://github.com/kamailio/kamailio/commit/ff1d3f06840928aace36780ecbc898c…
Patch: https://github.com/kamailio/kamailio/commit/ff1d3f06840928aace36780ecbc898c…
---
diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c
index 86d8fc4..974127c 100644
--- a/utils/kamcmd/kamcmd.c
+++ b/utils/kamcmd/kamcmd.c
@@ -111,7 +111,7 @@ arg:\n\
string or number; to force a number to be interpreted as string \n\
prefix it by \"s:\", e.g. s:1\n\
Examples:\n\
- " NAME " -s unixs:/tmp/ser_unix system.listMethods\n\
+ " NAME " -s unixs:/tmp/" NAME "_ctl system.listMethods\n\
" NAME " -f \"pid: %v desc: %v\\n\" -s udp:localhost:2047 core.ps \n\
" NAME " ps # uses default ctl socket \n\
" NAME " # enters interactive mode on the default socket \n\