Skip to content

Commit 84931dc

Browse files
fix(backend, TCP): remove unused var
1 parent ef0b071 commit 84931dc

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

backend/cmd/setup_transport.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,19 @@ func configureTCPClientTransport(
6464
i := 0 // count
6565

6666
// map of remote server addresses to transport targets for boards not present in vehicle config
67-
serverTargets := make(map[string]abstraction.TransportTarget)
6867
for _, board := range podData.Boards {
68+
69+
// Skip boards not in config.Vehicle.Boards to avoid unnecessary TCP clients and potential connection issues
6970
if !common.Contains(config.Vehicle.Boards, board.Name) {
70-
serverTargets[fmt.Sprintf("%s:%d", adj.Info.Addresses[board.Name], adj.Info.Ports[TcpClient])] = abstraction.TransportTarget(board.Name)
7171
continue
7272
}
73+
74+
// Resolve local TCP client address with incremental port to avoid conflicts
7375
backendTcpClientAddr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", adj.Info.Addresses[BACKEND], adj.Info.Ports[TcpClient]+uint16(i)))
7476
if err != nil {
75-
panic("Failed to resolve local backend TCP client address")
77+
trace.Fatal().Err(err).Msg("failed to resolve local backend TCP client address: " + err.Error())
7678
}
79+
7780
// Create TCP client config with custom parameters from config
7881
clientConfig := tcp.NewClientConfig(backendTcpClientAddr)
7982

backend/pkg/transport/transport.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (transport *Transport) HandleClient(config tcp.ClientConfig, remote string)
5555
client := tcp.NewClient(remote, config, transport.logger)
5656
clientLogger := transport.logger.With().Str("remoteAddress", remote).Logger()
5757
defer clientLogger.Warn().Msg("abort connection")
58-
var hasConnected = false
58+
hasConnected := false
5959

6060
for {
6161
conn, err := client.Dial()
@@ -126,7 +126,8 @@ func (transport *Transport) handleTCPConn(conn net.Conn) error {
126126
return err
127127
}
128128

129-
connectionLogger := transport.logger.With().Str("remoteAddress", conn.RemoteAddr().String()).Str("target", string(target)).Logger()
129+
connectionLogger := transport.logger.With().
130+
Str("remoteAddress", conn.RemoteAddr().String()).Str("target", string(target)).Logger()
130131
connectionLogger.Info().Msg("new connection")
131132

132133
if err := transport.rejectIfConnectedTCPConn(target, conn, connectionLogger); err != nil {
@@ -143,6 +144,7 @@ func (transport *Transport) handleTCPConn(conn net.Conn) error {
143144
cleanupConn := transport.registerTCPConn(target, conn, connectionLogger)
144145
defer cleanupConn()
145146

147+
// Notify vehicle of connection status.
146148
transport.api.ConnectionUpdate(target, true)
147149
defer transport.api.ConnectionUpdate(target, false)
148150

0 commit comments

Comments
 (0)