udp: add udp decapsulation

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

diff --git a/src/vnet/udp/udp_api.c b/src/vnet/udp/udp_api.c
index d00d74e..6ba92bb 100644 (file)
--- a/src/vnet/udp/udp_api.c
+++ b/src/vnet/udp/udp_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Cisco and/or its affiliates.
+ * Copyright (c) 2018-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -16,6 +16,7 @@
 #include <vnet/vnet.h>
 #include <vlibmemory/api.h>
 
+#include <vnet/udp/udp_local.h>
 #include <vnet/udp/udp_encap.h>
 #include <vnet/fib/fib_table.h>
 #include <vnet/ip/ip_types_api.h>
@@ -38,11 +39,11 @@
 
 #include <vlibapi/api_helper_macros.h>
 
-
-#define foreach_udp_api_msg            \
-_(UDP_ENCAP_DEL, udp_encap_del)        \
-_(UDP_ENCAP_ADD, udp_encap_add)        \
-_(UDP_ENCAP_DUMP, udp_encap_dump)
+#define foreach_udp_api_msg                                                   \
+  _ (UDP_ENCAP_DEL, udp_encap_del)                                            \
+  _ (UDP_ENCAP_ADD, udp_encap_add)                                            \
+  _ (UDP_ENCAP_DUMP, udp_encap_dump)                                          \
+  _ (UDP_DECAP_ADD_DEL, udp_decap_add_del)
 
 static void
 send_udp_encap_details (const udp_encap_t * ue, vl_api_registration_t * reg,
@@ -51,7 +52,7 @@ send_udp_encap_details (const udp_encap_t * ue, vl_api_registration_t * reg,
   vl_api_udp_encap_details_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_UDP_ENCAP_DETAILS);
   mp->context = context;
 
@@ -61,8 +62,8 @@ send_udp_encap_details (const udp_encap_t * ue, vl_api_registration_t * reg,
                   &ue->ue_hdrs.ip4.ue_ip4.src_address, 4);
       clib_memcpy (&mp->udp_encap.dst_ip.un.ip4,
                   &ue->ue_hdrs.ip4.ue_ip4.dst_address, 4);
-      mp->udp_encap.dst_ip.af = clib_host_to_net_u32 (ADDRESS_IP4);
-      mp->udp_encap.src_ip.af = clib_host_to_net_u32 (ADDRESS_IP4);
+      mp->udp_encap.dst_ip.af = ip_address_family_encode (AF_IP4);
+      mp->udp_encap.src_ip.af = ip_address_family_encode (AF_IP4);
 
       /* ports aren't byte swapped because they are stored in network
        * byte order */
@@ -75,8 +76,8 @@ send_udp_encap_details (const udp_encap_t * ue, vl_api_registration_t * reg,
                   &ue->ue_hdrs.ip6.ue_ip6.src_address, 16);
       clib_memcpy (&mp->udp_encap.dst_ip.un.ip6,
                   &ue->ue_hdrs.ip6.ue_ip6.dst_address, 16);
-      mp->udp_encap.dst_ip.af = clib_host_to_net_u32 (ADDRESS_IP6);
-      mp->udp_encap.src_ip.af = clib_host_to_net_u32 (ADDRESS_IP6);
+      mp->udp_encap.dst_ip.af = ip_address_family_encode (AF_IP6);
+      mp->udp_encap.src_ip.af = ip_address_family_encode (AF_IP6);
 
       /* ports aren't byte swapped because they are stored in network
        * byte order */
@@ -92,8 +93,7 @@ send_udp_encap_details (const udp_encap_t * ue, vl_api_registration_t * reg,
 }
 
 static void
-vl_api_udp_encap_dump_t_handler (vl_api_udp_encap_dump_t * mp,
-                                vlib_main_t * vm)
+vl_api_udp_encap_dump_t_handler (vl_api_udp_encap_dump_t *mp)
 {
   vl_api_registration_t *reg;
   udp_encap_t *ue;
@@ -103,15 +103,15 @@ vl_api_udp_encap_dump_t_handler (vl_api_udp_encap_dump_t * mp,
     return;
 
   /* *INDENT-OFF* */
-  pool_foreach(ue, udp_encap_pool,
-  ({
+  pool_foreach (ue, udp_encap_pool)
+   {
     send_udp_encap_details(ue, reg, mp->context);
-  }));
+  }
   /* *INDENT-ON* */
 }
 
 static void
-vl_api_udp_encap_add_t_handler (vl_api_udp_encap_add_t * mp, vlib_main_t * vm)
+vl_api_udp_encap_add_t_handler (vl_api_udp_encap_add_t *mp)
 {
   vl_api_udp_encap_add_reply_t *rmp;
   ip46_address_t src_ip, dst_ip;
@@ -121,6 +121,7 @@ vl_api_udp_encap_add_t_handler (vl_api_udp_encap_add_t * mp, vlib_main_t * vm)
   index_t uei;
   int rv = 0;
 
+  uei = INDEX_INVALID;
   table_id = ntohl (mp->udp_encap.table_id);
 
   itype = ip_address_decode (&mp->udp_encap.src_ip, &src_ip);
@@ -151,7 +152,7 @@ done:
 }
 
 static void
-vl_api_udp_encap_del_t_handler (vl_api_udp_encap_del_t * mp, vlib_main_t * vm)
+vl_api_udp_encap_del_t_handler (vl_api_udp_encap_del_t *mp)
 {
   vl_api_udp_encap_del_reply_t *rmp;
   int rv = 0;
@@ -161,6 +162,45 @@ vl_api_udp_encap_del_t_handler (vl_api_udp_encap_del_t * mp, vlib_main_t * vm)
   REPLY_MACRO (VL_API_UDP_ENCAP_DEL_REPLY);
 }
 
+u32
+udp_api_decap_proto_to_index (vlib_main_t *vm,
+                             vl_api_udp_decap_next_proto_t iproto)
+{
+  switch (iproto)
+    {
+    case UDP_API_DECAP_PROTO_IP4:
+      return vlib_get_node_by_name (vm, (u8 *) "ip4-input")->index;
+    case UDP_API_DECAP_PROTO_IP6:
+      return vlib_get_node_by_name (vm, (u8 *) "ip6-input")->index;
+    case UDP_API_DECAP_PROTO_MPLS:
+      return vlib_get_node_by_name (vm, (u8 *) "mpls-input")->index;
+    }
+  return ~0;
+}
+
+static void
+vl_api_udp_decap_add_del_t_handler (vl_api_udp_decap_add_del_t *mp)
+{
+  vl_api_udp_decap_add_del_reply_t *rmp;
+  vlib_main_t *vm = vlib_get_main ();
+  int rv = 0;
+
+  if (mp->is_add)
+    {
+      u32 node_index =
+       udp_api_decap_proto_to_index (vm, ntohl (mp->udp_decap.next_proto));
+      if (node_index == ~0)
+       rv = VNET_API_ERROR_INVALID_PROTOCOL;
+      else
+       udp_register_dst_port (vm, ntohs (mp->udp_decap.port), node_index,
+                              mp->udp_decap.is_ip4);
+    }
+  else
+    udp_unregister_dst_port (vm, ntohs (mp->udp_decap.port),
+                            mp->udp_decap.is_ip4);
+  REPLY_MACRO (VL_API_UDP_DECAP_ADD_DEL_REPLY);
+}
+
 #define vl_msg_name_crc_list
 #include <vnet/udp/udp.api.h>
 #undef vl_msg_name_crc_list
@@ -176,7 +216,7 @@ setup_message_id_table (api_main_t * am)
 static clib_error_t *
 udp_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \