summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-01-07 07:21:36 -0600
committerJeff Carr <[email protected]>2024-01-07 07:21:36 -0600
commit7343cbfa5753d6df2768936744c25e0465552f32 (patch)
tree77d678321183714f62c7f74bc5f1acd8365970c6
parent807b3be94f4be4b1aeea48695474aca1bfef4ab2 (diff)
fix real IPv4 display
Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--linuxstatus/hostname.go7
-rw-r--r--linuxstatus/net.go8
-rw-r--r--main.go19
3 files changed, 7 insertions, 27 deletions
diff --git a/linuxstatus/hostname.go b/linuxstatus/hostname.go
index 184e593..2a83eba 100644
--- a/linuxstatus/hostname.go
+++ b/linuxstatus/hostname.go
@@ -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
diff --git a/linuxstatus/net.go b/linuxstatus/net.go
index 7170765..22c9a4c 100644
--- a/linuxstatus/net.go
+++ b/linuxstatus/net.go
@@ -270,9 +270,15 @@ func deleteChanges() bool {
return changed
}
+func (ls *LinuxStatus) GetIPv6() []string {
+ if ! me.Ready() {return nil}
+ tmp := me.workingIPv6.Get()
+ return strings.Split(tmp, "\n")
+}
+
func (ls *LinuxStatus) GetIPv4() []string {
if ! me.Ready() {return nil}
- tmp := "(none) fixme"
+ tmp := me.workingIPv4.Get()
return strings.Split(tmp, "\n")
}
diff --git a/main.go b/main.go
index 1cf0621..5988392 100644
--- a/main.go
+++ b/main.go
@@ -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
-}