fib: Decouple source from priority and behaviour

[vpp.git] / src / plugins / nat / nat64.c

diff --git a/src/plugins/nat/nat64.c b/src/plugins/nat/nat64.c
index 748205a..e1afea6 100644 (file)
--- a/src/plugins/nat/nat64.c
+++ b/src/plugins/nat/nat64.c
@@ -306,7 +306,7 @@ nat64_set_hash (u32 bib_buckets, u32 bib_memory_size, u32 st_buckets,
     {
       if (nat64_db_init (db, bib_buckets, bib_memory_size, st_buckets,
                          st_memory_size, nat64_free_out_addr_and_port))
-       nat_log_err ("NAT64 DB init failed");
+       nat_elog_err ("NAT64 DB init failed");
     }
   /* *INDENT-ON* */
 }
@@ -343,7 +343,7 @@ nat64_add_del_pool_addr (u32 thread_index,
       if (vrf_id != ~0)
        a->fib_index =
          fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, vrf_id,
-                                            FIB_SOURCE_PLUGIN_HI);
+                                            nat_fib_src_hi);
 #define _(N, id, n, s) \
       clib_bitmap_alloc (a->busy_##n##_port_bitmap, 65535); \
       a->busy_##n##_ports = 0; \
@@ -357,8 +357,7 @@ nat64_add_del_pool_addr (u32 thread_index,
        return VNET_API_ERROR_NO_SUCH_ENTRY;
 
       if (a->fib_index != ~0)
-       fib_table_unlock (a->fib_index, FIB_PROTOCOL_IP6,
-                         FIB_SOURCE_PLUGIN_HI);
+       fib_table_unlock (a->fib_index, FIB_PROTOCOL_IP6, nat_fib_src_hi);
       /* Delete sessions using address */
         /* *INDENT-OFF* */
         vec_foreach (db, nm->db)
@@ -606,7 +605,7 @@ nat64_free_out_addr_and_port (struct nat64_db_s *db, ip4_address_t * addr,
          foreach_snat_protocol
 #undef _
        default:
-         nat_log_notice ("unknown protocol");
+         nat_elog_notice ("unknown protocol");
          return;
        }
       break;
@@ -688,7 +687,7 @@ nat64_add_del_static_bib_entry (ip6_address_t * in_addr,
   nat64_main_t *nm = &nat64_main;
   nat64_db_bib_entry_t *bibe;
   u32 fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, vrf_id,
-                                                    FIB_SOURCE_PLUGIN_HI);
+                                                    nat_fib_src_hi);
   snat_protocol_t p = ip_proto_to_snat_proto (proto);
   ip46_address_t addr;
   int i;
@@ -1027,7 +1026,7 @@ nat64_add_del_prefix (ip6_address_t * prefix, u8 plen, u32 vrf_id, u8 is_add)
          vec_add2 (nm->pref64, p, 1);
          p->fib_index =
            fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, vrf_id,
-                                              FIB_SOURCE_PLUGIN_HI);
+                                              nat_fib_src_hi);
          p->vrf_id = vrf_id;
        }
 
@@ -1120,7 +1119,7 @@ nat64_compose_ip6 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index)
          ip6->as_u32[3] = ip4->as_u32;
          break;
        default:
-         nat_log_notice ("invalid prefix length");
+         nat_elog_notice ("invalid prefix length");
          break;
        }
     }
@@ -1193,7 +1192,7 @@ nat64_extract_ip4 (ip6_address_t * ip6, ip4_address_t * ip4, u32 fib_index)
       ip4->as_u32 = ip6->as_u32[3];
       break;
     default:
-      nat_log_notice ("invalid prefix length");
+      nat_elog_notice ("invalid prefix length");
       break;
     }
 }
@@ -1278,7 +1277,7 @@ nat64_expire_walk_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
        case NAT64_CLEANER_RESCHEDULE:
          break;
        default:
-         nat_log_notice ("unknown event %u", event_type);
+         nat_elog_notice_X1 ("unknown event %d", "i4", event_type);
          break;
        }