Merge branch 'develop' into backend/updater

Author: JESUSJH18

backend/cmd/config.go

@@ -14,9 +14,14 @@ type Network struct {
 	Manual bool
 }
 
+type Transport struct {
+	PropagateFault bool
+}
+
 type Config struct {
-	Vehicle vehicle.Config
-	Server  server.Config
-	Adj     Adj
-	Network Network
+	Vehicle   vehicle.Config
+	Server    server.Config
+	Adj       Adj
+	Network   Network
+	Transport Transport
 }

backend/cmd/config.toml

@@ -23,3 +23,5 @@ branch = "main" # Leave blank when using ADJ as a submodule (like this: "")
 test = true
 [network]
 manual = false
+[transport]
+propagate_fault = true

backend/cmd/main.go

@@ -327,6 +327,7 @@ func main() {
 
 	// <--- transport --->
 	transp := transport.NewTransport(trace.Logger)
+	transp.SetpropagateFault(config.Transport.PropagateFault)
 
 	// <--- vehicle --->
 	ipToBoardId := make(map[string]abstraction.BoardId)

backend/internal/adj/git.go

@@ -1,6 +1,7 @@
 package adj
 
 import (
+	"log"
 	"os"
 	"path/filepath"
 
@@ -35,6 +36,7 @@ func updateRepo(AdjBranch string) error {
 		_, err = git.PlainClone(tempPath, false, cloneOptions)
 		if err != nil {
 			// If the clone fails, work with the local ADJ
+			log.Printf("Warning: Could not clone ADJ branch '%s' from remote. Working with local ADJ. Error: %v", AdjBranch, err)
 			return nil
 		}
 

backend/pkg/adj/git.go

@@ -1,6 +1,7 @@
 package adj
 
 import (
+	"log"
 	"os"
 	"path/filepath"
 
@@ -35,6 +36,7 @@ func updateRepo(AdjBranch string) error {
 		_, err = git.PlainClone(tempPath, false, cloneOptions)
 		if err != nil {
 			// If the clone fails, work with the local ADJ
+			log.Printf("Warning: Could not clone ADJ branch '%s' from remote. Working with local ADJ. Error: %v", AdjBranch, err)
 			return nil
 		}
 

backend/pkg/transport/transport.go

@@ -36,6 +36,8 @@ type Transport struct {
 
 	tftp *tftp.Client
 
+	propagateFault bool
+
 	api abstraction.TransportAPI
 
 	logger zerolog.Logger
@@ -170,6 +172,14 @@ func (transport *Transport) handleTCPConn(conn net.Conn) error {
 				return
 			}
 
+			if transport.propagateFault && packet.Id() == 0 {
+				connectionLogger.Info().Msg("replicating packet with id 0 to all boards")
+				err := transport.handlePacketEvent(NewPacketMessage(packet))
+				if err != nil {
+					connectionLogger.Error().Err(err).Msg("failed to replicate packet")
+				}
+			}
+
 			from := conn.RemoteAddr().String()
 			to := conn.LocalAddr().String()
 
@@ -208,6 +218,37 @@ func (transport *Transport) SendMessage(message abstraction.TransportMessage) er
 // handlePacketEvent is used to send an order to one of the connected boards
 func (transport *Transport) handlePacketEvent(message PacketMessage) error {
 	eventLogger := transport.logger.With().Str("type", fmt.Sprintf("%T", message.Packet)).Uint16("id", uint16(message.Id())).Logger()
+
+	if message.Id() == 0 {
+		eventLogger.Info().Msg("broadcasting packet id 0")
+		data, err := transport.encoder.Encode(message.Packet)
+		if err != nil {
+			eventLogger.Error().Stack().Err(err).Msg("encode")
+			transport.errChan <- err
+			return err
+		}
+
+		transport.connectionsMx.Lock()
+		defer transport.connectionsMx.Unlock()
+		for target, conn := range transport.connections {
+			eventLogger := eventLogger.With().Str("target", string(target)).Logger()
+
+			totalWritten := 0
+			for totalWritten < len(data) {
+				n, err := conn.Write(data[totalWritten:])
+				eventLogger.Trace().Int("amount", n).Msg("written chunk")
+				totalWritten += n
+				if err != nil {
+					eventLogger.Error().Stack().Err(err).Msg("write")
+					transport.errChan <- err
+					return err
+				}
+			}
+			eventLogger.Info().Msg("sent")
+		}
+		return nil
+	}
+
 	target, ok := transport.idToTarget[message.Id()]
 	if !ok {
 		eventLogger.Debug().Msg("target not found")
@@ -299,6 +340,15 @@ func (transport *Transport) handleConversation(socket network.Socket, reader io.
 				return
 			}
 
+			// Intercept packets with id == 0 and replicate
+			if transport.propagateFault && packet.Id() == 0 {
+				conversationLogger.Info().Msg("replicating packet with id 0 to all boards")
+				err := transport.handlePacketEvent(NewPacketMessage(packet))
+				if err != nil {
+					conversationLogger.Error().Err(err).Msg("failed to replicate packet")
+				}
+			}
+
 			transport.api.Notification(NewPacketNotification(packet, srcAddr, dstAddr, time.Now()))
 		}
 	}()
@@ -322,3 +372,7 @@ func (transport *Transport) SendFault() {
 	// transport.errChan <- err
 	// }
 }
+
+func (transport *Transport) SetpropagateFault(enabled bool) {
+	transport.propagateFault = enabled
+}