Strip /32 prefix to fix #33

NHAS · Mar 2, 2023 · a06307a · a06307a
1 parent d0105dd
commit a06307a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/internal/router/bpf_bpfeb.o b/internal/router/bpf_bpfeb.o
diff --git a/internal/router/bpf_bpfel.o b/internal/router/bpf_bpfel.o
diff --git a/internal/webserver/web.go b/internal/webserver/web.go
@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/url"
 	"sort"
+	"strings"
 	"time"
 
 	"github.com/NHAS/wag/internal/config"
@@ -408,13 +409,19 @@ func registerDevice(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	dnsWithOutSubnet := config.Values().Wireguard.DNS
+
+	for i := 0; i < len(dnsWithOutSubnet); i++ {
+		dnsWithOutSubnet[i] = strings.TrimSuffix(dnsWithOutSubnet[i], "/32")
+	}
+
 	i := resources.Interface{
 		ClientPrivateKey:   keyStr,
 		ClientAddress:      address,
 		ServerAddress:      fmt.Sprintf("%s:%d", config.Values().ExternalAddress, wgPort),
 		ServerPublicKey:    wgPublicKey.String(),
 		CapturedAddresses:  append(acl.Allow, acl.Mfa...),
-		DNS:                config.Values().Wireguard.DNS,
+		DNS:                dnsWithOutSubnet,
 		ClientPresharedKey: presharedKey,
 	}