Fix dual loop >= 4. Fix format specified for printing u64 counter.

Change-Id: I314837f6a3482264fc200493a392e744aa1a21c7
Signed-off-by: Ole Troan <ot@cisco.com>

diff --git a/vnet/vnet/map/ip4_map.c b/vnet/vnet/map/ip4_map.c
index 559275e..6ed176c 100644 (file)
--- a/vnet/vnet/map/ip4_map.c
+++ b/vnet/vnet/map/ip4_map.c
@@ -176,7 +176,7 @@ ip4_map (vlib_main_t *vm,
     vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
 
     /* Dual loop */
-    while (n_left_from > 4 && n_left_to_next > 2) {
+    while (n_left_from >= 4 && n_left_to_next >= 2) {
       u32 pi0, pi1;
       vlib_buffer_t *p0, *p1;
       map_domain_t *d0, *d1;

diff --git a/vnet/vnet/map/ip6_map.c b/vnet/vnet/map/ip6_map.c
index e803af9..7ef85e7 100644 (file)
--- a/vnet/vnet/map/ip6_map.c
+++ b/vnet/vnet/map/ip6_map.c
@@ -164,7 +164,7 @@ ip6_map (vlib_main_t *vm,
     vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
 
     /* Dual loop */
-    while (n_left_from > 4 && n_left_to_next > 2) {
+    while (n_left_from >= 4 && n_left_to_next >= 2) {
       u32 pi0, pi1;
       vlib_buffer_t *p0, *p1;
       u8 error0 = MAP_ERROR_NONE;

diff --git a/vnet/vnet/map/map.c b/vnet/vnet/map/map.c
index b0cab66..fe54f65 100644 (file)
--- a/vnet/vnet/map/map.c
+++ b/vnet/vnet/map/map.c
@@ -676,9 +676,9 @@ format_map_domain (u8 *s, va_list *args)
     map_domain_counter_lock(mm);
     vlib_counter_t v;
     vlib_get_combined_counter(&mm->domain_counters[MAP_DOMAIN_COUNTER_TX], d - mm->domains, &v);
-    s = format(s, "  TX: %d/%d", v.packets, v.bytes);
+    s = format(s, "  TX: %lld/%lld", v.packets, v.bytes);
     vlib_get_combined_counter(&mm->domain_counters[MAP_DOMAIN_COUNTER_RX], d - mm->domains, &v);
-    s = format(s, "  RX: %d/%d", v.packets, v.bytes);
+    s = format(s, "  RX: %lld/%lld", v.packets, v.bytes);
     map_domain_counter_unlock(mm);
   }