Change the InterfaceDevice property to InterfaceName to match the…

… `net.InterfaceByName` naming convention Sgguestd by @Hipska Signed-off-by: Matthieu Pignolet <[email protected]>
prometheus-community · Oct 30, 2024 · 94017ff · 94017ff
1 parent 2c9120c
commit 94017ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/ping/ping.go b/cmd/ping/ping.go
@@ -94,7 +94,7 @@ func main() {
 	pinger.Interval = *interval
 	pinger.Timeout = *timeout
 	pinger.TTL = *ttl
-	pinger.InterfaceDevice = *iface
+	pinger.InterfaceName = *iface
 	pinger.SetPrivileged(*privileged)
 
 	fmt.Printf("PING %s (%s):\n", pinger.Addr(), pinger.IPAddr())

diff --git a/ping.go b/ping.go
@@ -208,7 +208,7 @@ type Pinger struct {
 	Source string
 
 	// Interface used to send/recv ICMP messages
-	InterfaceDevice string
+	InterfaceName string
 
 	// Channel and mutex used to communicate when the Pinger should stop between goroutines.
 	done chan interface{}
@@ -528,8 +528,8 @@ func (p *Pinger) RunWithContext(ctx context.Context) error {
 	}
 
 	conn.SetTTL(p.TTL)
-	if p.InterfaceDevice != "" {
-		iface, err := net.InterfaceByName(p.InterfaceDevice)
+	if p.InterfaceName != "" {
+		iface, err := net.InterfaceByName(p.InterfaceName)
 		if err != nil {
 			return err
 		}

diff --git a/ping_test.go b/ping_test.go
@@ -480,7 +480,7 @@ func TestSetInterfaceName(t *testing.T) {
 	pinger.Timeout = time.Second
 
 	// Set loopback interface
-	pinger.InterfaceDevice = "lo"
+	pinger.InterfaceName = "lo"
 	err := pinger.Run()
 	if runtime.GOOS == "linux" {
 		AssertNoError(t, err)
@@ -489,7 +489,7 @@ func TestSetInterfaceName(t *testing.T) {
 	}
 
 	// Set fake interface
-	pinger.InterfaceDevice = "L()0pB@cK"
+	pinger.InterfaceName = "L()0pB@cK"
 	err = pinger.Run()
 	AssertError(t, err, "device not found")
 }