diff --git a/backend/cmd/main.go b/backend/cmd/main.go index 03644e5ca..d5e4785fa 100644 --- a/backend/cmd/main.go +++ b/backend/cmd/main.go @@ -381,7 +381,6 @@ func selectDev(adjAddr map[string]string, conf Config) (pcap.Interface, error) { for _, dev := range devs { for _, addr := range dev.Addresses { if addr.IP.String() == adjAddr["backend"] { - println(dev.Name) return dev, nil } } @@ -583,8 +582,8 @@ func getIPIPfilter() string { return "ip[9] == 4" } -func getUDPFilter(addrs []net.IP, backendAddr net.IP, _ uint16) string { - udpPort := "udp" // TODO use proper ports for the filter +func getUDPFilter(addrs []net.IP, backendAddr net.IP, port uint16) string { + udpPort := fmt.Sprintf("udp port %d", port) // TODO use proper ports for the filter srcUdpAddrs := common.Map(addrs, func(addr net.IP) string { return fmt.Sprintf("(src host %s)", addr) }) diff --git a/backend/internal/adj/adj.go b/backend/internal/adj/adj.go index 7708aaa35..ddc627926 100644 --- a/backend/internal/adj/adj.go +++ b/backend/internal/adj/adj.go @@ -36,21 +36,17 @@ func NewADJ(AdjBranch string) (ADJ, error) { } } - type BoardList struct { - Boards map[string]string `json:"boards"` - } - - var boardsList BoardList + var boardsList map[string]string if err := json.Unmarshal(boardsRaw, &boardsList); err != nil { return ADJ{}, err } - boards, err := getBoards(boardsList.Boards) + boards, err := getBoards(boardsList) if err != nil { return ADJ{}, err } - info.BoardIds, err = getBoardIds(boardsList.Boards) + info.BoardIds, err = getBoardIds(boardsList) if err != nil { return ADJ{}, err }