VXLAN over IPv6.

[vpp.git] / vpp / api / api.c

diff --git a/vpp/api/api.c b/vpp/api/api.c
index ea76693..1b6d52b 100644 (file)
--- a/vpp/api/api.c
+++ b/vpp/api/api.c
@@ -2213,7 +2213,7 @@ vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t *mp, vlib_mai
             rv = vnet_set_ip6_ethernet_neighbor 
                 (vm, ntohl(mp->sw_if_index),
                  (ip6_address_t *)(mp->dst_address), 
-                 mp->mac_address, sizeof (mp->mac_address));
+                 mp->mac_address, sizeof (mp->mac_address), mp->is_static);
         else
             rv = vnet_unset_ip6_ethernet_neighbor 
                 (vm, ntohl(mp->sw_if_index),
@@ -2428,7 +2428,8 @@ static void vl_api_sw_interface_clear_stats_t_handler (
 static void send_sw_interface_details (vpe_api_main_t * am,
                                        unix_shared_memory_queue_t *q,
                                        vnet_sw_interface_t * swif,
-                                       u8 * interface_name)
+                                       u8 * interface_name,
+                                       u32 context)
 {
     vl_api_sw_interface_details_t * mp;
     vnet_hw_interface_t * hi;
@@ -2449,6 +2450,7 @@ static void send_sw_interface_details (vpe_api_main_t * am,
     mp->link_speed = ((hi->flags & VNET_HW_INTERFACE_FLAG_SPEED_MASK) >>
                      VNET_HW_INTERFACE_FLAG_SPEED_SHIFT);
     mp->link_mtu = ntohs(hi->max_packet_bytes);
+    mp->context = context;
 
     strncpy ((char *) mp->interface_name, 
              (char *) interface_name, ARRAY_LEN(mp->interface_name)-1);
@@ -2568,7 +2570,7 @@ static void vl_api_sw_interface_dump_t_handler (
         if (mp->name_filter_valid == 0 ||
             strcasestr((char *) name_string, (char *) filter_string)) {
 
-            send_sw_interface_details (am, q, swif, name_string);
+            send_sw_interface_details (am, q, swif, name_string, mp->context);
             send_sw_interface_flags (am, q, swif);
         }
         _vec_len (name_string) = 0;
@@ -3690,7 +3692,8 @@ static void vl_api_sw_interface_vhost_user_details_t_handler (
 #if DPDK > 0
 static void send_sw_interface_vhost_user_details (vpe_api_main_t * am,
                                        unix_shared_memory_queue_t *q,
-                                       vhost_user_intf_details_t * vui)
+                                       vhost_user_intf_details_t * vui,
+                                       u32 context)
 {
     vl_api_sw_interface_vhost_user_details_t * mp;
 
@@ -3703,6 +3706,7 @@ static void send_sw_interface_vhost_user_details (vpe_api_main_t * am,
     mp->is_server = vui->is_server;
     mp->num_regions = ntohl(vui->num_regions);
     mp->sock_errno = ntohl(vui->sock_errno);
+    mp->context = context;
 
     strncpy ((char *) mp->sock_filename,
              (char *) vui->sock_filename, ARRAY_LEN(mp->sock_filename)-1);
@@ -3735,7 +3739,7 @@ vl_api_sw_interface_vhost_user_dump_t_handler (
         return;
 
     vec_foreach (vuid, ifaces) {
-        send_sw_interface_vhost_user_details (am, q, vuid);
+        send_sw_interface_vhost_user_details (am, q, vuid, mp->context);
     }
     vec_free(ifaces);
 #endif
@@ -3744,7 +3748,8 @@ vl_api_sw_interface_vhost_user_dump_t_handler (
 static void send_sw_if_l2tpv3_tunnel_details (vpe_api_main_t * am,
                                        unix_shared_memory_queue_t *q,
                                        l2t_session_t *s,
-                                       l2t_main_t * lm)
+                                       l2t_main_t * lm,
+                                       u32 context)
 {
     vl_api_sw_if_l2tpv3_tunnel_details_t * mp;
     u8 * if_name = NULL;
@@ -3769,6 +3774,7 @@ static void send_sw_if_l2tpv3_tunnel_details (vpe_api_main_t * am,
     clib_memcpy(mp->client_address, &s->client_address, sizeof(s->client_address));
     clib_memcpy(mp->our_address, &s->our_address, sizeof(s->our_address));
     mp->l2_sublayer_present = s->l2_sublayer_present;
+    mp->context = context;
 
     vl_msg_api_send_shmem (q, (u8 *)&mp);
 }
@@ -3866,7 +3872,7 @@ vl_api_sw_if_l2tpv3_tunnel_dump_t_handler (
 
     pool_foreach (session, lm->sessions, 
     ({
-        send_sw_if_l2tpv3_tunnel_details (am, q, session, lm);
+        send_sw_if_l2tpv3_tunnel_details (am, q, session, lm, mp->context);
     }));
 }
 
@@ -3952,7 +3958,8 @@ static void vl_api_l2_fib_table_entry_t_handler (
 static void send_l2fib_table_entry (vpe_api_main_t * am,
                                     unix_shared_memory_queue_t *q,
                                     l2fib_entry_key_t * l2fe_key,
-                                    l2fib_entry_result_t * l2fe_res)
+                                    l2fib_entry_result_t * l2fe_res,
+                                    u32 context)
 {
     vl_api_l2_fib_table_entry_t * mp;
 
@@ -3967,6 +3974,7 @@ static void send_l2fib_table_entry (vpe_api_main_t * am,
     mp->static_mac = l2fe_res->fields.static_mac;
     mp->filter_mac = l2fe_res->fields.filter;
     mp->bvi_mac = l2fe_res->fields.bvi;
+    mp->context = context;
 
     vl_msg_api_send_shmem (q, (u8 *)&mp);
 }
@@ -4002,7 +4010,7 @@ vl_api_l2_fib_table_dump_t_handler (vl_api_l2_fib_table_dump_t *mp)
 
     vec_foreach_index (ni, l2fe_key) {
         send_l2fib_table_entry (am, q, vec_elt_at_index(l2fe_key, ni),
-                                vec_elt_at_index(l2fe_res, ni));
+                                vec_elt_at_index(l2fe_res, ni), mp->context);
     }
     vec_free(l2fe_key);
     vec_free(l2fe_res);
@@ -4188,13 +4196,25 @@ static void vl_api_vxlan_add_del_tunnel_t_handler
     }
     encap_fib_index = p[0];
 
+    /* Check src & dst are different */
+    if ((a->is_ip6 && memcmp(mp->src_address, mp->dst_address, 16) == 0) ||
+       (!a->is_ip6 && memcmp(mp->src_address, mp->dst_address, 4) == 0)) {
+        rv = VNET_API_ERROR_SAME_SRC_DST;
+        goto out;
+    }
     memset (a, 0, sizeof (*a));
 
     a->is_add = mp->is_add;
+    a->is_ip6 = mp->is_ipv6;
 
     /* ip addresses sent in network byte order */
-    a->src.as_u32 = mp->src_address;
-    a->dst.as_u32 = mp->dst_address;
+    if (a->is_ip6) {
+        memcpy(&(a->src.ip6), mp->src_address, 16);
+        memcpy(&(a->dst.ip6), mp->dst_address, 16);
+    } else {
+        memcpy(&(a->src.ip4), mp->src_address, 4);
+        memcpy(&(a->dst.ip4), mp->dst_address, 4);
+    }
 
     a->encap_fib_index = encap_fib_index;
     a->decap_next_index = ntohl(mp->decap_next_index);
@@ -4212,17 +4232,26 @@ static void send_vxlan_tunnel_details
 (vxlan_tunnel_t * t, unix_shared_memory_queue_t * q)
 {
     vl_api_vxlan_tunnel_details_t * rmp;
-    ip4_main_t * im = &ip4_main;
+    ip4_main_t * im4 = &ip4_main;
+    ip6_main_t * im6 = &ip6_main;
+    u8 is_ipv6 = !(t->flags & VXLAN_TUNNEL_IS_IPV4);
 
     rmp = vl_msg_api_alloc (sizeof (*rmp));
     memset (rmp, 0, sizeof (*rmp));
     rmp->_vl_msg_id = ntohs(VL_API_VXLAN_TUNNEL_DETAILS);
-    rmp->src_address = t->src.data_u32;
-    rmp->dst_address = t->dst.data_u32;
-    rmp->encap_vrf_id = htonl(im->fibs[t->encap_fib_index].table_id);
+    if (is_ipv6) {
+        memcpy(rmp->src_address, &(t->src.ip6), 16);
+        memcpy(rmp->dst_address, &(t->dst.ip6), 16);
+        rmp->encap_vrf_id = htonl(im6->fibs[t->encap_fib_index].table_id);
+    } else {
+        memcpy(rmp->src_address, &(t->src.ip4), 4);
+        memcpy(rmp->dst_address, &(t->dst.ip4), 4);
+        rmp->encap_vrf_id = htonl(im4->fibs[t->encap_fib_index].table_id);
+    }
     rmp->vni = htonl(t->vni);
     rmp->decap_next_index = htonl(t->decap_next_index);
     rmp->sw_if_index = htonl(t->sw_if_index);
+    rmp->is_ipv6 = is_ipv6;
 
     vl_msg_api_send_shmem (q, (u8 *)&rmp);
 }
@@ -5397,6 +5426,7 @@ vl_api_map_domain_dump_t_handler
     rmp->ip6_src_len = d->ip6_src_len;
     rmp->mtu = htons(d->mtu);
     rmp->is_translation = (d->flags & MAP_DOMAIN_TRANSLATION);
+    rmp->context = mp->context;
 
     vl_msg_api_send_shmem (q, (u8 *)&rmp);
   }));
@@ -5437,6 +5467,7 @@ vl_api_map_rule_dump_t_handler
     rmp->_vl_msg_id = ntohs(VL_API_MAP_RULE_DETAILS);
     rmp->psid = htons(i);
     clib_memcpy(rmp->ip6_dst, &dst, sizeof(rmp->ip6_dst));
+    rmp->context = mp->context;
     vl_msg_api_send_shmem(q, (u8 *)&rmp);
   }
 }