summaryrefslogtreecommitdiffstats
path: root/src/vat/api_format.c
diff options
context:
space:
mode:
authorJakub Grajciar <jgrajcia@cisco.com>2019-10-28 10:22:01 +0100
committerOle Trøan <otroan@employees.org>2019-10-30 09:06:33 +0000
commit3ae52627125a4c97bff91d43adad9bbaed42a6f5 (patch)
tree24b49a4f2326ac8bb2634453945ab12aa4b06617 /src/vat/api_format.c
parent40680c6601b8d02b820540461f805a46a3e354a8 (diff)
l2: l2tp API cleanup
Use consistent API types. Type: fix Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com> Change-Id: I9015fc60e8d77e5d5ac36bf2862c1fe794addb81 Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'src/vat/api_format.c')
-rw-r--r--src/vat/api_format.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 3ad4ec6e2cd..482575a66bf 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -11575,17 +11575,17 @@ api_l2tpv3_create_tunnel (vat_main_t * vam)
M (L2TPV3_CREATE_TUNNEL, mp);
- clib_memcpy (mp->client_address, client_address.as_u8,
- sizeof (mp->client_address));
+ clib_memcpy (mp->client_address.un.ip6, client_address.as_u8,
+ sizeof (ip6_address_t));
- clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address));
+ clib_memcpy (mp->our_address.un.ip6, our_address.as_u8,
+ sizeof (ip6_address_t));
mp->local_session_id = ntohl (local_session_id);
mp->remote_session_id = ntohl (remote_session_id);
mp->local_cookie = clib_host_to_net_u64 (local_cookie);
mp->remote_cookie = clib_host_to_net_u64 (remote_cookie);
mp->l2_sublayer_present = l2_sublayer_present;
- mp->is_ipv6 = 1;
S (mp);
W (ret);
@@ -11750,9 +11750,9 @@ static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
vat_json_init_object (node);
- clib_memcpy (&addr, mp->our_address, sizeof (addr));
+ clib_memcpy (&addr, mp->our_address.un.ip6, sizeof (addr));
vat_json_object_add_ip6 (node, "our_address", addr);
- clib_memcpy (&addr, mp->client_address, sizeof (addr));
+ clib_memcpy (&addr, mp->client_address.un.ip6, sizeof (addr));
vat_json_object_add_ip6 (node, "client_address", addr);
vat_json_node_t *lc = vat_json_object_add (node, "local_cookie");