Add missing output files for MPLS/ICMP extensions capture file

Add the test cases accordingly.
Complete Hannes's commit fad6704f63f034e6e678e466c4094054527fa82d.

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 0c652e29663a0f41535e4000b6e3cab28aa2b52b..97cd83b89212e7f88b71ee8a32aeabfc7534f2bd 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -51,6 +51,8 @@ lspping-fec-ldp-vv lspping-fec-ldp.pcap lspping-fec-ldp-vv.out -t -vv
 lspping-fec-rsvp    lspping-fec-rsvp.pcap lspping-fec-rsvp.out -t
 lspping-fec-rsvp-v  lspping-fec-rsvp.pcap lspping-fec-rsvp-v.out -t -v
 lspping-fec-rsvp-vv lspping-fec-rsvp.pcap lspping-fec-rsvp-vv.out -t -vv
 lspping-fec-rsvp    lspping-fec-rsvp.pcap lspping-fec-rsvp.out -t
 lspping-fec-rsvp-v  lspping-fec-rsvp.pcap lspping-fec-rsvp-v.out -t -v
 lspping-fec-rsvp-vv lspping-fec-rsvp.pcap lspping-fec-rsvp-vv.out -t -vv

+mpls-traceroute   mpls-traceroute.pcap mpls-traceroute.out -t
+mpls-traceroute-v mpls-traceroute.pcap mpls-traceroute-v.out -t -v

 
 # OSPF tests
 ospf-gmpls     ospf-gmpls.pcap                         ospf-gmpls.out          -t -v
 
 # OSPF tests
 ospf-gmpls     ospf-gmpls.pcap                         ospf-gmpls.out          -t -v

diff --git a/tests/mpls-traceroute-v.out b/tests/mpls-traceroute-v.out
new file mode 100644 (file)
index 0000000..b70c2e3
--- /dev/null
+++ b/tests/mpls-traceroute-v.out
@@ -0,0 +1,81 @@
+MPLS (label 100704, exp 0, [S], ttl 1)
+       IP (tos 0x0, ttl 1, id 42316, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33435: UDP, length 12
+IP (tos 0x0, ttl 255, id 5014, offset 0, flags [DF], proto ICMP (1), length 168)
+    10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+       IP (tos 0x0, ttl 1, id 42316, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33435: UDP, length 12
+       MPLS extension v2, checksum 0xc55f (correct), length 12
+         MPLS Stack Entry Object (1), Class-Type: 1, length 8
+           label 100704, exp 0, [S], ttl 1
+MPLS (label 100704, exp 0, [S], ttl 1)
+       IP (tos 0x0, ttl 1, id 42317, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33436: UDP, length 12
+IP (tos 0x0, ttl 255, id 5015, offset 0, flags [DF], proto ICMP (1), length 168)
+    10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+       IP (tos 0x0, ttl 1, id 42317, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33436: UDP, length 12
+       MPLS extension v2, checksum 0xc55f (correct), length 12
+         MPLS Stack Entry Object (1), Class-Type: 1, length 8
+           label 100704, exp 0, [S], ttl 1
+MPLS (label 100704, exp 0, [S], ttl 1)
+       IP (tos 0x0, ttl 1, id 42318, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33437: UDP, length 12
+IP (tos 0x0, ttl 255, id 5016, offset 0, flags [DF], proto ICMP (1), length 168)
+    10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+       IP (tos 0x0, ttl 1, id 42318, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33437: UDP, length 12
+       MPLS extension v2, checksum 0xc55f (correct), length 12
+         MPLS Stack Entry Object (1), Class-Type: 1, length 8
+           label 100704, exp 0, [S], ttl 1
+MPLS (label 100704, exp 0, [S], ttl 2)
+       IP (tos 0x0, ttl 2, id 42319, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33438: UDP, length 12
+IP (tos 0x0, ttl 254, id 59166, offset 0, flags [DF], proto ICMP (1), length 168)
+    10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+       IP (tos 0x0, ttl 1, id 42319, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33438: UDP, length 12
+       MPLS extension v2, checksum 0xc4e4 (correct), length 12
+         MPLS Stack Entry Object (1), Class-Type: 1, length 8
+           label 102672, exp 0, [S], ttl 1
+MPLS (label 100704, exp 0, [S], ttl 2)
+       IP (tos 0x0, ttl 2, id 42320, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33439: UDP, length 12
+IP (tos 0x0, ttl 254, id 59167, offset 0, flags [DF], proto ICMP (1), length 168)
+    10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+       IP (tos 0x0, ttl 1, id 42320, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33439: UDP, length 12
+       MPLS extension v2, checksum 0xc4e4 (correct), length 12
+         MPLS Stack Entry Object (1), Class-Type: 1, length 8
+           label 102672, exp 0, [S], ttl 1
+MPLS (label 100704, exp 0, [S], ttl 2)
+       IP (tos 0x0, ttl 2, id 42321, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33440: UDP, length 12
+IP (tos 0x0, ttl 254, id 59168, offset 0, flags [DF], proto ICMP (1), length 168)
+    10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+       IP (tos 0x0, ttl 1, id 42321, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33440: UDP, length 12
+       MPLS extension v2, checksum 0xc4e4 (correct), length 12
+         MPLS Stack Entry Object (1), Class-Type: 1, length 8
+           label 102672, exp 0, [S], ttl 1
+MPLS (label 100704, exp 0, [S], ttl 3)
+       IP (tos 0x0, ttl 3, id 42322, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33441: UDP, length 12
+IP (tos 0x0, ttl 253, id 50599, offset 0, flags [DF], proto ICMP (1), length 56)
+    12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33441 unreachable, length 36
+       IP (tos 0x0, ttl 1, id 42322, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33441: UDP, length 12
+MPLS (label 100704, exp 0, [S], ttl 3)
+       IP (tos 0x0, ttl 3, id 42323, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33442: UDP, length 12
+IP (tos 0x0, ttl 253, id 50600, offset 0, flags [DF], proto ICMP (1), length 56)
+    12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33442 unreachable, length 36
+       IP (tos 0x0, ttl 1, id 42323, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33442: UDP, length 12
+MPLS (label 100704, exp 0, [S], ttl 3)
+       IP (tos 0x0, ttl 3, id 42324, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33443: UDP, length 12
+IP (tos 0x0, ttl 253, id 50601, offset 0, flags [DF], proto ICMP (1), length 56)
+    12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33443 unreachable, length 36
+       IP (tos 0x0, ttl 1, id 42324, offset 0, flags [none], proto UDP (17), length 40)
+    12.4.4.4.42315 > 12.1.1.1.33443: UDP, length 12

diff --git a/tests/mpls-traceroute.out b/tests/mpls-traceroute.out
new file mode 100644 (file)
index 0000000..fe8c116
--- /dev/null
+++ b/tests/mpls-traceroute.out
@@ -0,0 +1,18 @@
+MPLS (label 100704, exp 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33435: UDP, length 12
+IP 10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+MPLS (label 100704, exp 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33436: UDP, length 12
+IP 10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+MPLS (label 100704, exp 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33437: UDP, length 12
+IP 10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+MPLS (label 100704, exp 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33438: UDP, length 12
+IP 10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+MPLS (label 100704, exp 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33439: UDP, length 12
+IP 10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+MPLS (label 100704, exp 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33440: UDP, length 12
+IP 10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
+MPLS (label 100704, exp 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33441: UDP, length 12
+IP 12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33441 unreachable, length 36
+MPLS (label 100704, exp 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33442: UDP, length 12
+IP 12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33442 unreachable, length 36
+MPLS (label 100704, exp 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33443: UDP, length 12
+IP 12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33443 unreachable, length 36