From 45d846d842ae9765f4296a495d547f804240bed0 Mon Sep 17 00:00:00 2001
From: Craig Moksnes <cmoksnes@geodigital.com>
Date: Mon, 9 Mar 2020 12:36:13 -0500
Subject: [PATCH] Relaxed device matching with Ceton discovery Fixed bug where
 app would not respond to HDHomeRun discovery requests on the correct local IP
 Fixed PCI device discovery

---
 ProxyServerModuleUnit.pas | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/ProxyServerModuleUnit.pas b/ProxyServerModuleUnit.pas
index 404bcd8..f4778ba 100644
--- a/ProxyServerModuleUnit.pas
+++ b/ProxyServerModuleUnit.pas
@@ -282,27 +282,12 @@ procedure TProxyServerModule.StartServer;
 
     try
       fSSDPServer.Bindings.Clear;
-
-      if lListenIP = '' then
-      begin
-        // If listening on all IPs, have to explicitly create a binding for each local IP
-        // so that we can properly read which IP that UDP packets come in on
-        for lLocalIPInfo in lLocalIPs do
-          with fSSDPServer.Bindings.Add do
-          begin
-            IP := lLocalIPInfo.IP;
-            Port := 0;
-          end;
-      end
-      else
-      begin
+      for lLocalIPInfo in lLocalIPs do
         with fSSDPServer.Bindings.Add do
         begin
-          IP := lListenIP;
+          IP := lLocalIPInfo.IP;
           Port := 0;
         end;
-      end;
-
       fSSDPServer.Active := True;
     except
       TLogger.Log('Unable to create SSDP server');
@@ -496,8 +481,10 @@ function TProxyServerModule.TryGetAddress(const aRequestLocalIP: String; out aAd
       lAddresses := lAddresses.Remove(ProxyServiceModule.Client.ListenIP);
     end;
 
+    // Choose a local IP that we should respond to
     aAddress := lAddresses.LowestMetric(4).IP;
-    Result := not SameText(aRequestLocalIP, aAddress);
+    // Return whether the local ip that the request came in on is equal to that chosen IP
+    Result := SameText(aRequestLocalIP, aAddress);
   end
   else
   begin
@@ -588,7 +575,7 @@ function TProxyServerModule.CreateSSDPDiscoverPacket: String;
   cSSDPDiscover =
     'M-SEARCH * HTTP/1.1'#13#10+
     'Host: 239.255.255.250:1900'#13#10+
-    'ST: urn:schemas-cetoncorp-com:device:SecureContainer:1'#13#10+
+    'ST: '+{'ssdp:all'}'urn:schemas-cetoncorp-com:device:SecureContainer:1'#13#10+
     'Man: "ssdp:discover"'#13#10+
     'MX: 3'#13#10#13#10;
 begin
@@ -621,7 +608,7 @@ procedure TProxyServerModule.SSDPClientRead(Sender: TObject;
     end
     else if String(lData).StartsWith('NOTIFY', True) then
     begin
-      if String(lData).Contains('NT: urn:schemas-cetoncorp-com:device:SecureContainer:1') then
+      if String(lData).ToLower.Contains('cetoncorp') then
       begin
         TLogger.LogFmt('Received NOTIFY from ceton device %s on %s: %s', [ABinding.PeerIP, ABinding.IP, String(lData)]);
 
@@ -732,7 +719,7 @@ procedure TProxyServerModule.SSDPServerRead(AThread: TIdUDPListenerThread; const
       lValues.NameValueSeparator := ':';
       lValues.Text := String(lData);
 
-      if SameText(Trim(lValues.Values['ST']), 'urn:schemas-cetoncorp-com:device:SecureContainer:1') then
+      if Trim(lValues.Values['ST']).ToLower.Contains('cetoncorp') then
       begin
         lLocation := Trim(lValues.Values['LOCATION']);