Merging upstream version 4.99.5.

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

1 files changed, 25 insertions, 25 deletions

diff --git a/tests/spb_bpduv4-v.out b/tests/spb_bpduv4-v.out
index cb9966b..8a89fff 100644
--- a/tests/spb_bpduv4-v.out
+++ b/tests/spb_bpduv4-v.out
@@ -1,4 +1,4 @@
-    1  13:19:44.964471 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    1  2012-10-04 13:19:44.964471 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -13,7 +13,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    2  13:19:46.966286 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    2  2012-10-04 13:19:46.966286 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -28,7 +28,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    3  13:19:48.968104 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    3  2012-10-04 13:19:48.968104 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -43,7 +43,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    4  13:19:50.968841 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    4  2012-10-04 13:19:50.968841 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -58,7 +58,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    5  13:19:52.969919 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    5  2012-10-04 13:19:52.969919 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -73,7 +73,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    6  13:19:54.971627 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    6  2012-10-04 13:19:54.971627 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -88,7 +88,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    7  13:19:56.973555 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    7  2012-10-04 13:19:56.973555 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -103,7 +103,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    8  13:19:58.974590 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    8  2012-10-04 13:19:58.974590 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -118,7 +118,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-    9  13:20:00.976152 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+    9  2012-10-04 13:20:00.976152 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -133,7 +133,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   10  13:20:02.977225 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   10  2012-10-04 13:20:02.977225 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -148,7 +148,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   11  13:20:04.978131 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   11  2012-10-04 13:20:04.978131 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -163,7 +163,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   12  13:20:06.979284 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   12  2012-10-04 13:20:06.979284 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -178,7 +178,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   13  13:20:08.980357 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   13  2012-10-04 13:20:08.980357 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -193,7 +193,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   14  13:20:10.981246 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   14  2012-10-04 13:20:10.981246 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -208,7 +208,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   15  13:20:12.982792 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   15  2012-10-04 13:20:12.982792 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -223,7 +223,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   16  13:20:14.984471 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   16  2012-10-04 13:20:14.984471 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -238,7 +238,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   17  13:20:16.985513 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   17  2012-10-04 13:20:16.985513 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -253,7 +253,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   18  13:20:18.987468 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   18  2012-10-04 13:20:18.987468 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -268,7 +268,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   19  13:20:20.988197 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   19  2012-10-04 13:20:20.988197 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -283,7 +283,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   20  13:20:22.989416 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   20  2012-10-04 13:20:22.989416 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -298,7 +298,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   21  13:20:24.990564 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   21  2012-10-04 13:20:24.990564 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -313,7 +313,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   22  13:20:26.992430 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   22  2012-10-04 13:20:26.992430 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -328,7 +328,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   23  13:20:28.993313 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   23  2012-10-04 13:20:28.993313 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -343,7 +343,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   24  13:20:30.994755 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   24  2012-10-04 13:20:30.994755 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -358,7 +358,7 @@
 	Agreement num 0, Discarded Agreement num 0, Agreement valid-flag 0,
 	Restricted role-flag: 0, Format id 0 cap 0, Convention id 2 cap 32,
 	Edge count 32, Agreement digest 0000000e918994fa9ca00398d9138a3e54000000
-   25  13:20:32.996159 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
+   25  2012-10-04 13:20:32.996159 STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 205
 	port-role Designated, CIST root-id 8000.52:54:00:45:5f:15, CIST ext-pathcost 0
 	CIST regional-root-id 8000.52:54:00:45:5f:15, CIST port-id 8003,
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s