new test cases.

diff --git a/tests/alltests.sh b/tests/alltests.sh
new file mode 100644 (file)
index 0000000..7df2599
--- /dev/null
+++ b/tests/alltests.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+for i in *.sh
+do
+  if [ "X$i" = "Xalltests.sh" ] 
+  then 
+       continue;
+  fi
+  sh ./$i
+done 
+
+

diff --git a/tests/bgp_vpn_attrset.out b/tests/bgp_vpn_attrset.out
index 40577927dae8d7dc0ee2b67a116a4c7b3e8f6437..c826e7662c89a7c61b560d904bc60ddbf2f300cb 100644 (file)
--- a/tests/bgp_vpn_attrset.out
+++ b/tests/bgp_vpn_attrset.out
@@ -1,4 +1,4 @@
-IP (tos 0xc0, ttl  62, id 58628, offset 0, flags [none], length: 173) 12.4.4.4.2051 > 12.1.1.1.179: P [tcp sum ok] 3293077573:3293077694(121) ack 3348108582 win 16384 <nop,nop,timestamp 383131 890299>: BGP, length: 121
+IP (tos 0xc0, ttl  62, id 58628, offset 0, flags [none], proto 6, length: 173) 12.4.4.4.2051 > 12.1.1.1.179: P [tcp sum ok] 3293077573:3293077694(121) ack 3348108582 win 16384 <nop,nop,timestamp 383131 890299>: BGP, length: 121
        Update Message (2), length: 121
          Origin (1), length: 1, Flags [T]: IGP
          AS Path (2), length: 0, Flags [T]: empty

diff --git a/tests/bgp_vpn_attrset.sh b/tests/bgp_vpn_attrset.sh
index 28d57a906b3a72848db36903d53b2f2ca530eed0..c32872c83beab19d7037467ffe57b3979d4aa004 100755 (executable)
--- a/tests/bgp_vpn_attrset.sh
+++ b/tests/bgp_vpn_attrset.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo -n test bgp_vpn_attrset...
-if (../tcpdump -t -n -v -r bgp_vpn_attrset.pcap | diff -  bgp_vpn_attrset.out)
+if (../tcpdump -t -n -v -r bgp_vpn_attrset.pcap | diff -w -  bgp_vpn_attrset.out)
 then
        echo passed.
 else

diff --git a/tests/esp0.out b/tests/esp0.out
index 701da2b901dcdb1e2d0c38a65d8de65bd702cc37..2e235160177cee69f07ec194d7f57db2b3736895 100644 (file)
--- a/tests/esp0.out
+++ b/tests/esp0.out
@@ -1,8 +1,8 @@
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8)

diff --git a/tests/esp1.out b/tests/esp1.out
index b8a2c7c982ad96cdbf06491d1f1bc05b107cc0de..dbfeb29e221e01b1160fea4f8f250c92156a0806 100644 (file)
--- a/tests/esp1.out
+++ b/tests/esp1.out
@@ -1,8 +1,8 @@
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1280 (DF) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1536 (DF) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1792 (DF) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2048 (DF) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2304 (DF) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2560 (DF) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2816 (DF) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 3072 (DF) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1280 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1536 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1792 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2048 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2304 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2560 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2816 (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 3072 (ipip-proto-4)

diff --git a/tests/esp2.out b/tests/esp2.out
index bf7c480293b5b218bdd7a13b33243948a477ffa3..229b162f928ca1da740c21fb601a5f0bbbbb427f 100644 (file)
--- a/tests/esp2.out
+++ b/tests/esp2.out
@@ -1,8 +1,8 @@
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x1): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1280 (DF) (ipip-proto-4) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x2): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1536 (DF) (ipip-proto-4) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x3): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1792 (DF) (ipip-proto-4) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x4): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2048 (DF) (ipip-proto-4) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x5): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2304 (DF) (ipip-proto-4) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x6): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2560 (DF) (ipip-proto-4) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x7): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2816 (DF) (ipip-proto-4) (ipip-proto-4)
-192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8): 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x8): 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 3072 (DF) (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x1): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x1): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1280 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x2): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x2): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1536 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x3): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x3): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 1792 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x4): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x4): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2048 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x5): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x5): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2304 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x6): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x6): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2560 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x7): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x7): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 2816 (ipip-proto-4) (ipip-proto-4)
+IP 192.1.2.23 > 192.1.2.45: ESP(spi=0x12345678,seq=0x8): IP 192.1.2.23 > 192.0.1.1: ESP(spi=0xabcdabcd,seq=0x8): IP 192.0.2.1 > 192.0.1.1: icmp 64: echo request seq 3072 (ipip-proto-4) (ipip-proto-4)

diff --git a/tests/isakmp3.out b/tests/isakmp3.out
index c2ff4e089751d87a53a9144e8cafecfc0c408976..fdc2f00c52600ecb55b980f518b9983a50ca4dd4 100644 (file)
--- a/tests/isakmp3.out
+++ b/tests/isakmp3.out
@@ -1,2 +1,2 @@
-IP (tos 0x0, ttl 255, id 41068, offset 0, flags [none], length: 312) 127.0.0.1.501 > 127.0.0.1.500: isakmp 1.0 msgid : phase 1 I ident:
+IP (tos 0x0, ttl 255, id 41068, offset 0, flags [none], proto 17, length: 312) 127.0.0.1.501 > 127.0.0.1.500: isakmp 1.0 msgid : phase 1 I ident:
     (id: idtype=FQDN protoid=0 port=0 len=248 \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000)

diff --git a/tests/mpls-ldp-hello.out b/tests/mpls-ldp-hello.out
index db217505f9b78ba2390d29ef3170d7ee5c9a720e..6888f87fc60be30b96e0b9bb2ab1dec42c56891d 100644 (file)
--- a/tests/mpls-ldp-hello.out
+++ b/tests/mpls-ldp-hello.out
@@ -1,4 +1,4 @@
-IP (tos 0xc0, ttl   1, id 15579, offset 0, flags [none], length: 70) 10.1.1.3.646 > 224.0.0.2.646: [udp sum ok] 
+IP (tos 0xc0, ttl   1, id 15579, offset 0, flags [none], proto 17, length: 70) 10.1.1.3.646 > 224.0.0.2.646: 
        LDP, Label-Space-ID: 10.1.0.2:0, length: 42
          Hello Message (0x0100), length: 28, Message ID: 0x00011970, Flags: [ignore if unknown]
            Common Hello Parameters TLV (0x0400), length: 4, Flags: [ignore and don't forward if unknown]

diff --git a/tests/ospf-gmpls.out b/tests/ospf-gmpls.out
index 9bce9830c175194f56f1d09994a03d9dddf2b10d..104ea9698e144362d8ff991a16dd62edcf4c19ce 100644 (file)
--- a/tests/ospf-gmpls.out
+++ b/tests/ospf-gmpls.out
@@ -1,4 +1,4 @@
-IP (tos 0xc0, ttl   1, id 4052, offset 0, flags [none], length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 152
+IP (tos 0xc0, ttl   1, id 4052, offset 0, flags [none], proto 89, length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 152
        Router-ID: 10.255.245.35, Backbone Area, Authentication Type: none (0), 1 LSA
          LSA #1
          Advertising Router: 10.255.245.37, seq 0x80000002, age 9s, length: 104
@@ -22,7 +22,7 @@ IP (tos 0xc0, ttl   1, id 4052, offset 0, flags [none], length: 172) 40.35.1.2 >
                priority level 6: 622.080 Mbps
                priority level 7: 622.080 Mbps
              Administrative Group subTLV (9), length: 4, 0x00000000
-IP (tos 0xc0, ttl   1, id 4106, offset 0, flags [none], length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 152
+IP (tos 0xc0, ttl   1, id 4106, offset 0, flags [none], proto 89, length: 172) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 152
        Router-ID: 10.255.245.35, Backbone Area, Authentication Type: none (0), 1 LSA
          LSA #1
          Advertising Router: 10.255.245.37, seq 0x80000002, age 9s, length: 104
@@ -46,7 +46,7 @@ IP (tos 0xc0, ttl   1, id 4106, offset 0, flags [none], length: 172) 40.35.1.2 >
                priority level 6: 622.080 Mbps
                priority level 7: 622.080 Mbps
              Administrative Group subTLV (9), length: 4, 0x00000000
-IP (tos 0xc0, ttl   1, id 4160, offset 0, flags [none], length: 212) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 192
+IP (tos 0xc0, ttl   1, id 4160, offset 0, flags [none], proto 89, length: 212) 40.35.1.2 > 224.0.0.5: OSPFv2, LS-Update (4), length: 192
        Router-ID: 10.255.245.35, Backbone Area, Authentication Type: none (0), 1 LSA
          LSA #1
          Advertising Router: 10.255.245.35, seq 0x80000003, age 3s, length: 144