From 5bb14c07dce8e5c320baca78715bb838c7c56371 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 7 Apr 2020 07:56:38 -0700 Subject: [PATCH] portlist: don't depend on tempfork/osexec on iOS, saves 90KB This gives us 90KB more of memory on iOS, as it shrinks the NetworkExtension binary by 90KB. The netstat binary isn't available in the network extension anyway, so no point pulling in the osexec package which'll just fail to find netstat anyway. --- portlist/portlist_ios.go | 22 +++++++++++++++++++ .../{portlist_darwin.go => portlist_macos.go} | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 portlist/portlist_ios.go rename portlist/{portlist_darwin.go => portlist_macos.go} (98%) diff --git a/portlist/portlist_ios.go b/portlist/portlist_ios.go new file mode 100644 index 000000000..a7a85a54c --- /dev/null +++ b/portlist/portlist_ios.go @@ -0,0 +1,22 @@ +// Copyright (c) 2020 Tailscale Inc & AUTHORS All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build darwin,!amd64 + +package portlist + +import ( + "errors" + "time" +) + +const pollInterval = 9999 * time.Hour + +func listPorts() (List, error) { + return nil, errors.New("not implemented") +} + +func addProcesses(pl []Port) ([]Port, error) { + return nil, errors.New("not implemented") +} diff --git a/portlist/portlist_darwin.go b/portlist/portlist_macos.go similarity index 98% rename from portlist/portlist_darwin.go rename to portlist/portlist_macos.go index 08bb514cc..12022cd32 100644 --- a/portlist/portlist_darwin.go +++ b/portlist/portlist_macos.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !linux,!windows +// +build darwin,amd64 package portlist