Module: kamailio
Branch: master
Commit: 11ff4226dea81582fd97661701142abbf5348911
URL: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2018-06-12T09:01:50+02:00
dispatcher: use xavps instead of avps
- removed avp names parameters
- new parameters:
- xavp_dst - name of the xavp to store destination records
- xavp_dst_mode - control the fields added to xavp_dst
- xavp_ctx - name of the xavp to store context attributes
- xavp_ctx_mode - control the fields added to xavp_ctx
---
Modified: src/modules/dispatcher/dispatch.c
Modified: src/modules/dispatcher/dispatch.h
Modified: src/modules/dispatcher/dispatcher.c
---
Diff: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab…
Patch: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab…
I noticed that ```kamailio -I``` and ```kamailio -V``` do not give git version hash anymore.
This commit fixes at least kamailio -I and -V output, I think.
I don't know / remember if further adjustment is needed for other REPO_ constants.
# Before
```
#define REPO_VER ""
#define REPO_HASH "unknown"
#define REPO_STATE ""
```
```
$ src/kamailio -I|grep Source
Source code revision ID: unknown
```
# After
```
#define REPO_VER "5c48b2"
#define REPO_HASH "5c48b2"
#define REPO_STATE ""
```
```
$ src/kamailio -I|grep Source
Source code revision ID: 5c48b2
```
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1560
-- Commit Summary --
* src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again
-- File Changes --
M src/Makefile (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1560.patchhttps://github.com/kamailio/kamailio/pull/1560.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/1560
Module: kamailio
Branch: master
Commit: ebd207ade41ccdfec687d85e210c32ffe9a7e6b0
URL: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2018-06-11T18:16:43+02:00
modules: readme files regenerated - mqueue ... [skip ci]
---
Modified: src/modules/mqueue/README
Modified: src/modules/rtpproxy/README
Modified: src/modules/sdpops/README
Modified: src/modules/tmx/README
---
Diff: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f…
Patch: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f…
---
diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README
index 118cc534c8..860887af56 100644
--- a/src/modules/mqueue/README
+++ b/src/modules/mqueue/README
@@ -200,7 +200,7 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n");
5. Exported Variables
- * $mqv(mqueue) - the most recent item key fetched from the specified
+ * $mqk(mqueue) - the most recent item key fetched from the specified
mqueue
* $mqv(mqueue) - the most recent item value fetched from the
specified mqueue
diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README
index 556e93d66b..9b7aa5a818 100644
--- a/src/modules/rtpproxy/README
+++ b/src/modules/rtpproxy/README
@@ -230,7 +230,7 @@ Chapter 1. Admin Guide
4.1. rtpproxy_sock (string)
- Used to define the list of RTPPRoxy instances to connect to. These can
+ Used to define the list of RTPProxy instances to connect to. These can
be UNIX sockets or IPv4/IPv6 UDP sockets. Each modparam entry will
insert sockets into a single set. If no set ID is given, the default
set ID '0' will be used. To define multiple sets add the set number at
diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README
index 7e029018f9..ce0e06ec2c 100644
--- a/src/modules/sdpops/README
+++ b/src/modules/sdpops/README
@@ -482,7 +482,7 @@ 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. The second
- parameter can contain psudeo-variables.
+ parameter can contain pseudo-variables.
This function can be used from ANY_ROUTE.
diff --git a/src/modules/tmx/README b/src/modules/tmx/README
index 81568f329d..58237382cd 100644
--- a/src/modules/tmx/README
+++ b/src/modules/tmx/README
@@ -264,7 +264,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) {
created via t_newtran() and the flags have been altered since.
It is not needed to execute this function when using t_relay() (or
- similar tm relay functions, flags are synchornized automatically in
+ similar tm relay functions, flags are synchronized automatically in
that case).
This function can be used from ANY_ROUTE .
@@ -282,7 +282,7 @@ t_flush_flags();
been altered since.
It is not needed to execute this function when using t_relay() (or
- similar tm relay functions, xflags are synchornized automatically in
+ similar tm relay functions, xflags are synchronized automatically in
that case).
This function can be used from ANY_ROUTE .
Module: kamailio
Branch: master
Commit: f46fc58f88b41563ada32b2abb13cf47161eeb5a
URL: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4…
Author: Mikko Lehto <mslehto(a)iki.fi>
Committer: Mikko Lehto <mslehto(a)iki.fi>
Date: 2018-06-11T18:55:53+03:00
sdpops: fix documentation typo
---
Modified: src/modules/sdpops/doc/sdpops_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4…
Patch: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4…
---
diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml
index 37f7f2d5a7..f51dfe0a3c 100644
--- a/src/modules/sdpops/doc/sdpops_admin.xml
+++ b/src/modules/sdpops/doc/sdpops_admin.xml
@@ -557,7 +557,7 @@ if(sdp_with_ice()) {
<para>
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.
- The second parameter can contain psudeo-variables.
+ The second parameter can contain pseudo-variables.
</para>
<para>
This function can be used from ANY_ROUTE.
Module: kamailio
Branch: master
Commit: 9ba37fd602a67066bd49f6959350ea1fd72d5e47
URL: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1…
Author: Mikko Lehto <mslehto(a)iki.fi>
Committer: Mikko Lehto <mslehto(a)iki.fi>
Date: 2018-06-11T18:55:38+03:00
mqueue: fix typo in variable name documentation
---
Modified: src/modules/mqueue/doc/mqueue_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1…
Patch: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1…
---
diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml
index f9c3493aaf..0ab18f0be0 100644
--- a/src/modules/mqueue/doc/mqueue_admin.xml
+++ b/src/modules/mqueue/doc/mqueue_admin.xml
@@ -207,7 +207,7 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n");
<title>Exported Variables</title>
<itemizedlist>
<listitem>
- <emphasis>$mqv(mqueue)</emphasis> - the most recent item key fetched from the specified mqueue
+ <emphasis>$mqk(mqueue)</emphasis> - the most recent item key fetched from the specified mqueue
</listitem>
<listitem>
<emphasis>$mqv(mqueue)</emphasis> - the most recent item value fetched from the specified mqueue
Module: kamailio
Branch: master
Commit: 21c219bcdd3f74a029582cd353c5f91d91a46f3d
URL: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91…
Author: Mikko Lehto <mslehto(a)iki.fi>
Committer: Mikko Lehto <mslehto(a)iki.fi>
Date: 2018-06-11T18:55:38+03:00
rtpproxy: mark RPC call with proper tag and small typo fix
---
Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml
Modified: src/modules/rtpproxy/rtpproxy.c
---
Diff: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91…
Patch: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91…
---
diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml
index 618f7938ef..d7f9b6de15 100644
--- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml
+++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml
@@ -98,7 +98,7 @@
<section id="rtpproxy.p.rtpproxy_sock">
<title><varname>rtpproxy_sock</varname> (string)</title>
<para>
- Used to define the list of RTPPRoxy instances to connect to.
+ Used to define the list of RTPProxy instances to connect to.
These can be UNIX sockets or IPv4/IPv6 UDP sockets.
Each modparam entry will insert sockets into a single set. If no set ID is given, the default set ID '0' will be used. To define multiple sets add the set number at the beginning of each parameter followed by '=='.
@@ -873,7 +873,7 @@ start_recording();
<section>
<title>RPC Commands</title>
<section id="rtpproxy.r.enable">
- <title>rtpproxy.enable</title>
+ <title><function>rtpproxy.enable</function></title>
<para>
Enables a rtp proxy if parameter value is greater than 0.
Disables it if a zero value is given.
diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c
index 4251a9ac82..b0b7a67fcf 100644
--- a/src/modules/rtpproxy/rtpproxy.c
+++ b/src/modules/rtpproxy/rtpproxy.c
@@ -169,7 +169,7 @@ static int_str ice_candidate_priority_avp;
static str rtp_inst_pv_param = {NULL, 0};
static pv_spec_t *rtp_inst_pvar = NULL;
-/* array with the sockets used by rtpporxy (per process)*/
+/* array with the sockets used by rtpproxy (per process)*/
static unsigned int rtpp_no = 0;
static int *rtpp_socks = 0;
Module: kamailio
Branch: master
Commit: c1d106161819b86427a9ea7a6e6502c1922d4b6f
URL: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c…
Author: Mikko Lehto <mslehto(a)iki.fi>
Committer: Mikko Lehto <mslehto(a)iki.fi>
Date: 2018-06-11T18:55:38+03:00
tmx: fix documentation typo
---
Modified: src/modules/tmx/doc/tmx_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c…
Patch: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c…
---
diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml
index fe630d2f76..19c808c931 100644
--- a/src/modules/tmx/doc/tmx_admin.xml
+++ b/src/modules/tmx/doc/tmx_admin.xml
@@ -216,7 +216,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) {
</para>
<para>
It is not needed to execute this function when using t_relay() (or
- similar tm relay functions, flags are synchornized automatically in
+ similar tm relay functions, flags are synchronized automatically in
that case).
</para>
<para>
@@ -242,7 +242,7 @@ t_flush_flags();
</para>
<para>
It is not needed to execute this function when using t_relay() (or
- similar tm relay functions, xflags are synchornized automatically in
+ similar tm relay functions, xflags are synchronized automatically in
that case).
</para>
<para>
Module: kamailio
Branch: 5.0
Commit: 6d3c7ba97ef57cb10ae478a1f39ee9da818d827e
URL: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-10T22:46:43+02:00
core: dns name to IP conversion - actually stop processing in error case
(cherry picked from commit 55d115e255b1d87121922f689b93870b84e1b2b4)
---
Modified: src/core/resolve.h
---
Diff: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d…
Patch: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d…
---
diff --git a/src/core/resolve.h b/src/core/resolve.h
index 30cce19581..1946d25081 100644
--- a/src/core/resolve.h
+++ b/src/core/resolve.h
@@ -232,6 +232,7 @@ static inline struct ip_addr* str2ip(str* st)
/* 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");
+ return 0;
}
s=(unsigned char*)st->s;
@@ -288,6 +289,7 @@ static inline struct ip_addr* str2ip6(str* st)
/* 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");
+ return 0;
}
/* init */
if ((st->len) && (st->s[0]=='[')){
Module: kamailio
Branch: 5.1
Commit: 2f63caf7ac87c1eca9c6f4150dc7418fa9f4fc35
URL: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-10T22:46:15+02:00
core: dns name to IP conversion - actually stop processing in error case
(cherry picked from commit 55d115e255b1d87121922f689b93870b84e1b2b4)
---
Modified: src/core/resolve.h
---
Diff: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418…
Patch: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418…
---
diff --git a/src/core/resolve.h b/src/core/resolve.h
index 30cce19581..1946d25081 100644
--- a/src/core/resolve.h
+++ b/src/core/resolve.h
@@ -232,6 +232,7 @@ static inline struct ip_addr* str2ip(str* st)
/* 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");
+ return 0;
}
s=(unsigned char*)st->s;
@@ -288,6 +289,7 @@ static inline struct ip_addr* str2ip6(str* st)
/* 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");
+ return 0;
}
/* init */
if ((st->len) && (st->s[0]=='[')){
Module: kamailio
Branch: master
Commit: 55d115e255b1d87121922f689b93870b84e1b2b4
URL: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-10T22:39:35+02:00
core: dns name to IP conversion - actually stop processing in error case
---
Modified: src/core/resolve.h
---
Diff: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870…
Patch: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870…
---
diff --git a/src/core/resolve.h b/src/core/resolve.h
index e0089d0a19..6b1e6cff24 100644
--- a/src/core/resolve.h
+++ b/src/core/resolve.h
@@ -226,6 +226,7 @@ static inline struct ip_addr* str2ip(str* st)
/* 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");
+ return 0;
}
s=(unsigned char*)st->s;
@@ -280,6 +281,7 @@ static inline struct ip_addr* str2ip6(str* st)
/* 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");
+ return 0;
}
/* init */
if ((st->len) && (st->s[0]=='[')){
Module: kamailio
Branch: master
Commit: dd4dc5361ae97b743c202360723df3cacac3259f
URL: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-06-09T00:58:54+02:00
core: udp server - remove deactivated functionality from 2008, not valid anymore
Remove decaticated functionality related zero terminated SIP messages in UPD server.
15 years ago this was a bug, but now with binary payloads its not valid anymore.
No change in functionality.
---
Modified: src/core/udp_server.c
---
Diff: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c…
Patch: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c…
---
diff --git a/src/core/udp_server.c b/src/core/udp_server.c
index def3ac1861..862bed174d 100644
--- a/src/core/udp_server.c
+++ b/src/core/udp_server.c
@@ -515,19 +515,6 @@ int udp_rcv_loop()
continue;
}
}
-/* historically, zero-terminated packets indicated a bug in clients
- * that calculated wrongly packet length and included string-terminating
- * zero; today clients exist with legitimate binary payloads and we
- * shall not check for zero-terminated payloads
- */
-#ifdef TRASH_ZEROTERMINATED_PACKETS
- if (buf[len-1]==0) {
- tmp=ip_addr2a(&ri.src_ip);
- LM_WARN("upstream bug - 0-terminated packet from %s %d\n",
- tmp, htons(ri.src_port));
- len--;
- }
-#endif
#endif
#ifdef DBG_MSG_QA
if (!dbg_msg_qa(buf, len)) {
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