Update the test cases due to the change in address formats

Author: nirui

application/commands/address.go

@@ -61,6 +61,11 @@ const (
 	HostNameAddr AddressType = 0x03
 )
 
+// Address size limits
+const (
+	MaxHostNameLen = 255
+)
+
 // Address data
 type Address struct {
 	port uint16
@@ -197,7 +202,7 @@ func (a Address) Marshal(b []byte) (int, error) {
 		}
 		b[0] = byte(a.port >> 8)
 		b[1] = byte(a.port)
-		b[2] = byte(LoopbackAddr << 6)
+		b[2] = byte(LoopbackAddr)
 		return 3, nil
 
 	case IPv4Addr:
@@ -206,7 +211,7 @@ func (a Address) Marshal(b []byte) (int, error) {
 		}
 		b[0] = byte(a.port >> 8)
 		b[1] = byte(a.port)
-		b[2] = byte(IPv4Addr << 6)
+		b[2] = byte(IPv4Addr)
 		copy(b[3:], a.data)
 		return 7, nil
 
@@ -216,25 +221,24 @@ func (a Address) Marshal(b []byte) (int, error) {
 		}
 		b[0] = byte(a.port >> 8)
 		b[1] = byte(a.port)
-		b[2] = byte(IPv6Addr << 6)
+		b[2] = byte(IPv6Addr)
 		copy(b[3:], a.data)
-
 		return 19, nil
 
 	case HostNameAddr:
 		hLen := len(a.data)
-		if hLen > 0x3f {
+		if hLen > MaxHostNameLen {
 			panic("Host name cannot longer than 0x3f")
 		}
-		if bLen < hLen+3 {
+		if bLen < hLen+4 {
 			return 0, ErrAddressMarshalBufferTooSmall
 		}
 		b[0] = byte(a.port >> 8)
 		b[1] = byte(a.port)
-		b[2] = byte(HostNameAddr << 6)
-		b[2] |= byte(hLen)
-		copy(b[3:], a.data)
-		return hLen + 3, nil
+		b[2] = byte(HostNameAddr)
+		b[3] = byte(hLen)
+		copy(b[4:], a.data)
+		return hLen + 4, nil
 
 	default:
 		return 0, ErrAddressInvalidAddressType

application/commands/address_test.go

@@ -95,7 +95,7 @@ func TestParseAddress(t *testing.T) {
 	testParseAddress(
 		t,
 		[]byte{
-			0x04, 0x1e, 0x40,
+			0x04, 0x1e, byte(IPv4Addr),
 			0x7f, 0x00, 0x00, 0x01,
 		},
 		make([]byte, 4), IPv4Addr, []byte{0x7f, 0x00, 0x00, 0x01}, 1054,
@@ -104,7 +104,7 @@ func TestParseAddress(t *testing.T) {
 	testParseAddress(
 		t,
 		[]byte{
-			0x04, 0x1e, 0x80,
+			0x04, 0x1e, byte(IPv6Addr),
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x7f, 0x00, 0x00, 0x01,
 		},
@@ -116,7 +116,8 @@ func TestParseAddress(t *testing.T) {
 	testParseAddress(
 		t,
 		[]byte{
-			0x04, 0x1e, 0xff,
+			0x04, 0x1e, byte(HostNameAddr), 73,
+			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
@@ -125,7 +126,8 @@ func TestParseAddress(t *testing.T) {
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'1', '2', '3',
 		},
-		make([]byte, 63), HostNameAddr, []byte{
+		make([]byte, 73), HostNameAddr, []byte{
+			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
@@ -134,5 +136,5 @@ func TestParseAddress(t *testing.T) {
 			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 			'1', '2', '3',
 		}, 1054,
-		strings.Repeat("ABCDEFGHIJ", 6)+"123:1054")
+		strings.Repeat("ABCDEFGHIJ", 7)+"123:1054")
 }

ui/commands/address.js

@@ -46,7 +46,7 @@ export class Address {
     portNum <<= 8;
     portNum |= readed[1];
 
-    addrType = readed[2] >> 6;
+    addrType = readed[2];
 
     switch (addrType) {
       case LOOPBACK:
@@ -61,7 +61,8 @@ export class Address {
         break;
 
       case HOSTNAME:
-        addrData = await reader.readN(rd, 0x3f & readed[2]);
+        addrData = await reader.readN(rd, 1);
+        addrData = await reader.readN(rd, addrData[0]);
         break;
 
       default:

ui/commands/address_test.js

@@ -82,7 +82,7 @@ describe("Address", () => {
   it("Address HostName", async () => {
     let addr = new address.Address(
         address.HOSTNAME,
-        new Uint8Array(["v", "a", "g", "u", "l", "1", "2", "3"]),
+        new Uint8Array(['n', 'i', 'r', 'u', 'i', 'o', 'r', 'g', 1, 2, 3]),
         8080,
       ),
       buf = addr.buffer();