Treat transport codes and path as their own segments

src/packet.ts

@@ -119,48 +119,68 @@ export class Packet implements IPacket {
 
     this.structure = [
       /* Header segment */
-      { name: "header", data: new Uint8Array([this.header, this.pathLength, ...this.path]), fields: [
+      {
-        /* Header flags */
+        name: "header",
-        {
+        data: new Uint8Array([this.header]),
-          name: "flags",
+        fields: [
-          type: FieldType.BITS,
+          /* Header flags */
-          size: 1,
+          {
-          bits: [
+            name: "flags",
-            { name: "payload version", size: 2 },
+            type: FieldType.BITS,
-            { name: "payload type",    size: 4 },
+            size: 1,
-            { name: "route type",      size: 2 },
+            bits: [
-          ]
+              { name: "payload version", size: 2 },
-        },
+              { name: "payload type",    size: 4 },
-        /* Transport codes */
+              { name: "route type",      size: 2 },
-        ...(Packet.hasTransportCodes(this.routeType) ? [
+            ]
+          },
+        ]
+      },
+
+      /* Transport codes */
+      ...(Packet.hasTransportCodes(this.routeType) ? [{
+        name: "transport codes",
+        data: new Uint8Array([
+          (this.transport![0] >> 8) & 0xff, this.transport![0] & 0xff,
+          (this.transport![1] >> 8) & 0xff, this.transport![1] & 0xff
+        ]),
+        fields: [
           {
             name: "transport code 1",
             type: FieldType.UINT16_BE,
-            size: 2
+            size: 2,
+            value: this.transport![0]
           },
           {
             name: "transport code 2",
             type: FieldType.UINT16_BE,
-            size: 2
+            size: 2,
+            value: this.transport![1]
           },
-        ] : []),
+        ]
+      }] : []),
 
-        /* Path length and hashes */
+      /* Path length and hashes */
-        {
+      {
-          name: "path length",
+        name: "path",
-          type: FieldType.UINT8,
+        data: new Uint8Array([this.pathLength, ...this.path]),
-          size: 1,
+        fields: [
-          bits: [
+          {
-            { name: "path hash size",  size: 2 },
+            name: "path length",
-            { name: "path hash count", size: 6 },
+            type: FieldType.UINT8,
-          ]
+            size: 1,
-        },
+            bits: [
-        {
+              { name: "path hash size",  size: 2 },
-          name: "path hashes",
+              { name: "path hash count", size: 6 },
-          type: pathHashType,
+            ]
-          size: this.path.length
+          },
-        }
+          {
-      ]},
+            name: "path hashes",
+            type: pathHashType,
+            size: this.path.length
+          }
+        ]
+      },
     ]
   }