IPv4/6 reassembly

[vpp.git] / src / vnet / udp / udp.c

diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index c12e837..9284cd7 100644 (file)
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -334,6 +334,7 @@ udp_init (vlib_main_t * vm)
   u32 num_threads;
   clib_error_t *error = 0;
   ip_protocol_info_t *pi;
+  int i;
 
   if ((error = vlib_call_init_function (vm, ip_main_init)))
     return error;
@@ -353,10 +354,11 @@ udp_init (vlib_main_t * vm)
   pi->format_header = format_udp_header;
   pi->unformat_pg_edit = unformat_pg_udp_header;
 
-
   /* Register as transport with URI */
-  transport_register_protocol (TRANSPORT_PROTO_UDP, 1, &udp_proto);
-  transport_register_protocol (TRANSPORT_PROTO_UDP, 0, &udp_proto);
+  transport_register_protocol (TRANSPORT_PROTO_UDP, &udp_proto,
+                              FIB_PROTOCOL_IP4, ip4_lookup_node.index);
+  transport_register_protocol (TRANSPORT_PROTO_UDP, &udp_proto,
+                              FIB_PROTOCOL_IP6, ip6_lookup_node.index);
 
   /*
    * Initialize data structures
@@ -367,6 +369,13 @@ udp_init (vlib_main_t * vm)
   vec_validate (um->connection_peekers, num_threads - 1);
   vec_validate (um->peekers_readers_locks, num_threads - 1);
   vec_validate (um->peekers_write_locks, num_threads - 1);
+
+  if (num_threads > 1)
+    for (i = 0; i < num_threads; i++)
+      {
+       clib_spinlock_init (&um->peekers_readers_locks[i]);
+       clib_spinlock_init (&um->peekers_write_locks[i]);
+      }
   return error;
 }