Changeset 68

Timestamp:

2014-10-11 15:03:35 (10 years ago)

Author:

lolodomo

Message:

New ability to install/uninstall a patch for UPnP discovery

Location:

trunk

Files:

• I_DLNAMediaController1.xml (modified) (4 diffs)
• J_DLNAMediaController1.js (modified) (6 diffs)
• L_DLNAUPnPUtility.lua (modified) (2 diffs)
• S_DLNAMediaController1.xml (modified) (1 diff)

trunk/I_DLNAMediaController1.xml ¶

@@ -18 +18 @@
   local TASK_BUSY = 1
 
+  local VERA_LOCAL_IP
   local VERA_IP
   local VERA_WEB_PORT
@@ -1214 +1215 @@
     end
 
+    --
+    -- Acquire the IP Address of Vera itself, needed for the Say method later on.
+    -- Note: We're assuming Vera is connected via it's WAN Port to the DLNA Media Renderer
+    --
+    local stdout = io.popen("GetNetworkState.sh ip_wan")
+    VERA_LOCAL_IP = stdout:read("*a")
+    stdout:close()
+    debug("DLNAStartup: Vera IP Address=" .. VERA_LOCAL_IP)
+
     if (routerIp == "") then
-        --
-        -- Acquire the IP Address of Vera itself, needed for the Say method later on.
-        -- Note: We're assuming Vera is connected via it's WAN Port to the DLNA Media Renderer
-        --
-        local stdout = io.popen("GetNetworkState.sh ip_wan")
-        VERA_IP = stdout:read("*a")
-        stdout:close()
-        debug("DLNAStartup: Vera IP Address=" .. VERA_IP)
+        VERA_IP = VERA_LOCAL_IP
         VERA_WEB_PORT = 80
     else
@@ -1233 +1236 @@
 
     iconURL = PLUGIN_ICON:format(VERA_IP, VERA_WEB_PORT)
+
+    if (upnp.isDiscoveryPatchInstalled(VERA_LOCAL_IP)) then
+        luup.variable_set(DLNA_DMC_SID, "DiscoveryPatchInstalled", "1", lul_device)
+    else
+        luup.variable_set(DLNA_DMC_SID, "DiscoveryPatchInstalled", "0", lul_device)
+    end
 
     luup.call_delay("deferredDLNAStartup", 1, lul_device)
@@ -2131 +2140 @@
   <action>
     <serviceId>urn:dlna-org:serviceId:DLNAMediaController1</serviceId>
+    <name>InstallDiscoveryPatch</name>
+    <run>
+      if (upnp.installDiscoveryPatch(VERA_LOCAL_IP)) then
+          log("Discovery patch now installed")
+      else
+          log("Discovery patch installation failed")
+      end
+      if (upnp.isDiscoveryPatchInstalled(VERA_LOCAL_IP)) then
+          luup.variable_set(DLNA_DMC_SID, "DiscoveryPatchInstalled", "1", lul_device)
+      else
+          luup.variable_set(DLNA_DMC_SID, "DiscoveryPatchInstalled", "0", lul_device)
+      end
+    </run>
+  </action>
+
+  <action>
+    <serviceId>urn:dlna-org:serviceId:DLNAMediaController1</serviceId>
+    <name>UninstallDiscoveryPatch</name>
+    <run>
+      if (upnp.uninstallDiscoveryPatch(VERA_LOCAL_IP)) then
+          log("Discovery patch now uninstalled")
+      else
+          log("Discovery patch uninstallation failed")
+      end
+      if (upnp.isDiscoveryPatchInstalled(VERA_LOCAL_IP)) then
+          luup.variable_set(DLNA_DMC_SID, "DiscoveryPatchInstalled", "1", lul_device)
+      else
+          luup.variable_set(DLNA_DMC_SID, "DiscoveryPatchInstalled", "0", lul_device)
+      end
+    </run>
+  </action>
+
+  <action>
+    <serviceId>urn:dlna-org:serviceId:DLNAMediaController1</serviceId>
     <name>NotifyRenderingChange</name>
     <job>

trunk/J_DLNAMediaController1.js ¶

@@ -27 +27 @@
     prevSinkProtocols : undefined,
     prevResultPlayback : undefined,
+    prevPatchInstalled : undefined,
 
     prevOnlineState3 : undefined,
@@ -372 +373 @@
     html += '<table cellspacing="10">';
     html += '<tr><td colspan=2>Push "discover" button, then select your Media Renderer in the list and finally push "Select" button.';
-    html += '<BR>If UPnP discovery is not working, fill in your DMR description URL and finally push "Select" button.</td></tr>';
+    html += '<BR>If UPnP discovery is not working, you can try to install the patch or fill in your DMR description URL and finally push "Select" button.</td></tr>';
+    html += '<tr>';
+    html += '<td>Discovery patch:</td>';
+    html += '<td>';
+    html += '<label id="patch"/>';
+    html += '<button id="install" type="button" style="margin-left: 10px; background-color:' + DLNA.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="DLNA_installPatch('+device+');">Install</button>';
+    html += '<button id="uninstall" type="button" style="margin-left: 10px; background-color:' + DLNA.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="DLNA_uninstallPatch('+device+');">Uninstall</button>';
+    html += '</td>';
+    html += '</tr>';
     html += '<tr>';
     html += '<td>';
@@ -457 +466 @@
     DLNA.prevProxy = undefined;
     DLNA.prevResultDiscovery2 = undefined;
+    DLNA.prevPatchInstalled = undefined;
 
     DLNA_refreshDiscovery(device);
@@ -1005 +1015 @@
         resultDiscovery = '';
     }
+    var patchInstalled = get_device_state(device, DLNA.DLNA_DMC_SID, "DiscoveryPatchInstalled", 1);
+    if (patchInstalled == "1") {
+        patchInstalled = "Installed";
+    }
+    else {
+        patchInstalled = "Not installed";
+    }
+
     if (modelName != DLNA.prevModelName
         || url != DLNA.prevUrl
         || onlineState != DLNA.prevOnlineState2
         || proxy != DLNA.prevProxy
-        || resultDiscovery != DLNA.prevResultDiscovery2) {
+        || resultDiscovery != DLNA.prevResultDiscovery2
+        || patchInstalled != DLNA.prevPatchInstalled) {
 
         DLNA.prevModelName = modelName;
@@ -1016 +1035 @@
         DLNA.prevProxy = proxy;
         DLNA.prevResultDiscovery2 = resultDiscovery;
+        DLNA.prevPatchInstalled = patchInstalled;
+
+        jQuery('#patch').html(patchInstalled);
+        if (patchInstalled == 'Installed') {
+            jQuery('#install').get(0).disabled = true;
+            jQuery('#uninstall').get(0).disabled = false;
+        }
+        else {
+            jQuery('#install').get(0).disabled = false;
+            jQuery('#uninstall').get(0).disabled = true;
+        }
 
         jQuery('#model').html(modelName);
@@ -1174 +1204 @@
     var url = encodeURIComponent(jQuery('#TTSserverURL').val());
     DLNA_callAction(device, DLNA.DLNA_DMC_SID, 'SetupTTS', {'DefaultLanguage':language, 'DefaultEngine':engine, 'OSXTTSServerURL':url} );
+}
+
+function DLNA_installPatch(device)
+{
+    DLNA_callAction(device, DLNA.DLNA_DMC_SID, 'InstallDiscoveryPatch', {} );
+}
+
+function DLNA_uninstallPatch(device)
+{
+    DLNA_callAction(device, DLNA.DLNA_DMC_SID, 'UninstallDiscoveryPatch', {} );
 }
 

trunk/L_DLNAUPnPUtility.lua ¶

@@ -8 +8 @@
 -- 5 Second timeout
 http.TIMEOUT = 5
+
+local IPTABLES_PARAM = "-d 224.0.0.0/4 -j SNAT --to-source %s"
+local IPTABLES_CMD = "iptables -t nat -%s POSTROUTING %s"
 
 local UPNP_DISCOVERY = "M-SEARCH * HTTP/1.1\r\nHOST: 239.255.255.250:1900\r\nMAN: \"ssdp:discover\"\r\nMX: 5\r\nST: %s\r\n\r\n"
@@ -302 +305 @@
 -- UPnP discovery
 --------------------------------------------------------------------------------
+
+
+function isDiscoveryPatchInstalled(ip)
+    local cmd = IPTABLES_CMD:format("S", "")
+    cmd = cmd .. "| grep \"^-A POSTROUTING " .. IPTABLES_PARAM:format(ip):gsub("%.", "\\.") .. "\""
+    if (os.execute(cmd) == 0) then
+        return true
+    else
+        return false
+    end
+end
+
+
+function installDiscoveryPatch(ip)
+    local resu = isDiscoveryPatchInstalled(ip)
+    if (resu == false) then
+        os.execute(IPTABLES_CMD:format("I", IPTABLES_PARAM:format(ip)))
+        resu = isDiscoveryPatchInstalled(ip)
+    end
+    return resu
+end
+
+
+function uninstallDiscoveryPatch(ip)
+    local resu = isDiscoveryPatchInstalled(ip)
+    if (resu == true) then
+        os.execute(IPTABLES_CMD:format("D", IPTABLES_PARAM:format(ip)))
+        resu = isDiscoveryPatchInstalled(ip)
+    end
+    return not resu
+end
 
 

trunk/S_DLNAMediaController1.xml ¶

@@ -233 +233 @@
     </action>
     <action>
+      <name>InstallDiscoveryPatch</name>
+    </action>
+    <action>
+      <name>UninstallDiscoveryPatch</name>
+    </action>
+    <action>
       <name>NotifyRenderingChange</name>
       <argumentList>