Add missing network type cases

- WIRED was reported as UNKNOWN

psiphon/common/inproxy/api.go

@@ -137,6 +137,8 @@ const (
 	NetworkTypeUnknown NetworkType = iota
 	NetworkTypeWiFi
 	NetworkTypeMobile
+	NetworkTypeWired
+	NetworkTypeVPN
 )
 
 // NetworkProtocol is an Internet protocol, such as TCP or UDP. This enum is
@@ -453,6 +455,10 @@ func GetNetworkType(packedBaseParams protocol.PackedAPIParameters) NetworkType {
 		return NetworkTypeWiFi
 	case "MOBILE":
 		return NetworkTypeMobile
+	case "WIRED":
+		return NetworkTypeWired
+	case "VPN":
+		return NetworkTypeVPN
 	}
 	return NetworkTypeUnknown
 }

psiphon/inproxy.go

@@ -2501,6 +2501,10 @@ func getInproxyNetworkType(networkType string) inproxy.NetworkType {
 		return inproxy.NetworkTypeWiFi
 	case "MOBILE":
 		return inproxy.NetworkTypeMobile
+	case "WIRED":
+		return inproxy.NetworkTypeWired
+	case "VPN":
+		return inproxy.NetworkTypeVPN
 	}
 
 	return inproxy.NetworkTypeUnknown

psiphon/net.go

@@ -179,6 +179,9 @@ type HasIPv6RouteGetter interface {
 // - "WIRED" for a wired network
 // - "VPN" for a VPN network
 // - "UNKNOWN" for when the network type cannot be determined
+//
+// Note that the functions psiphon.GetNetworkType, psiphon.getInproxyNetworkType,
+// and inproxy.GetNetworkType must all be updated when new network types are added.
 type NetworkIDGetter interface {
 	GetNetworkID() string
 }

psiphon/utils.go

@@ -288,14 +288,17 @@ func GetNetworkType(networkID string) string {
 	// check for and use the common network type prefixes currently used in
 	// NetworkIDGetter implementations.
 
-	if strings.HasPrefix(networkID, "VPN") {
-		return "VPN"
-	}
 	if strings.HasPrefix(networkID, "WIFI") {
 		return "WIFI"
 	}
 	if strings.HasPrefix(networkID, "MOBILE") {
 		return "MOBILE"
 	}
+	if strings.HasPrefix(networkID, "WIRED") {
+		return "WIRED"
+	}
+	if strings.HasPrefix(networkID, "VPN") {
+		return "VPN"
+	}
 	return "UNKNOWN"
 }