From 3687e5352b9f067752f70913c94ee842aab42f4a Mon Sep 17 00:00:00 2001 From: julianknodt Date: Fri, 18 Jun 2021 16:02:41 -0700 Subject: [PATCH] derp: fix traffic handler peer addresses Before it was using the local address and port, so fix that. The fields in the response from `ss` are: State, Recv-Q, Send-Q, Local Address:Port, Peer Address:Port, Process Signed-off-by: julianknodt --- derp/derp_server.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/derp/derp_server.go b/derp/derp_server.go index 38881bec6..4ac578724 100644 --- a/derp/derp_server.go +++ b/derp/derp_server.go @@ -1435,17 +1435,10 @@ func parseSSOutput(raw string) map[netaddr.IPPort]BytesSentRecv { if len(ipInfo) < 5 { continue } - src, err := netaddr.ParseIPPort(ipInfo[3]) + src, err := netaddr.ParseIPPort(ipInfo[4]) if err != nil { continue } - /* - TODO(jknodt) do we care about the full route or just the src? - dst, err := netaddr.ParseIPPort(string(ipInfo[4])) - if err != nil { - continue - } - */ stats := strings.Fields(strings.TrimSpace(lines[i+1])) stat := BytesSentRecv{} for _, s := range stats {