Small fixes to parsing ports

multiaddr_test.go

@@ -83,6 +83,7 @@ func TestConstructFails(t *testing.T) {
 		"/ip4/127.0.0.1/p2p/tcp",
 		"/unix",
 		"/ip4/1.2.3.4/tcp/80/unix",
+		"/ip4/1.2.3.4/tcp/-1",
 		"/ip4/127.0.0.1/tcp/9090/http/p2p-webcrt-direct",
 		"/",
 		"",

transcoders.go

@@ -132,21 +132,18 @@
 var TranscoderPort = NewTranscoderFromFunctions(portStB, portBtS, nil)
 
 func portStB(s string) ([]byte, error) {
-	i, err := strconv.Atoi(s)
+	i, err := strconv.ParseUint(s, 10, 16)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse port addr: %s", err)
 	}
-	if i >= 65536 {
-		return nil, fmt.Errorf("failed to parse port addr: %s", "greater than 65536")
-	}
 	b := make([]byte, 2)
 	binary.BigEndian.PutUint16(b, uint16(i))
 	return b, nil
 }
 
 func portBtS(b []byte) (string, error) {
 	i := binary.BigEndian.Uint16(b)
-	return strconv.Itoa(int(i)), nil
+	return strconv.FormatUint(uint64(i), 10), nil
 }
 
 var TranscoderOnion = NewTranscoderFromFunctions(onionStB, onionBtS, nil)
@@ -167,15 +164,12 @@
 	}
 
 	// onion port number
-	i, err := strconv.Atoi(addr[1])
+	i, err := strconv.ParseUint(addr[1], 10, 16)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse onion addr: %s", err)
 	}
-	if i >= 65536 {
-		return nil, fmt.Errorf("failed to parse onion addr: %s", "port greater than 65536")
-	}
-	if i < 1 {
-		return nil, fmt.Errorf("failed to parse onion addr: %s", "port less than 1")
+	if i == 0 {
+		return nil, fmt.Errorf("failed to parse onion addr: %s", "non-zero port")
 	}
 
 	onionPortBytes := make([]byte, 2)
@@ -189,7 +183,10 @@
 func onionBtS(b []byte) (string, error) {
 	addr := strings.ToLower(base32.StdEncoding.EncodeToString(b[0:10]))
 	port := binary.BigEndian.Uint16(b[10:12])
-	return addr + ":" + strconv.Itoa(int(port)), nil
+	if port == 0 {
+		return "", fmt.Errorf("failed to parse onion addr: %s", "non-zero port")
+	}
+	return addr + ":" + strconv.FormatUint(uint64(port), 10), nil
 }
 
 var TranscoderOnion3 = NewTranscoderFromFunctions(onion3StB, onion3BtS, nil)
@@ -210,15 +207,12 @@
 	}
 
 	// onion port number
-	i, err := strconv.Atoi(addr[1])
+	i, err := strconv.ParseUint(addr[1], 10, 16)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse onion addr: %s", err)
 	}
-	if i >= 65536 {
-		return nil, fmt.Errorf("failed to parse onion addr: %s", "port greater than 65536")
-	}
-	if i < 1 {
-		return nil, fmt.Errorf("failed to parse onion addr: %s", "port less than 1")
+	if i == 0 {
+		return nil, fmt.Errorf("failed to parse onion addr: %s", "non-zero port")
 	}
 
 	onionPortBytes := make([]byte, 2)
@@ -232,7 +226,10 @@
 func onion3BtS(b []byte) (string, error) {
 	addr := strings.ToLower(base32.StdEncoding.EncodeToString(b[0:35]))
 	port := binary.BigEndian.Uint16(b[35:37])
-	str := addr + ":" + strconv.Itoa(int(port))
+	if port < 1 {
+		return "", fmt.Errorf("failed to parse onion addr: %s", "port less than 1")
+	}
+	str := addr + ":" + strconv.FormatUint(uint64(port), 10)
 	return str, nil
 }