TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-12-25 09:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "TUN_OFFSET_BYTES per platform"

Browse Source 
This reverts commit 85c5bc61ac39169f96b9c853d63e165823a014e1.
This commit is contained in:
Neil Alexander 2019-11-24 21:09:29 +00:00
parent 85c5bc61ac
commit 8f323b740d
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
6 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tuntap/iface.go
View File

@ -9,6 +9,8 @@ import (
"github.com/Arceliar/phony" "github.com/Arceliar/phony"
) )
const TUN_OFFSET_BYTES = 4
type tunWriter struct { type tunWriter struct {
phony.Inbox phony.Inbox
tun *TunAdapter tun *TunAdapter

2
src/tuntap/tun_bsd.go
View File

@ -15,8 +15,6 @@ import (
wgtun "golang.zx2c4.com/wireguard/tun" wgtun "golang.zx2c4.com/wireguard/tun"
) )
const TUN_OFFSET_BYTES = 0
const SIOCSIFADDR_IN6 = (0x80000000) | ((288 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 12 const SIOCSIFADDR_IN6 = (0x80000000) | ((288 & 0x1fff) << 16) | uint32(byte('i'))<<8 | 12
type in6_addrlifetime struct { type in6_addrlifetime struct {

2
src/tuntap/tun_darwin.go
View File

@ -15,8 +15,6 @@ import (
wgtun "golang.zx2c4.com/wireguard/tun" wgtun "golang.zx2c4.com/wireguard/tun"
) )
const TUN_OFFSET_BYTES = 0
// Configures the "utun" adapter with the correct IPv6 address and MTU. // Configures the "utun" adapter with the correct IPv6 address and MTU.
func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error { func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error {
if ifname == "auto" { if ifname == "auto" {

2
src/tuntap/tun_linux.go
View File

@ -9,8 +9,6 @@ import (
wgtun "golang.zx2c4.com/wireguard/tun" wgtun "golang.zx2c4.com/wireguard/tun"
) )
const TUN_OFFSET_BYTES = 0
// Configures the TUN adapter with the correct IPv6 address and MTU. // Configures the TUN adapter with the correct IPv6 address and MTU.
func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error { func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error {
if ifname == "auto" { if ifname == "auto" {

2
src/tuntap/tun_other.go
View File

@ -9,8 +9,6 @@ import (
wgtun "golang.zx2c4.com/wireguard/tun" wgtun "golang.zx2c4.com/wireguard/tun"
) )
const TUN_OFFSET_BYTES = 0
// Configures the TUN adapter with the correct IPv6 address and MTU. // Configures the TUN adapter with the correct IPv6 address and MTU.
func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error { func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error {
iface, err := wgtun.CreateTUN(ifname, mtu) iface, err := wgtun.CreateTUN(ifname, mtu)

4
src/tuntap/tun_windows.go
View File

@ -2,8 +2,6 @@
package tuntap package tuntap
// This is to catch Windows platforms
import ( import (
"bytes" "bytes"
"errors" "errors"
@ -18,7 +16,7 @@ import (
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
) )
const TUN_OFFSET_BYTES = 4 // This is to catch Windows platforms
// Configures the TUN adapter with the correct IPv6 address and MTU. // Configures the TUN adapter with the correct IPv6 address and MTU.
func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error { func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error {