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

Merge pull request #38 from Arceliar/bsdedupe

Browse Source 
Deduplicate some BSD code
This commit is contained in:
Neil Alexander 2018-03-04 19:23:27 +00:00 committed by GitHub
commit 3eccca62cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 109 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/yggdrasil/tun_bsd.go Normal file
View File

@ -0,0 +1,99 @@
// +build openbsd freebsd
package yggdrasil
import "os/exec"
import "unsafe"
import "golang.org/x/sys/unix"
import water "github.com/yggdrasil-network/water"
type in6_addrlifetime struct {
ia6t_expire float64
ia6t_preferred float64
ia6t_vltime uint32
ia6t_pltime uint32
}
type sockaddr_in6 struct {
sin6_len uint8
sin6_family uint8
sin6_port uint8
sin6_flowinfo uint32
sin6_addr [8]uint16
sin6_scope_id uint32
}
type in6_aliasreq struct {
ifra_name [16]byte
ifra_addr sockaddr_in6
ifra_dstaddr sockaddr_in6
ifra_prefixmask sockaddr_in6
ifra_flags uint32
ifra_lifetime in6_addrlifetime
}
func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int) error {
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 {
case iftapmode || ifname[:8] == "/dev/tap":
config = water.Config{DeviceType: water.TAP}
case !iftapmode || ifname[:8] == "/dev/tun":
panic("TUN mode is not currently supported on this platform, please use TAP instead")
default:
panic("TUN/TAP name must be in format /dev/tunX or /dev/tapX")
}
config.Name = ifname
iface, err := water.New(config)
if err != nil {
panic(err)
}
tun.iface = iface
tun.mtu = getSupportedMTU(mtu)
return tun.setupAddress(addr)
}
func (tun *tunDevice) setupAddress(addr string) error {
fd := tun.iface.FD().Fd()
var err error
var ti tuninfo
tun.core.log.Printf("Interface name: %s", tun.iface.Name())
tun.core.log.Printf("Interface IPv6: %s", addr)
tun.core.log.Printf("Interface MTU: %d", tun.mtu)
// Get the existing interface flags
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNGIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {
err = errno
tun.core.log.Printf("Error in TUNGIFINFO: %v", errno)
return err
}
// Update with any OS-specific flags, MTU, etc.
ti.setInfo(tun)
// Set the new interface flags
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNSIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {
err = errno
tun.core.log.Printf("Error in TUNSIFINFO: %v", errno)
return err
}
// Set address
cmd := exec.Command("ifconfig", tun.iface.Name(), "inet6", addr)
//tun.core.log.Printf("ifconfig command: %v", strings.Join(cmd.Args, " "))
output, err := cmd.CombinedOutput()
if err != nil {
tun.core.log.Printf("ifconfig failed: %v.", err)
tun.core.log.Println(string(output))
}
return nil
}

103
src/yggdrasil/tun_freebsd.go
View File

@ -1,12 +1,5 @@
package yggdrasil package yggdrasil
import "os/exec"
import "unsafe"
//import "syscall"
import "golang.org/x/sys/unix"
import water "github.com/yggdrasil-network/water"
// This is to catch FreeBSD and NetBSD // This is to catch FreeBSD and NetBSD
func getDefaults() tunDefaultParameters { func getDefaults() tunDefaultParameters {
@ -40,99 +33,11 @@ type tuninfo struct {
tun_dummy uint8 tun_dummy uint8
} }
func (ti *tuninfo) setInfo(tun *tunDevice) {
ti.tun_mtu = int16(tun.mtu)
}
const TUNSIFINFO = (0x80000000) | ((8 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 91 const TUNSIFINFO = (0x80000000) | ((8 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 91
const TUNGIFINFO = (0x40000000) | ((8 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 92 const TUNGIFINFO = (0x40000000) | ((8 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 92
const TUNSIFHEAD = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 96 const TUNSIFHEAD = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 96
const SIOCAIFADDR_IN6 = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 27 const SIOCAIFADDR_IN6 = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 27
// Below this point seems to be fairly standard at least...
type in6_addrlifetime struct {
ia6t_expire float64
ia6t_preferred float64
ia6t_vltime uint32
ia6t_pltime uint32
}
type sockaddr_in6 struct {
sin6_len uint8
sin6_family uint8
sin6_port uint8
sin6_flowinfo uint32
sin6_addr [8]uint16
sin6_scope_id uint32
}
type in6_aliasreq struct {
ifra_name [16]byte
ifra_addr sockaddr_in6
ifra_dstaddr sockaddr_in6
ifra_prefixmask sockaddr_in6
ifra_flags uint32
ifra_lifetime in6_addrlifetime
}
func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int) error {
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 {
case iftapmode || ifname[:8] == "/dev/tap":
config = water.Config{DeviceType: water.TAP}
case !iftapmode || ifname[:8] == "/dev/tun":
//config = water.Config{DeviceType: water.TUN}
panic("TUN mode is not currently supported on this platform, please use TAP instead")
default:
panic("TUN/TAP name must be in format /dev/tunX or /dev/tapX")
}
config.Name = ifname
iface, err := water.New(config)
if err != nil {
panic(err)
}
tun.iface = iface
tun.mtu = getSupportedMTU(mtu)
return tun.setupAddress(addr)
}
func (tun *tunDevice) setupAddress(addr string) error {
fd := tun.iface.FD().Fd()
var err error
var ti tuninfo
tun.core.log.Printf("Interface name: %s", tun.iface.Name())
tun.core.log.Printf("Interface IPv6: %s", addr)
tun.core.log.Printf("Interface MTU: %d", tun.mtu)
// Get the existing interface flags
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNGIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {
err = errno
tun.core.log.Printf("Error in TUNGIFINFO: %v", errno)
return err
}
// Set the new MTU
ti.tun_mtu = int16(tun.mtu)
// Set the new interface flags
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNSIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {
err = errno
tun.core.log.Printf("Error in TUNSIFINFO: %v", errno)
return err
}
// Set address
cmd := exec.Command("ifconfig", tun.iface.Name(), "inet6", addr)
//tun.core.log.Printf("ifconfig command: %v", strings.Join(cmd.Args, " "))
output, err := cmd.CombinedOutput()
if err != nil {
tun.core.log.Printf("ifconfig failed: %v.", err)
tun.core.log.Println(string(output))
}
return nil
}

109
src/yggdrasil/tun_openbsd.go
View File

@ -1,11 +1,6 @@
package yggdrasil package yggdrasil
import "os/exec"
import "unsafe"
import "syscall" import "syscall"
import "golang.org/x/sys/unix"
import water "github.com/yggdrasil-network/water"
// This is to catch OpenBSD // This is to catch OpenBSD
@ -44,85 +39,7 @@ type tuninfo struct {
tun_baudrate uint32 tun_baudrate uint32
} }
const TUNSIFINFO = (0x80000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 91 func (ti *tuninfo) setInfo(tun *tunDevice) {
const TUNGIFINFO = (0x40000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 92
const SIOCAIFADDR_IN6 = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 27
// Below this point seems to be fairly standard at least...
type in6_addrlifetime struct {
ia6t_expire float64
ia6t_preferred float64
ia6t_vltime uint32
ia6t_pltime uint32
}
type sockaddr_in6 struct {
sin6_len uint8
sin6_family uint8
sin6_port uint8
sin6_flowinfo uint32
sin6_addr [8]uint16
sin6_scope_id uint32
}
type in6_aliasreq struct {
ifra_name [16]byte
ifra_addr sockaddr_in6
ifra_dstaddr sockaddr_in6
ifra_prefixmask sockaddr_in6
ifra_flags uint32
ifra_lifetime in6_addrlifetime
}
func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int) error {
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 {
case iftapmode || ifname[:8] == "/dev/tap":
config = water.Config{DeviceType: water.TAP}
case !iftapmode || ifname[:8] == "/dev/tun":
// config = water.Config{DeviceType: water.TUN}
panic("TUN mode is not currently supported on this platform, please use TAP instead")
default:
panic("TUN/TAP name must be in format /dev/tunX or /dev/tapX")
}
config.Name = ifname
iface, err := water.New(config)
if err != nil {
panic(err)
}
tun.iface = iface
tun.mtu = getSupportedMTU(mtu)
return tun.setupAddress(addr)
}
func (tun *tunDevice) setupAddress(addr string) error {
fd := tun.iface.FD().Fd()
var err error
var ti tuninfo
tun.core.log.Printf("Interface name: %s", tun.iface.Name())
tun.core.log.Printf("Interface IPv6: %s", addr)
tun.core.log.Printf("Interface MTU: %d", tun.mtu)
// Get the existing interface flags
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNGIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {
err = errno
tun.core.log.Printf("Error in TUNGIFINFO: %v", errno)
return err
}
//tun.core.log.Printf("TUNGIFINFO: %+v", ti)
// Set the new MTU
ti.tun_mtu = uint32(tun.mtu)
// Set the new interface flags
ti.tun_flags |= syscall.IFF_UP ti.tun_flags |= syscall.IFF_UP
switch { switch {
case tun.iface.IsTAP(): case tun.iface.IsTAP():
@ -131,23 +48,9 @@ func (tun *tunDevice) setupAddress(addr string) error {
case tun.iface.IsTUN(): case tun.iface.IsTUN():
ti.tun_flags |= syscall.IFF_POINTOPOINT ti.tun_flags |= syscall.IFF_POINTOPOINT
} }
ti.tun_mtu = uint32(tun.mtu)
// Set the new interface flags
//tun.core.log.Printf("TUNSIFINFO: %+v", ti)
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNSIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {
err = errno
tun.core.log.Printf("Error in TUNSIFINFO: %v", errno)
return err
}
// Set address
cmd := exec.Command("ifconfig", tun.iface.Name(), "inet6", addr)
//tun.core.log.Printf("ifconfig command: %v", strings.Join(cmd.Args, " "))
output, err := cmd.CombinedOutput()
if err != nil {
tun.core.log.Printf("ifconfig failed: %v.", err)
tun.core.log.Println(string(output))
}
return nil
} }
const TUNSIFINFO = (0x80000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 91
const TUNGIFINFO = (0x40000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 92
const SIOCAIFADDR_IN6 = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 27