You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3371
-- Commit Summary --
* p_usrloc: typos
* pdb: typos
* peering: typo
* permissions: typos
* pike: typos
* pipelimit: typo
* presence: typos
* presence_conference: typos
* presence_dialoginfo: typos
* presence_mwi: typo
* presence_profile: typo
* presence_reginfo: typos
* presence_xml: typos
* print_lib: typo
* pua: typos
* pua_dialoginfo: typos
* pua_reginfo: typos
* pua_xmpp: typos
* pv: typos
* pv_headers: typos
-- File Changes --
M src/modules/p_usrloc/p_usrloc_mod.c (4)
M src/modules/p_usrloc/udomain.c (2)
M src/modules/p_usrloc/ul_db_handle.c (2)
M src/modules/p_usrloc/urecord.c (2)
M src/modules/p_usrloc/urecord.h (2)
M src/modules/pdb/doc/pdb_admin.xml (2)
M src/modules/pdb/pdb.c (2)
M src/modules/peering/doc/peering_admin.xml (2)
M src/modules/permissions/doc/permissions_admin.xml (12)
M src/modules/permissions/rule.c (2)
M src/modules/pike/pike_funcs.c (4)
M src/modules/pipelimit/doc/pipelimit_admin.xml (2)
M src/modules/presence/doc/presence_admin.xml (14)
M src/modules/presence/doc/presence_devel.xml (2)
M src/modules/presence/event_list.h (2)
M src/modules/presence/notify.c (2)
M src/modules/presence/presence.c (2)
M src/modules/presence/presentity.c (2)
M src/modules/presence_conference/notify_body.c (6)
M src/modules/presence_conference/presence_conference.c (2)
M src/modules/presence_dialoginfo/notify_body.c (12)
M src/modules/presence_dialoginfo/presence_dialoginfo.c (2)
M src/modules/presence_mwi/presence_mwi.c (2)
M src/modules/presence_profile/presence_profile.c (2)
M src/modules/presence_reginfo/notify_body.c (8)
M src/modules/presence_reginfo/presence_reginfo.c (2)
M src/modules/presence_xml/doc/presence_xml_admin.xml (2)
M src/modules/presence_xml/notify_body.c (32)
M src/modules/presence_xml/presence_xml.c (2)
M src/modules/print_lib/print_lib.c (2)
M src/modules/pua/pua.c (4)
M src/modules/pua/pua_db.c (2)
M src/modules/pua/send_publish.c (2)
M src/modules/pua/send_publish.h (2)
M src/modules/pua/send_subscribe.h (2)
M src/modules/pua_dialoginfo/dialog_publish.c (2)
M src/modules/pua_dialoginfo/pua_dialoginfo.c (2)
M src/modules/pua_dialoginfo/pua_dialoginfo.h (2)
M src/modules/pua_reginfo/doc/pua_reginfo_admin.xml (4)
M src/modules/pua_xmpp/simple2xmpp.c (2)
M src/modules/pua_xmpp/xmpp2simple.c (2)
M src/modules/pv/pv.c (8)
M src/modules/pv/pv_branch.c (2)
M src/modules/pv/pv_core.c (8)
M src/modules/pv/pv_shv.c (2)
M src/modules/pv/pv_trans.c (2)
M src/modules/pv_headers/doc/functions.xml (2)
M src/modules/pv_headers/doc/params.xml (2)
M src/modules/pv_headers/pv_headers.c (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3371.patchhttps://github.com/kamailio/kamailio/pull/3371.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3371
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3371(a)github.com>
Module: kamailio
Branch: master
Commit: d87120dfb77d018cdf571cbcf18cf1950ce61987
URL: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2023-02-13T13:16:18+01:00
modules: readme files regenerated - nathelper ... [skip ci]
---
Modified: src/modules/nathelper/README
---
Diff: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19…
Patch: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19…
---
diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README
index 941cee9465..b1edb5d450 100644
--- a/src/modules/nathelper/README
+++ b/src/modules/nathelper/README
@@ -191,10 +191,10 @@ Chapter 1. Admin Guide
save() and should be used for ���REGISTER��� requests.
Note: fix_nated_contact() changes the ���Contact��� header, thus it breaks
- the RFC. Although usually this is not an issue, it may cause problems
+ the RFC. Although this is not always an issue, it may cause problems
with strict SIP clients. An alternative is to use add_contact_alias()
- that together with the handle_ruri_alias() is standards conforming and
- also supports reuse of TCP/TLS connections.
+ (or set_contact_alias()) that together with the handle_ruri_alias() is
+ standards conforming and also supports reuse of TCP/TLS connections.
2. NAT pinging types
@@ -285,12 +285,15 @@ modparam("nathelper", "natping_interval", 10)
4.3. ping_nated_only (integer)
If this parameter is set to 1 then only contacts that have the behind
- NAT ���nat_bflag��� flag in user location database set will get
- SIP-request-based ping.
-
- If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is
- sent to all contacts. If it is 0 and sipping_bflag parameter is set,
- then SIP-request-based pinging is sent to all contacts.
+ NAT ���nat_bflag��� flag set in user location records get the NAT ping (the
+ ���nat_bflag��� is specified via modparam of usrloc module). By default the
+ ping is done with 4-bytes UDP packet. If sipping_bflag is also set,
+ then the ping is done with a stateless SIP request (by default: OPTIONS
+ request).
+
+ If it is 0, then all contacts get a NAT ping, by default being the
+ 4-bytes UDP packet. If it is 0 and sipping_bflag parameter is set, then
+ SIP-request-based pinging is sent to all contacts.
Default value is 0.
My experiments show that with
```
modparam("nathelper", "ping_nated_only", 1)
modparam("nathelper", "sipping_bflag", FLB_NATSIPPING)
modparam("usrloc", "nat_bflag", FLB_NATB)
```
when both FLB_NATB and FLB_NATSIPPING branch flags are set, no OPTIONS from Kamailio to UAC is generated, so I assume that nathelper.ping_nated_only=1 does force 4-bytes UDP keepalive.
This change spells the above, as the behaviour currently is not specified.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3346
-- Commit Summary --
* nathelper: ping_nated_only sends 4-bytes UDP-packet pings
-- File Changes --
M src/modules/nathelper/doc/nathelper_admin.xml (12)
M src/modules/nathelper/examples/4to6.cfg (2)
M src/modules/nathelper/examples/alg.cfg (2)
M src/modules/nathelper/nathelper.c (6)
M src/modules/nathelper/nhelpr_funcs.c (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3346.patchhttps://github.com/kamailio/kamailio/pull/3346.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3346
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3346(a)github.com>
Module: kamailio
Branch: master
Commit: fdf72bec2d6cc20618bc30d0978d7f24f8106d44
URL: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2023-02-13T13:01:34+01:00
modules: readme files regenerated - nathelper ... [skip ci]
---
Modified: src/modules/nathelper/README
---
Diff: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2…
Patch: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2…
---
diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README
index e091d2018f..941cee9465 100644
--- a/src/modules/nathelper/README
+++ b/src/modules/nathelper/README
@@ -107,7 +107,7 @@ Ovidiu Sas
1.17. Set alias_name parameter
1.18. fix_nated_contact usage
1.19. fix_nated_sdp usage
- 1.20. add_rcv_paramer usage
+ 1.20. add_rcv_param usage
1.21. fix_nated_register usage
1.22. nat_uac_test usage
1.23. is_rfc1918 usage
@@ -187,10 +187,10 @@ Chapter 1. Admin Guide
with request's source address:port pair. The function fix_nated_sdp()
adds the active direction indication to SDP (flag 0x01) and updates the
source IP address too (flag 0x02). The function fix_nated_register()
- exports exports the request's source address:port into an AVP to be
- used during save() and should be used for ���REGISTER��� requests.
+ exports the request's source address:port into an AVP to be used during
+ save() and should be used for ���REGISTER��� requests.
- Note: fix_nated_contact changes the ���Contact��� header, thus it breaks
+ Note: fix_nated_contact() changes the ���Contact��� header, thus it breaks
the RFC. Although usually this is not an issue, it may cause problems
with strict SIP clients. An alternative is to use add_contact_alias()
that together with the handle_ruri_alias() is standards conforming and
@@ -205,7 +205,7 @@ Chapter 1. Admin Guide
Kamailio;
+ Disadvantages: unidirectional traffic through NAT (inbound -
from outside to inside); As many NATs do update the bind
- timeout only on outbound traffic, the bind may expire and
+ timeout only on outbound traffic, the bind may expire and get
closed.
* SIP request - a stateless SIP request is sent to the UDP contact
address.
@@ -285,7 +285,8 @@ modparam("nathelper", "natping_interval", 10)
4.3. ping_nated_only (integer)
If this parameter is set to 1 then only contacts that have the behind
- NAT ���nat_bflag��� flag in user location database set will get ping.
+ NAT ���nat_bflag��� flag in user location database set will get
+ SIP-request-based ping.
If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is
sent to all contacts. If it is 0 and sipping_bflag parameter is set,
@@ -583,7 +584,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");};
This function can be used from REQUEST_ROUTE.
- Example 1.20. add_rcv_paramer usage
+ Example 1.20. add_rcv_param usage
...
add_rcv_param(); # add the parameter to the Contact header
....
@@ -821,7 +822,7 @@ $ kamcmd nathelper.enable_ping 1
8.1. @nathelper.rewrite_contact[n]
Get n-th Contact value with IP:Port rewritten to source ip:port. N is
- counted from 1. Only IP:port is rewritten, remaining part are left
+ counted from 1. Only IP:port is rewritten, remaining parts are left
unchanged. Full nameaddr is supported.
Example 1.31. @nathelper.rewrite_contact usage