Merge branch 'dev'

README.md

@@ -24,6 +24,8 @@ The program will convert IPv4-only wireguard-interfaces to IPv6. It converts and
 
 IPv6-Adresses are generated based on the IPv4-Adress.
 
+If not filtered out, then default routes (0.0.0.0/0) are handled specially and are converted to the IPv6 default route (::/0).
+
 Beware: This program needs `NET_ADMIN` privileges for setting Adresses and to access the wireguard-daemon.
 
 <br>
@@ -82,7 +84,7 @@ Restart=always
 RestartSec=30
 
 Environment="INTERFACE=wt0"
-Environment="RECHECK_INTERVAL=60"
+Environment="RECHECK_INTERVAL=60s"
 
 [Install]
 WantedBy=multi-user.target

cmd/app/main.go

@@ -17,6 +17,7 @@ import (
 var envRequired = []string{
 	"INTERFACE",
 }
+
 var envDefaults = map[string]string{
 	"IPV6_FORMAT":      "fc12::%02x%02x:%02x%02x/%d",
 	"FILTER_PREFIX":    "100.100",
@@ -26,7 +27,7 @@ var envDefaults = map[string]string{
 func main() {
 	// Environment-vars
 	err := envChecks.HandleRequired(envRequired)
-	if(err != nil){
+	if err != nil {
 		logger.Error.Fatal(err)
 	}
 	envChecks.HandleDefaults(envDefaults)
@@ -39,7 +40,7 @@ func main() {
 	}
 
 	ipv6Format := os.Getenv("IPV6_FORMAT")
-    ipv6TestStr := *convertIPv4ToIPv6(&ipv6Format, &net.IPNet{IP: net.IPv4(1,1,1,1), Mask: net.CIDRMask(24, net.IPv4len)})
+	ipv6TestStr := *convertIPv4ToIPv6(&ipv6Format, &net.IPNet{IP: net.IPv4(1, 1, 1, 1), Mask: net.CIDRMask(24, net.IPv4len)})
 	_, err = netlink.ParseIPNet(ipv6TestStr)
 	if err != nil {
 		logger.Error.Fatalf("IPV6_FORMAT is invalid: %s", err)
@@ -53,7 +54,16 @@ func main() {
 		logger.Error.Fatalf("Couldn't parse RECHECK_INTERVAL '%s': %s", checkIntervalStr, err)
 	}
 
-    // Get the IPv4 address of the interface
+	// Create a WireGuard client
+	client, err := wgctrl.New()
+	if err != nil {
+		logger.Error.Fatal(err)
+	}
+	defer client.Close()
+
+	// Loop indefinitely
+	for {
+		// Get the IPv4 addresses of the interface
 		addrs, err := netlink.AddrList(netInterface, netlink.FAMILY_V4)
 		if err != nil {
 			logger.Error.Fatal(err)
@@ -82,24 +92,15 @@ func main() {
 				case os.IsExist(err):
 					logger.Warn.Println("Address is already set on interface")
 				default:
-                logger.Warn.Printf("Failed to set address on interface: %v", err)
+					logger.Error.Fatalf("Failed to set address on interface: %v", err)
 				}
 			}
 			processedCount++
 		}
-    if(processedCount != len(addrs)) {
+		if processedCount != len(addrs) {
 			logger.Warn.Printf("Not all Interface-Addresses were processed. Summary: %d processed, %d filtered, %d failed", processedCount, filteredCount, len(addrs)-processedCount-filteredCount)
 		}
 
-    // Create a WireGuard client
-    client, err := wgctrl.New()
-    if err != nil {
-        logger.Error.Fatal(err)
-    }
-    defer client.Close()
-
-    // Loop indefinitely
-    for {
 		// Get the WireGuard peers on the interface
 		wgDevice, err := client.Device(iface)
 		if err != nil {
@@ -111,7 +112,7 @@ func main() {
 
 		for _, peer := range wgDevice.Peers {
 			// Create slice for 1 expected addition
-            var addAllowedIPs = make([]net.IPNet, 0, 1)
+			addAllowedIPs := make([]net.IPNet, 0, 1)
 
 			// Loop through the allowed-ips and add the ones starting with 100.100
 			for _, allowedIP := range peer.AllowedIPs {
@@ -135,7 +136,7 @@ func main() {
 				}
 			}
 
-            if(len(addAllowedIPs) > 0){
+			if len(addAllowedIPs) > 0 {
 				// Create peer-config
 				peerConfig := wgtypes.PeerConfig{
 					PublicKey:  peer.PublicKey,
@@ -147,11 +148,11 @@ func main() {
 			}
 		}
 
-        if(len(wgConfig.Peers) == 0){
+		if len(wgConfig.Peers) == 0 {
 			logger.Info.Println("No changes, skipping")
 		} else {
 			err = client.ConfigureDevice(iface, wgConfig)
-            if(err != nil){
+			if err != nil {
 				logger.Error.Fatalf("Error configuring wg-device '%s': %s", iface, err)
 			}
 		}
@@ -161,7 +162,15 @@ func main() {
 	}
 }
 
-func convertIPv4ToIPv6(ipv6Format *string, ipv4 *net.IPNet) (*string) {
+func convertIPv4ToIPv6(ipv6Format *string, ipv4 *net.IPNet) *string {
+	// Check if this is a default route (0.0.0.0/0)
+	if ipv4.IP.Equal(net.IPv4zero) {
+		if ones, _ := ipv4.Mask.Size(); ones == 0 {
+			defaultRoute := "::/0"
+			return &defaultRoute
+		}
+	}
+
 	CIDR, _ := ipv4.Mask.Size()
 	// Run format
 	ipv6Str := fmt.Sprintf(*ipv6Format, (*ipv4).IP[0], (*ipv4).IP[1], (*ipv4).IP[2], (*ipv4).IP[3], net.IPv6len*8-(net.IPv4len*8-CIDR))