xsteadfastx/dsnet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #37 from botto/require-xor-ipv4-ipv6

Browse Source 
Ensure we always have at least 1 address in config
This commit is contained in:
Callan Bryant 2020-12-27 21:29:16 +00:00 committed by GitHub
commit 4c6e5301db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
up.go
View File

@ -20,6 +20,10 @@ func RunPostUp(conf *DsnetConfig) {
// CreateLink sets up the WG interface and link with the correct // CreateLink sets up the WG interface and link with the correct
// address // address
func CreateLink(conf *DsnetConfig) { func CreateLink(conf *DsnetConfig) {
if len(conf.IP) == 0 && len(conf.IP6) == 0 {
ExitFail("No IPv4 or IPv6 network defined in config")
}
linkAttrs := netlink.NewLinkAttrs() linkAttrs := netlink.NewLinkAttrs()
linkAttrs.Name = conf.InterfaceName linkAttrs.Name = conf.InterfaceName
@ -33,7 +37,7 @@ func CreateLink(conf *DsnetConfig) {
ExitFail("Could not add interface '%s' (%v)", conf.InterfaceName, err) ExitFail("Could not add interface '%s' (%v)", conf.InterfaceName, err)
} }
if conf.IP != nil { if len(conf.IP) != 0 {
addr := &netlink.Addr{ addr := &netlink.Addr{
IPNet: &net.IPNet{ IPNet: &net.IPNet{
IP: conf.IP, IP: conf.IP,
@ -47,7 +51,7 @@ func CreateLink(conf *DsnetConfig) {
} }
} }
if conf.IP6 != nil { if len(conf.IP6) != 0 {
addr6 := &netlink.Addr{ addr6 := &netlink.Addr{
IPNet: &net.IPNet{ IPNet: &net.IPNet{
IP: conf.IP6, IP: conf.IP6,