diff options
| author | ckishimo <carles.kishimoto@gmail.com> | 2019-08-23 10:46:39 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-05-25 16:43:42 +0200 |
| commit | 586e9b77209d079dec43284b48883dcfacb66a33 (patch) | |
| tree | f252ebff2b65bf8aaca20203ee87775e9d0c58a9 /tests | |
| parent | 44d21c36a135710261a1ae9733f12bf9ef9c2aa6 (diff) | |
| download | tcpdump-586e9b77209d079dec43284b48883dcfacb66a33.tar.gz | |
IS-IS: Add LAN Adjacency Segment Identifier subTLV
Adapted from GitHub pull request #798.
Print " (invalid)" when combinations of V-Flag and L-Flag are invalid.
Update comments (draft -> RFC).
Remove some ND_TCHECK_LEN because GET_ use.
Update the output of isis_sid test because commit
b09710dfcdd50251efd487e800cd1b9fd01eaf96 updated the output format
of the IS-IS dissector.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/TESTLIST | 1 | ||||
| -rw-r--r-- | tests/isis_cap_tlv.out | 21 | ||||
| -rw-r--r-- | tests/isis_sid.out | 99 | ||||
| -rw-r--r-- | tests/isis_sid.pcap | bin | 0 -> 556 bytes |
4 files changed, 115 insertions, 6 deletions
diff --git a/tests/TESTLIST b/tests/TESTLIST index 818a0845..2cd4abb9 100644 --- a/tests/TESTLIST +++ b/tests/TESTLIST @@ -319,6 +319,7 @@ isis_sr-v isis_sr.pcapng isis_sr.out -v # isis-seg-fault-1-v is now conditionally handled by isis-seg-fault-1-v.sh isis-seg-fault-2-v isis-seg-fault-2.pcapng isis-seg-fault-2-v.out -v isis-seg-fault-3-v isis-seg-fault-3.pcapng isis-seg-fault-3-v.out -v +isis_sid isis_sid.pcap isis_sid.out -v # RSVP tests rsvp_infloop-v rsvp-infinite-loop.pcap rsvp_infloop-v.out -v diff --git a/tests/isis_cap_tlv.out b/tests/isis_cap_tlv.out index e47f28b6..1ffdef4c 100644 --- a/tests/isis_cap_tlv.out +++ b/tests/isis_cap_tlv.out @@ -35,8 +35,11 @@ Reservable link bandwidth subTLV #10, length: 4, 1000.000 Mbps Maximum link bandwidth subTLV #9, length: 4, 1000.000 Mbps Administrative groups subTLV #3, length: 4, 0x00000000 - unknown subTLV #32, length: 11 - 0x0000: 3000 0192 0168 0002 0000 12 + LAN Adjacency Segment Identifier subTLV #32, length: 11 + Flags: [Value, Local significance] + Weight: 0 + Neighbor System-ID: 0192.0168.0002 + Label: 18 IS Neighbor: 0192.0168.0003.02, Metric: 63, sub-TLVs present (81) IPv4 interface address subTLV #6, length: 4, 10.0.13.1 Link Local/Remote Identifier subTLV #4, length: 8, 0x00000182, 0x00000000 @@ -52,8 +55,11 @@ Reservable link bandwidth subTLV #10, length: 4, 1000.000 Mbps Maximum link bandwidth subTLV #9, length: 4, 1000.000 Mbps Administrative groups subTLV #3, length: 4, 0x00000000 - unknown subTLV #32, length: 11 - 0x0000: 3000 0192 0168 0003 0000 10 + LAN Adjacency Segment Identifier subTLV #32, length: 11 + Flags: [Value, Local significance] + Weight: 0 + Neighbor System-ID: 0192.0168.0003 + Label: 16 Extended IS Reachability TLV #22, length: 92 IS Neighbor: 0192.0168.0004.02, Metric: 63, sub-TLVs present (81) IPv4 interface address subTLV #6, length: 4, 10.0.14.1 @@ -70,8 +76,11 @@ Reservable link bandwidth subTLV #10, length: 4, 1000.000 Mbps Maximum link bandwidth subTLV #9, length: 4, 1000.000 Mbps Administrative groups subTLV #3, length: 4, 0x00000000 - unknown subTLV #32, length: 11 - 0x0000: 3000 0192 0168 0004 0000 11 + LAN Adjacency Segment Identifier subTLV #32, length: 11 + Flags: [Value, Local significance] + Weight: 0 + Neighbor System-ID: 0192.0168.0004 + Label: 17 IPv4 Internal Reachability TLV #128, length: 60 IPv4 prefix: 10.0.12.0/24, Distribution: up, Metric: 10, Internal IPv4 prefix: 10.0.13.0/24, Distribution: up, Metric: 63, Internal diff --git a/tests/isis_sid.out b/tests/isis_sid.out new file mode 100644 index 00000000..e5799d0b --- /dev/null +++ b/tests/isis_sid.out @@ -0,0 +1,99 @@ + 1 12:36:55.841195 IS-IS, length 495 + L2 LSP, hlen: 27, v: 1, pdu-v: 1, sys-id-len: 6 (0), max-area: 3 (0) + lsp-id: 0192.0168.0001.00-00, seq: 0x0000000b, lifetime: 1196s + chksum: 0xc074 (incorrect should be 0x3cf5), PDU length: 495, Flags: [ L2 IS ] + Area address(es) TLV #1, length: 4 + Area address (length: 3): 49.0002 + LSP Buffersize TLV #14, length: 2 + LSP Buffersize: 1492 + Protocols supported TLV #129, length: 2 + NLPID(s): IPv4 (0xcc), IPv6 (0x8e) + Traffic Engineering Router ID TLV #134, length: 4 + Traffic Engineering Router ID: 192.168.0.1 + IPv4 Interface address(es) TLV #132, length: 4 + IPv4 interface address: 192.168.0.1 + Hostname TLV #137, length: 9 + Hostname: vmx-18-r1 + IS Reachability TLV #2, length: 34 + IsNotVirtual + IS Neighbor: 0192.0168.0002.02, Default Metric: 10, Internal + IS Neighbor: 0192.0168.0003.02, Default Metric: 63, Internal + IS Neighbor: 0192.0168.0004.02, Default Metric: 63, Internal + Extended IS Reachability TLV #22, length: 184 + IS Neighbor: 0192.0168.0002.02, Metric: 10, sub-TLVs present (81) + IPv4 interface address subTLV #6, length: 4, 10.0.12.1 + Link Local/Remote Identifier subTLV #4, length: 8, 0x00000180, 0x00000000 + Unreserved bandwidth subTLV #11, length: 32 + TE-Class 0: 1000.000 Mbps + TE-Class 1: 1000.000 Mbps + TE-Class 2: 1000.000 Mbps + TE-Class 3: 1000.000 Mbps + TE-Class 4: 1000.000 Mbps + TE-Class 5: 1000.000 Mbps + TE-Class 6: 1000.000 Mbps + TE-Class 7: 1000.000 Mbps + Reservable link bandwidth subTLV #10, length: 4, 1000.000 Mbps + Maximum link bandwidth subTLV #9, length: 4, 1000.000 Mbps + Administrative groups subTLV #3, length: 4, 0x00000000 + LAN Adjacency Segment Identifier subTLV #32, length: 11 + Flags: [Value, Local significance] + Weight: 0 + Neighbor System-ID: 0192.0168.0002 + Label: 18 + IS Neighbor: 0192.0168.0003.02, Metric: 63, sub-TLVs present (81) + IPv4 interface address subTLV #6, length: 4, 10.0.13.1 + Link Local/Remote Identifier subTLV #4, length: 8, 0x00000182, 0x00000000 + Unreserved bandwidth subTLV #11, length: 32 + TE-Class 0: 1000.000 Mbps + TE-Class 1: 1000.000 Mbps + TE-Class 2: 1000.000 Mbps + TE-Class 3: 1000.000 Mbps + TE-Class 4: 1000.000 Mbps + TE-Class 5: 1000.000 Mbps + TE-Class 6: 1000.000 Mbps + TE-Class 7: 1000.000 Mbps + Reservable link bandwidth subTLV #10, length: 4, 1000.000 Mbps + Maximum link bandwidth subTLV #9, length: 4, 1000.000 Mbps + Administrative groups subTLV #3, length: 4, 0x00000000 + LAN Adjacency Segment Identifier subTLV #32, length: 11 + Flags: [Value, Local significance] + Weight: 0 + Neighbor System-ID: 0192.0168.0003 + Label: 16 + Extended IS Reachability TLV #22, length: 92 + IS Neighbor: 0192.0168.0004.02, Metric: 63, sub-TLVs present (81) + IPv4 interface address subTLV #6, length: 4, 10.0.14.1 + Link Local/Remote Identifier subTLV #4, length: 8, 0x00000183, 0x00000000 + Unreserved bandwidth subTLV #11, length: 32 + TE-Class 0: 1000.000 Mbps + TE-Class 1: 1000.000 Mbps + TE-Class 2: 1000.000 Mbps + TE-Class 3: 1000.000 Mbps + TE-Class 4: 1000.000 Mbps + TE-Class 5: 1000.000 Mbps + TE-Class 6: 1000.000 Mbps + TE-Class 7: 1000.000 Mbps + Reservable link bandwidth subTLV #10, length: 4, 1000.000 Mbps + Maximum link bandwidth subTLV #9, length: 4, 1000.000 Mbps + Administrative groups subTLV #3, length: 4, 0x00000000 + LAN Adjacency Segment Identifier subTLV #32, length: 11 + Flags: [Value, Local significance] + Weight: 0 + Neighbor System-ID: 0192.0168.0004 + Label: 17 + IPv4 Internal Reachability TLV #128, length: 60 + IPv4 prefix: 10.0.12.0/24, Distribution: up, Metric: 10, Internal + IPv4 prefix: 10.0.13.0/24, Distribution: up, Metric: 63, Internal + IPv4 prefix: 10.0.14.0/24, Distribution: up, Metric: 63, Internal + IPv4 prefix: 172.16.11.0/24, Distribution: up, Metric: 63, Internal + IPv4 prefix: 192.168.0.1/32, Distribution: up, Metric: 63, Internal + Extended IPv4 Reachability TLV #135, length: 41 + IPv4 prefix: 10.0.12.0/24, Distribution: up, Metric: 10 + IPv4 prefix: 10.0.13.0/24, Distribution: up, Metric: 63 + IPv4 prefix: 10.0.14.0/24, Distribution: up, Metric: 63 + IPv4 prefix: 172.16.11.0/24, Distribution: up, Metric: 63 + IPv4 prefix: 192.168.0.1/32, Distribution: up, Metric: 63 + IS-IS Router Capability TLV #242, length: 8 + Router-ID 192.168.0.1, Flags [S bit, D bit] + unknown subTLV #19, length: 1 + 0x0000: 00 diff --git a/tests/isis_sid.pcap b/tests/isis_sid.pcap Binary files differnew file mode 100644 index 00000000..f2c8756e --- /dev/null +++ b/tests/isis_sid.pcap |