admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(network): enable ipv6 connection and tunneling (#1114)

Browse Source 
Co-authored-by: Quentin McGaw <quentin.mcgaw@gmail.com>
This commit is contained in:
EkilDeew
2022-09-14 02:18:10 +02:00
committed by GitHub
parent 6a5aa8eddb
commit 875690ab18
9 changed files with 88 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/routing/default.go
View File

@@ -43,8 +43,11 @@ func (r *Routing) DefaultRoutes() (defaultRoutes []DefaultRoute, err error) {
}
attributes := link.Attrs()
defaultRoute.NetInterface = attributes.Name
defaultRoute.AssignedIP, err = r.assignedIP(defaultRoute.NetInterface)
family := netlink.FAMILY_V6
if route.Gw.To4() != nil {
family = netlink.FAMILY_V4
}
defaultRoute.AssignedIP, err = r.assignedIP(defaultRoute.NetInterface, family)
if err != nil {
return nil, fmt.Errorf("cannot get assigned IP of %s: %w", defaultRoute.NetInterface, err)
}

17
internal/routing/ip.go
View File

@@ -4,6 +4,8 @@ import (
"errors"
"fmt"
"net"
"github.com/qdm12/gluetun/internal/netlink"
)
func IPIsPrivate(ip net.IP) bool {
@@ -15,7 +17,12 @@ var (
errInterfaceIPNotFound = errors.New("IP address not found for interface")
)
func (r *Routing) assignedIP(interfaceName string) (ip net.IP, err error) {
func ipMatchesFamily(ip net.IP, family int) bool {
return (family == netlink.FAMILY_V6 && ip.To4() == nil) ||
(family == netlink.FAMILY_V4 && ip.To4() != nil)
}
func (r *Routing) assignedIP(interfaceName string, family int) (ip net.IP, err error) {
iface, err := net.InterfaceByName(interfaceName)
if err != nil {
return nil, fmt.Errorf("network interface %s not found: %w", interfaceName, err)
@@ -27,9 +34,13 @@ func (r *Routing) assignedIP(interfaceName string) (ip net.IP, err error) {
for _, address := range addresses {
switch value := address.(type) {
case *net.IPAddr:
return value.IP, nil
if ipMatchesFamily(value.IP, family) {
return value.IP, nil
}
case *net.IPNet:
return value.IP, nil
if ipMatchesFamily(value.IP, family) {
return value.IP, nil
}
}
}
return nil, fmt.Errorf("%w: interface %s in %d addresses",

8
internal/routing/local.go
View File

@@ -41,7 +41,7 @@ func (r *Routing) LocalNetworks() (localNetworks []LocalNetwork, err error) {
return localNetworks, fmt.Errorf("%w: in %d links", ErrLinkLocalNotFound, len(links))
}
routes, err := r.netLinker.RouteList(nil, netlink.FAMILY_V4)
routes, err := r.netLinker.RouteList(nil, netlink.FAMILY_ALL)
if err != nil {
return localNetworks, fmt.Errorf("cannot list routes: %w", err)
}
@@ -65,7 +65,11 @@ func (r *Routing) LocalNetworks() (localNetworks []LocalNetwork, err error) {
localNet.InterfaceName = link.Attrs().Name
ip, err := r.assignedIP(localNet.InterfaceName)
family := netlink.FAMILY_V6
if localNet.IPNet.IP.To4() != nil {
family = netlink.FAMILY_V4
}
ip, err := r.assignedIP(localNet.InterfaceName, family)
if err != nil {
return localNetworks, err
}