Add option for per-tuner IP-address binding

tvheadend · May 5, 2015 · 9b73ad4 · 9b73ad4
1 parent 885d68f
commit 9b73ad4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/docs/html/config_tvadapters.html b/docs/html/config_tvadapters.html
@@ -202,6 +202,11 @@ <h3>The adapters and tuners are listed / edited  in a tree</h3>
   <dd>Force the delay between RTSP TEARDOWN and RTSP SETUP command (value
       from 'Next tune delay in ms' is used). Some devices are not able to handle
       quick continuous tuning.</dd>
+<p>
+  <dt><b>Tuner bind IP address</b><dt>
+  <dd>Force all network connections to this tuner be made over the specificed 
+      IP-address, similar to the setting for the SAT-IP - device itself. Setting
+      this overrides the device - specific setting.</dd>
 
 </dl>
 </p>

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
@@ -46,7 +46,7 @@ satip_frontend_find_by_number( satip_device_t *sd, int num )
 static char *
 satip_frontend_bindaddr( satip_frontend_t *lfe )
 {
-  char *bindaddr = lfe->sf_device->sd_bindaddr;
+  char *bindaddr = lfe->sf_tuner_bindaddr;
   if (bindaddr == NULL || bindaddr[0] == '\0')
     bindaddr = lfe->sf_device->sd_bindaddr;
   return bindaddr;
@@ -174,6 +174,13 @@ const idclass_t satip_frontend_class =
       .opts     = PO_ADVANCED,
       .off      = offsetof(satip_frontend_t, sf_teardown_delay),
     },
+    {
+      .type     = PT_STR,
+      .id       = "tunerbindaddr",
+      .name     = "Tuner bind IP address",
+      .opts     = PO_ADVANCED,
+      .off      = offsetof(satip_frontend_t, sf_tuner_bindaddr),
+    },
     {}
   }
 };

diff --git a/src/input/mpegts/satip/satip_private.h b/src/input/mpegts/satip/satip_private.h
@@ -121,6 +121,7 @@ struct satip_frontend
   int                        sf_play2;
   int                        sf_tdelay;
   int                        sf_teardown_delay;
+  char                      *sf_tuner_bindaddr;
 
   /*
    * Reception