From 288e093624515e31a8bc0f0f870e5a9c7fa2dbaa Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Wed, 29 May 2019 12:30:05 +0200 Subject: ipip: refactor ipip.api with explicit types Use explicit types vl_api_address/prefix in ipip.api. Change-Id: Ib3133cebdbe4437742924efd49cde4009c4cc31b Type: refactor Signed-off-by: Ole Troan --- src/vnet/ipip/ipip.api | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'src/vnet/ipip/ipip.api') diff --git a/src/vnet/ipip/ipip.api b/src/vnet/ipip/ipip.api index e8051fde7f8..8a6e726eba4 100644 --- a/src/vnet/ipip/ipip.api +++ b/src/vnet/ipip/ipip.api @@ -1,4 +1,3 @@ -/* Hey Emacs use -*- mode: C -*- */ /* * Copyright (c) 2018 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -58,13 +57,14 @@ import "vnet/ip/ip_types.api"; */ typedef ipip_tunnel { - u32 instance; /* If non-~0, specifies a custom dev instance */ + u32 instance; /* If non-~0, specifies a custom dev instance */ vl_api_address_t src; vl_api_address_t dst; - u32 sw_if_index; /* ignored on create, set in details/dump */ -u32 table_id; - u8 tc_tos; /* If ~0, the TOS/TC value is copied from - inner packet, otherwise set to value */ + vl_api_interface_index_t sw_if_index; /* ignored on create, set in + details/dump */ + u32 table_id; + u8 tc_tos; /* If ~0, the TOS/TC value is copied from + inner packet, otherwise set to value */ }; /** @@ -103,14 +103,12 @@ define ipip_6rd_add_tunnel u32 context; u32 ip6_table_id; u32 ip4_table_id; - u8 ip6_prefix[16]; - u8 ip4_prefix[4]; - u8 ip4_src[4]; - u8 ip6_prefix_len; - u8 ip4_prefix_len; - u8 security_check; - u8 tc_tos; /* If ~0, the TOS/TC value is copied from - inner packet, otherwise set to value */ + vl_api_ip6_prefix_t ip6_prefix; + vl_api_ip4_prefix_t ip4_prefix; + vl_api_ip4_address_t ip4_src; + bool security_check; + u8 tc_tos; /* If ~0, the TOS/TC value is copied from + inner packet, otherwise set to value */ }; define ipip_6rd_add_tunnel_reply @@ -145,9 +143,3 @@ define ipip_tunnel_details u32 context; vl_api_ipip_tunnel_t tunnel; }; - -/* - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ -- cgit 1.2.3-korg