Transport fixes and SNTP server

Author: jmaralo

backend/cmd/main.go

@@ -49,6 +49,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/google/gopacket/layers"
 	"github.com/google/gopacket/pcap"
+	"github.com/jmaralo/sntp"
 	"github.com/pelletier/go-toml/v2"
 	trace "github.com/rs/zerolog/log"
 )
@@ -187,17 +188,19 @@ func main() {
 	}
 
 	// Start handling TCP client connections
-	backendTcpClientAddr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", info.Addresses.Backend.String(), info.Ports.TcpClient))
-	if err != nil {
-		panic("Failed to resolve local backend TCP client address")
-	}
+	i := 0
 	serverTargets := make(map[string]abstraction.TransportTarget)
 	for _, board := range podData.Boards {
 		if !common.Contains(config.Vehicle.Boards, board.Name) {
 			serverTargets[fmt.Sprintf("%s:%d", info.Addresses.Boards[board.Name], info.Ports.TcpClient)] = abstraction.TransportTarget(board.Name)
 			continue
 		}
+		backendTcpClientAddr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", info.Addresses.Backend.String(), info.Ports.TcpClient+uint16(i)))
+		if err != nil {
+			panic("Failed to resolve local backend TCP client address")
+		}
 		go transp.HandleClient(tcp.NewClient(backendTcpClientAddr), abstraction.TransportTarget(board.Name), "tcp", fmt.Sprintf("%s:%d", info.Addresses.Boards[board.Name], info.Ports.TcpServer))
+		i++
 	}
 
 	// Start handling TCP server connections
@@ -248,6 +251,26 @@ func main() {
 		go httpServer.ListenAndServe()
 	}
 
+	// <--- SNTP --->
+	sntpAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", info.Addresses.Backend, info.Ports.SNTP))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error resolving sntp address: %v\n", err)
+		os.Exit(1)
+	}
+	sntpServer, err := sntp.NewUnicast("udp", sntpAddr)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error creating sntp server: %v\n", err)
+		os.Exit(1)
+	}
+
+	go func() {
+		err := sntpServer.ListenAndServe()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error listening sntp server: %v\n", err)
+			return
+		}
+	}()
+
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)
 

backend/go.mod

@@ -1,6 +1,6 @@
 module github.com/HyperloopUPV-H8/h9-backend
 
-go 1.19
+go 1.21.3
 
 require (
 	github.com/HyperloopUPV-H8/ade-linter v0.0.0-20230530153315-3379f05a664f
@@ -23,6 +23,7 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/jmaralo/sntp v0.0.0-20240116111937-45a0a3419272 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect

backend/go.sum

@@ -60,6 +60,8 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/jmaralo/sntp v0.0.0-20240116111937-45a0a3419272 h1:dtQzdBn2P781UxyDPZd1tv4QE29ffpnmJ15qBkXHypY=
+github.com/jmaralo/sntp v0.0.0-20240116111937-45a0a3419272/go.mod h1:nA+gdd8RXyFnxlLOCu0lOLGcQuwNklQfWOUL8fAFBDI=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=

backend/pkg/transport/transport.go

@@ -98,6 +98,11 @@ func (transport *Transport) handleTCPConn(target abstraction.TransportTarget, co
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error setting %s linger to zero: %v\n", target, err)
 		}
+
+		err = tcpConn.SetNoDelay(true)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error setting %s no delay: %v\n", target, err)
+		}
 	}
 	conn, errChan := tcp.WithErrChan(conn)
 	defer conn.Close()
@@ -123,8 +128,8 @@ func (transport *Transport) handleTCPConn(target abstraction.TransportTarget, co
 				break
 			}
 
-			from := conn.LocalAddr().String()
-			to := string(target)
+			to := conn.LocalAddr().String()
+			from := conn.RemoteAddr().String()
 
 			transport.api.Notification(NewPacketNotification(packet, from, to, time.Now()))
 		}

go.work

@@ -1,4 +1,4 @@
-go 1.21
+go 1.21.3
 
 use (
 	./backend