From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 16 Feb 2017 08:08:53 +0000 (+0100)
Subject: SAT>IP server: allow to accept any IP address for NAT connections, fixes #4228
X-Git-Tag: v4.2.1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6d940eaf17d1705c7f71d6641f608e96692e77f;p=thirdparty%2Ftvheadend.git

SAT>IP server: allow to accept any IP address for NAT connections, fixes #4228
---

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index 39a5fde51..c9d8d9523 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -263,9 +263,13 @@ rtsp_check_urlbase(char *u)
       return NULL;
 #endif
   }
-  if (strcmp(u, rtsp_ip))
-    if (rtsp_nat_ip == NULL || rtsp_nat_ip[0] == '\0' || strcmp(u, rtsp_nat_ip))
+  if (strcmp(u, rtsp_ip)) {
+    if (rtsp_nat_ip == NULL)
       return NULL;
+    if (rtsp_nat_ip[0] != '*')
+      if (rtsp_nat_ip[0] == '\0' || strcmp(u, rtsp_nat_ip))
+        return NULL;
+  }
   return p ? p + 1 : u + strlen(u);
 }
 
diff --git a/src/satip/server.c b/src/satip/server.c
index 0a65da34c..ecde43e1a 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -667,7 +667,7 @@ const idclass_t satip_server_class = {
       .id     = "satip_nat_ip",
       .name   = N_("External IP (NAT)"),
       .desc   = N_("Enter external IP if behind Network address "
-                   "translation (NAT)."),
+                   "translation (NAT). Asterisk (*) means accept all IP addresses."),
       .off    = offsetof(struct satip_server_conf, satip_nat_ip),
       .opts   = PO_EXPERT,
       .group  = 1,