From 42f1d92ae020cf44f10be1a51b0059b46a21478b Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Sat, 17 Sep 2022 22:48:49 -0700 Subject: [PATCH] net/netns: implement UseSocketMark for Android. Build fails on Android: `../../../../go/pkg/mod/tailscale.com@v1.1.1-0.20220916223019-65c24b6334e9/wgengine/magicsock/magicsock_linux.go:133:12: undefined: netns.UseSocketMark` Signed-off-by: Denton Gentry --- net/netns/netns_android.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/netns/netns_android.go b/net/netns/netns_android.go index dad3358d8..9b28e924e 100644 --- a/net/netns/netns_android.go +++ b/net/netns/netns_android.go @@ -20,6 +20,11 @@ var ( androidProtectFunc func(fd int) error ) +// UseSocketMark reports whether SO_MARK is in use. Android does not use SO_MARK. +func UseSocketMark() bool { + return false +} + // SetAndroidProtectFunc register a func that Android provides that JNI calls into // https://developer.android.com/reference/android/net/VpnService#protect(int) // which is documented as: