L2 over MPLS
[vpp.git] / src / vnet / ip / ip6_neighbor.c
index 3118277..6a9139a 100644 (file)
@@ -273,10 +273,23 @@ ip6_neighbor_sw_interface_up_down (vnet_main_t * vnm,
        {
          n = pool_elt_at_index (nm->neighbor_pool, to_delete[i]);
          mhash_unset (&nm->neighbor_index_by_key, &n->key, 0);
-         fib_table_entry_delete_index (n->fib_entry_index, FIB_SOURCE_ADJ);
-         pool_put (nm->neighbor_pool, n);
+         if (FIB_NODE_INDEX_INVALID != n->fib_entry_index)
+           {
+             fib_prefix_t pfx = {
+               .fp_len = 128,
+               .fp_proto = FIB_PROTOCOL_IP6,
+               .fp_addr.ip6 = n->key.ip6_address,
+             };
+             fib_table_entry_path_remove
+               (ip6_fib_table_get_index_for_sw_if_index (n->key.sw_if_index),
+                &pfx,
+                FIB_SOURCE_ADJ,
+                DPO_PROTO_IP6,
+                &pfx.fp_addr,
+                n->key.sw_if_index, ~0, 1, FIB_ROUTE_PATH_FLAG_NONE);
+             pool_put (nm->neighbor_pool, n);
+           }
        }
-
       vec_free (to_delete);
     }
 
@@ -610,6 +623,7 @@ vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
       mhash_set (&nm->neighbor_index_by_key, &k, n - nm->neighbor_pool,
                 /* old value */ 0);
       n->key = k;
+      n->fib_entry_index = FIB_NODE_INDEX_INVALID;
 
       clib_memcpy (n->link_layer_address,
                   link_layer_address, n_bytes_link_layer_address);
@@ -626,14 +640,14 @@ vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
          };
          u32 fib_index;
 
-         fib_index = ip6_main.fib_index_by_sw_if_index[n->key.sw_if_index];
+         fib_index =
+           ip6_fib_table_get_index_for_sw_if_index (n->key.sw_if_index);
          n->fib_entry_index =
-           fib_table_entry_update_one_path (fib_index, &pfx,
-                                            FIB_SOURCE_ADJ,
-                                            FIB_ENTRY_FLAG_NONE,
-                                            FIB_PROTOCOL_IP6, &pfx.fp_addr,
-                                            n->key.sw_if_index, ~0, 1, NULL,
-                                            FIB_ROUTE_PATH_FLAG_NONE);
+           fib_table_entry_path_add (fib_index, &pfx, FIB_SOURCE_ADJ,
+                                     FIB_ENTRY_FLAG_ATTACHED,
+                                     DPO_PROTO_IP6, &pfx.fp_addr,
+                                     n->key.sw_if_index, ~0, 1, NULL,
+                                     FIB_ROUTE_PATH_FLAG_NONE);
        }
       else
        {
@@ -750,7 +764,21 @@ vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
   adj_nbr_walk_nh6 (sw_if_index,
                    &n->key.ip6_address, ip6_nd_mk_incomplete_walk, NULL);
 
-  fib_table_entry_delete_index (n->fib_entry_index, FIB_SOURCE_ADJ);
+
+  if (FIB_NODE_INDEX_INVALID != n->fib_entry_index)
+    {
+      fib_prefix_t pfx = {
+       .fp_len = 128,
+       .fp_proto = FIB_PROTOCOL_IP6,
+       .fp_addr.ip6 = n->key.ip6_address,
+      };
+      fib_table_entry_path_remove
+       (ip6_fib_table_get_index_for_sw_if_index (n->key.sw_if_index),
+        &pfx,
+        FIB_SOURCE_ADJ,
+        DPO_PROTO_IP6,
+        &pfx.fp_addr, n->key.sw_if_index, ~0, 1, FIB_ROUTE_PATH_FLAG_NONE);
+    }
   pool_put (nm->neighbor_pool, n);
 
 out:
@@ -1451,9 +1479,8 @@ icmp6_router_solicitation (vlib_main_t * vm,
                        sizeof (icmp6_router_advertisement_header_t);
 
                      vlib_buffer_add_data (vm,
-                                           p0->free_list_index,
-                                           bi0,
-                                           (void *) &rh,
+                                           vlib_buffer_get_free_list_index
+                                           (p0), bi0, (void *) &rh,
                                            sizeof
                                            (icmp6_router_advertisement_header_t));
 
@@ -1471,9 +1498,8 @@ icmp6_router_solicitation (vlib_main_t * vm,
                                       eth_if0->address, 6);
 
                          vlib_buffer_add_data (vm,
-                                               p0->free_list_index,
-                                               bi0,
-                                               (void *) &h,
+                                               vlib_buffer_get_free_list_index
+                                               (p0), bi0, (void *) &h,
                                                sizeof
                                                (icmp6_neighbor_discovery_ethernet_link_layer_address_option_t));
 
@@ -1497,9 +1523,8 @@ icmp6_router_solicitation (vlib_main_t * vm,
                            sizeof (icmp6_neighbor_discovery_mtu_option_t);
 
                          vlib_buffer_add_data (vm,
-                                               p0->free_list_index,
-                                               bi0,
-                                               (void *) &h,
+                                               vlib_buffer_get_free_list_index
+                                               (p0), bi0, (void *) &h,
                                                sizeof
                                                (icmp6_neighbor_discovery_mtu_option_t));
                        }
@@ -1551,7 +1576,7 @@ icmp6_router_solicitation (vlib_main_t * vm,
                             payload_length += sizeof( icmp6_neighbor_discovery_prefix_information_option_t);
 
                             vlib_buffer_add_data (vm,
-                                                  p0->free_list_index,
+                                           vlib_buffer_get_free_list_index (p0),
                                                   bi0,
                                                   (void *)&h, sizeof(icmp6_neighbor_discovery_prefix_information_option_t));
 
@@ -1624,7 +1649,7 @@ icmp6_router_solicitation (vlib_main_t * vm,
                                adj_index0;
                            }
                        }
-                     p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+                     p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
 
                      radv_info->n_solicitations_dropped += is_dropped;
                      radv_info->n_solicitations_rcvd += is_solicitation;
@@ -2053,7 +2078,7 @@ ip6_neighbor_add_mld_grp (ip6_radv_t * a,
  * @brief create and initialize router advertisement parameters with default
  * values for this intfc
  */
-static u32
+u32
 ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm,
                                   u32 sw_if_index, u32 is_add)
 {
@@ -2298,7 +2323,7 @@ ip6_neighbor_send_mldpv2_report (u32 sw_if_index)
     num_addr_records++;
 
     vlib_buffer_add_data
-      (vm, b0->free_list_index, bo0,
+      (vm, vlib_buffer_get_free_list_index (b0), bo0,
        (void *)&rr, sizeof(icmp6_multicast_address_record_t));
 
     payload_length += sizeof( icmp6_multicast_address_record_t);
@@ -2323,7 +2348,7 @@ ip6_neighbor_send_mldpv2_report (u32 sw_if_index)
     vnet_main.local_interface_sw_if_index;
 
   vnet_buffer (b0)->ip.adj_index[VLIB_TX] = radv_info->mcast_adj_index;
-  b0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+  b0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
 
   vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "ip6-rewrite-mcast");
 
@@ -4085,7 +4110,7 @@ ip6_neighbor_proxy_add_del (u32 sw_if_index, ip6_address_t * addr, u8 is_del)
       fib_table_entry_path_remove (fib_index,
                                   &pfx,
                                   FIB_SOURCE_IP6_ND_PROXY,
-                                  FIB_PROTOCOL_IP6,
+                                  DPO_PROTO_IP6,
                                   &nh,
                                   sw_if_index,
                                   ~0, 1, FIB_ROUTE_PATH_FLAG_NONE);
@@ -4099,7 +4124,7 @@ ip6_neighbor_proxy_add_del (u32 sw_if_index, ip6_address_t * addr, u8 is_del)
                                &pfx,
                                FIB_SOURCE_IP6_ND_PROXY,
                                FIB_ENTRY_FLAG_NONE,
-                               FIB_PROTOCOL_IP6,
+                               DPO_PROTO_IP6,
                                &nh,
                                sw_if_index,
                                ~0, 1, NULL, FIB_ROUTE_PATH_FLAG_NONE);
@@ -4164,6 +4189,59 @@ ethernet_ndp_change_mac (u32 sw_if_index)
   /* *INDENT-ON* */
 }
 
+void
+send_ip6_na (vlib_main_t * vm, vnet_hw_interface_t * hi)
+{
+  ip6_main_t *i6m = &ip6_main;
+  u32 sw_if_index = hi->sw_if_index;
+  ip6_address_t *ip6_addr = ip6_interface_first_address (i6m, sw_if_index);
+  if (ip6_addr)
+    {
+      clib_warning
+       ("Sending unsolicitated NA IP6 address %U on sw_if_idex %d",
+        format_ip6_address, ip6_addr, sw_if_index);
+
+      /* Form unsolicited neighbor advertisement packet from NS pkt template */
+      int bogus_length;
+      u32 bi = 0;
+      icmp6_neighbor_solicitation_header_t *h =
+       vlib_packet_template_get_packet (vm,
+                                        &i6m->discover_neighbor_packet_template,
+                                        &bi);
+      ip6_set_reserved_multicast_address (&h->ip.dst_address,
+                                         IP6_MULTICAST_SCOPE_link_local,
+                                         IP6_MULTICAST_GROUP_ID_all_hosts);
+      h->ip.src_address = ip6_addr[0];
+      h->neighbor.icmp.type = ICMP6_neighbor_advertisement;
+      h->neighbor.target_address = ip6_addr[0];
+      h->neighbor.advertisement_flags = clib_host_to_net_u32
+       (ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE);
+      clib_memcpy (h->link_layer_option.ethernet_address,
+                  hi->hw_address, vec_len (hi->hw_address));
+      h->neighbor.icmp.checksum =
+       ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h->ip, &bogus_length);
+      ASSERT (bogus_length == 0);
+
+      /* Setup MAC header with IP6 Etype and mcast DMAC */
+      vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+      vlib_buffer_advance (b, -sizeof (ethernet_header_t));
+      ethernet_header_t *e = vlib_buffer_get_current (b);
+      e->type = clib_host_to_net_u16 (ETHERNET_TYPE_IP6);
+      clib_memcpy (e->src_address, hi->hw_address, sizeof (e->src_address));
+      ip6_multicast_ethernet_address (e->dst_address,
+                                     IP6_MULTICAST_GROUP_ID_all_hosts);
+
+      /* Send unsolicited ND advertisement packet out the specified interface */
+      vnet_buffer (b)->sw_if_index[VLIB_RX] =
+       vnet_buffer (b)->sw_if_index[VLIB_TX] = sw_if_index;
+      vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
+      u32 *to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi;
+      f->n_vectors = 1;
+      vlib_put_frame_to_node (vm, hi->output_node_index, f);
+    }
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *