IPv6 local-address for P2P ethernet interfaces

[vpp.git] / src / vnet / ip / ip6_neighbor.c

diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
index b8f6f9b..62cf23a 100644 (file)
--- a/src/vnet/ip/ip6_neighbor.c
+++ b/src/vnet/ip/ip6_neighbor.c
@@ -284,7 +284,7 @@ ip6_neighbor_sw_interface_up_down (vnet_main_t * vnm,
                (ip6_fib_table_get_index_for_sw_if_index (n->key.sw_if_index),
                 &pfx,
                 FIB_SOURCE_ADJ,
-                FIB_PROTOCOL_IP6,
+                DPO_PROTO_IP6,
                 &pfx.fp_addr,
                 n->key.sw_if_index, ~0, 1, FIB_ROUTE_PATH_FLAG_NONE);
              pool_put (nm->neighbor_pool, n);
@@ -645,7 +645,7 @@ vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
          n->fib_entry_index =
            fib_table_entry_path_add (fib_index, &pfx, FIB_SOURCE_ADJ,
                                      FIB_ENTRY_FLAG_ATTACHED,
-                                     FIB_PROTOCOL_IP6, &pfx.fp_addr,
+                                     DPO_PROTO_IP6, &pfx.fp_addr,
                                      n->key.sw_if_index, ~0, 1, NULL,
                                      FIB_ROUTE_PATH_FLAG_NONE);
        }
@@ -776,7 +776,7 @@ vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
        (ip6_fib_table_get_index_for_sw_if_index (n->key.sw_if_index),
         &pfx,
         FIB_SOURCE_ADJ,
-        FIB_PROTOCOL_IP6,
+        DPO_PROTO_IP6,
         &pfx.fp_addr, n->key.sw_if_index, ~0, 1, FIB_ROUTE_PATH_FLAG_NONE);
     }
   pool_put (nm->neighbor_pool, n);
@@ -1479,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));
 
@@ -1499,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));
 
@@ -1525,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));
                        }
@@ -1579,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));
 
@@ -1652,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;
@@ -2326,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);
@@ -2351,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");
 
@@ -3416,7 +3413,8 @@ enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
                    (&link_local_address, eth_if0->address);
 
                  sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
-                 if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB)
+                 if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB ||
+                     sw_if0->type == VNET_SW_INTERFACE_TYPE_P2P)
                    {
                      /* make up  an interface id */
                      md5_context_t m;
@@ -4113,7 +4111,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);
@@ -4127,7 +4125,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);