Hello,
as a follow up to previous discussions on the mailing list, I would like
to propose Wednesday, Feb 3, 2016 as the day to freeze the development
for next major release. It will allow the people going at Fosdem to chat
and do last minute tunings before freezing.
Other suggestions or comments are welcome!
Cheers,
Daniel
--
Daniel-Constantin Mierla
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
Book: SIP Routing With Kamailio - http://www.asipto.comhttp://miconda.eu
This latest commit implements some of the TODO's in the curl module.
- default client_cert, client_key, cacert and verifyserver modparams implemented
- added a cipher_suites modparam so the default list provided by libcurl can be overridden (e.g. enabling elliptic-curve ciphers)
- added per-connection value for verifyserver
Here are some followup questions for @oej or anyone else who may use the curl module.
Should the [verify_host](http://curl.haxx.se/libcurl/c/CURLOPT_SSL_VERIFYHOST.html) parameter be configurable as well as verify_peer?
Is the intention to make the client cert/key configurable per-connection?
If we add more parameters to the curlcon modparam, it will easily get unmanageable.
I suggest two modparams, curlcon and curlcon_param. The first sets up the url and parameters (this is unchanged). The second will add parameters to a curlcon that is already defined. E.g.
```
modparam("curl", "curlcon", "apione=>https://myserver.example.com/url;timeout=12")
modparam("curl", "curlcon_param", "apione=>verifyserver=1")
modparam("curl", "curlcon_param", "apione=>clientkey=/var/certs/myserver.example.com.pem")
```
Any thoughts? Have I missed anything else in this area?
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/481
-- Commit Summary --
* curl: Add client key/certificate to curl_connect
-- File Changes --
M modules/curl/curl.c (2)
M modules/curl/curl.h (6)
M modules/curl/curlcon.c (24)
M modules/curl/doc/curl_admin.xml (26)
M modules/curl/functions.c (113)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/481.patchhttps://github.com/kamailio/kamailio/pull/481.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/481
- SHM pointer is freed when it is required later by dialog callbacks. Remove the free_dlginfo_cell() call.
This is causing crashing after the BYE, when a call is ongoing during a Kamailio restart
The free is actually done by the callback function `dlg_api.register_dlgcb()` when it is registered in `pua_dialoginfo.c`
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/492
-- Commit Summary --
* pua_dialoginfo: fixed crash when loading dialogs from database on restart
-- File Changes --
M modules/pua_dialoginfo/doc/pua_dialoginfo.xml (11)
M modules/pua_dialoginfo/pua_dialoginfo.c (1)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/492.patchhttps://github.com/kamailio/kamailio/pull/492.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/492
Module: kamailio
Branch: master
Commit: 094613b85d21e430fe9350722a99794bb2ae59bf
URL: https://github.com/kamailio/kamailio/commit/094613b85d21e430fe9350722a99794…
Author: Camille Oudot <camille.oudot(a)orange.com>
Committer: Camille Oudot <camille.oudot(a)orange.com>
Date: 2016-01-29T16:23:33+01:00
Merge pull request #491 from mslehto/bsdtcpops
Make tcpops module usable on BSD
---
Modified: modules/tcpops/doc/functions.xml
Modified: modules/tcpops/doc/tcpops.xml
Modified: tcp_options.h
---
Diff: https://github.com/kamailio/kamailio/commit/094613b85d21e430fe9350722a99794…
Patch: https://github.com/kamailio/kamailio/commit/094613b85d21e430fe9350722a99794…
---
diff --git a/modules/tcpops/doc/functions.xml b/modules/tcpops/doc/functions.xml
index b7b9842..937018a 100644
--- a/modules/tcpops/doc/functions.xml
+++ b/modules/tcpops/doc/functions.xml
@@ -18,7 +18,7 @@
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the Kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the Kamailio internal
connection id (as in the <emphasis>$conid</emphasis> pseudovariable).
</para>
</listitem>
@@ -48,7 +48,7 @@
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the Kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the Kamailio internal
connection id (as in the <emphasis>$conid</emphasis> pseudovariable).
</para>
</listitem>
@@ -83,7 +83,7 @@
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the kamailio internal
connection id on which TCP keepalive will be enabled. If no parameter
is given, the keepalive mechanism will be enabled on the current message
source connection.
@@ -140,7 +140,7 @@ onreply_route[foo] {
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the kamailio internal
connection id on which TCP keepalive will be disabled. If no parameter
is given, the keepalive mechanism will be disabled on the current message
source connection.
@@ -181,7 +181,7 @@ onreply_route[foo] {
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the kamailio internal
connection id on which to set the new lifetime. If no parameter
is given, it will be set on the current message source connection.
</para>
diff --git a/modules/tcpops/doc/tcpops.xml b/modules/tcpops/doc/tcpops.xml
index f142b7d..e4137e0 100644
--- a/modules/tcpops/doc/tcpops.xml
+++ b/modules/tcpops/doc/tcpops.xml
@@ -45,7 +45,7 @@
<para>
<emphasis>Note</emphasis>: the keepalive functions only work on systems with the
HAVE_TCP_KEEPIDLE, HAVE_TCP_KEEPCNT and HAVE_TCP_KEEPINTVL macros defined
- (currently only Linux).
+ (Linux, FreeBSD, DragonFly BSD, NetBSD).
</para>
</section>
diff --git a/tcp_options.h b/tcp_options.h
index f3b181d..d8da5f3 100644
--- a/tcp_options.h
+++ b/tcp_options.h
@@ -23,6 +23,7 @@
#ifdef USE_TCP
+#include <netinet/tcp.h>
#ifndef NO_TCP_ASYNC
#define TCP_ASYNC /* enabled async mode */
#endif
@@ -74,24 +75,24 @@
/* keepintvl */
#ifndef NO_TCP_KEEPINTVL
-#ifdef __OS_linux
+#ifdef TCP_KEEPINTVL
#define HAVE_TCP_KEEPINTVL
-#endif /* __OS_ */
-#endif /* NO_TCP_KEEPIDLE */
+#endif /* TCP_KEEPINTVL */
+#endif /* NO_TCP_KEEPINTVL */
/* keepidle */
#ifndef NO_TCP_KEEPIDLE
-#ifdef __OS_linux
+#ifdef TCP_KEEPIDLE
#define HAVE_TCP_KEEPIDLE
-#endif /* __OS_*/
+#endif /* TCP_KEEPIDLE*/
#endif /* NO_TCP_KEEPIDLE */
/* keepcnt */
#ifndef NO_TCP_KEEPCNT
-#ifdef __OS_linux
+#ifdef TCP_KEEPCNT
#define HAVE_TCP_KEEPCNT
-#endif /* __OS_ */
+#endif /* TCP_KEEPCNT */
#endif /* NO_TCP_KEEPCNT */
Module: kamailio
Branch: master
Commit: 957e8a04f798b9c30964005bdaedd895bd62f46f
URL: https://github.com/kamailio/kamailio/commit/957e8a04f798b9c30964005bdaedd89…
Author: Mikko Lehto <mslehto(a)iki.fi>
Committer: Mikko Lehto <mslehto(a)iki.fi>
Date: 2016-01-27T19:31:46+02:00
modules/tcpops: fix documentation typo
---
Modified: modules/tcpops/doc/functions.xml
---
Diff: https://github.com/kamailio/kamailio/commit/957e8a04f798b9c30964005bdaedd89…
Patch: https://github.com/kamailio/kamailio/commit/957e8a04f798b9c30964005bdaedd89…
---
diff --git a/modules/tcpops/doc/functions.xml b/modules/tcpops/doc/functions.xml
index b7b9842..937018a 100644
--- a/modules/tcpops/doc/functions.xml
+++ b/modules/tcpops/doc/functions.xml
@@ -18,7 +18,7 @@
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the Kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the Kamailio internal
connection id (as in the <emphasis>$conid</emphasis> pseudovariable).
</para>
</listitem>
@@ -48,7 +48,7 @@
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the Kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the Kamailio internal
connection id (as in the <emphasis>$conid</emphasis> pseudovariable).
</para>
</listitem>
@@ -83,7 +83,7 @@
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the kamailio internal
connection id on which TCP keepalive will be enabled. If no parameter
is given, the keepalive mechanism will be enabled on the current message
source connection.
@@ -140,7 +140,7 @@ onreply_route[foo] {
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the kamailio internal
connection id on which TCP keepalive will be disabled. If no parameter
is given, the keepalive mechanism will be disabled on the current message
source connection.
@@ -181,7 +181,7 @@ onreply_route[foo] {
<para>Meaning of the parameters is as follows:</para>
<itemizedlist>
<listitem>
- <para><emphasis>conid</emphasis> (optionnal): the kamailio internal
+ <para><emphasis>conid</emphasis> (optional): the kamailio internal
connection id on which to set the new lifetime. If no parameter
is given, it will be set on the current message source connection.
</para>