change binary

Author: farsnow

gateway.go

@@ -18,6 +18,6 @@ func DiscoverGateway() (ip net.IP, err error) {
 }
 
 // DiscoverInterface is the OS independent function to call to get the default network interface IP that uses the default gateway
-func DiscoverInterface() (ip net.IP, err error) {
+func DiscoverInterface() (ip *net.IPNet, err error) {
 	return discoverGatewayInterfaceOSSpecific()
 }

gateway_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package gateway
@@ -28,7 +29,7 @@ func discoverGatewayOSSpecific() (ip net.IP, err error) {
 	return parseLinuxGatewayIP(bytes)
 }
 
-func discoverGatewayInterfaceOSSpecific() (ip net.IP, err error) {
+func discoverGatewayInterfaceOSSpecific() (ip *net.IPNet, err error) {
 	f, err := os.Open(file)
 	if err != nil {
 		return nil, fmt.Errorf("Can't access %s", file)

gateway_parsers.go

@@ -199,7 +199,7 @@ func parseLinuxGatewayIP(output []byte) (net.IP, error) {
 	return net.IP(ipd32), nil
 }
 
-func parseLinuxInterfaceIP(output []byte) (net.IP, error) {
+func parseLinuxInterfaceIP(output []byte) (*net.IPNet, error) {
 	parsedStruct, err := parseToLinuxRouteStruct(output)
 	if err != nil {
 		return nil, err
@@ -216,12 +216,11 @@ func parseLinuxInterfaceIP(output []byte) (net.IP, error) {
 	}
 
 	// split when its 192.168.8.8/24
-	ipString := strings.Split(addrs[0].String(), "/")[0]
-	ip := net.ParseIP(ipString)
-	if ip == nil {
-		return nil, fmt.Errorf("invalid addr %s", ipString)
+	_, ipNet, err := net.ParseCIDR(addrs[0].String())
+	if err != nil {
+		return nil, err
 	}
-	return ip, nil
+	return ipNet, nil
 }
 
 func parseDarwinRouteGet(output []byte) (net.IP, error) {

t_test.go

@@ -0,0 +1,14 @@
+package gateway
+
+import (
+	"fmt"
+	"testing"
+)
+
+func Test(t *testing.T) {
+	discoverInterface, err := DiscoverInterface()
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println(discoverInterface)
+}