EIGRP: Get the packet header fields right.

In the spec the packet diagram instead of a 32-bit AS number shows a
16-bit virtual router ID followed by a 16-bit AS number, implement
that. Also add two missing flag values and use bittok2str() to print
the bitmask. Lose a stale comment and update some tests.

diff --git a/print-eigrp.c b/print-eigrp.c
index 136efd04b83b9e7cc54367b11ac40415b7c72af9..1bcdf1793e36bf0341152e18c5c1e3ea38d2b754 100644 (file)
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -43,7 +43,8 @@ struct eigrp_common_header {
     nd_uint32_t flags;
     nd_uint32_t seq;
     nd_uint32_t ack;
-    nd_uint32_t asn;
+    nd_uint16_t vrid;
+    nd_uint16_t asn;
 };
 
 #define        EIGRP_VERSION                        2
@@ -68,6 +69,8 @@ static const struct tok eigrp_opcode_values[] = {
 static const struct tok eigrp_common_header_flag_values[] = {
     { 0x01, "Init" },
     { 0x02, "Conditionally Received" },
+    { 0x04, "Restart" },
+    { 0x08, "End-of-Table" },
     { 0, NULL}
 };
 
@@ -259,18 +262,19 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
     }
     tlen=len-sizeof(struct eigrp_common_header);
 
-    /* FIXME print other header info */
-    ND_PRINT("\n\tEIGRP v%u, opcode: %s (%u), chksum: 0x%04x, Flags: [%s]\n\tseq: 0x%08x, ack: 0x%08x, AS: %u, length: %u",
+    ND_PRINT("\n\tEIGRP v%u, opcode: %s (%u), chksum: 0x%04x, Flags: [%s]"
+             "\n\tseq: 0x%08x, ack: 0x%08x, VRID: %u, AS: %u, length: %u",
            GET_U_1(eigrp_com_header->version),
            tok2str(eigrp_opcode_values, "unknown, type: %u",GET_U_1(eigrp_com_header->opcode)),
            GET_U_1(eigrp_com_header->opcode),
            GET_BE_U_2(eigrp_com_header->checksum),
-           tok2str(eigrp_common_header_flag_values,
+           bittok2str(eigrp_common_header_flag_values,
                    "none",
                    GET_BE_U_4(eigrp_com_header->flags)),
            GET_BE_U_4(eigrp_com_header->seq),
            GET_BE_U_4(eigrp_com_header->ack),
-           GET_BE_U_4(eigrp_com_header->asn),
+           GET_BE_U_2(eigrp_com_header->vrid),
+           GET_BE_U_2(eigrp_com_header->asn),
            tlen);
 
     tptr+=sizeof(struct eigrp_common_header);

diff --git a/tests/eigrp-tlv-oobr.out b/tests/eigrp-tlv-oobr.out
index 250e2c4cf1be245ef588b280947b9e2127e3d49c..b84a3be7d96215f34660dde2881448aae6e7d1b3 100644 (file)
--- a/tests/eigrp-tlv-oobr.out
+++ b/tests/eigrp-tlv-oobr.out
@@ -1,7 +1,7 @@
     1  00:00:00.000000 c2:02:73:fe:00:00 > 01:00:5e:00:00:0a, ethertype IPv4 (0x0800), length 65535: (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 65521)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 65481
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 65481
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
            0x0000:  0100 0100 0000 000f

diff --git a/tests/eigrp1-v.out b/tests/eigrp1-v.out
index 2930d7458a0cc04f83029a6446e97a1fac157c81..893b2da6b604dee1dfef79e36531a1d4ee6edc8d 100644 (file)
--- a/tests/eigrp1-v.out
+++ b/tests/eigrp1-v.out
@@ -1,7 +1,7 @@
     1  00:27:41.907937 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -9,7 +9,7 @@
     2  00:27:46.596218 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -17,7 +17,7 @@
     3  00:27:51.016481 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -25,7 +25,7 @@
     4  00:27:55.372743 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -33,7 +33,7 @@
     5  00:28:00.161048 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -41,7 +41,7 @@
     6  00:28:04.825321 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -49,7 +49,7 @@
     7  00:28:09.092016 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -57,7 +57,7 @@
     8  00:28:13.485851 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -65,7 +65,7 @@
     9  00:28:15.983324 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -73,7 +73,7 @@
    10  00:28:15.998024 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -81,7 +81,7 @@
    11  00:28:16.006026 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -89,19 +89,19 @@
    12  00:28:16.006029 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Update (1), chksum: 0xfd82, Flags: [Init]
-       seq: 0x00000017, ack: 0x00000000, AS: 100, length: 0
+       seq: 0x00000017, ack: 0x00000000, VRID: 0, AS: 100, length: 0
    13  00:28:18.008523 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Update (1), chksum: 0xfd82, Flags: [Init]
-       seq: 0x00000017, ack: 0x00000000, AS: 100, length: 0
+       seq: 0x00000017, ack: 0x00000000, VRID: 0, AS: 100, length: 0
    14  00:28:18.016606 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Update (1), chksum: 0xfd6b, Flags: [Init]
-       seq: 0x00000017, ack: 0x00000017, AS: 100, length: 0
+       seq: 0x00000017, ack: 0x00000017, VRID: 0, AS: 100, length: 0
    15  00:28:18.024546 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 239)
     10.0.0.1 > 10.0.0.2: 
-       EIGRP v2, opcode: Update (1), chksum: 0x24b9, Flags: [none]
-       seq: 0x00000018, ack: 0x00000017, AS: 100, length: 199
+       EIGRP v2, opcode: Update (1), chksum: 0x24b9, Flags: [End-of-Table]
+       seq: 0x00000018, ack: 0x00000017, VRID: 0, AS: 100, length: 199
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.1.0/24, nexthop: self
              delay 25 ms, bandwidth 25600 Kbps, mtu 1500, hop 0, reliability 255, load 1
@@ -125,8 +125,8 @@
              delay 793 ms, bandwidth 256000 Kbps, mtu 1500, hop 3, reliability 255, load 1
    16  00:28:18.072623 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 154)
     10.0.0.2 > 10.0.0.1: 
-       EIGRP v2, opcode: Update (1), chksum: 0x7d9b, Flags: [none]
-       seq: 0x00000018, ack: 0x00000018, AS: 100, length: 114
+       EIGRP v2, opcode: Update (1), chksum: 0x7d9b, Flags: [End-of-Table]
+       seq: 0x00000018, ack: 0x00000018, VRID: 0, AS: 100, length: 114
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.2.0/24, nexthop: self
              delay 25 ms, bandwidth 25600 Kbps, mtu 1500, hop 0, reliability 255, load 1
@@ -142,11 +142,11 @@
    17  00:28:18.080553 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd7e, Flags: [none]
-       seq: 0x00000000, ack: 0x00000018, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000018, VRID: 0, AS: 100, length: 0
    18  00:28:18.080556 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 77)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xc352, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 37
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 37
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -158,7 +158,7 @@
    19  00:28:18.088800 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 125)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Update (1), chksum: 0xa2d8, Flags: [Conditionally Received]
-       seq: 0x00000019, ack: 0x00000000, AS: 100, length: 85
+       seq: 0x00000019, ack: 0x00000000, VRID: 0, AS: 100, length: 85
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.1.0/24, nexthop: self
              delay 42949672 ms, bandwidth 256000 Kbps, mtu 1500, hop 1, reliability 255, load 1
@@ -171,7 +171,7 @@
    20  00:28:18.096555 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 125)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Update (1), chksum: 0xa2c2, Flags: [none]
-       seq: 0x00000019, ack: 0x00000018, AS: 100, length: 85
+       seq: 0x00000019, ack: 0x00000018, VRID: 0, AS: 100, length: 85
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.1.0/24, nexthop: self
              delay 42949672 ms, bandwidth 256000 Kbps, mtu 1500, hop 1, reliability 255, load 1
@@ -184,11 +184,11 @@
    21  00:28:18.104539 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd7d, Flags: [none]
-       seq: 0x00000000, ack: 0x00000019, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000019, VRID: 0, AS: 100, length: 0
    22  00:28:18.112543 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 125)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Update (1), chksum: 0x9dd9, Flags: [none]
-       seq: 0x00000019, ack: 0x00000000, AS: 100, length: 85
+       seq: 0x00000019, ack: 0x00000000, VRID: 0, AS: 100, length: 85
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.2.0/24, nexthop: self
              delay 42949672 ms, bandwidth 256000 Kbps, mtu 1500, hop 1, reliability 255, load 1
@@ -201,11 +201,11 @@
    23  00:28:18.120746 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd7d, Flags: [none]
-       seq: 0x00000000, ack: 0x00000019, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000019, VRID: 0, AS: 100, length: 0
    24  00:28:20.558302 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -213,7 +213,7 @@
    25  00:28:21.006411 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -221,7 +221,7 @@
    26  00:28:25.305039 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -229,7 +229,7 @@
    27  00:28:25.881007 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -237,7 +237,7 @@
    28  00:28:30.197268 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -245,7 +245,7 @@
    29  00:28:30.245288 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -253,7 +253,7 @@
    30  00:28:35.017593 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -261,7 +261,7 @@
    31  00:28:35.063475 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -269,7 +269,7 @@
    32  00:28:39.391576 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -277,7 +277,7 @@
    33  00:28:39.479560 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -285,7 +285,7 @@
    34  00:28:43.730081 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -293,7 +293,7 @@
    35  00:28:44.416033 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -301,7 +301,7 @@
    36  00:28:48.424144 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -309,7 +309,7 @@
    37  00:28:48.792148 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -317,7 +317,7 @@
    38  00:28:52.696389 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -325,7 +325,7 @@
    39  00:28:53.264442 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -333,7 +333,7 @@
    40  00:28:57.392695 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -341,7 +341,7 @@
    41  00:28:58.136687 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -349,7 +349,7 @@
    42  00:29:02.019177 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -357,7 +357,7 @@
    43  00:29:02.507178 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -365,7 +365,7 @@
    44  00:29:06.427427 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -373,7 +373,7 @@
    45  00:29:07.267445 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -381,7 +381,7 @@
    46  00:29:11.399725 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -389,7 +389,7 @@
    47  00:29:11.983746 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -397,7 +397,7 @@
    48  00:29:15.957786 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -405,7 +405,7 @@
    49  00:29:16.310001 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -413,7 +413,7 @@
    50  00:29:20.512268 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -421,7 +421,7 @@
    51  00:29:20.840270 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -429,7 +429,7 @@
    52  00:29:24.752507 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -437,7 +437,7 @@
    53  00:29:25.624537 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8

diff --git a/tests/eigrp2-v.out b/tests/eigrp2-v.out
index 807a90c87d2130a60f2f22f815f50b4024ec602f..0335656cc127039ca586c09ae12a9e7f1f5403dc 100644 (file)
--- a/tests/eigrp2-v.out
+++ b/tests/eigrp2-v.out
@@ -1,7 +1,7 @@
     1  01:04:16.103886 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -9,7 +9,7 @@
     2  01:04:17.134010 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -17,7 +17,7 @@
     3  01:04:20.518585 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -25,7 +25,7 @@
     4  01:04:21.962280 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -33,7 +33,7 @@
     5  01:04:25.242510 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -41,7 +41,7 @@
     6  01:04:26.370559 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -49,7 +49,7 @@
     7  01:04:30.194834 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -57,7 +57,7 @@
     8  01:04:30.994865 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -65,7 +65,7 @@
     9  01:04:32.803002 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xf167, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 255, k2 255, k3 255, k4 255, k5 255
          Software Version TLV (0x0004), length: 8
@@ -73,7 +73,7 @@
    10  01:04:35.319118 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -81,7 +81,7 @@
    11  01:04:40.177355 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -89,7 +89,7 @@
    12  01:04:44.865678 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -97,7 +97,7 @@
    13  01:04:49.801931 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -105,7 +105,7 @@
    14  01:04:54.236229 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -113,7 +113,7 @@
    15  01:04:58.956522 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8

diff --git a/tests/eigrp3-v.out b/tests/eigrp3-v.out
index bcbee9077e67e3a804fcd2be40de592184c3aeb1..726208c20498c004dd5230f254588f3099661659 100644 (file)
--- a/tests/eigrp3-v.out
+++ b/tests/eigrp3-v.out
@@ -1,7 +1,7 @@
     1  00:48:32.630923 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -9,7 +9,7 @@
     2  00:48:36.963186 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -17,7 +17,7 @@
     3  00:48:37.431201 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -25,7 +25,7 @@
     4  00:48:41.271439 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -33,7 +33,7 @@
     5  00:48:42.243480 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -41,7 +41,7 @@
     6  00:48:46.179719 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -49,7 +49,7 @@
     7  00:48:46.875749 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -57,62 +57,62 @@
     8  00:48:48.687842 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Update (1), chksum: 0x7876, Flags: [none]
-       seq: 0x00000034, ack: 0x00000000, AS: 100, length: 28
+       seq: 0x00000034, ack: 0x00000000, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 42949672 ms, bandwidth 256000 Kbps, mtu 1500, hop 2, reliability 255, load 1
     9  00:48:48.699874 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd62, Flags: [none]
-       seq: 0x00000000, ack: 0x00000034, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000034, VRID: 0, AS: 100, length: 0
    10  00:48:48.711870 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Query (3), chksum: 0x5f7e, Flags: [none]
-       seq: 0x0000002e, ack: 0x00000000, AS: 100, length: 28
+       seq: 0x0000002e, ack: 0x00000000, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 42949672 ms, bandwidth 0 Kbps, mtu 1500, hop 0, reliability 0, load 0
    11  00:48:48.723843 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd68, Flags: [none]
-       seq: 0x00000000, ack: 0x0000002e, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x0000002e, VRID: 0, AS: 100, length: 0
    12  00:48:48.735845 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Query (3), chksum: 0x5f75, Flags: [none]
-       seq: 0x00000037, ack: 0x00000000, AS: 100, length: 28
+       seq: 0x00000037, ack: 0x00000000, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 42949672 ms, bandwidth 0 Kbps, mtu 1500, hop 0, reliability 0, load 0
    13  00:48:48.747867 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd5f, Flags: [none]
-       seq: 0x00000000, ack: 0x00000037, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000037, VRID: 0, AS: 100, length: 0
    14  00:48:48.795866 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Reply (4), chksum: 0x5f44, Flags: [none]
-       seq: 0x00000030, ack: 0x00000037, AS: 100, length: 28
+       seq: 0x00000030, ack: 0x00000037, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 42949672 ms, bandwidth 0 Kbps, mtu 1500, hop 0, reliability 0, load 0
    15  00:48:48.807846 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd66, Flags: [none]
-       seq: 0x00000000, ack: 0x00000030, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000030, VRID: 0, AS: 100, length: 0
    16  00:48:49.119868 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Reply (4), chksum: 0x5f46, Flags: [none]
-       seq: 0x00000039, ack: 0x00000030, AS: 100, length: 28
+       seq: 0x00000039, ack: 0x00000030, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 42949672 ms, bandwidth 0 Kbps, mtu 1500, hop 0, reliability 0, load 0
    17  00:48:49.131907 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd5d, Flags: [none]
-       seq: 0x00000000, ack: 0x00000039, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000039, VRID: 0, AS: 100, length: 0
    18  00:48:50.547977 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -120,7 +120,7 @@
    19  00:48:51.268008 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -128,7 +128,7 @@
    20  00:48:55.308281 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -136,7 +136,7 @@
    21  00:48:56.076302 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8

diff --git a/tests/eigrp4-v.out b/tests/eigrp4-v.out
index 6237a7448c2d600220d2bcb47c4d07292f4bdaf6..7ba6092f1342e310a86f86df6c86e24b22e11045 100644 (file)
--- a/tests/eigrp4-v.out
+++ b/tests/eigrp4-v.out
@@ -1,7 +1,7 @@
     1  00:41:22.355240 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -9,7 +9,7 @@
     2  00:41:24.453490 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -17,7 +17,7 @@
     3  00:41:26.929634 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -25,29 +25,29 @@
     4  00:41:28.705759 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Update (1), chksum: 0x0a7e, Flags: [none]
-       seq: 0x0000002d, ack: 0x00000000, AS: 100, length: 28
+       seq: 0x0000002d, ack: 0x00000000, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 281 ms, bandwidth 256000 Kbps, mtu 1500, hop 1, reliability 255, load 1
     5  00:41:28.705766 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Update (1), chksum: 0xa67a, Flags: [none]
-       seq: 0x0000002f, ack: 0x00000000, AS: 100, length: 28
+       seq: 0x0000002f, ack: 0x00000000, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 537 ms, bandwidth 256000 Kbps, mtu 1500, hop 2, reliability 255, load 1
     6  00:41:28.713764 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.1 > 10.0.0.2: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd69, Flags: [none]
-       seq: 0x00000000, ack: 0x0000002d, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x0000002d, VRID: 0, AS: 100, length: 0
     7  00:41:28.713767 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd67, Flags: [none]
-       seq: 0x00000000, ack: 0x0000002f, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x0000002f, VRID: 0, AS: 100, length: 0
     8  00:41:28.721729 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -55,18 +55,18 @@
     9  00:41:28.769731 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 68)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Update (1), chksum: 0x7878, Flags: [none]
-       seq: 0x00000032, ack: 0x00000000, AS: 100, length: 28
+       seq: 0x00000032, ack: 0x00000000, VRID: 0, AS: 100, length: 28
          IP Internal routes TLV (0x0102), length: 28
            IPv4 prefix:     192.168.4.0/24, nexthop: self
              delay 42949672 ms, bandwidth 256000 Kbps, mtu 1500, hop 2, reliability 255, load 1
    10  00:41:28.809749 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 40)
     10.0.0.2 > 10.0.0.1: 
        EIGRP v2, opcode: Hello (5), chksum: 0xfd64, Flags: [none]
-       seq: 0x00000000, ack: 0x00000032, AS: 100, length: 0
+       seq: 0x00000000, ack: 0x00000032, VRID: 0, AS: 100, length: 0
    11  00:41:31.739695 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -74,7 +74,7 @@
    12  00:41:33.453986 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -82,7 +82,7 @@
    13  00:41:36.315953 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -90,7 +90,7 @@
    14  00:41:37.822249 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.1 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8
@@ -98,7 +98,7 @@
    15  00:41:40.830453 IP (tos 0xc0, ttl 2, id 0, offset 0, flags [none], proto EIGRP (88), length 60)
     10.0.0.2 > 224.0.0.10: 
        EIGRP v2, opcode: Hello (5), chksum: 0xee68, Flags: [none]
-       seq: 0x00000000, ack: 0x00000000, AS: 100, length: 20
+       seq: 0x00000000, ack: 0x00000000, VRID: 0, AS: 100, length: 20
          General Parameters TLV (0x0001), length: 12
            holdtime: 15s, k1 1, k2 0, k3 1, k4 0, k5 0
          Software Version TLV (0x0004), length: 8