From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Aug 2017 08:08:45 +0000 (+0200)
Subject: satip server: allow to turn off UPnP discovery, fixes #4482
X-Git-Tag: v4.2.4~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96a063fcf4e845c3743260597ced2aa5ac23b63e;p=thirdparty%2Ftvheadend.git

satip server: allow to turn off UPnP discovery, fixes #4482
---

diff --git a/src/satip/server.c b/src/satip/server.c
index 901d1389c..e6b5fdf62 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -669,6 +669,14 @@ const idclass_t satip_server_class = {
       .off    = offsetof(struct satip_server_conf, satip_anonymize),
       .group  = 1,
     },
+    {
+      .type   = PT_BOOL,
+      .id     = "satip_noupnp",
+      .name   = N_("Disable UPnP"),
+      .desc   = N_("Disable UPnP discovery."),
+      .off    = offsetof(struct satip_server_conf, satip_noupnp),
+      .group  = 1,
+    },
     {
       .type   = PT_INT,
       .id     = "satip_weight",
@@ -990,12 +998,16 @@ void satip_server_register(void)
   if (save)
     idnode_changed(&config.idnode);
 
-  satips_upnp_discovery = upnp_service_create(upnp_service);
-  if (satips_upnp_discovery == NULL) {
-    tvherror(LS_SATIPS, "unable to create UPnP discovery service");
+  if (!satip_server_conf.satip_noupnp) {
+    satips_upnp_discovery = upnp_service_create(upnp_service);
+    if (satips_upnp_discovery == NULL) {
+      tvherror(LS_SATIPS, "unable to create UPnP discovery service");
+    } else {
+      satips_upnp_discovery->us_received = satips_upnp_discovery_received;
+      satips_upnp_discovery->us_destroy  = satips_upnp_discovery_destroy;
+    }
   } else {
-    satips_upnp_discovery->us_received = satips_upnp_discovery_received;
-    satips_upnp_discovery->us_destroy  = satips_upnp_discovery_destroy;
+    satips_upnp_discovery = NULL;
   }
 
   satip_server_rtsp_register();
diff --git a/src/satip/server.h b/src/satip/server.h
index b7f99aaa2..054e48138 100644
--- a/src/satip/server.h
+++ b/src/satip/server.h
@@ -50,6 +50,7 @@ struct satip_server_conf {
   int satip_nom3u;
   int satip_notcp_mode;
   int satip_anonymize;
+  int satip_noupnp;
   int satip_iptv_sig_level;
   int satip_force_sig_level;
   int satip_dvbs;