Ticket #2609: ip.patch

libs/libmythtv/videosource.cpp

@@ -949 +949 @@
         setHelpText(QObject::tr("Device ID from the back of "
                                 "the HDHomeRun unit.  You may use "
                                 "'FFFFFFFF' if there is only one unit "
-                                "on your your network."));
+                                "on your your network.  Alternatively, "
+                                "you may enter the IP address "
+                                "of the HDHomeRun unit."));
     }
 };
 

libs/libmythtv/hdhrchannel.cpp

@@ -34 +34 @@
       _device_id(0),            _device_ip(0),
       _tuner(tuner),            _lock(true)
 {
+    /* Valid device ID? */
     bool valid;
     _device_id = device.toUInt(&valid, 16);
 
-    if (!valid || !hdhomerun_discover_validate_device_id(_device_id))
+    if (valid && hdhomerun_discover_validate_device_id(_device_id))
+        return;
+
+    /* Otherwise, is it a valid IP address? */
+    struct in_addr address;
+    if (inet_aton(device, &address)) 
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + QString("Invalid DeviceID '%1'")
-                .arg(device));
+        _device_ip = ntohl(address.s_addr);
+        return;
+    }
 
-        _device_id = HDHOMERUN_DEVICE_ID_WILDCARD;
-    }
+    /* Invalid, use wildcard device ID. */
+    VERBOSE(VB_IMPORTANT, LOC_ERR + QString("Invalid DeviceID '%1'")
+            .arg(device));
+
+    _device_id = HDHOMERUN_DEVICE_ID_WILDCARD;
 }
 
 HDHRChannel::~HDHRChannel(void)
@@ -76 +86 @@
 
 bool HDHRChannel::FindDevice(void)
 {
-    _device_ip = 0;
+    if (_device_ip)
+    {
+        /* IP provided directly by user */
+        return true;
+    }
 
     /* Create socket. */
     struct hdhomerun_discover_sock_t *discoverSock = NULL;