Bugfix

2025-05-09 10:47:14 +02:00
parent 4d9ab976ce
commit 99a9beb065
1 changed files with 7 additions and 6 deletions
--- a/main.go
+++ b/main.go
@@ -62,10 +62,11 @@ type singleData struct {
 type addrPair struct{ Name, IPv4, IPv6 string }

 type rangeData struct {
-	Start, End string
-	Rows       []addrPair
-	Error      string
-	HaveResult bool
+	Start, End            string
+	DhcpServer, DhcpScope string
+	Rows                  []addrPair
+	Error                 string
+	HaveResult            bool
 }

 // ---------------------------------------------------------------------------
@@ -124,7 +125,7 @@ func handleRange(w http.ResponseWriter, r *http.Request) {
 		startStr := r.FormValue("start")
 		endStr := r.FormValue("end")
 		rows, err := convertRange(startStr, endStr)
-		d := rangeData{Start: startStr, End: endStr}
+		d := rangeData{Start: startStr, End: endStr, DhcpServer: dhcpServer, DhcpScope: dhcpScope}
 		if err != nil {
 			d.Error = err.Error()
 		} else {
@@ -327,7 +328,7 @@ var rangePageHTML = `<!DOCTYPE html>
 {{if .HaveResult}}
 <table>
 <tr><th>IPv4</th><th>IPv6</th><th>DHCP-IPv4</th><th>DHCP-IPv6</th></tr>
- {{range .Rows}}<tr><td>{{.IPv4}}</td><td>{{.IPv6}}</td><td>netsh DHCP Server %s Scope %s Add reservedip {{.IPv4}} "{{.Name}}.stadt-hilden.de" "" "DHCP"</td><td>---</td></tr>{{end}}
+ {{range .Rows}}<tr><td>{{.IPv4}}</td><td>{{.IPv6}}</td><td>netsh DHCP Server {{$.DhcpServer}} Scope {{$.DhcpScope}} Add reservedip {{.IPv4}} "{{.Name}}.stadt-hilden.de" "" "DHCP"</td><td>---</td></tr>{{end}}
 </table>
 {{end}}
 {{if .Error}}<p style="color:#b00">Fehler: {{.Error}}</p>{{end}}