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

Simplifies Platform Specific Interface Creation

Browse source 
The interface `Config` object is now passed directly into each creation
function in order to more easily use additional options.

In addition, the linux and darwin parameters were split to better
capture different options for each platform.
This commit is contained in:
Matthew Ellison 2017-05-22 12:25:48 -04:00
parent 80f6655041
commit 70591d2499
No known key found for this signature in database
GPG key ID: A815A44BDC8DD409
9 changed files with 38 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
syscalls_linux.go
View file

@ -21,12 +21,12 @@ type ifReq struct {
pad [0x28 - 0x10 - 2]byte
}
func newTAP(ifName string) (ifce *Interface, err error) {
func newTAP(config Config) (ifce *Interface, err error) {
file, err := os.OpenFile("/dev/net/tun", os.O_RDWR, 0)
if err != nil {
return nil, err
}
name, err := createInterface(file.Fd(), ifName, cIFF_TAP|cIFF_NO_PI)
name, err := createInterface(file.Fd(), config.Name, cIFF_TAP|cIFF_NO_PI)
if err != nil {
return nil, err
}
@ -34,12 +34,12 @@ func newTAP(ifName string) (ifce *Interface, err error) {
return
}
func newTUN(ifName string) (ifce *Interface, err error) {
func newTUN(config Config) (ifce *Interface, err error) {
file, err := os.OpenFile("/dev/net/tun", os.O_RDWR, 0)
if err != nil {
return nil, err
}
name, err := createInterface(file.Fd(), ifName, cIFF_TUN|cIFF_NO_PI)
name, err := createInterface(file.Fd(), config.Name, cIFF_TUN|cIFF_NO_PI)
if err != nil {
return nil, err
}