This commit is contained in:
16
main.go
16
main.go
@@ -50,6 +50,7 @@ var (
|
|||||||
dhcpServer string
|
dhcpServer string
|
||||||
dhcpScope string
|
dhcpScope string
|
||||||
dhcpNamePrefix string
|
dhcpNamePrefix string
|
||||||
|
dhcpDomain string
|
||||||
)
|
)
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -63,11 +64,11 @@ type singleData struct {
|
|||||||
type addrPair struct{ Name, IPv4, IPv6 string }
|
type addrPair struct{ Name, IPv4, IPv6 string }
|
||||||
|
|
||||||
type rangeData struct {
|
type rangeData struct {
|
||||||
Start, End string
|
Start, End string
|
||||||
DhcpServer, DhcpScope string
|
DhcpServer, DhcpScope, DhcpDomain string
|
||||||
Rows []addrPair
|
Rows []addrPair
|
||||||
Error string
|
Error string
|
||||||
HaveResult bool
|
HaveResult bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -126,7 +127,7 @@ func handleRange(w http.ResponseWriter, r *http.Request) {
|
|||||||
startStr := r.FormValue("start")
|
startStr := r.FormValue("start")
|
||||||
endStr := r.FormValue("end")
|
endStr := r.FormValue("end")
|
||||||
rows, err := convertRange(startStr, endStr)
|
rows, err := convertRange(startStr, endStr)
|
||||||
d := rangeData{Start: startStr, End: endStr, DhcpServer: dhcpServer, DhcpScope: dhcpScope}
|
d := rangeData{Start: startStr, End: endStr, DhcpServer: dhcpServer, DhcpScope: dhcpScope, DhcpDomain: dhcpDomain}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
d.Error = err.Error()
|
d.Error = err.Error()
|
||||||
} else {
|
} else {
|
||||||
@@ -243,6 +244,7 @@ func initConfigAndTemplates() {
|
|||||||
dhcpScope = os.Getenv("DHCP_SCOPE")
|
dhcpScope = os.Getenv("DHCP_SCOPE")
|
||||||
dhcpServer = os.Getenv("DHCP_SERVER")
|
dhcpServer = os.Getenv("DHCP_SERVER")
|
||||||
dhcpNamePrefix = os.Getenv("DHCP_NAME_PREFIX")
|
dhcpNamePrefix = os.Getenv("DHCP_NAME_PREFIX")
|
||||||
|
dhcpDomain = os.Getenv("DHCP_DOMAIN")
|
||||||
|
|
||||||
// Range limit ---------------------------------
|
// Range limit ---------------------------------
|
||||||
if limStr := os.Getenv("RANGE_LIMIT"); limStr != "" {
|
if limStr := os.Getenv("RANGE_LIMIT"); limStr != "" {
|
||||||
@@ -342,7 +344,7 @@ var rangePageHTML = `<!DOCTYPE html>
|
|||||||
{{if .HaveResult}}
|
{{if .HaveResult}}
|
||||||
<table>
|
<table>
|
||||||
<tr><th>IPv4</th><th>IPv6</th><th>DHCP-IPv4</th><th>DHCP-IPv6</th></tr>
|
<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 {{$.DhcpServer}} Scope {{$.DhcpScope}} 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}}.{{$.DhcpDomain}}" "" "DHCP"</td><td>---</td></tr>{{end}}
|
||||||
</table>
|
</table>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .Error}}<p style="color:#b00">Fehler: {{.Error}}</p>{{end}}
|
{{if .Error}}<p style="color:#b00">Fehler: {{.Error}}</p>{{end}}
|
||||||
|
Reference in New Issue
Block a user