diff options
| author | Brad Fitzpatrick <bradfitz@tailscale.com> | 2020-08-01 12:40:09 -0700 |
|---|---|---|
| committer | David Anderson <danderson@tailscale.com> | 2020-08-01 19:43:16 +0000 |
| commit | 1d9ab6d484196255c8f828c05ea146f4afc12893 (patch) | |
| tree | 2af64efcf55b871f2fbcf494337f3945de507538 | |
| parent | e98ed6319a417caf4d665ec759d71d4bb8c8aaee (diff) | |
| download | tailscale-1.0.2.tar.xz tailscale-1.0.2.zip | |
wgengine/filter: omit logging for all v6 multicast, remove debug panic :(v1.0.2
(cherry picked from commit da3b50ad88d75693a80b1203075b531a5c89cdf1)
| -rw-r--r-- | wgengine/filter/filter.go | 5 | ||||
| -rw-r--r-- | wgengine/filter/filter_test.go | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/wgengine/filter/filter.go b/wgengine/filter/filter.go index d9d721baf..4875b40c2 100644 --- a/wgengine/filter/filter.go +++ b/wgengine/filter/filter.go @@ -349,7 +349,10 @@ func omitDropLogging(p *packet.ParsedPacket, dir direction) bool { if string(dst) == ipv6AllMLDv2CapableRouters { return true } - panic(fmt.Sprintf("Got proto=%2x; src=%x dst=%x", int(p.IPProto), src, dst)) + // Actually, just catch all multicast. + if dst[0] == 0xff { + return true + } } } return false diff --git a/wgengine/filter/filter_test.go b/wgengine/filter/filter_test.go index 5f8c64f67..c95f43897 100644 --- a/wgengine/filter/filter_test.go +++ b/wgengine/filter/filter_test.go @@ -343,6 +343,12 @@ func TestOmitDropLogging(t *testing.T) { dir: out, want: true, }, + { + name: "v6_udp_multicast", + pkt: parseHexPkt(t, "60 00 00 00 00 00 11 00 fe800000000000007dc6bc04499262a3 ff120000000000000000000000008384"), + dir: out, + want: true, + }, } for _, tt := range tests { |