device: export Bind and remove socketfd shims for android

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>

diff --git a/device/bindsocketshim.go b/device/bindsocketshim.go
index 68e150408370295b4c3ccf6bb5b156d4b1bfa613..896c7d27ed554e68013056407359caea24e0d47b 100644 (file)
--- a/device/bindsocketshim.go
+++ b/device/bindsocketshim.go
@@ -34,27 +34,3 @@ func (device *Device) BindSocketToInterface6(interfaceIndex uint32, blackhole bo
        }
        return nil
 }
-
-// TODO(crawshaw): this method is a compatibility shim. Replace with direct use of conn.
-func (device *Device) PeekLookAtSocketFd4() (fd int, err error) {
-       if device.net.bind == nil {
-               return -1, errors.New("Bind is not yet initialized")
-       }
-
-       if iface, ok := device.net.bind.(conn.PeekLookAtSocketFd); ok {
-               return iface.PeekLookAtSocketFd4()
-       }
-       return -1, errors.New("unimplemented")
-}
-
-// TODO(crawshaw): this method is a compatibility shim. Replace with direct use of conn.
-func (device *Device) PeekLookAtSocketFd6() (fd int, err error) {
-       if device.net.bind == nil {
-               return -1, errors.New("Bind is not yet initialized")
-       }
-
-       if iface, ok := device.net.bind.(conn.PeekLookAtSocketFd); ok {
-               return iface.PeekLookAtSocketFd6()
-       }
-       return -1, errors.New("unimplemented")
-}

diff --git a/device/device.go b/device/device.go
index 11119f9f195250049972ed11a53bb331057ee0d4..c64432ed307200f8ef3a0a2d95803c13d7b9dce5 100644 (file)
--- a/device/device.go
+++ b/device/device.go
@@ -430,6 +430,12 @@ func unsafeCloseBind(device *Device) error {
        return err
 }
 
+func (device *Device) Bind() conn.Bind {
+       device.net.Lock()
+       defer device.net.Unlock()
+       return device.net.bind
+}
+
 func (device *Device) BindSetMark(mark uint32) error {
 
        device.net.Lock()