-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31 from mudler/pin/water
Improve windows support
- Loading branch information
Showing
10 changed files
with
70 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| //go:build !windows && !darwin | ||
| // +build !windows,!darwin | ||
| //go:build !windows && !darwin && !freebsd | ||
| // +build !windows,!darwin,!freebsd | ||
|
|
||
| /* | ||
| Copyright © 2021-2022 Ettore Di Giacinto <[email protected]> | ||
|
|
@@ -17,7 +17,7 @@ limitations under the License. | |
| package vpn | ||
|
|
||
| import ( | ||
| "github.com/songgao/water" | ||
| "github.com/mudler/water" | ||
| "github.com/vishvananda/netlink" | ||
| ) | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| //go:build freebsd | ||
| // +build freebsd | ||
|
|
||
| /* | ||
| Copyright © 2021-2022 Ettore Di Giacinto <[email protected]> | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package vpn | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/mudler/water" | ||
| "os/exec" | ||
| ) | ||
|
|
||
| func createInterface(c *Config) (*water.Interface, error) { | ||
| config := water.Config{ | ||
| DeviceType: c.DeviceType, | ||
| } | ||
| config.Name = c.InterfaceName | ||
|
|
||
| return water.New(config) | ||
| } | ||
|
|
||
| func prepareInterface(c *Config) error { | ||
| err := sh(fmt.Sprintf("ifconfig %s create", c.InterfaceName)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = sh(fmt.Sprintf("ifconfig %s inet %s %s netmask %s", c.InterfaceName, c.InterfaceAddress, c.InterfaceAddress, "255.255.255.0")) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return sh(fmt.Sprintf("ifconfig %s up", c.InterfaceName)) | ||
| } | ||
|
|
||
| func sh(c string) (err error) { | ||
| _, err = exec.Command("/bin/sh", "-c", c).CombinedOutput() | ||
| return | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters