yggdrasil-network/water
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/water.git synced 2025-05-19 08:25:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix test and revert non-test changes

Browse source
This commit is contained in:
Song Gao 2019-01-05 21:32:14 +00:00
parent 4d58427608
commit ab2cda57af
2 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ipv4_test.go
View file

@ -77,17 +77,11 @@ readFrame:
} }
func TestCloseUnblockPendingRead(t *testing.T) { func TestCloseUnblockPendingRead(t *testing.T) {
var (
self = net.IPv4(192, 168, 150, 1)
mask = net.IPv4Mask(255, 255, 255, 0)
)
ifce, err := New(Config{DeviceType: TUN}) ifce, err := New(Config{DeviceType: TUN})
if err != nil { if err != nil {
t.Fatalf("creating TUN error: %v\n", err) t.Fatalf("creating TUN error: %v\n", err)
} }
setupIfce(t, net.IPNet{IP: self, Mask: mask}, ifce.Name())
c := make(chan struct{}) c := make(chan struct{})
go func() { go func() {
ifce.Read(make([]byte, 1<<16)) ifce.Read(make([]byte, 1<<16))

15
syscalls_linux.go
View file

@ -31,7 +31,7 @@ func ioctl(fd uintptr, request uintptr, argp uintptr) error {
} }
func newTAP(config Config) (ifce *Interface, err error) { func newTAP(config Config) (ifce *Interface, err error) {
file, err := openTun() file, err := os.OpenFile("/dev/net/tun", os.O_RDWR, 0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -55,7 +55,7 @@ func newTAP(config Config) (ifce *Interface, err error) {
} }
func newTUN(config Config) (ifce *Interface, err error) { func newTUN(config Config) (ifce *Interface, err error) {
file, err := openTun() file, err := os.OpenFile("/dev/net/tun", os.O_RDWR, 0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -107,16 +107,5 @@ func setDeviceOptions(fd uintptr, config Config) (err error) {
if config.Persist { if config.Persist {
value = 1 value = 1
} }
return ioctl(fd, syscall.TUNSETPERSIST, uintptr(value)) return ioctl(fd, syscall.TUNSETPERSIST, uintptr(value))
} }
func openTun() (*os.File, error) {
tunFile := "/dev/net/tun"
bfile, err := os.OpenFile(tunFile, os.O_RDWR, 0)
if err != nil {
return nil, err
}
return os.NewFile(bfile.Fd(), tunFile), nil
}