Module: sip-router
Branch: master
Commit: 80d55e19f18a93cc15f7f4eadb2828210bf15970
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80d55e1…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: Wed Jan 8 18:09:18 2014 +0100
uac_redirect: fixed typo in comments
---
modules/uac_redirect/rd_funcs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/uac_redirect/rd_funcs.c b/modules/uac_redirect/rd_funcs.c
index aa8dbd0..f85d84d 100644
--- a/modules/uac_redirect/rd_funcs.c
+++ b/modules/uac_redirect/rd_funcs.c
@@ -223,7 +223,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl,
/* contact header is not parsed */
if ( sh_rpl->msg_flags&FL_SHM_CLONE ) {
/* duplicate the reply into private memory to be able
- * to parse it and after words to free the parsed mems */
+ * to parse it and afterwards to free the parsed mems */
memcpy( &dup_rpl, sh_rpl, sizeof(struct sip_msg) );
dup = 2;
/* ok -> force the parsing of contact header */
Module: sip-router
Branch: master
Commit: 97c3a6ad01700f2c2d03e163df65c5aba097165c
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97c3a6a…
Author: Federico Cabiddu <federico.cabiddu(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: Wed Jan 8 12:17:49 2014 +0100
modules/dialog: docs updated for timeout_noreset parameter and timeout-noreset property
---
modules/dialog/doc/dialog_admin.xml | 42 ++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml
index f0d1626..7b96101 100644
--- a/modules/dialog/doc/dialog_admin.xml
+++ b/modules/dialog/doc/dialog_admin.xml
@@ -1235,6 +1235,28 @@ modparam("dialog", "ka_interval", 300)
</example>
</section>
+ <section>
+ <title><varname>timeout_noreset</varname> (int)</title>
+ <para>
+ If set to 1, the dialog timeout won't be reset each
+ time a sequential request is processed.
+ It is an alternative to dlg_set_property("timeout-noreset") for all dialogs.
+ </para>
+ <para>
+ <emphasis>
+ Default value is <quote>0</quote>.
+ </emphasis>
+ </para>
+ <example>
+ <title>Set <varname>timeout_noreset</varname> parameter</title>
+ <programlisting format="linespecific">
+...
+modparam("dialog", "timeout_noreset", 1)
+...
+</programlisting>
+ </example>
+ </section>
+
</section>
@@ -1802,8 +1824,17 @@ dlg_set_timeout_by_profile("users", "abc123", "3");
<itemizedlist>
<listitem>
<para><emphasis>attr</emphasis> - name of property. It can be:
- 'ka-src' - send keep alive OPTION requests to caller;
- 'ka-dst' - send keep alive OPTION requests to callee.
+ <itemizedlist>
+ <listitem>
+ 'ka-src' - send keep alive OPTION requests to caller
+ </listitem>
+ <listitem>
+ 'ka-dst' - send keep alive OPTION requests to callee
+ </listitem>
+ <listitem>
+ 'timeout-noreset' - don't reset timeout on in-dialog messages reception
+ </listitem>
+ </itemizedlist>
</para>
</listitem>
</itemizedlist>
@@ -1813,7 +1844,11 @@ dlg_set_timeout_by_profile("users", "abc123", "3");
within dialog, with the scope of detecting if the destination is
still in the call. If the keep alive request results in a local
timeout or '481 Call Leg/Transaction Does Not Exist', then the
- dialog is ended from the server.
+ dialog is ended from the server.
+ </para>
+ <para>
+ If 'timeout-noreset' is set, dialog timeout won't be reset upon reception
+ of in-dialog messages (default behavior).
</para>
<para>
This function can be used from ANY_ROUTE.
@@ -1824,6 +1859,7 @@ dlg_set_timeout_by_profile("users", "abc123", "3");
...
dlg_set_property("ka-src");
dlg_set_property("ka-dst");
+dlg_set_property("timeout-noreset");
...
</programlisting>
</example>
Hi,
I've been trying to set up Kamailio 4.0.5 as a P-CSCF, I-CSCF and S-CSCF
today, and hit a few issues which I've fixed.
http://sip-router.org/contribute/ suggests that patches should be
submitted to this list, so here I am.
The first issue I hit was the sem_post issue that has been reported from
time to time
(http://lists.kamailio.org/pipermail/sr-users/2013-January/076554.html)
- it looks as though sem_post is only included in -lpthread on Ubuntu
12.04, not -lrt
(https://bugs.launchpad.net/ubuntu/+source/manpages/+bug/874418), so
I've updated some Makefiles to reflect that.
I subsequently hit a segfault when calling pcscf_save: I've tracked this
down to a while loop that was missing curly braces, and so tried to
dereference a null pointer. I think there's another bug in this piece of
code - because h is NULL at the end of the first while loop, we never go
round the second loop, and so never call free_rr. It looks like even if
we did, h->parsed has been set to 0 before we try and free it, so
nothing would happen. I wasn't sure how the memory management here
works, though, and so haven't tried to change this.
I also found that the ims_auth module didn't handle standard SIP Digest
authentication on the MAR interface, only AKA and Digest-MD5 (which
seems to be specific to OpenIMSCore HSS, and not mentioned in the IMS
specs). Most of the code to allow SIP Digest authentication was already
there, so I just hooked the last piece in to get it to work. I'm not
sure whether this counts as a new feature or a bugfix - it's not clear
whether this was meant to be supported but just missing a piece, or not
meant to be supported but very easy to add in.
Finally, I was working from the 4.0 nightlies Debian repository, and the
examples/scsf/kamailio.cfg file for 4.0.x seems to skip authentication.
It looks like this section has been reworked heavily in 4.1.0, so this
may be less important - but I put together a different kamailio.cfg
based on a mailing list post
(http://lists.sip-router.org/pipermail/sr-users/2013-March/077142.html),
and it might make sense to use that as the default file for 4.0.x.
The attached patches are against the 4.0 branch in Git (specifically,
commit 1b98961522fd8a7eb73ecc7d1772541f8b81aabc). I'm happy to apply any
feedback which more knowledgeable contributors have.
Best regards,
Rob