TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-06-09 09:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

portlist: reduce log spam on macOS

Browse Source 
Running tailscaled on my machine yields lots of entries like:

weird: missing {tcp 6060}

parsePortsNetstat is filtering out loopback addresses as uninteresting.
Then addProcesses is surprised to discover these listening ports,
which results in spurious logging.
Teach addProcesses to also ignore loopback addresses.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2020-09-02 15:42:33 -07:00 committed by Josh Bleecher Snyder
parent 3b05cbacfb
commit a570c27577
2 changed files with 11 additions and 4 deletions

8
portlist/netstat.go

@ -41,6 +41,10 @@ func parsePort(s string) int {
return int(port) return int(port)
} }
func isLoopbackAddr(s string) bool {
return strings.HasPrefix(s, "127.0.0.1:") || strings.HasPrefix(s, "127.0.0.1.")
}
type nothing struct{} type nothing struct{}
// Lowest common denominator parser for "netstat -na" format. // Lowest common denominator parser for "netstat -na" format.
@ -74,7 +78,7 @@ func parsePortsNetstat(output string) List {
// not interested in non-listener sockets // not interested in non-listener sockets
continue continue
} }
if strings.HasPrefix(laddr, "127.0.0.1:") || strings.HasPrefix(laddr, "127.0.0.1.") { if isLoopbackAddr(laddr) {
// not interested in loopback-bound listeners // not interested in loopback-bound listeners
continue continue
} }
@ -85,7 +89,7 @@ func parsePortsNetstat(output string) List {
proto = "udp" proto = "udp"
laddr = cols[len(cols)-2] laddr = cols[len(cols)-2]
raddr = cols[len(cols)-1] raddr = cols[len(cols)-1]
if strings.HasPrefix(laddr, "127.0.0.1:") || strings.HasPrefix(laddr, "127.0.0.1.") { if isLoopbackAddr(laddr) {
// not interested in loopback-bound listeners // not interested in loopback-bound listeners
continue continue
} }

7
portlist/portlist_macos.go

@ -95,9 +95,12 @@ func addProcesses(pl []Port) ([]Port, error) {
if port > 0 { if port > 0 {
pp := ProtoPort{proto, uint16(port)} pp := ProtoPort{proto, uint16(port)}
p := m[pp] p := m[pp]
if p != nil { switch {
case p != nil:
p.Process = cmd p.Process = cmd
} else { case isLoopbackAddr(val):
// ignore
default:
fmt.Fprintf(os.Stderr, "weird: missing %v\n", pp) fmt.Fprintf(os.Stderr, "weird: missing %v\n", pp)
} }
} }