[sr-dev] git:5.0:bebf08e2: nathelper: allow port to be specified in force_socket, fixes #1298

[Timmo Verlaan]

Module: kamailio
Branch: 5.0
Commit: bebf08e2cb8fd87141e686af5cb37947f0720a33
URL: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb37947f0720a33

Author: Timmo Verlaan <tverlaan at gmail.com>
Committer: Timmo Verlaan <tverlaan at gmail.com>
Date: 2018-01-13T10:49:55+01:00

nathelper: allow port to be specified in force_socket, fixes #1298

---

Modified: src/modules/nathelper/doc/nathelper_admin.xml
Modified: src/modules/nathelper/nathelper.c

---

Diff:  https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb37947f0720a33.diff
Patch: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb37947f0720a33.patch

---

diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml
index d7ea668e02..76def0b1cf 100644
--- a/src/modules/nathelper/doc/nathelper_admin.xml
+++ b/src/modules/nathelper/doc/nathelper_admin.xml
@@ -139,7 +139,7 @@
 		<title>Set <varname>force_socket</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("nathelper", "force_socket", "localhost:33333")
+modparam("nathelper", "force_socket", "127.0.0.1:5060")
 ...
 </programlisting>
 		</example>
diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c
index 642318d52b..8af1b7a828 100644
--- a/src/modules/nathelper/nathelper.c
+++ b/src/modules/nathelper/nathelper.c
@@ -428,6 +428,8 @@ mod_init(void)
 	struct in_addr addr;
 	pv_spec_t avp_spec;
 	str s;
+	int port, proto;
+	str host;
 
 	if(nathelper_rpc_init()<0)
 	{
@@ -453,8 +455,13 @@ mod_init(void)
 		rcv_avp_type = 0;
 	}
 
-	if (force_socket_str.s && force_socket_str.len>0) {
-		force_socket=grep_sock_info(&force_socket_str,0,0);
+	if(force_socket_str.s && force_socket_str.len > 0) {
+		if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) {
+			force_socket = grep_sock_info(&host, port, proto);
+			if(force_socket == 0) {
+				LM_ERR("non-local force_socket <%s>\n", force_socket_str.s);
+			}
+		}
 	}
 
 	/* create raw socket? */