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

Be a little bit less verbose on OpenBSD

Browse Source
This commit is contained in:
Neil Alexander 2018-03-01 15:31:49 +00:00
parent 6640b33334
commit 7c0102e43d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/yggdrasil/tun_openbsd.go
View File

@ -3,7 +3,6 @@
package yggdrasil package yggdrasil
import "os/exec" import "os/exec"
import "strings"
import "unsafe" import "unsafe"
import "syscall" import "syscall"
import "golang.org/x/sys/unix" import "golang.org/x/sys/unix"
@ -90,13 +89,17 @@ func (tun *tunDevice) setupAddress(addr string) error {
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 IPv6: %s", addr)
tun.core.log.Printf("Interface MTU: %d", tun.mtu)
// Get the existing interface flags // Get the existing interface flags
if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNGIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 { if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(TUNGIFINFO), uintptr(unsafe.Pointer(&ti))); errno != 0 {
err = errno err = errno
tun.core.log.Printf("Error in TUNGIFINFO: %v", errno) tun.core.log.Printf("Error in TUNGIFINFO: %v", errno)
return err return err
} }
tun.core.log.Printf("TUNGIFINFO: %+v", ti) //tun.core.log.Printf("TUNGIFINFO: %+v", ti)
// Set the new MTU // Set the new MTU
ti.tun_mtu = uint16(tun.mtu) ti.tun_mtu = uint16(tun.mtu)
@ -112,7 +115,7 @@ func (tun *tunDevice) setupAddress(addr string) error {
} }
// Set the new interface flags // Set the new interface flags
tun.core.log.Printf("TUNSIFINFO: %+v", ti) //tun.core.log.Printf("TUNSIFINFO: %+v", ti)
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 {
err = errno err = errno
tun.core.log.Printf("Error in TUNSIFINFO: %v", errno) tun.core.log.Printf("Error in TUNSIFINFO: %v", errno)
@ -121,7 +124,7 @@ func (tun *tunDevice) setupAddress(addr string) error {
// Set address // Set address
cmd := exec.Command("ifconfig", tun.iface.Name(), "inet6", addr) cmd := exec.Command("ifconfig", tun.iface.Name(), "inet6", addr)
tun.core.log.Printf("ifconfig command: %v", strings.Join(cmd.Args, " ")) //tun.core.log.Printf("ifconfig command: %v", strings.Join(cmd.Args, " "))
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
tun.core.log.Printf("ifconfig failed: %v.", err) tun.core.log.Printf("ifconfig failed: %v.", err)