Fix some debug messages in MQTT

toxuin · Aug 16, 2022 · c1f1fb6 · c1f1fb6
1 parent 21fc6c3
commit c1f1fb6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/buses/mqtt/mqtt.go b/buses/mqtt/mqtt.go
@@ -62,4 +62,7 @@ func (mqtt *Bus) SendMessage(topic string, payload interface{}) {
 	if token := mqtt.client.Publish(topic, 0, false, payload); token.Wait() && token.Error() != nil {
 		fmt.Printf("MQTT ERROR, %s\n", token.Error())
 	}
+	if mqtt.Debug {
+		fmt.Printf("MQTT: Sent message to %s\n", topic)
+	}
 }
diff --git a/servers/hikvision/httpEventReader.go b/servers/hikvision/httpEventReader.go
@@ -4,7 +4,6 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"mime"
 	"mime/multipart"
@@ -21,7 +20,7 @@ func (eventReader *HttpEventReader) ReadEvents(camera *HikCamera, channel chan<-
 		eventReader.client = &http.Client{}
 	}
 
-	request, err := http.NewRequest("GET", camera.Url+"/Event/notification/alertStream", nil)
+	request, err := http.NewRequest("GET", camera.Url+"Event/notification/alertStream", nil)
 	if err != nil {
 		fmt.Printf("HIK: Error: Could not connect to camera %s\n", camera.Name)
 		fmt.Println("HIK: Error", err)
@@ -60,7 +59,7 @@ func (eventReader *HttpEventReader) ReadEvents(camera *HikCamera, channel chan<-
 			fmt.Println(err)
 			continue
 		}
-		body, err := ioutil.ReadAll(part)
+		body, err := io.ReadAll(part)
 		if err != nil {
 			fmt.Println(err)
 			continue

diff --git a/servers/hikvision/tcpEventReader.go b/servers/hikvision/tcpEventReader.go
@@ -80,9 +80,6 @@ func (eventReader *TcpEventReader) ReadEvents(camera *HikCamera, channel chan<-
 
 		// READ HTTP HEADERS
 		var headers = make(map[string]string)
-		if eventReader.Debug {
-			fmt.Println("HEADERS:")
-		}
 		for {
 			headerLine, err := textConn.ReadLine()
 			if err == io.EOF {
@@ -102,6 +99,10 @@ func (eventReader *TcpEventReader) ReadEvents(camera *HikCamera, channel chan<-
 			headerValue := strings.SplitN(headerLine, ": ", 2)[1]
 			headers[headerKey] = headerValue
 		}
+		if eventReader.Debug {
+			fmt.Println("HIK-TCP: HEADERS:")
+			fmt.Println(headers)
+		}
 
 		// PRINT ERROR
 		if statusCode != "200" {

diff --git a/servers/hisilicon/server.go b/servers/hisilicon/server.go
@@ -71,6 +71,10 @@ func (server *Server) handleTcpConnection(conn net.Conn) {
 	}
 	if dataMap["Address"] != nil {
 		hexAddrStr := fmt.Sprintf("%v", dataMap["Address"])
+		if len(hexAddrStr) < 2 {
+			fmt.Printf("HISI: BAD DEVICE ADDRESS: %s\n", hexAddrStr)
+			return
+		}
 		dataMap["ipAddr"] = hexIpToCIDR(hexAddrStr)
 	}