xsteadfastx/wireguard-go
1
0
Fork 0
mirror of https://git.zx2c4.com/wireguard-go synced 2024-11-15 01:05:15 +01:00
Code Issues Releases Wiki Activity

conn: disable sticky sockets on Android

Browse Source 
We can't have the netlink listener socket, so it's not possible to
support it. Plus, android networking stack complexity makes it a bit
tricky anyway, so best to leave it disabled.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2023-03-23 18:38:34 +01:00
parent cc20c08c96
commit 3a9e75374f
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
conn/controlfns_linux.go
View File

@ -7,6 +7,7 @@ package conn
import ( import (
"fmt" "fmt"
"runtime"
"syscall" "syscall"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@ -36,14 +37,18 @@ func init() {
var err error var err error
switch network { switch network {
case "udp4": case "udp4":
c.Control(func(fd uintptr) { if runtime.GOOS != "android" {
err = unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, unix.IP_PKTINFO, 1) c.Control(func(fd uintptr) {
}) err = unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, unix.IP_PKTINFO, 1)
})
}
case "udp6": case "udp6":
c.Control(func(fd uintptr) { c.Control(func(fd uintptr) {
err = unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_RECVPKTINFO, 1) if runtime.GOOS != "android" {
if err != nil { err = unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_RECVPKTINFO, 1)
return if err != nil {
return
}
} }
err = unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_V6ONLY, 1) err = unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_V6ONLY, 1)
}) })

4
conn/sticky_default.go
View File

@ -1,4 +1,4 @@
//go:build !linux //go:build !linux || android
/* SPDX-License-Identifier: MIT /* SPDX-License-Identifier: MIT
* *
@ -23,3 +23,5 @@ func setSrcControl(control *[]byte, ep *StdNetEndpoint) {
// srcControlSize returns the recommended buffer size for pooling sticky control // srcControlSize returns the recommended buffer size for pooling sticky control
// data. // data.
const srcControlSize = 0 const srcControlSize = 0
const StdNetSupportsStickySockets = false

4
conn/sticky_linux.go
View File

@ -1,3 +1,5 @@
//go:build linux && !android
/* SPDX-License-Identifier: MIT /* SPDX-License-Identifier: MIT
* *
* Copyright (C) 2017-2023 WireGuard LLC. All Rights Reserved. * Copyright (C) 2017-2023 WireGuard LLC. All Rights Reserved.
@ -111,3 +113,5 @@ func setSrcControl(control *[]byte, ep *StdNetEndpoint) {
} }
var srcControlSize = unix.CmsgSpace(unix.SizeofInet6Pktinfo) var srcControlSize = unix.CmsgSpace(unix.SizeofInet6Pktinfo)
const StdNetSupportsStickySockets = true

2
conn/sticky_linux_test.go
View File

@ -1,4 +1,4 @@
//go:build linux //go:build linux && !android
/* SPDX-License-Identifier: MIT /* SPDX-License-Identifier: MIT
* *

3
device/sticky_linux.go
View File

@ -25,6 +25,9 @@ import (
) )
func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) { func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {
if !conn.StdNetSupportsStickySockets {
return nil, nil
}
if _, ok := bind.(*conn.StdNetBind); !ok { if _, ok := bind.(*conn.StdNetBind); !ok {
return nil, nil return nil, nil
} }