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

populate default PlatformSpecificParams when it's empty (#43)

Browse source
This commit is contained in:
Song Gao 2018-04-20 14:47:39 +08:00 • committed by GitHub
parent 8bbc3c8191
commit bf1a5d0277
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
water.test

3
if.go
View file

@ -53,6 +53,9 @@ func New(config Config) (ifce *Interface, err error) {
if zeroConfig == config { if zeroConfig == config {
config = defaultConfig() config = defaultConfig()
} }
if config.PlatformSpecificParams == zeroConfig.PlatformSpecificParams {
config.PlatformSpecificParams = defaultPlatformSpecificParams()
}
switch config.DeviceType { switch config.DeviceType {
case TUN: case TUN:
return newTUN(config) return newTUN(config)

2
syscalls_darwin.go
View file

@ -175,7 +175,7 @@ func (t *tunReadCloser) Write(from []byte) (int, error) {
} else if ipVer == 6 { } else if ipVer == 6 {
t.wBuf[3] = syscall.AF_INET6 t.wBuf[3] = syscall.AF_INET6
} else { } else {
return 0, errors.New("Unable to determine IP version from packet.") return 0, errors.New("Unable to determine IP version from packet")
} }
copy(t.wBuf[4:], from) copy(t.wBuf[4:], from)