jcarr
/
control-panel-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix real IPv4 display 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-01-07 07:21:36 -06:00
parent 807b3be94f
commit 7343cbfa57
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linuxstatus/hostname.go
View File

@ -3,7 +3,6 @@
package linuxstatus
import (
"strings"
"io/ioutil"
"go.wit.com/log"
@ -65,12 +64,6 @@ func (ls *LinuxStatus) setHostShort() {
}
}
func (ls *LinuxStatus) GetIPv6() []string {
if ! me.Ready() {return nil}
tmp := me.workingIPv6.Get()
return strings.Split(tmp, "\n")
}
func lookupHostname() {
if ! me.Ready() {return}
var err error

10
linuxstatus/net.go
View File

@ -270,9 +270,15 @@ func deleteChanges() bool {
return changed
}
func (ls *LinuxStatus) GetIPv4() []string {
func (ls *LinuxStatus) GetIPv6() []string {
if ! me.Ready() {return nil}
tmp := "(none) fixme"
tmp := me.workingIPv6.Get()
return strings.Split(tmp, "\n")
}
func (ls *LinuxStatus) GetIPv4() []string {
if ! me.Ready() {return nil}
tmp := me.workingIPv4.Get()
return strings.Split(tmp, "\n")
}

19
main.go
View File

@ -6,8 +6,6 @@ package main
import (
"fmt"
"strings"
"sort"
"runtime"
"time"
"embed"
@ -182,20 +180,3 @@ func timeFunction(f func()) time.Duration {
f() // Execute the function
return time.Since(startTime) // Calculate the elapsed time
}
// sortLines takes a string, splits it on newlines, sorts the lines,
// and rejoins them with newlines.
func sortLines(input string) string {
lines := strings.Split(input, "\n")
// Trim leading and trailing whitespace from each line
for i, line := range lines {
lines[i] = strings.TrimSpace(line)
}
sort.Strings(lines)
tmp := strings.Join(lines, "\n")
tmp = strings.TrimLeft(tmp, "\n")
tmp = strings.TrimRight(tmp, "\n")
return tmp
}