gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 23:54:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixing ipv6

Browse source
This commit is contained in:
afeiszli 2022-05-02 10:48:00 -04:00
parent 2e4ae94521
commit 80cc86783d
6 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
compose/docker-compose.contained.yml
View file

@ -16,6 +16,7 @@ services:
- net.ipv4.ip_forward=1 - net.ipv4.ip_forward=1
- net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.conf.all.src_valid_mark=1
- net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.forwarding=1
restart: always restart: always
environment: environment:
SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN"

1
compose/docker-compose.nocaddy.yml
View file

@ -16,6 +16,7 @@ services:
- net.ipv4.ip_forward=1 - net.ipv4.ip_forward=1
- net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.conf.all.src_valid_mark=1
- net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.forwarding=1
restart: always restart: always
environment: environment:
SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN"

1
compose/docker-compose.nodns.yml
View file

@ -16,6 +16,7 @@ services:
- net.ipv4.ip_forward=1 - net.ipv4.ip_forward=1
- net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.conf.all.src_valid_mark=1
- net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.forwarding=1
restart: always restart: always
environment: environment:
SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN"

1
compose/docker-compose.reference.yml
View file

@ -15,6 +15,7 @@ services:
- net.ipv4.ip_forward=1 - net.ipv4.ip_forward=1
- net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.conf.all.src_valid_mark=1
- net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.forwarding=1
restart: always restart: always
network_mode: host # Must configure with very particular settngs for host networking to work. Do not just set on! network_mode: host # Must configure with very particular settngs for host networking to work. Do not just set on!
environment: environment:

1
compose/docker-compose.yml
View file

@ -16,6 +16,7 @@ services:
- net.ipv4.ip_forward=1 - net.ipv4.ip_forward=1
- net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.conf.all.src_valid_mark=1
- net.ipv6.conf.all.disable_ipv6=0 - net.ipv6.conf.all.disable_ipv6=0
- net.ipv6.conf.all.forwarding=1
restart: always restart: always
environment: environment:
SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN" SERVER_NAME: "broker.NETMAKER_BASE_DOMAIN"

11
logic/wireguard.go
View file

@ -3,6 +3,7 @@ package logic
import ( import (
"errors" "errors"
"fmt" "fmt"
"net"
"os" "os"
"os/exec" "os/exec"
"strconv" "strconv"
@ -397,10 +398,16 @@ func setServerRoutes(iface, network string) {
parentNetwork, err := GetParentNetwork(network) parentNetwork, err := GetParentNetwork(network)
if err == nil { if err == nil {
if parentNetwork.AddressRange != "" { if parentNetwork.AddressRange != "" {
local.SetCIDRRoute(iface, parentNetwork.AddressRange, nil) ip, cidr, err := net.ParseCIDR(parentNetwork.AddressRange)
if err == nil {
local.SetCIDRRoute(iface, ip.String(), cidr)
}
} }
if parentNetwork.AddressRange6 != "" { if parentNetwork.AddressRange6 != "" {
local.SetCIDRRoute(iface, parentNetwork.AddressRange6, nil) ip, cidr, err := net.ParseCIDR(parentNetwork.AddressRange6)
if err == nil {
local.SetCIDRRoute(iface, ip.String(), cidr)
}
} }
} }
} }