Module: kamailio
Branch: master
Commit: 6d4fd9400835ff971a1642e07b83b0dc137db7bd
URL: https://github.com/kamailio/kamailio/commit/6d4fd9400835ff971a1642e07b83b0d…
Author: Henning Westerholt <hw(a)skalatan.de>
Committer: Henning Westerholt <hw(a)skalatan.de>
Date: 2020-04-08T19:56:56Z
github: document precise GPLv2 version that we use in Kamailio (GPLv2 "or later")
---
Modified: .github/CONTRIBUTING.md
---
Diff: https://github.com/kamailio/kamailio/commit/6d4fd9400835ff971a1642e07b83b0d…
Patch: https://github.com/kamailio/kamailio/commit/6d4fd9400835ff971a1642e07b83b0d…
---
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 1fc1b6342b..68fa7f5e4d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -237,8 +237,8 @@ replaced with tokens like a.b.c.d, f.g.h.j).
Kamailio Main License: *GPLv2*.
Each source code file refers to the license and copyright details in the top
-of the file. Most of the code is licensed under GPLv2, some parts of the code
-are licensed under BSD.
+of the file. Most of the code is licensed under GPLv2 (with the "any later
+version" clause), some parts of the code are licensed under BSD.
### License Of New Code Contributions ###
Module: kamailio
Branch: 5.3
Commit: be8aac491ebdc5b48bbcfe05f198a9c915d3bf00
URL: https://github.com/kamailio/kamailio/commit/be8aac491ebdc5b48bbcfe05f198a9c…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2020-04-08T15:16:27+02:00
modules: readme files regenerated - modules ... [skip ci]
---
Modified: src/modules/rr/README
---
Diff: https://github.com/kamailio/kamailio/commit/be8aac491ebdc5b48bbcfe05f198a9c…
Patch: https://github.com/kamailio/kamailio/commit/be8aac491ebdc5b48bbcfe05f198a9c…
---
diff --git a/src/modules/rr/README b/src/modules/rr/README
index 1b1ef14557..61e5550d5a 100644
--- a/src/modules/rr/README
+++ b/src/modules/rr/README
@@ -170,8 +170,8 @@ Chapter 1. Admin Guide
3261 (see 12.1.1 UAS behavior).
For this purpose, the modules offers the following functions:
- * add_rr_param() - see ???
- * check_route_param() - see ???
+ * add_rr_param() - see Section 5.6, “add_rr_param(param)”
+ * check_route_param() - see Section 5.7, “check_route_param(re)”
Example 1.1. Dialog support in RR module
...
@@ -515,8 +515,9 @@ record_route_advertised_address("1.2.3.4:5080");
Adds a parameter to the Record-Route URI (param must be in
“;name=value” format. The function may be called also before or after
- the record_route() or record_route_advertised_address() calls (see ???
- or ???)).
+ the record_route() or record_route_advertised_address() calls (see
+ Section 5.2, “record_route([sparams])” or Section 5.5,
+ “record_route_advertised_address(address)”)).
Meaning of the parameters is as follows:
* param - String containing the URI parameter to be added. It must
@@ -534,7 +535,8 @@ add_rr_param(";nat=yes");
The function checks if the URI parameters of the local Route header
(corresponding to the local server) matches the given regular
- expression. It must be call after loose_route() (see ???).
+ expression. It must be call after loose_route() (see Section 5.1,
+ “loose_route()”).
Meaning of the parameters is as follows:
* re - regular expression to check against the Route URI parameters.
@@ -553,7 +555,8 @@ if (check_route_param("nat=yes")) {
The function checks the flow direction of in-dialog requests. This
function uses the “ftag” parameter from the Route header, therefore the
append_fromtag (see ??? module parameter must be enabled. Also this
- must be called only after loose_route() (see ???).
+ must be called only after loose_route() (see Section 5.1,
+ “loose_route()”).
The function returns true if the “dir” is the same with the request's
flow direction.
Module: kamailio
Branch: 5.3
Commit: fa02f4346b40bad4d4782765709973dcfa0bee74
URL: https://github.com/kamailio/kamailio/commit/fa02f4346b40bad4d4782765709973d…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2020-04-08T15:06:08+02:00
rr: docs - updated ids for xref linkend
(cherry picked from commit 62a2553043f81cd47f611d2829181604488a4b0c)
---
Modified: src/modules/rr/doc/rr_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/fa02f4346b40bad4d4782765709973d…
Patch: https://github.com/kamailio/kamailio/commit/fa02f4346b40bad4d4782765709973d…
---
diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml
index 362edd4f1f..a8dcbf63d9 100644
--- a/src/modules/rr/doc/rr_admin.xml
+++ b/src/modules/rr/doc/rr_admin.xml
@@ -47,12 +47,12 @@
<itemizedlist>
<listitem>
- <para>add_rr_param() - see <xref linkend="add-rr-param-id"/></para>
+ <para>add_rr_param() - see <xref linkend="rr.f.add_rr_param"/></para>
</listitem>
<listitem>
<para>check_route_param() - see <xref
- linkend="check-route-param-id"/></para>
+ linkend="rr.f.check_route_param"/></para>
</listitem>
</itemizedlist>
@@ -547,8 +547,8 @@ record_route_advertised_address("1.2.3.4:5080");
<para>Adds a parameter to the Record-Route URI (param must be in
<quote>;name=value</quote> format. The function may be called also
before or after the record_route() or record_route_advertised_address()
- calls (see <xref linkend="record-route-id"/> or <xref
- linkend="record-route-adv-addr-id"/>)).</para>
+ calls (see <xref linkend="rr.f.record_route"/> or <xref
+ linkend="rr.f.record_route_adv_addr"/>)).</para>
<para>Meaning of the parameters is as follows:</para>
@@ -581,7 +581,7 @@ add_rr_param(";nat=yes");
<para>The function checks if the URI parameters of the local Route
header (corresponding to the local server) matches the given regular
expression. It must be call after loose_route() (see <xref
- linkend="loose-route-id"/>).</para>
+ linkend="rr.f.loose_route"/>).</para>
<para>Meaning of the parameters is as follows:</para>
@@ -612,9 +612,9 @@ if (check_route_param("nat=yes")) {
<para>The function checks the flow direction of in-dialog requests. This
function uses the <quote>ftag</quote> parameter from the Route header,
- therefore the append_fromtag (see <xref linkend="append-fromtag-id"/>
+ therefore the append_fromtag (see <xref linkend="rr.p.append_fromtag"/>
module parameter must be enabled. Also this must be called only after
- loose_route() (see <xref linkend="loose-route-id"/>).</para>
+ loose_route() (see <xref linkend="rr.f.loose_route"/>).</para>
<para>The function returns true if the <quote>dir</quote> is the same
with the request's flow direction.</para>
Module: kamailio
Branch: master
Commit: 0162a0c85397f302f164e8b22c777beb6843fe57
URL: https://github.com/kamailio/kamailio/commit/0162a0c85397f302f164e8b22c777be…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2020-04-08T14:59:09+02:00
siptrace: docs for send_sock_name parameter
- send_sock_addr parameter name can be now used instead of
force_send_sock to suggest better its purpose (the later can still be
used)
---
Modified: src/modules/siptrace/doc/siptrace_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/0162a0c85397f302f164e8b22c777be…
Patch: https://github.com/kamailio/kamailio/commit/0162a0c85397f302f164e8b22c777be…
---
diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml
index 24e305500a..cc6ead1132 100644
--- a/src/modules/siptrace/doc/siptrace_admin.xml
+++ b/src/modules/siptrace/doc/siptrace_admin.xml
@@ -449,22 +449,46 @@ modparam("siptrace", "trace_delayed", 1)
</programlisting>
</example>
</section>
- <section id="siptrace.p.force_send_sock">
- <title><varname>force_send_sock</varname> (str)</title>
+ <section id="siptrace.p.send_sock_name">
+ <title><varname>send_sock_name</varname> (str)</title>
+ <para>
+ The name of the local listen socket from where to send
+ the duplicated traffic via SIP or HEP. In the absence of this parameter
+ &kamailio; automatically picks an interface. It has priority over
+ 'send_sock_addr' parameter.
+ </para>
+ <example>
+ <title>Set <varname>send_sock_name</varname> parameter</title>
+ <programlisting format="linespecific">
+...
+modparam("siptrace", "send_sock_name", "sock1")
+...
+</programlisting>
+ </example>
+ </section>
+ <section id="siptrace.p.send_sock_addr">
+ <title><varname>send_sock_addr</varname> (str)</title>
<para>
The local interface in the form of SIP URI from where to send
the duplicated traffic. In the absence of this parameter
&kamailio; automatically picks an interface.
</para>
<example>
- <title>Set <varname>force_send_sock</varname> parameter</title>
+ <title>Set <varname>send_sock_addr</varname> parameter</title>
<programlisting format="linespecific">
...
-modparam("siptrace", "force_send_sock", "sip:10.1.1.2:5000")
+modparam("siptrace", "send_sock_addr", "sip:10.1.1.2:5000")
...
</programlisting>
</example>
</section>
+ <section id="siptrace.p.force_send_sock">
+ <title><varname>force_send_sock</varname> (str)</title>
+ <para>It is the same as 'send_sock_addr' parameter, this being
+ kept for backward compatibility when 'send_sock_name' and
+ 'send_sock_addr' were introduced.</para>
+ </section>
+
<section id="siptrace.p.trace_init_mode">
<title><varname>trace_init_mode</varname> (integer)</title>
<para>
Module: kamailio
Branch: master
Commit: 744c954f268dee56764ed408172b7d04b536bbff
URL: https://github.com/kamailio/kamailio/commit/744c954f268dee56764ed408172b7d0…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2020-04-08T12:46:24+02:00
modules: readme files regenerated - rr ... [skip ci]
---
Modified: src/modules/rr/README
---
Diff: https://github.com/kamailio/kamailio/commit/744c954f268dee56764ed408172b7d0…
Patch: https://github.com/kamailio/kamailio/commit/744c954f268dee56764ed408172b7d0…
---
diff --git a/src/modules/rr/README b/src/modules/rr/README
index b97c569f85..9f3917c484 100644
--- a/src/modules/rr/README
+++ b/src/modules/rr/README
@@ -179,8 +179,8 @@ Chapter 1. Admin Guide
3261 (see 12.1.1 UAS behavior).
For this purpose, the modules offers the following functions:
- * add_rr_param() - see ???
- * check_route_param() - see ???
+ * add_rr_param() - see Section 5.7, “add_rr_param(param)”
+ * check_route_param() - see Section 5.8, “check_route_param(re)”
Example 1.1. Dialog support in RR module
...
@@ -559,8 +559,9 @@ record_route_advertised_address("1.2.3.4:5080");
Adds a parameter to the Record-Route URI (param must be in
“;name=value” format. The function may be called also before or after
- the record_route() or record_route_advertised_address() calls (see ???
- or ???)).
+ the record_route() or record_route_advertised_address() calls (see
+ Section 5.3, “record_route([sparams])” or Section 5.6,
+ “record_route_advertised_address(address)”)).
Meaning of the parameters is as follows:
* param - String containing the URI parameter to be added. It must
@@ -578,7 +579,8 @@ add_rr_param(";nat=yes");
The function checks if the URI parameters of the local Route header
(corresponding to the local server) matches the given regular
- expression. It must be call after loose_route() (see ???).
+ expression. It must be call after loose_route() (see Section 5.1,
+ “loose_route()”).
Meaning of the parameters is as follows:
* re - regular expression to check against the Route URI parameters.
@@ -597,7 +599,8 @@ if (check_route_param("nat=yes")) {
The function checks the flow direction of in-dialog requests. This
function uses the “ftag” parameter from the Route header, therefore the
append_fromtag (see ??? module parameter must be enabled. Also this
- must be called only after loose_route() (see ???).
+ must be called only after loose_route() (see Section 5.1,
+ “loose_route()”).
The function returns true if the “dir” is the same with the request's
flow direction.
Module: kamailio
Branch: master
Commit: 62a2553043f81cd47f611d2829181604488a4b0c
URL: https://github.com/kamailio/kamailio/commit/62a2553043f81cd47f611d282918160…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2020-04-08T12:45:07+02:00
rr: docs - updated ids for xref linkend
---
Modified: src/modules/rr/doc/rr_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/62a2553043f81cd47f611d282918160…
Patch: https://github.com/kamailio/kamailio/commit/62a2553043f81cd47f611d282918160…
---
diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml
index bce2042d05..fb7b4d03ca 100644
--- a/src/modules/rr/doc/rr_admin.xml
+++ b/src/modules/rr/doc/rr_admin.xml
@@ -47,12 +47,12 @@
<itemizedlist>
<listitem>
- <para>add_rr_param() - see <xref linkend="add-rr-param-id"/></para>
+ <para>add_rr_param() - see <xref linkend="rr.f.add_rr_param"/></para>
</listitem>
<listitem>
<para>check_route_param() - see <xref
- linkend="check-route-param-id"/></para>
+ linkend="rr.f.check_route_param"/></para>
</listitem>
</itemizedlist>
@@ -594,8 +594,8 @@ record_route_advertised_address("1.2.3.4:5080");
<para>Adds a parameter to the Record-Route URI (param must be in
<quote>;name=value</quote> format. The function may be called also
before or after the record_route() or record_route_advertised_address()
- calls (see <xref linkend="record-route-id"/> or <xref
- linkend="record-route-adv-addr-id"/>)).</para>
+ calls (see <xref linkend="rr.f.record_route"/> or <xref
+ linkend="rr.f.record_route_adv_addr"/>)).</para>
<para>Meaning of the parameters is as follows:</para>
@@ -628,7 +628,7 @@ add_rr_param(";nat=yes");
<para>The function checks if the URI parameters of the local Route
header (corresponding to the local server) matches the given regular
expression. It must be call after loose_route() (see <xref
- linkend="loose-route-id"/>).</para>
+ linkend="rr.f.loose_route"/>).</para>
<para>Meaning of the parameters is as follows:</para>
@@ -659,9 +659,9 @@ if (check_route_param("nat=yes")) {
<para>The function checks the flow direction of in-dialog requests. This
function uses the <quote>ftag</quote> parameter from the Route header,
- therefore the append_fromtag (see <xref linkend="append-fromtag-id"/>
+ therefore the append_fromtag (see <xref linkend="rr.p.append_fromtag"/>
module parameter must be enabled. Also this must be called only after
- loose_route() (see <xref linkend="loose-route-id"/>).</para>
+ loose_route() (see <xref linkend="rr.f.loose_route"/>).</para>
<para>The function returns true if the <quote>dir</quote> is the same
with the request's flow direction.</para>