Hello,
I recently added etc/kamailio-oob.cfg (oob stands for out of the box),
with the purpose of building a more complex configuration file that
should show how to use various features (out of the box :-) ). The file
is installed automatically (ser had it already) and should be added to
packages as well.
The plan is to keep default config file (kamailio.cfg) simple enough and
SIP routing specific to be useful for getting started. At this moment
the two files are identical.
Config defines should still be used in oob to allow enabling/disabling
features easily. It has to be kept up to date by new additions to it
(e.g., try not to break existing features), but should be more open to
contributions.
From my point of view, Ovidiu's last additions to kamailio.cfg should
be kept only in the oob version. I hope that is ok.
Moreover, because it is related, everyone should know that another
config file could be placed in etc/ and it will be installed:
kamailio-basic.cfg . This should be more like a bare bone config to
start with. If anyone finds it useful, feel free to add one (you can
look at the sip-router-basic.cfg which came from ser flavour).
Cheers,
Daniel
--
Daniel-Constantin Mierla - http://www.asipto.comhttp://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
I was just wondering, could you run these twice if you called msg_apply_changes() between?
"Olle E. Johansson" <oej(a)edvina.net> wrote:
>Module: sip-router
>Branch: master
>Commit: 1c35849b76ea9257162d5977e839399027c9659b
>URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c35849…
>
>Author: Olle E. Johansson <oej(a)edvina.net>
>Committer: Olle E. Johansson <oej(a)edvina.net>
>Date: Thu Dec 20 13:44:59 2012 +0100
>
>uac: Add note about only using uac_replace once in the same request
>
>---
>
> modules_k/uac/doc/uac_admin.xml | 19 +++++++++++++------
> 1 files changed, 13 insertions(+), 6 deletions(-)
>
>diff --git a/modules_k/uac/doc/uac_admin.xml b/modules_k/uac/doc/uac_admin.xml
>index 5e3b70a..147b6e1 100644
>--- a/modules_k/uac/doc/uac_admin.xml
>+++ b/modules_k/uac/doc/uac_admin.xml
>@@ -19,16 +19,16 @@
> <para>
> The <acronym>UAC</acronym> (User Agent Client) module provides some basic UAC
> functionalities like sending SIP requests, registering with a remote service,
>- FROM header manipulation (anonymization) and client authentication.
>+ From: header manipulation (anonymization) and client authentication.
> </para>
> <para>
>- From version 1.5.0 it has function to send SIP message from
>+ The UAC module also supports sending a SIP request from the
> configuration file. See variable $uac_req(name) and the function
> uac_req_send().
> </para>
> <para>
>- Version 3.1.0 adds database-driven SIP registration functionality. See
>- uac_reg_lookup() function and dedicated section for remote
>+ In addition, the module supports database-driven SIP registration functionality. See
>+ the uac_reg_lookup() function and dedicated section for remote
> registration configuration.
> </para>
> <para>
>@@ -46,6 +46,13 @@
> may be rejected.
> </para>
> </listitem>
>+ <listitem>
>+ <para>
>+ The <quote>uac_replace_*</quote> functions can only be run once on the same
>+ SIP request. Try to save needed changes in a pseudovariable and
>+ apply them once.
>+ </para>
>+ </listitem>
> </itemizedlist>
> </section>
>
>@@ -64,13 +71,13 @@
> <listitem>
> <para>
> <emphasis>RR - Record-Route Module</emphasis>, but only if
>- restore mode for FROM URI is set to <quote>auto</quote>.
>+ restore mode for From: URI is set to <quote>auto</quote>.
> </para>
> </listitem>
> <listitem>
> <para>
> <emphasis>Dialog Module</emphasis>, but only if
>- restore mode for FROM URI is set to <quote>auto</quote> and
>+ restore mode for From: URI is set to <quote>auto</quote> and
> you want uac_replace_from or uac_replace_to to store the values
> of the URIs as dialog variables.
> </para>
>
>
>_______________________________________________
>sr-dev mailing list
>sr-dev(a)lists.sip-router.org
>http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Module: sip-router
Branch: master
Commit: 1c35849b76ea9257162d5977e839399027c9659b
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c35849…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Olle E. Johansson <oej(a)edvina.net>
Date: Thu Dec 20 13:44:59 2012 +0100
uac: Add note about only using uac_replace once in the same request
---
modules_k/uac/doc/uac_admin.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/modules_k/uac/doc/uac_admin.xml b/modules_k/uac/doc/uac_admin.xml
index 5e3b70a..147b6e1 100644
--- a/modules_k/uac/doc/uac_admin.xml
+++ b/modules_k/uac/doc/uac_admin.xml
@@ -19,16 +19,16 @@
<para>
The <acronym>UAC</acronym> (User Agent Client) module provides some basic UAC
functionalities like sending SIP requests, registering with a remote service,
- FROM header manipulation (anonymization) and client authentication.
+ From: header manipulation (anonymization) and client authentication.
</para>
<para>
- From version 1.5.0 it has function to send SIP message from
+ The UAC module also supports sending a SIP request from the
configuration file. See variable $uac_req(name) and the function
uac_req_send().
</para>
<para>
- Version 3.1.0 adds database-driven SIP registration functionality. See
- uac_reg_lookup() function and dedicated section for remote
+ In addition, the module supports database-driven SIP registration functionality. See
+ the uac_reg_lookup() function and dedicated section for remote
registration configuration.
</para>
<para>
@@ -46,6 +46,13 @@
may be rejected.
</para>
</listitem>
+ <listitem>
+ <para>
+ The <quote>uac_replace_*</quote> functions can only be run once on the same
+ SIP request. Try to save needed changes in a pseudovariable and
+ apply them once.
+ </para>
+ </listitem>
</itemizedlist>
</section>
@@ -64,13 +71,13 @@
<listitem>
<para>
<emphasis>RR - Record-Route Module</emphasis>, but only if
- restore mode for FROM URI is set to <quote>auto</quote>.
+ restore mode for From: URI is set to <quote>auto</quote>.
</para>
</listitem>
<listitem>
<para>
<emphasis>Dialog Module</emphasis>, but only if
- restore mode for FROM URI is set to <quote>auto</quote> and
+ restore mode for From: URI is set to <quote>auto</quote> and
you want uac_replace_from or uac_replace_to to store the values
of the URIs as dialog variables.
</para>
Module: sip-router
Branch: master
Commit: b56e823ed8e7ac2f88d1020677f5e94546a91516
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b56e823…
Author: Mihály Mészáros <misi(a)niif.hu>
Committer: Mihály Mészáros <misi(a)niif.hu>
Date: Sun Dec 16 13:03:18 2012 +0100
core/dns: fix an issue when using it without dns cache
- fixing an issue what caused that without dns cache we have to use a different function for srv resolution.
---
resolve.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/resolve.c b/resolve.c
index d37a74e..34d4ff8 100644
--- a/resolve.c
+++ b/resolve.c
@@ -1576,7 +1576,12 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch
}
srv_name.s=tmp_srv;
srv_name.len=len;
- if ((he=dns_srv_get_he(&srv_name, port, dns_flags))!=0) {
+ #ifdef USE_DNS_CACHE
+ he=dns_srv_get_he(&srv_name, port, dns_flags);
+ #else
+ he=srv_sip_resolvehost(&srv_name, 0, port, proto, 1, 0);
+ #endif
+ if (he!=0) {
return he;
}
}
Module: sip-router
Branch: master
Commit: e6a8bc85079389314f86cc4141cf827ecabeaf4a
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6a8bc8…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Olle E. Johansson <oej(a)edvina.net>
Date: Thu Dec 20 08:56:56 2012 +0100
iptrtpproxy Documentation updates (SER => kamailio)
---
modules/iptrtpproxy/doc/iptrtpproxy.xml | 53 ++++++++++----------
.../{functions.xml => iptrtpproxy_functions.xml} | 0
.../doc/{params.xml => iptrtpproxy_params.xml} | 0
3 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/modules/iptrtpproxy/doc/iptrtpproxy.xml b/modules/iptrtpproxy/doc/iptrtpproxy.xml
index 7f857b0..fbe7595 100644
--- a/modules/iptrtpproxy/doc/iptrtpproxy.xml
+++ b/modules/iptrtpproxy/doc/iptrtpproxy.xml
@@ -9,8 +9,9 @@
]
>
-<section id="iptrtpproxy" xmlns:xi="http://www.w3.org/2001/XInclude">
- <sectioninfo>
+<book id="iptrtpproxy" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <bookinfo>
+ <title>The Iptrtpproxy module</title>
<authorgroup>
<author>
<firstname>Tomas</firstname>
@@ -26,31 +27,29 @@
<holder>Tomas Mandys</holder>
</copyright>
- </sectioninfo>
+ </bookinfo>
- <title>Iptrtpproxy module</title>
<section id="iptrtpproxy.overview">
<title>Overview</title>
<para>
- It provides similar functionality as <emphasis>nathelper</emphasis> but
- communicates with <emphasis>netfilter</emphasis> kernel <emphasis>xt_RTPPROXY</emphasis> module using
- <emphasis>libipt_RTPPROXY</emphasis> userspace library.
- See <ulink url="http://www.2p.cz/en/netfilter_rtp_proxy">http://www.2p.cz/en/netfilter_rtp_proxy</ulink>
- All RTP streams are
- manipulated directly in kernel space, no data is copied from
+ This module provides similar functionality as <emphasis>nathelper</emphasis> but
+ communicates with <emphasis>netfilter</emphasis> kernel
+ <emphasis>xt_RTPPROXY</emphasis> module using
+ the <emphasis>libipt_RTPPROXY</emphasis> userspace library.
+ All RTP streams are manipulated directly in kernel space, no data is copied from
kernel to userspace and back, it reduces load and delay.
See <ulink url="http://www.2p.cz/en/netfilter_rtp_proxy">
http://www.2p.cz/en/netfilter_rtp_proxy</ulink> for more details.
</para>
<para>
- The ser module is written as light-weighted, there is not implemented
- any dialog managment as in <emphasis>nathelper</emphasis>, the reason is that such an API
- should be provided by core or specialized dialog manager module.
- Because such module is not in CVS, session information may be stored
- in extra attributes of <emphasis>avp_db</emphasis> module and
- session id itself in record route as cookie, see <emphasis>rr</emphasis> module.
+ This &kamailio; module is written as a light-weight module, there is no
+ dialog managment as in <emphasis>Nathelper</emphasis>. The reason is that such an API
+ should be provided by core or a specialized dialog manager module.
+ Because such module is not in git, session information may be stored
+ in extra attributes of the <emphasis>avp_db</emphasis> module and
+ the session id itself in record route as cookie, see the <emphasis>rr</emphasis> module.
</para>
<para>
@@ -63,9 +62,9 @@
</para>
<para>
- There is also support for media authorization. Number of codec sets may be defined. When a message containing
- SDP offer/answer is being processed then current codecs and streams may be inspected, removed or signallized
- according a codec set.
+ There is also support for media authorization. Number of codec sets may be defined.
+ When a message containing SDP offer/answer is being processed then current codecs
+ and streams may be inspected, removed or signallized according a codec set.
</para>
@@ -74,12 +73,12 @@
<itemizedlist>
<listitem>
<para>
- only IPv4 addresses are supported.
+ Only IPv4 addresses are supported.
</para>
</listitem>
<listitem>
<para>
- more media streams per session supported
+ More media streams per session supported
</para>
</listitem>
</itemizedlist>
@@ -91,7 +90,7 @@
<para>
The following libraries or applications must be installed before
- running SER with this module loaded:
+ running &kamailio; with this module loaded:
<itemizedlist>
<listitem>
<para>
@@ -102,7 +101,7 @@
</itemizedlist>
</para>
<note><para>
- The module Makefile must be edited and iptdir setup to the directory with
+ The modules Makefile must be edited and iptdir setup to the directory with
the iptable sources (if different from ~/iptables). Alternatively
compile the module using:
<programlisting>
@@ -133,10 +132,10 @@
<programlisting>
- switchboard_name [ ":" [ session_id "/" created ] * ( "," session_id "/" created ) ] ]
- session_id = * ( [0-9] ) ; empty when no session allocated
- created = timestamp
- </programlisting>
+switchboard_name [ ":" [ session_id "/" created ] * ( "," session_id "/" created ) ] ]
+session_id = * ( [0-9] ) ; empty when no session allocated
+created = timestamp
+</programlisting>
</section>
diff --git a/modules/iptrtpproxy/doc/functions.xml b/modules/iptrtpproxy/doc/iptrtpproxy_functions.xml
similarity index 100%
rename from modules/iptrtpproxy/doc/functions.xml
rename to modules/iptrtpproxy/doc/iptrtpproxy_functions.xml
diff --git a/modules/iptrtpproxy/doc/params.xml b/modules/iptrtpproxy/doc/iptrtpproxy_params.xml
similarity index 100%
rename from modules/iptrtpproxy/doc/params.xml
rename to modules/iptrtpproxy/doc/iptrtpproxy_params.xml
i noticed that daniel is doing work on s modules. regarding domain
module in s, i added some of its features (those that i had using
myself) to k domain module. i didn't do anything on flags, although
there is flags column in k domain table. what comes to domain level
avps in s, they didn't work anyway.
-- juha