diff options
| author |   David Hotham <david.hotham@metaswitch.com> | 2016-09-19 09:55:07 -0700 |
|---|---|---|
| committer |   John Lo <loj@cisco.com> | 2016-09-19 19:01:59 +0000 |
| commit | a8cd30937e5dc8a3bf629e1ee667550e267e5651 (patch) | |
| tree | afdc2648efdb29bf6e0dde24aa581041c88b46cf /vpp | |
| parent | 16b7aaafac0bd06a9c330457eea9f6f674906606 (diff) | |
Add support for transparent ethernet bridging to GRE
Change-Id: Iaa3cefe223eb48b128893029a17e092b72a5157c
Signed-off-by: David Hotham <david.hotham@metaswitch.com>
Diffstat (limited to 'vpp')
| -rw-r--r-- | vpp/vpp-api/api.c | 2 | ||||
| -rw-r--r-- | vpp/vpp-api/custom_dump.c | 3 | ||||
| -rw-r--r-- | vpp/vpp-api/vpe.api | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c index c1da5aa9..62dd000f 100644 --- a/vpp/vpp-api/api.c +++ b/vpp/vpp-api/api.c @@ -4989,6 +4989,7 @@ static void vl_api_gre_add_del_tunnel_t_handler memset (a, 0, sizeof (*a)); a->is_add = mp->is_add; + a->teb = mp->teb; /* ip addresses sent in network byte order */ clib_memcpy (&(a->src), mp->src_address, 4); @@ -5018,6 +5019,7 @@ static void send_gre_tunnel_details clib_memcpy (rmp->src_address, &(t->tunnel_src), 4); clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4); rmp->outer_fib_id = htonl (im->fibs[t->outer_fib_index].table_id); + rmp->teb = t->teb; rmp->sw_if_index = htonl (t->sw_if_index); rmp->context = context; diff --git a/vpp/vpp-api/custom_dump.c b/vpp/vpp-api/custom_dump.c index a92e6803..cc37368d 100644 --- a/vpp/vpp-api/custom_dump.c +++ b/vpp/vpp-api/custom_dump.c @@ -1446,6 +1446,9 @@ static void *vl_api_gre_add_del_tunnel_t_print (ip46_address_t *) & (mp->src_address), mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4); + if (mp->teb) + s = format (s, "teb "); + if (mp->outer_fib_id) s = format (s, "outer-fib-id %d ", ntohl (mp->outer_fib_id)); diff --git a/vpp/vpp-api/vpe.api b/vpp/vpp-api/vpe.api index ae4c12d4..2434517e 100644 --- a/vpp/vpp-api/vpe.api +++ b/vpp/vpp-api/vpe.api @@ -2013,6 +2013,7 @@ define gre_add_del_tunnel u32 context; u8 is_add; u8 is_ipv6; + u8 teb; u8 src_address[16]; u8 dst_address[16]; u32 outer_fib_id; @@ -2037,6 +2038,7 @@ define gre_tunnel_details u32 context; u32 sw_if_index; u8 is_ipv6; + u8 teb; u8 src_address[16]; u8 dst_address[16]; u32 outer_fib_id; |