diff options
| author |   Ole Troan <ot@cisco.com> | 2018-02-12 18:14:39 +0100 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2018-03-01 14:37:11 +0000 |
| commit | 6ee4051139409eb53cd41b2b73dac838e8c4e8a0 (patch) | |
| tree | c7c8e5ac17cfb31c84684a877e7da027c191e64e /src/vnet/adj | |
| parent | 62bab658e7ca782c8d35dacacfa5906ddbcaf437 (diff) | |
6RD: Rewritten 6RD RFC5969 support.
Change-Id: Ic30fbcb2630f39e45345d7215babf5d7ed4b33a0
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vnet/adj')
| -rw-r--r-- | src/vnet/adj/adj_delegate.h | 1 | ||||
| -rw-r--r-- | src/vnet/adj/adj_glean.c | 9 | ||||
| -rw-r--r-- | src/vnet/adj/adj_glean.h | 1 | ||||
| -rw-r--r-- | src/vnet/adj/rewrite.c | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/src/vnet/adj/adj_delegate.h b/src/vnet/adj/adj_delegate.h index c47380012f1..13bf911c5a6 100644 --- a/src/vnet/adj/adj_delegate.h +++ b/src/vnet/adj/adj_delegate.h @@ -99,7 +99,6 @@ extern int adj_delegate_add(ip_adjacency_t *adj, adj_delegate_type_t fdt, index_t adi); - /** * @brief Get a delegate from an adjacency * diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c index 82d0a46eb1f..7de8e397737 100644 --- a/src/vnet/adj/adj_glean.c +++ b/src/vnet/adj/adj_glean.c @@ -48,6 +48,7 @@ adj_get_glean_node (fib_protocol_t proto) */ adj_index_t adj_glean_add_or_lock (fib_protocol_t proto, + vnet_link_t linkt, u32 sw_if_index, const ip46_address_t *nh_addr) { @@ -61,15 +62,23 @@ adj_glean_add_or_lock (fib_protocol_t proto, adj->lookup_next_index = IP_LOOKUP_NEXT_GLEAN; adj->ia_nh_proto = proto; + adj->ia_link = linkt; adj_gleans[proto][sw_if_index] = adj_get_index(adj); if (NULL != nh_addr) { adj->sub_type.glean.receive_addr = *nh_addr; } + else + { + adj->sub_type.glean.receive_addr = zero_addr; + } adj->rewrite_header.sw_if_index = sw_if_index; adj->rewrite_header.data_bytes = 0; + adj->rewrite_header.max_l3_packet_bytes = + vnet_sw_interface_get_mtu(vnet_get_main(), sw_if_index, VLIB_TX); + adj_lock(adj_get_index(adj)); vnet_update_adjacency_for_sw_interface(vnet_get_main(), diff --git a/src/vnet/adj/adj_glean.h b/src/vnet/adj/adj_glean.h index 47cddfbed2b..3ffbe36b51c 100644 --- a/src/vnet/adj/adj_glean.h +++ b/src/vnet/adj/adj_glean.h @@ -44,6 +44,7 @@ * as the source address in packets when the ARP/ND packet is sent */ extern adj_index_t adj_glean_add_or_lock(fib_protocol_t proto, + vnet_link_t linkt, u32 sw_if_index, const ip46_address_t *nh_addr); diff --git a/src/vnet/adj/rewrite.c b/src/vnet/adj/rewrite.c index c21495a9644..f4b26a9d0dd 100644 --- a/src/vnet/adj/rewrite.c +++ b/src/vnet/adj/rewrite.c @@ -82,6 +82,8 @@ format_vnet_rewrite (u8 * s, va_list * args) s = format (s, "DELETED:%d", rw->sw_if_index); } + s = format (s, " mtu:%d", rw->max_l3_packet_bytes); + /* Format rewrite string. */ if (rw->data_bytes > 0) s = format (s, " %U", |