Merging upstream version 4.99.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 29 insertions, 29 deletions

diff --git a/tests/udld-v.out b/tests/udld-v.out
index f996fd3..6255796 100644
--- a/tests/udld-v.out
+++ b/tests/udld-v.out
@@ -1,4 +1,4 @@
-    1  11:14:12.243962 UDLDv1, Code Probe message (1), Flags [RT, RSY] (0x03), length 60
+    1  2008-06-20 11:14:12.243962 UDLDv1, Code Probe message (1), Flags [RT, RSY] (0x03), length 60
 	Checksum 0x6d85 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -7,7 +7,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 1
-    2  11:14:12.244346 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    2  2008-06-20 11:14:12.244346 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805d (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -16,7 +16,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 1
-    3  11:14:12.244696 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    3  2008-06-20 11:14:12.244696 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805e (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -25,7 +25,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 1
-    4  11:14:12.633254 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    4  2008-06-20 11:14:12.633254 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805c (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -34,7 +34,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 2
-    5  11:14:13.250690 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    5  2008-06-20 11:14:13.250690 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805d (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -43,7 +43,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 2
-    6  11:14:13.631606 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    6  2008-06-20 11:14:13.631606 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805b (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -52,7 +52,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 3
-    7  11:14:14.249094 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    7  2008-06-20 11:14:14.249094 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805c (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -61,7 +61,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 3
-    8  11:14:14.629963 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    8  2008-06-20 11:14:14.629963 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805a (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -70,7 +70,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 4
-    9  11:14:15.247436 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+    9  2008-06-20 11:14:15.247436 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805b (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -79,7 +79,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 4
-   10  11:14:15.628301 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+   10  2008-06-20 11:14:15.628301 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x8059 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -88,7 +88,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 5
-   11  11:14:16.245782 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
+   11  2008-06-20 11:14:16.245782 UDLDv1, Code Echo message (2), Flags [none] (0x00), length 80
 	Checksum 0x805a (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -97,7 +97,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 5
-   12  11:14:16.635051 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   12  2008-06-20 11:14:16.635051 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x795c (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -106,7 +106,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 1
-   13  11:14:17.244147 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   13  2008-06-20 11:14:17.244147 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x795d (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -115,7 +115,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 1
-   14  11:14:23.631900 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   14  2008-06-20 11:14:23.631900 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x795b (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -124,7 +124,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 2
-   15  11:14:24.249530 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   15  2008-06-20 11:14:24.249530 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x795c (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -133,7 +133,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 2
-   16  11:14:30.637186 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   16  2008-06-20 11:14:30.637186 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x795a (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -142,7 +142,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 3
-   17  11:14:31.246440 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   17  2008-06-20 11:14:31.246440 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x795b (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -151,7 +151,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 3
-   18  11:14:37.634025 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   18  2008-06-20 11:14:37.634025 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7959 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -160,7 +160,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 4
-   19  11:14:38.251795 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   19  2008-06-20 11:14:38.251795 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x795a (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -169,7 +169,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 4
-   20  11:14:44.639308 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   20  2008-06-20 11:14:44.639308 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7958 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -178,7 +178,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 5
-   21  11:14:45.248751 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   21  2008-06-20 11:14:45.248751 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7959 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -187,7 +187,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 5
-   22  11:14:59.639781 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   22  2008-06-20 11:14:59.639781 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7957 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -196,7 +196,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 6
-   23  11:15:00.249419 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   23  2008-06-20 11:15:00.249419 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7958 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -205,7 +205,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 6
-   24  11:15:14.640244 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   24  2008-06-20 11:15:14.640244 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7956 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -214,7 +214,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 7
-   25  11:15:15.814760 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   25  2008-06-20 11:15:15.814760 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7957 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -223,7 +223,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 7
-   26  11:15:29.640733 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   26  2008-06-20 11:15:29.640733 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7955 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -232,7 +232,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 8
-   27  11:15:30.259144 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   27  2008-06-20 11:15:30.259144 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7956 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1
@@ -241,7 +241,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S1
 	Sequence Number TLV (0x0007) TLV, length 8, 8
-   28  11:15:44.641210 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   28  2008-06-20 11:15:44.641210 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7954 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1025X4W3
 	Port-ID TLV (0x0002) TLV, length 9, Fa0/1
@@ -250,7 +250,7 @@
 	Timeout Interval TLV (0x0005) TLV, length 5, 5s
 	Device Name TLV (0x0006) TLV, length 6, S2
 	Sequence Number TLV (0x0007) TLV, length 8, 9
-   29  11:15:45.259800 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
+   29  2008-06-20 11:15:45.259800 UDLDv1, Code Probe message (1), Flags [RT] (0x01), length 80
 	Checksum 0x7955 (unverified)
 	Device-ID TLV (0x0001) TLV, length 15, FOC1031Z7JG
 	Port-ID TLV (0x0002) TLV, length 9, Gi0/1