From 53967fc72a5012c8928687cd97ca1bef804570e1 Mon Sep 17 00:00:00 2001
From: Alexey Khit <alexey.khit@gmail.com>
Date: Tue, 2 May 2023 09:36:38 +0300
Subject: [PATCH] Update ONVIF discovery request #397

---
 pkg/onvif/helpers.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkg/onvif/helpers.go b/pkg/onvif/helpers.go
index dd12e6bc..c772ee02 100644
--- a/pkg/onvif/helpers.go
+++ b/pkg/onvif/helpers.go
@@ -6,6 +6,7 @@ import (
 	"net/url"
 	"regexp"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -30,17 +31,19 @@ func DiscoveryStreamingHosts() ([]string, error) {
 		return nil, err
 	}
 
+	// https://www.onvif.org/wp-content/uploads/2016/12/ONVIF_Feature_Discovery_Specification_16.07.pdf
+	// 5.3 Discovery Procedure:
 	msg := `<?xml version="1.0" ?>
 <s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">
 	<s:Header xmlns:a="http://schemas.xmlsoap.org/ws/2004/08/addressing">
 		<a:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</a:Action>
-		<a:MessageID>uuid:` + UUID() + `</a:MessageID>
+		<a:MessageID>urn:uuid:` + UUID() + `</a:MessageID>
 		<a:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</a:To>
 	</s:Header>
 	<s:Body>
 		<d:Probe xmlns:d="http://schemas.xmlsoap.org/ws/2005/04/discovery">
-            <d:Types>tds:Device</d:Types>
-			<d:Scopes>onvif://www.onvif.org/Profile/Streaming</d:Scopes>
+            <d:Types />
+			<d:Scopes />
 		</d:Probe>
 	</s:Body>
 </s:Envelope>`
@@ -67,6 +70,13 @@ func DiscoveryStreamingHosts() ([]string, error) {
 			break
 		}
 
+		// ignore printers, etc
+		if !strings.Contains(string(b[:n]), "onvif") {
+			continue
+		}
+
+		//log.Printf("[onvif] discovery response:\n%s", b[:n])
+
 		rawURL := FindTagValue(b[:n], "XAddrs")
 		if rawURL == "" {
 			continue