fix: discovery mode netscan when using docker-compose (#176)

Signed-off-by: edgego <tianxingguo@gmail.com>

internal/driver/driver.go

@@ -257,6 +257,11 @@ func (d *Driver) addProvisionWatchers() error {
 
 	var errs []error
 	for _, file := range files {
+		// skip all directories, and files that do not end with .json
+		if file.IsDir() || !strings.HasSuffix(file.Name(), ".json") {
+			continue
+		}
+
 		filename := filepath.Join(provisionWatcherFolder, file.Name())
 		d.lc.Debugf("processing %s", filename)
 		var watcher dtos.ProvisionWatcher

internal/driver/onvifdiscovery.go

@@ -133,10 +133,10 @@ func (d *Driver) createDiscoveredDevice(onvifDevice onvif.Device) (sdkModel.Disc
 		device.Protocols[OnvifProtocol][LastSeen] = time.Now().Format(time.UnixDate)
 		device.Protocols[OnvifProtocol][FriendlyName] = devInfo.Manufacturer + " " + devInfo.Model
 
-		// Spaces are not allowed in the device name
+		// Spaces and slashes are not allowed in the device name
 		deviceName := fmt.Sprintf("%s-%s-%s",
 			strings.ReplaceAll(devInfo.Manufacturer, " ", "-"),
-			strings.ReplaceAll(devInfo.Model, " ", "-"),
+			strings.ReplaceAll(strings.ReplaceAll(devInfo.Model, "/", "-"), " ", "-"),
 			endpointRefAddr)
 
 		netInfo, err := d.getNetworkInterfaces(device)
@@ -189,9 +189,9 @@ func executeRawProbe(conn net.Conn, params netscan.Params) ([]onvif.Device, erro
 
 	var responses []string
 	buf := make([]byte, bufSize)
-	// keep reading from the PacketConn until the read deadline expires or an error occurs
+	// keep reading responses from the connection until the read deadline expires or an error occurs
 	for {
-		n, _, err := (conn.(net.PacketConn)).ReadFrom(buf)
+		n, err := conn.Read(buf)
 		if err != nil {
 			// ErrDeadlineExceeded is expected once the read timeout is expired
 			if !stdErrors.Is(err, os.ErrDeadlineExceeded) {