fumiama/water
1
0
Fork 0
mirror of https://github.com/fumiama/water.git synced 2026-06-26 06:50:24 +08:00
Code Activity

addressing comments

Browse Source
This commit is contained in:
Yifan Gu
2019-06-17 11:55:30 -04:00
committed by Song Gao
parent aa5a321f82
commit 2ed58ad390
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
syscalls_darwin.go
View File

@@ -61,11 +61,17 @@ type sockaddrCtl struct {
var sockaddrCtlSize uintptr = 32
func openDev(config Config) (ifce *Interface, err error) {
if config.Driver == TunTapOSXDriver {
if config.Driver == MacOSDriverTunTapOSX {
return openDevTunTapOSX(config)
} else if config.Driver != SystemDriver {
return nil, errors.New("unrecognized driver")
}
if config.Driver == MacOSDriverSystem {
return openDevSystem(config)
}
return nil, errors.New("unrecognized driver")
}
// openDevSystem opens tun device on system
func openDevSystem(config Config) (ifce *Interface, err error) {
if config.DeviceType != TUN {
return nil, errors.New("only tun is implemented for SystemDriver, use TunTapOSXDriver for tap")
}
@@ -140,9 +146,11 @@ func openDevTunTapOSX(config Config) (ifce *Interface, err error) {
if config.DeviceType == TAP && !strings.HasPrefix(config.Name, "tap") {
return nil, errors.New("device name does not start with tap when creating a tap device")
} else if config.DeviceType == TUN && !strings.HasPrefix(config.Name, "tun") {
}
if config.DeviceType == TUN && !strings.HasPrefix(config.Name, "tun") {
return nil, errors.New("device name does not start with tun when creating a tun device")
} else if config.DeviceType != TAP && config.DeviceType != TUN {
}
if config.DeviceType != TAP && config.DeviceType != TUN {
return nil, errors.New("unsupported DeviceType")
}
if len(config.Name) >= 15 {