Fix metric parsing in localized versions

gateway_parsers.go

@@ -14,6 +14,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"unicode"
 )
 
 const (
@@ -146,6 +147,28 @@ func parseToWindowsRouteStruct(output []byte) ([]windowsRouteStruct, error) {
 				break
 			}
 			fields := strings.Fields(inputLine)
+			// Some Windows commands are localized, so we need to handle the fields in a logical way.
+			// Baiscally, fields that start with a number will be treated as-is, but consecutive fields
+			// that start with a letter will be combined into a single field.
+			{
+				var logicalFields []string
+				for f := 0; f < len(fields); f++ {
+					field := fields[f]
+					if len(field) > 0 && unicode.IsLetter(rune(field[0])) {
+						for f+1 < len(fields) {
+							nextField := fields[f+1]
+							if len(nextField) > 0 && unicode.IsLetter(rune(nextField[0])) {
+								field += " " + nextField
+								f++
+							} else {
+								break
+							}
+						}
+					}
+					logicalFields = append(logicalFields, field)
+				}
+				fields = logicalFields
+			}
 			if len(fields) < 5 || !ipRegex.MatchString(fields[0]) {
 				return nil, &ErrCantParse{}
 			}
@@ -263,7 +286,8 @@ func parseWindowsGatewayIPs(output []byte) ([]net.IP, error) {
 
 	result := make([]net.IP, 0, len(parsedOutputs))
 	for _, parsedOutput := range parsedOutputs {
-		if strings.EqualFold(parsedOutput.Gateway, "On-link") {
+		// Skip "On-link" gateways (these will start with a letter; not all languages will print "On-link").
+		if len(parsedOutput.Gateway) > 0 && unicode.IsLetter(rune(parsedOutput.Gateway[0])) {
 			continue
 		}
 		ip := net.ParseIP(parsedOutput.Gateway)
@@ -272,6 +296,9 @@ func parseWindowsGatewayIPs(output []byte) ([]net.IP, error) {
 		}
 		result = append(result, ip)
 	}
+	if len(result) == 0 {
+		return nil, &ErrNoGateway{}
+	}
 	return result, nil
 }
 

gateway_test.go

@@ -50,12 +50,13 @@ func TestParseWindows(t *testing.T) {
 	testcases := []ipTestCase{
 		{windows, true, "10.88.88.2", nil},
 		{windowsLocalized, true, "10.88.88.2", nil},
+		{windowsLocalized2, true, "192.168.100.1", nil},
 		{windowsMultipleGateways, true, "10.21.38.1", nil},
 		{randomData, false, "", &ErrCantParse{}},
 		{windowsNoRoute, false, "", &ErrNoGateway{}},
 		{windowsNoDefaultRoute, false, "", &ErrNoGateway{}},
 		{windowsBadRoute1, false, "", &ErrCantParse{}},
-		{windowsBadRoute2, false, "", &ErrCantParse{}},
+		{windowsBadRoute2, false, "", &ErrNoGateway{}},
 	}
 
 	t.Run("parseWindowsGatewayIPs", func(t *testing.T) {

route-tables/windows.txt

@@ -8,12 +8,12 @@ IPv4 Route Table
 Active Routes:
 Network Destination        Netmask          Gateway       Interface  Metric
           0.0.0.0          0.0.0.0       10.88.88.2     10.88.88.149     10
-          0.0.0.0        128.0.0.0         On-link       192.168.0.1      5
         127.0.0.0        255.0.0.0         On-link         127.0.0.1    331
         127.0.0.1  255.255.255.255         On-link         127.0.0.1    331
   127.255.255.255  255.255.255.255         On-link         127.0.0.1    331
-      192.168.0.0    255.255.255.0         On-link      192.168.0.52    291
-     192.168.0.52  255.255.255.255         On-link      192.168.0.52    291
-    192.168.0.255  255.255.255.255         On-link      192.168.0.52    291
 ===========================================================================
 Persistent Routes:
+  Network Address          Netmask  Gateway Address  Metric
+          0.0.0.0          0.0.0.0       10.88.88.2  Default
+    192.168.1.255  255.255.255.255       10.88.88.2       1
+--------------------------------------------------------------------------- 

route-tables/windowsLocalized2.txt

@@ -0,0 +1,28 @@
+===========================================================================
+ILista de interfaces
+29...........................SGNAutobahn Tunnel
+11...........................SGN Tunnel
+18...01 02 03 04 05 60 ......Microsoft Wi-Fi Direct Virtual Adapter
+ 4...01 02 03 04 05 61 ......Microsoft Wi-Fi Direct Virtual Adapter #2
+10...01 02 03 04 05 62 ......MediaTek Wi-Fi 6E MT7902 Wireless LAN Card
+14...01 02 03 04 05 63 ......Bluetooth Device (Personal Area Network)
+ 1...........................Software Loopback Interface 1
+===========================================================================
+
+IPv4 Tabla de enrutamiento
+===========================================================================
+Rutas activas:
+Destino de red        Máscara de red   Puerta de enlace   Interfaz  Métrica
+          0.0.0.0          0.0.0.0    192.168.100.1   192.168.100.80     35
+          0.0.0.0        192.0.0.0      En vínculo       123.45.0.10    250
+===========================================================================
+Rutas persistentes:
+  Ninguno
+
+IPv6 Tabla de enrutamiento
+===========================================================================
+Rutas activas:
+  Ninguno
+Rutas persistentes:
+  Ninguno
+