sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:4.1: nathelper: readme updated for carrier grade nat address space matching
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.1 Commit: 9eba669d45baeb16a8e2fab0b1201c6140f2c652 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9eba669… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 14:51:05 2014 +0100 nathelper: readme updated for carrier grade nat address space matching (cherry picked from commit 15537553aabfd59bb0fe2af45174ab4a4575120f) --- modules/nathelper/README | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/nathelper/README b/modules/nathelper/README index e27e29f..efaf195 100644 --- a/modules/nathelper/README +++ b/modules/nathelper/README @@ -533,15 +533,16 @@ fix_nated_register(); parameter determines what heuristics is used. Meaning of the flags is as follows: - * 1 - Contact header field is searched for occurrence of RFC1918 - addresses. + * 1 - Contact header field is searched for occurrence of RFC1918 or + rfc6598 addresses. * 2 - the "received" test is used: address in Via is compared against source IP address of signaling - * 4 - Top Most VIA is searched for occurrence of RFC1918 addresses - * 8 - SDP is searched for occurrence of RFC1918 addresses + * 4 - Top Most VIA is searched for occurrence of RFC1918 or rfc6598 + addresses + * 8 - SDP is searched for occurrence of RFC1918 or rfc6598 addresses * 16 - test if the source port is different from the port in Via - * 32 - test if the source IP address of signaling is a RFC1918 - address + * 32 - test if the source IP address of signaling is a RFC1918 or + rfc6598 address * 64 - test if the source connection of signaling is a WebSocket * 128 - test if the Contact URI port differs from the source port of the request (Warning: this is might be legal or even intended @@ -555,8 +556,8 @@ fix_nated_register(); 5.6. is_rfc1918(ip_address) - Determines if the address in the parameter is an rfc1918 address. The - parameter allows pseudo-variables usage. + Determines if the address in the parameter is an rfc1918 or rfc6598 + address. The parameter allows pseudo-variables usage. This function can be used from ANY_ROUTE.

1 0

git:4.1: nathelper: mention the match of a natted address against rfc6598 ( carrier grade nat)
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.1 Commit: b2446a8ba6a80cf7b42839fb9aa04f5ed06767be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2446a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 14:49:22 2014 +0100 nathelper: mention the match of a natted address against rfc6598 (carrier grade nat) (cherry picked from commit 048448f059b64863d41ca146650f7d26b195cdce) --- modules/nathelper/doc/nathelper_admin.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/nathelper/doc/nathelper_admin.xml b/modules/nathelper/doc/nathelper_admin.xml index c80a2d7..41b064e 100644 --- a/modules/nathelper/doc/nathelper_admin.xml +++ b/modules/nathelper/doc/nathelper_admin.xml @@ -587,7 +587,7 @@ fix_nated_register(); <itemizedlist> <listitem><para> <emphasis>1</emphasis> - Contact header field is searched - for occurrence of RFC1918 addresses. + for occurrence of RFC1918 or rfc6598 addresses. </para></listitem> <listitem><para> <emphasis>2</emphasis> - the "received" test is used: address @@ -595,11 +595,11 @@ fix_nated_register(); </para></listitem> <listitem><para> <emphasis>4</emphasis> - Top Most VIA is searched - for occurrence of RFC1918 addresses + for occurrence of RFC1918 or rfc6598 addresses </para></listitem> <listitem><para> <emphasis>8</emphasis> - SDP is searched for occurrence of - RFC1918 addresses + RFC1918 or rfc6598 addresses </para></listitem> <listitem><para> <emphasis>16</emphasis> - test if the source port is different @@ -607,7 +607,7 @@ fix_nated_register(); </para></listitem> <listitem><para> <emphasis>32</emphasis> - test if the source IP address of - signaling is a RFC1918 address + signaling is a RFC1918 or rfc6598 address </para></listitem> <listitem><para> <emphasis>64</emphasis> - test if the source connection of @@ -633,7 +633,7 @@ fix_nated_register(); <function>is_rfc1918(ip_address)</function> </title> <para> - Determines if the address in the parameter is an rfc1918 address. + Determines if the address in the parameter is an rfc1918 or rfc6598 address. The parameter allows pseudo-variables usage. </para> <para>

1 0

git:4.1: nathelper: added carrier grade nat address space (rfc6598)
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.1 Commit: a1db16222f16c75f2ed10aa023853e28772ab35a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1db162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 14:48:13 2014 +0100 nathelper: added carrier grade nat address space (rfc6598) (cherry picked from commit b992cfe8e88d069a0b3b0cfa31fe0d60a555cc4c) --- modules/nathelper/nathelper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 8e9de7f..c34beee 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -328,6 +328,7 @@ static struct { {"10.0.0.0", 0, 0xffffffffu << 24}, {"172.16.0.0", 0, 0xffffffffu << 20}, {"192.168.0.0", 0, 0xffffffffu << 16}, + {"100.64.0.0", 0, 0xffffffffu << 22}, /* rfc6598 - cg-nat */ {NULL, 0, 0} };

1 0

git:master: nathelper: readme updated for carrier grade nat address space matching
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: 15537553aabfd59bb0fe2af45174ab4a4575120f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1553755… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 14:51:05 2014 +0100 nathelper: readme updated for carrier grade nat address space matching --- modules/nathelper/README | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/nathelper/README b/modules/nathelper/README index e27e29f..efaf195 100644 --- a/modules/nathelper/README +++ b/modules/nathelper/README @@ -533,15 +533,16 @@ fix_nated_register(); parameter determines what heuristics is used. Meaning of the flags is as follows: - * 1 - Contact header field is searched for occurrence of RFC1918 - addresses. + * 1 - Contact header field is searched for occurrence of RFC1918 or + rfc6598 addresses. * 2 - the "received" test is used: address in Via is compared against source IP address of signaling - * 4 - Top Most VIA is searched for occurrence of RFC1918 addresses - * 8 - SDP is searched for occurrence of RFC1918 addresses + * 4 - Top Most VIA is searched for occurrence of RFC1918 or rfc6598 + addresses + * 8 - SDP is searched for occurrence of RFC1918 or rfc6598 addresses * 16 - test if the source port is different from the port in Via - * 32 - test if the source IP address of signaling is a RFC1918 - address + * 32 - test if the source IP address of signaling is a RFC1918 or + rfc6598 address * 64 - test if the source connection of signaling is a WebSocket * 128 - test if the Contact URI port differs from the source port of the request (Warning: this is might be legal or even intended @@ -555,8 +556,8 @@ fix_nated_register(); 5.6. is_rfc1918(ip_address) - Determines if the address in the parameter is an rfc1918 address. The - parameter allows pseudo-variables usage. + Determines if the address in the parameter is an rfc1918 or rfc6598 + address. The parameter allows pseudo-variables usage. This function can be used from ANY_ROUTE.

1 0

git:master: nathelper: mention the match of a natted address against rfc6598 (carrier grade nat)
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: 048448f059b64863d41ca146650f7d26b195cdce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=048448f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 14:49:22 2014 +0100 nathelper: mention the match of a natted address against rfc6598 (carrier grade nat) --- modules/nathelper/doc/nathelper_admin.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/nathelper/doc/nathelper_admin.xml b/modules/nathelper/doc/nathelper_admin.xml index c80a2d7..41b064e 100644 --- a/modules/nathelper/doc/nathelper_admin.xml +++ b/modules/nathelper/doc/nathelper_admin.xml @@ -587,7 +587,7 @@ fix_nated_register(); <itemizedlist> <listitem><para> <emphasis>1</emphasis> - Contact header field is searched - for occurrence of RFC1918 addresses. + for occurrence of RFC1918 or rfc6598 addresses. </para></listitem> <listitem><para> <emphasis>2</emphasis> - the "received" test is used: address @@ -595,11 +595,11 @@ fix_nated_register(); </para></listitem> <listitem><para> <emphasis>4</emphasis> - Top Most VIA is searched - for occurrence of RFC1918 addresses + for occurrence of RFC1918 or rfc6598 addresses </para></listitem> <listitem><para> <emphasis>8</emphasis> - SDP is searched for occurrence of - RFC1918 addresses + RFC1918 or rfc6598 addresses </para></listitem> <listitem><para> <emphasis>16</emphasis> - test if the source port is different @@ -607,7 +607,7 @@ fix_nated_register(); </para></listitem> <listitem><para> <emphasis>32</emphasis> - test if the source IP address of - signaling is a RFC1918 address + signaling is a RFC1918 or rfc6598 address </para></listitem> <listitem><para> <emphasis>64</emphasis> - test if the source connection of @@ -633,7 +633,7 @@ fix_nated_register(); <function>is_rfc1918(ip_address)</function> </title> <para> - Determines if the address in the parameter is an rfc1918 address. + Determines if the address in the parameter is an rfc1918 or rfc6598 address. The parameter allows pseudo-variables usage. </para> <para>

1 0

git:master: nathelper: added carrier grade nat address space (rfc6598)
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: b992cfe8e88d069a0b3b0cfa31fe0d60a555cc4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b992cfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 14:48:13 2014 +0100 nathelper: added carrier grade nat address space (rfc6598) --- modules/nathelper/nathelper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 8e9de7f..c34beee 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -328,6 +328,7 @@ static struct { {"10.0.0.0", 0, 0xffffffffu << 24}, {"172.16.0.0", 0, 0xffffffffu << 20}, {"192.168.0.0", 0, 0xffffffffu << 16}, + {"100.64.0.0", 0, 0xffffffffu << 22}, /* rfc6598 - cg-nat */ {NULL, 0, 0} };

1 0

git:4.1: nat_traversal: added RFC6598 shared address space to client NAT tests
by Charles Chance 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.1 Commit: 71c276c092bb3f1e958b17de1bb146a9d9937b3f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71c276c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Mar 6 13:35:46 2014 +0000 nat_traversal: added RFC6598 shared address space to client NAT tests (cherry picked from commit 01f76bb99cfd4cebb580ed10ecd478049b038f48) --- modules/nat_traversal/README | 24 +++++++++++--------- modules/nat_traversal/doc/nat_traversal_admin.xml | 6 +++- modules/nat_traversal/nat_traversal.c | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/modules/nat_traversal/README b/modules/nat_traversal/README index a9a9f13..93ee58b 100644 --- a/modules/nat_traversal/README +++ b/modules/nat_traversal/README @@ -10,7 +10,7 @@ Dan Pascu <dan(a)ag-projects.com> - Copyright � 2008 Dan Pascu + Copyright © 2008 Dan Pascu __________________________________________________________________ Table of Contents @@ -405,7 +405,7 @@ Chapter 1. Admin Guide each endpoint will receive exactly one keepalive message. A negative value or zero will disable the keepalive functionality. - Default value is "60". + Default value is “60”. Example 1.1. Setting the keepalive_interval parameter ... @@ -418,7 +418,7 @@ modparam("nat_traversal", "keepalive_interval", 90) for this purpose are NOTIFY and OPTIONS. NOTIFY generates smaller replies from user agents, but they are almost entirely negative replies. Apparently almost none of the user agents understand that the - purpose of the NOTIFY with a "keep-alive" event is to keep NAT open, + purpose of the NOTIFY with a “keep-alive” event is to keep NAT open, even though many user agents send such NOTIFY requests themselves. However this does not affect the result at all, since the purpose is to trigger a response from the user agent behind NAT, positive or negative @@ -433,7 +433,7 @@ modparam("nat_traversal", "keepalive_interval", 90) times bigger than negative replies or replies to NOTIFY requests. For this reason the default value for the used method is NOTIFY. - Default value is "NOTIFY". + Default value is “NOTIFY”. Example 1.2. Setting the keepalive_method parameter ... @@ -448,7 +448,7 @@ modparam("nat_traversal", "keepalive_method", "OPTIONS") keepalive message, which is the same interface on which the request that triggered keepalive functionality arrived. - Default value is "sip:keepalive@proxy_ip" with proxy_ip being the + Default value is “sip:keepalive@proxy_ip” with proxy_ip being the actual IP of the outgoing interface. Example 1.3. Setting the keepalive_from parameter @@ -487,7 +487,7 @@ MyHeader: some_value\r\n") case it will store it in the Kamailio working directory, or an absolute path. - Default value is undefined "keepalive_state". + Default value is undefined “keepalive_state”. Example 1.5. Setting the keepalive_state_file parameter ... @@ -501,7 +501,7 @@ tate") 5.2. fix_contact() 5.3. nat_keepalive() -5.1. client_nat_test(type) +5.1. client_nat_test(type) Check if the client is behind NAT. What tests are performed is specified by the type parameter which is an integer given by the sum of @@ -509,12 +509,14 @@ tate") numbers corresponding to individual tests are shown below: * 1 - tests if client has a private IP address (as defined by - RFC1918) in the Contact field of the SIP message. + RFC1918) or one from shared address space (RFC6598) in the Contact + field of the SIP message. * 2 - tests if client has contacted Kamailio from an address that is different from the one in the Via field. Both the IP and port are compared by this test. * 4 - tests if client has a private IP address (as defined by - RFC1918) in the top Via field of the SIP message. + RFC1918) or one from shared address space (RFC6598) in the top Via + field of the SIP message. For example calling client_nat_test("3") will perform test 1 and test 2 and return true if at least one succeeds, otherwise false. @@ -529,7 +531,7 @@ if (client_nat_test("3")) { } ... -5.2. fix_contact() +5.2. fix_contact() Will replace the IP and port in the Contact header with the IP and port the SIP message was received from. Usually called after a succesful @@ -545,7 +547,7 @@ if (client_nat_test("3")) { } ... -5.3. nat_keepalive() +5.3. nat_keepalive() Trigger keepalive functionality for the source address of the request. When called it only sets some internal flags, which will trigger later diff --git a/modules/nat_traversal/doc/nat_traversal_admin.xml b/modules/nat_traversal/doc/nat_traversal_admin.xml index 8d03189..d796d6c 100644 --- a/modules/nat_traversal/doc/nat_traversal_admin.xml +++ b/modules/nat_traversal/doc/nat_traversal_admin.xml @@ -515,7 +515,8 @@ modparam("nat_traversal", "keepalive_state_file", "/var/run/kamailio/keepalive_s <itemizedlist> <listitem><para> 1 - tests if client has a private IP address (as defined by RFC1918) - in the Contact field of the SIP message. + or one from shared address space (RFC6598) in the Contact field + of the SIP message. </para></listitem> <listitem><para> 2 - tests if client has contacted &kamailio; from an address that @@ -524,7 +525,8 @@ modparam("nat_traversal", "keepalive_state_file", "/var/run/kamailio/keepalive_s </para></listitem> <listitem><para> 4 - tests if client has a private IP address (as defined by RFC1918) - in the top Via field of the SIP message. + or one from shared address space (RFC6598) in the top Via field + of the SIP message. </para></listitem> </itemizedlist> </para> diff --git a/modules/nat_traversal/nat_traversal.c b/modules/nat_traversal/nat_traversal.c index 92ddd4c..8c5dbbb 100644 --- a/modules/nat_traversal/nat_traversal.c +++ b/modules/nat_traversal/nat_traversal.c @@ -225,6 +225,7 @@ static NetInfo rfc1918nets[] = { {"10.0.0.0", 0x0a000000UL, 0xff000000UL}, {"172.16.0.0", 0xac100000UL, 0xfff00000UL}, {"192.168.0.0", 0xc0a80000UL, 0xffff0000UL}, + {"100.64.0.0", 0x64400000UL, 0xffc00000UL}, // include rfc6598 shared address space as technically the same for our purpose {NULL, 0UL, 0UL} };

1 0

git:master: nat_traversal: added RFC6598 shared address space to client NAT tests
by Charles Chance 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: 01f76bb99cfd4cebb580ed10ecd478049b038f48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01f76bb… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Mar 6 13:35:46 2014 +0000 nat_traversal: added RFC6598 shared address space to client NAT tests --- modules/nat_traversal/README | 24 +++++++++++--------- modules/nat_traversal/doc/nat_traversal_admin.xml | 6 +++- modules/nat_traversal/nat_traversal.c | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/modules/nat_traversal/README b/modules/nat_traversal/README index a9a9f13..93ee58b 100644 --- a/modules/nat_traversal/README +++ b/modules/nat_traversal/README @@ -10,7 +10,7 @@ Dan Pascu <dan(a)ag-projects.com> - Copyright � 2008 Dan Pascu + Copyright © 2008 Dan Pascu __________________________________________________________________ Table of Contents @@ -405,7 +405,7 @@ Chapter 1. Admin Guide each endpoint will receive exactly one keepalive message. A negative value or zero will disable the keepalive functionality. - Default value is "60". + Default value is “60”. Example 1.1. Setting the keepalive_interval parameter ... @@ -418,7 +418,7 @@ modparam("nat_traversal", "keepalive_interval", 90) for this purpose are NOTIFY and OPTIONS. NOTIFY generates smaller replies from user agents, but they are almost entirely negative replies. Apparently almost none of the user agents understand that the - purpose of the NOTIFY with a "keep-alive" event is to keep NAT open, + purpose of the NOTIFY with a “keep-alive” event is to keep NAT open, even though many user agents send such NOTIFY requests themselves. However this does not affect the result at all, since the purpose is to trigger a response from the user agent behind NAT, positive or negative @@ -433,7 +433,7 @@ modparam("nat_traversal", "keepalive_interval", 90) times bigger than negative replies or replies to NOTIFY requests. For this reason the default value for the used method is NOTIFY. - Default value is "NOTIFY". + Default value is “NOTIFY”. Example 1.2. Setting the keepalive_method parameter ... @@ -448,7 +448,7 @@ modparam("nat_traversal", "keepalive_method", "OPTIONS") keepalive message, which is the same interface on which the request that triggered keepalive functionality arrived. - Default value is "sip:keepalive@proxy_ip" with proxy_ip being the + Default value is “sip:keepalive@proxy_ip” with proxy_ip being the actual IP of the outgoing interface. Example 1.3. Setting the keepalive_from parameter @@ -487,7 +487,7 @@ MyHeader: some_value\r\n") case it will store it in the Kamailio working directory, or an absolute path. - Default value is undefined "keepalive_state". + Default value is undefined “keepalive_state”. Example 1.5. Setting the keepalive_state_file parameter ... @@ -501,7 +501,7 @@ tate") 5.2. fix_contact() 5.3. nat_keepalive() -5.1. client_nat_test(type) +5.1. client_nat_test(type) Check if the client is behind NAT. What tests are performed is specified by the type parameter which is an integer given by the sum of @@ -509,12 +509,14 @@ tate") numbers corresponding to individual tests are shown below: * 1 - tests if client has a private IP address (as defined by - RFC1918) in the Contact field of the SIP message. + RFC1918) or one from shared address space (RFC6598) in the Contact + field of the SIP message. * 2 - tests if client has contacted Kamailio from an address that is different from the one in the Via field. Both the IP and port are compared by this test. * 4 - tests if client has a private IP address (as defined by - RFC1918) in the top Via field of the SIP message. + RFC1918) or one from shared address space (RFC6598) in the top Via + field of the SIP message. For example calling client_nat_test("3") will perform test 1 and test 2 and return true if at least one succeeds, otherwise false. @@ -529,7 +531,7 @@ if (client_nat_test("3")) { } ... -5.2. fix_contact() +5.2. fix_contact() Will replace the IP and port in the Contact header with the IP and port the SIP message was received from. Usually called after a succesful @@ -545,7 +547,7 @@ if (client_nat_test("3")) { } ... -5.3. nat_keepalive() +5.3. nat_keepalive() Trigger keepalive functionality for the source address of the request. When called it only sets some internal flags, which will trigger later diff --git a/modules/nat_traversal/doc/nat_traversal_admin.xml b/modules/nat_traversal/doc/nat_traversal_admin.xml index 8d03189..d796d6c 100644 --- a/modules/nat_traversal/doc/nat_traversal_admin.xml +++ b/modules/nat_traversal/doc/nat_traversal_admin.xml @@ -515,7 +515,8 @@ modparam("nat_traversal", "keepalive_state_file", "/var/run/kamailio/keepalive_s <itemizedlist> <listitem><para> 1 - tests if client has a private IP address (as defined by RFC1918) - in the Contact field of the SIP message. + or one from shared address space (RFC6598) in the Contact field + of the SIP message. </para></listitem> <listitem><para> 2 - tests if client has contacted &kamailio; from an address that @@ -524,7 +525,8 @@ modparam("nat_traversal", "keepalive_state_file", "/var/run/kamailio/keepalive_s </para></listitem> <listitem><para> 4 - tests if client has a private IP address (as defined by RFC1918) - in the top Via field of the SIP message. + or one from shared address space (RFC6598) in the top Via field + of the SIP message. </para></listitem> </itemizedlist> </para> diff --git a/modules/nat_traversal/nat_traversal.c b/modules/nat_traversal/nat_traversal.c index 92ddd4c..8c5dbbb 100644 --- a/modules/nat_traversal/nat_traversal.c +++ b/modules/nat_traversal/nat_traversal.c @@ -225,6 +225,7 @@ static NetInfo rfc1918nets[] = { {"10.0.0.0", 0x0a000000UL, 0xff000000UL}, {"172.16.0.0", 0xac100000UL, 0xfff00000UL}, {"192.168.0.0", 0xc0a80000UL, 0xffff0000UL}, + {"100.64.0.0", 0x64400000UL, 0xffc00000UL}, // include rfc6598 shared address space as technically the same for our purpose {NULL, 0UL, 0UL} };

1 0

Nat_traversal module + RFC6598
by Charles Chance 06 Mar '14

06 Mar '14

Hello All, Any objections if I update nat_traversal module to include CGN address space, similar to the patch submitted for nathelper module (with the correct address range)? Or does someone else have it in mind to do it? Regards, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Unit 10 iBIC, Birmingham Science Park, Holt Court South, Birmingham B7 4EJ.

2 4

git:4.0: tls: the pointer of cfg structure
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: dfc8d544f7435e39771f8a39f349b969ba730944 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfc8d54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 11:57:23 2014 +0100 tls: the pointer of cfg structure - synchronize when updating the list of tls configs and their reference count - with parts from patch by Ding Ma, FS#380, contributed under BSD license - backport of 208934d47ac1585d42029234267bcceab40ae218 --- modules/tls/tls_cfg.c | 2 +- modules/tls/tls_cfg.h | 2 +- modules/tls/tls_domain.c | 1 + modules/tls/tls_domain.h | 2 +- modules/tls/tls_mod.c | 2 +- modules/tls/tls_rpc.c | 2 ++ modules/tls/tls_server.c | 9 +++------ modules/tls/tls_util.c | 11 +++++++---- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index d1253af..dc118d8 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -74,7 +74,7 @@ struct cfg_group_tls default_tls_cfg = { 0 /* send_close_notify (off by default)*/ }; -void* tls_cfg = &default_tls_cfg; +volatile void* tls_cfg = &default_tls_cfg; /* if *to<0 to=default_val, else if to>max_val to=max_val */ diff --git a/modules/tls/tls_cfg.h b/modules/tls/tls_cfg.h index 86b8816..6064182 100644 --- a/modules/tls/tls_cfg.h +++ b/modules/tls/tls_cfg.h @@ -101,7 +101,7 @@ struct cfg_group_tls { extern struct cfg_group_tls default_tls_cfg; -extern void* tls_cfg; +extern volatile void* tls_cfg; extern cfg_def_t tls_cfg_def[]; diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 2d49969..c06892c 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -118,6 +118,7 @@ void tls_free_cfg(tls_domains_cfg_t* cfg) } if (cfg->srv_default) tls_free_domain(cfg->srv_default); if (cfg->cli_default) tls_free_domain(cfg->cli_default); + shm_free(cfg); } diff --git a/modules/tls/tls_domain.h b/modules/tls/tls_domain.h index e4d1319..2f5c72a 100644 --- a/modules/tls/tls_domain.h +++ b/modules/tls/tls_domain.h @@ -92,7 +92,7 @@ typedef struct tls_domains_cfg { tls_domain_t* srv_list; /**< Server domain list */ tls_domain_t* cli_list; /**< Client domain list */ struct tls_domains_cfg* next; /**< Next element in the garbage list */ - int ref_count; /**< How many connections use this configuration */ + volatile int ref_count; /**< How many connections use this configuration */ } tls_domains_cfg_t; diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 69967da..bb5d3ad 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -300,7 +300,7 @@ static int mod_init(void) } /* declare configuration */ if (cfg_declare("tls", tls_cfg_def, &default_tls_cfg, - cfg_sizeof(tls), &tls_cfg)) { + cfg_sizeof(tls), (void **)&tls_cfg)) { ERR("failed to register the configuration\n"); return -1; } diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 12a0711..b7b0a3c 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -81,8 +81,10 @@ static void tls_reload(rpc_t* rpc, void* ctx) } DBG("TLS configuration successfuly loaded"); + lock_get(tls_domains_cfg_lock); cfg->next = (*tls_domains_cfg); *tls_domains_cfg = cfg; + lock_release(tls_domains_cfg_lock); return; error: diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index f71956d..353e4e9 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -151,13 +151,9 @@ static int tls_complete_init(struct tcp_connection* c) goto error2; } /* Get current TLS configuration and increase reference - * count immediately. There is no need to lock the structure - * here, because it does not get deleted immediately. When - * SER reloads TLS configuration it will put the old configuration - * on a garbage queue and delete it later, so we know here that - * the pointer we get from *tls_domains_cfg will be valid for a while, - * at least by the time this function finishes + * count immediately. */ + lock_get(tls_domains_cfg_lock); cfg = *tls_domains_cfg; /* Increment the reference count in the configuration structure, this @@ -165,6 +161,7 @@ static int tls_complete_init(struct tcp_connection* c) * not get deleted if there are still connection referencing its SSL_CTX */ cfg->ref_count++; + lock_release(tls_domains_cfg_lock); if (c->flags & F_CONN_PASSIVE) { state=S_TLS_ACCEPTING; diff --git a/modules/tls/tls_util.c b/modules/tls/tls_util.c index a0897fc..8ec8892 100644 --- a/modules/tls/tls_util.c +++ b/modules/tls/tls_util.c @@ -74,7 +74,7 @@ int shm_asciiz_dup(char** dest, char* val) */ void collect_garbage(void) { - tls_domains_cfg_t* prev, *cur; + tls_domains_cfg_t* prev, *cur, *next; /* Make sure we do not run two garbage collectors * at the same time @@ -88,14 +88,17 @@ void collect_garbage(void) cur = (*tls_domains_cfg)->next; while(cur) { + next = cur->next; if (cur->ref_count == 0) { - /* Not referenced by any existing connection */ + /* Not referenced by any existing connection */ prev->next = cur->next; tls_free_cfg(cur); + } else { + /* Only update prev if we didn't remove cur */ + prev = cur; } - prev = cur; - cur = cur->next; + cur = next; } lock_release(tls_domains_cfg_lock);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2014