cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-22 22:20:27 +00:00
Code Releases Activity

Fix using 'auto' as device name on OpenBSD - default to /dev/tap0

Browse Source
This commit is contained in:
Neil Alexander 2018-03-01 15:19:20 +00:00
parent 24be3f1d67
commit 6640b33334
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/yggdrasil/tun_openbsd.go
View File

@ -12,6 +12,10 @@ import water "github.com/neilalexander/water"
// This is to catch OpenBSD // This is to catch OpenBSD
// TODO: Fix TUN mode for OpenBSD. It turns out that OpenBSD doesn't have a way
// to disable the PI header when in TUN mode, so we need to modify the read/
// writes to handle those first four bytes
// Warning! When porting this to other BSDs, the tuninfo struct can appear with // Warning! When porting this to other BSDs, the tuninfo struct can appear with
// the fields in a different order, and the consts below might also have // the fields in a different order, and the consts below might also have
// different values // different values
@ -56,11 +60,18 @@ type in6_aliasreq struct {
func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int) error { func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int) error {
var config water.Config var config water.Config
if ifname[:4] == "auto" {
ifname = "/dev/tap0"
}
if len(ifname) < 9 {
panic("TUN/TAP name must be in format /dev/tunX or /dev/tapX")
}
switch { switch {
case iftapmode || ifname[:8] == "/dev/tap": case iftapmode || ifname[:8] == "/dev/tap":
config = water.Config{DeviceType: water.TAP} config = water.Config{DeviceType: water.TAP}
case !iftapmode || ifname[:8] == "/dev/tun": case !iftapmode || ifname[:8] == "/dev/tun":
config = water.Config{DeviceType: water.TUN} // config = water.Config{DeviceType: water.TUN}
panic("TUN mode is not currently supported on OpenBSD, please use TAP instead")
default: default:
panic("TUN/TAP name must be in format /dev/tunX or /dev/tapX") panic("TUN/TAP name must be in format /dev/tunX or /dev/tapX")
} }