TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-11-27 12:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Arceliar 2018-03-04 10:56:46 -06:00
parent e7726cfb00
commit 478b80a07a
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/yggdrasil/tun_bsd.go
View File

@ -2,7 +2,7 @@ package yggdrasil
import "os/exec" import "os/exec"
import "unsafe" import "unsafe"
//import "syscall"
import "golang.org/x/sys/unix" import "golang.org/x/sys/unix"
import water "github.com/yggdrasil-network/water" import water "github.com/yggdrasil-network/water"
@ -44,7 +44,6 @@ func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int)
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}
panic("TUN mode is not currently supported on this platform, please use TAP instead") panic("TUN mode is not currently supported on this platform, 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")
@ -62,7 +61,7 @@ func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int)
func (tun *tunDevice) setupAddress(addr string) error { func (tun *tunDevice) setupAddress(addr string) error {
fd := tun.iface.FD().Fd() fd := tun.iface.FD().Fd()
var err error var err error
var ti tuninfo var ti tuninfo
tun.core.log.Printf("Interface name: %s", tun.iface.Name()) tun.core.log.Printf("Interface name: %s", tun.iface.Name())
tun.core.log.Printf("Interface IPv6: %s", addr) tun.core.log.Printf("Interface IPv6: %s", addr)
@ -75,8 +74,8 @@ func (tun *tunDevice) setupAddress(addr string) error {
return err return err
} }
// Update with any OS-specific flags, MTU, etc. // Update with any OS-specific flags, MTU, etc.
ti.setInfo(tun) ti.setInfo(tun)
// Set the new interface flags // Set the new interface flags
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNSIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 { if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNSIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {

3
src/yggdrasil/tun_freebsd.go
View File

@ -34,11 +34,10 @@ type tuninfo struct {
} }
func (ti *tuninfo) setInfo(tun *tunDevice) { func (ti *tuninfo) setInfo(tun *tunDevice) {
ti.tun_mtu = int16(tun.mtu) 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

3
src/yggdrasil/tun_openbsd.go
View File

@ -48,10 +48,9 @@ func (ti *tuninfo) setInfo(tun *tunDevice) {
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) ti.tun_mtu = uint32(tun.mtu)
} }
const TUNSIFINFO = (0x80000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 91 const TUNSIFINFO = (0x80000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 91
const TUNGIFINFO = (0x40000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 92 const TUNGIFINFO = (0x40000000) | ((12 & 0x1fff) << 16) | uint32(byte('t'))<<8 | 92
const SIOCAIFADDR_IN6 = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 27 const SIOCAIFADDR_IN6 = (0x80000000) | ((4 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 27