From de5b08fb302e84142e4ba0cf0cbed4e740e4165c Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 29 Aug 2018 06:37:18 -0700 Subject: [PATCH] Introduce a mac_address_t on the API and in VPP Change-Id: I05d6c2cb5d34de469eb050e4ee10dc6b954c986d Signed-off-by: Neale Ranns --- extras/vom/vom/Makefile.am | 1 + extras/vom/vom/api_types.cpp | 123 +++++++++++++++++++++++++++++++++ extras/vom/vom/api_types.hpp | 45 ++++++++++++ extras/vom/vom/types.cpp | 2 +- extras/vom/vom/types.hpp | 2 +- src/vnet.am | 5 +- src/vnet/CMakeLists.txt | 2 + src/vnet/ethernet/ethernet.h | 16 ++++- src/vnet/ethernet/ethernet_types.api | 19 +++++ src/vnet/ethernet/ethernet_types_api.c | 57 +++++++++++++++ src/vnet/ethernet/ethernet_types_api.h | 45 ++++++++++++ src/vnet/ethernet/mac_address.c | 39 +++++++++++ src/vnet/ethernet/mac_address.h | 62 +++++++++++++++++ src/vnet/ip/ip.api | 1 + 14 files changed, 414 insertions(+), 5 deletions(-) create mode 100644 extras/vom/vom/api_types.cpp create mode 100644 extras/vom/vom/api_types.hpp create mode 100644 src/vnet/ethernet/ethernet_types.api create mode 100644 src/vnet/ethernet/ethernet_types_api.c create mode 100644 src/vnet/ethernet/ethernet_types_api.h create mode 100644 src/vnet/ethernet/mac_address.c create mode 100644 src/vnet/ethernet/mac_address.h diff --git a/extras/vom/vom/Makefile.am b/extras/vom/vom/Makefile.am index f976b6fad90..797bef0f611 100644 --- a/extras/vom/vom/Makefile.am +++ b/extras/vom/vom/Makefile.am @@ -80,6 +80,7 @@ endif libvom_la_SOURCES = \ types.cpp \ + api_types.cpp \ arp_proxy_binding_cmds.cpp \ arp_proxy_binding.cpp \ arp_proxy_config_cmds.cpp \ diff --git a/extras/vom/vom/api_types.cpp b/extras/vom/vom/api_types.cpp new file mode 100644 index 00000000000..1b9ff2913a1 --- /dev/null +++ b/extras/vom/vom/api_types.cpp @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace VOM { + +static vapi_type_ip4_address +to_api(const boost::asio::ip::address_v4& a) +{ + vapi_type_ip4_address v; + + std::copy_n(a.to_bytes().data(), 4, v.address); + + return v; +} + +static vapi_type_ip6_address +to_api(const boost::asio::ip::address_v6& a) +{ + vapi_type_ip6_address v; + + std::copy_n(a.to_bytes().data(), 16, v.address); + + return v; +} + +vapi_type_address +to_api(const ip_address_t& a) +{ + if (a.is_v4()) { + vapi_type_address v = { + .af = ADDRESS_IP4, + .un = + { + .ip4 = to_api(a.to_v4()), + }, + }; + return (v); + } else { + vapi_type_address v = { + .af = ADDRESS_IP6, + .un = + { + .ip6 = to_api(a.to_v6()), + }, + }; + return (v); + } +} + +ip_address_t +from_api(const vapi_type_address& v) +{ + boost::asio::ip::address addr; + + if (ADDRESS_IP6 == v.af) { + std::array a; + std::copy(v.un.ip6.address, v.un.ip6.address + 16, std::begin(a)); + boost::asio::ip::address_v6 v6(a); + addr = v6; + } else { + std::array a; + std::copy(v.un.ip6.address, v.un.ip6.address + 4, std::begin(a)); + boost::asio::ip::address_v4 v4(a); + addr = v4; + } + + return addr; +} + +vapi_type_mac_address +to_api(const mac_address_t& a) +{ + vapi_type_mac_address v; + + std::copy(std::begin(a.bytes), std::end(a.bytes), v.bytes); + + return (v); +} + +mac_address_t +from_api(const vapi_type_mac_address& v) +{ + return mac_address_t(v.bytes); +} + +route::prefix_t +from_api(const vapi_type_prefix& v) +{ + return route::prefix_t(from_api(v.address), v.address_length); +} + +vapi_type_prefix +to_api(const route::prefix_t& p) +{ + vapi_type_prefix v = { + .address = to_api(p.address()), .address_length = p.mask_width(), + }; + + return v; +} +}; + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "mozilla") + * End: + */ diff --git a/extras/vom/vom/api_types.hpp b/extras/vom/vom/api_types.hpp new file mode 100644 index 00000000000..b555fc3c752 --- /dev/null +++ b/extras/vom/vom/api_types.hpp @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +#include + +namespace VOM { + +typedef boost::asio::ip::address ip_address_t; + +vapi_type_address to_api(const ip_address_t& a); + +ip_address_t from_api(const vapi_type_address& v); + +vapi_type_mac_address to_api(const mac_address_t& a); + +mac_address_t from_api(const vapi_type_mac_address& v); + +route::prefix_t from_api(const vapi_type_prefix&); + +vapi_type_prefix to_api(const route::prefix_t&); +}; + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "mozilla") + * End: + */ diff --git a/extras/vom/vom/types.cpp b/extras/vom/vom/types.cpp index c6093ebd15d..a67a7f360f9 100644 --- a/extras/vom/vom/types.cpp +++ b/extras/vom/vom/types.cpp @@ -109,7 +109,7 @@ operator<<(std::ostream& os, const handle_t& h) return (os); } -mac_address_t::mac_address_t(uint8_t b[6]) +mac_address_t::mac_address_t(const uint8_t b[6]) { std::copy(b, b + 6, std::begin(bytes)); } diff --git a/extras/vom/vom/types.hpp b/extras/vom/vom/types.hpp index 7b08d831352..ab214085d16 100644 --- a/extras/vom/vom/types.hpp +++ b/extras/vom/vom/types.hpp @@ -289,7 +289,7 @@ std::ostream& operator<<(std::ostream& os, const handle_t& h); */ struct mac_address_t { - mac_address_t(uint8_t bytes[6]); + mac_address_t(const uint8_t bytes[6]); mac_address_t(const std::string& str); mac_address_t(std::initializer_list bytes); /** diff --git a/src/vnet.am b/src/vnet.am index b9402b11e74..8235d9b9a51 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -120,6 +120,7 @@ libvnet_la_SOURCES += \ vnet/ethernet/format.c \ vnet/ethernet/init.c \ vnet/ethernet/interface.c \ + vnet/ethernet/mac_address.c \ vnet/ethernet/node.c \ vnet/ethernet/pg.c \ vnet/ethernet/sfp.c \ @@ -139,7 +140,9 @@ nobase_include_HEADERS += \ vnet/ethernet/p2p_ethernet.api.h \ vnet/ethernet/p2p_ethernet.h -API_FILES += vnet/ethernet/p2p_ethernet.api +API_FILES += \ + vnet/ethernet/p2p_ethernet.api \ + vnet/ethernet/ethernet_types.api ######################################## # Layer 2 protocol: Ethernet bridging diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index a10ec821e9a..61945a41867 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -109,9 +109,11 @@ list(APPEND VNET_API_FILES cop/cop.api) # Layer 2 protocol: Ethernet ############################################################################## list(APPEND VNET_SOURCES + ethernet/ethernet_types_api.c ethernet/format.c ethernet/init.c ethernet/interface.c + ethernet/mac_address.c ethernet/node.c ethernet/pg.c ethernet/sfp.c diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h index 0bfd48723e2..9a23448b3e6 100644 --- a/src/vnet/ethernet/ethernet.h +++ b/src/vnet/ethernet/ethernet.h @@ -46,7 +46,7 @@ #include always_inline u64 -ethernet_mac_address_u64 (u8 * a) +ethernet_mac_address_u64 (const u8 * a) { return (((u64) a[0] << (u64) (5 * 8)) | ((u64) a[1] << (u64) (4 * 8)) @@ -55,6 +55,18 @@ ethernet_mac_address_u64 (u8 * a) | ((u64) a[4] << (u64) (1 * 8)) | ((u64) a[5] << (u64) (0 * 8))); } +always_inline void +ethernet_mac_address_from_u64 (u64 u, u8 * a) +{ + i8 ii; + + for (ii = 5; ii >= 0; ii--) + { + a[ii] = u & 0xFF; + u = u >> 8; + } +} + static inline int ethernet_mac_address_is_multicast_u64 (u64 a) { @@ -62,7 +74,7 @@ ethernet_mac_address_is_multicast_u64 (u64 a) } static inline int -ethernet_mac_address_is_zero (u8 * mac) +ethernet_mac_address_is_zero (const u8 * mac) { return ((*((u32 *) mac) == 0) && (*((u16 *) (mac + 4)) == 0)); } diff --git a/src/vnet/ethernet/ethernet_types.api b/src/vnet/ethernet/ethernet_types.api new file mode 100644 index 00000000000..c33a02c377a --- /dev/null +++ b/src/vnet/ethernet/ethernet_types.api @@ -0,0 +1,19 @@ +/* Hey Emacs use -*- mode: C -*- */ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +typedef mac_address { + u8 bytes[6]; +}; diff --git a/src/vnet/ethernet/ethernet_types_api.c b/src/vnet/ethernet/ethernet_types_api.c new file mode 100644 index 00000000000..d9e06012870 --- /dev/null +++ b/src/vnet/ethernet/ethernet_types_api.c @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#define vl_typedefs /* define message structures */ +#include +#undef vl_typedefs + +#define vl_endianfun /* define message structures */ +#include +#undef vl_endianfun + +/* instantiate all the print functions we know about */ +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) +#define vl_printfun +#include +#undef vl_printfun + +void +mac_address_decode (const vl_api_mac_address_t * in, mac_address_t * out) +{ + mac_address_from_bytes (out, in->bytes); +} + +void +mac_address_encode (const mac_address_t * in, vl_api_mac_address_t * out) +{ +} + +extern u8 * +format_vl_api_mac_address (u8 * s, va_list * args) +{ + vl_api_mac_address_t *mac = va_arg (args, vl_api_mac_address_t *); + + return (format (s, "%U", format_mac_address, mac->bytes)); +} + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/ethernet/ethernet_types_api.h b/src/vnet/ethernet/ethernet_types_api.h new file mode 100644 index 00000000000..f326f8afa56 --- /dev/null +++ b/src/vnet/ethernet/ethernet_types_api.h @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __ETHERNET_TYPES_API_H__ +#define __ETHERNET_TYPES_API_H__ + +/** + * Conversion functions to/from (decode/encode) API types to VPP internal types + */ + +#include + +/** + * Forward declarations so we need not #include the API definitions here + */ +struct _vl_api_mac_address; + +extern void mac_address_decode (const struct _vl_api_mac_address *in, + mac_address_t * out); +extern void mac_address_encode (const mac_address_t * in, + struct _vl_api_mac_address *out); + +extern u8 *format_vl_api_mac_address (u8 * s, va_list * args); + +#endif + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/ethernet/mac_address.c b/src/vnet/ethernet/mac_address.c new file mode 100644 index 00000000000..72725c8e593 --- /dev/null +++ b/src/vnet/ethernet/mac_address.c @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +const mac_address_t ZERO_MAC_ADDRESS = { + .bytes = { + 0, 0, 0, 0, 0, 0, + }, +}; + +u8 * +format_mac_address_t (u8 * s, va_list * args) +{ + const mac_address_t *mac = va_arg (*args, mac_address_t *); + + return (format (s, "%U", format_mac_address, mac->bytes)); +} + + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/ethernet/mac_address.h b/src/vnet/ethernet/mac_address.h new file mode 100644 index 00000000000..e97eab6c3d7 --- /dev/null +++ b/src/vnet/ethernet/mac_address.h @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __MAC_ADDRESS_H__ +#define __MAC_ADDRESS_H__ + +#include + +typedef struct mac_address_t_ +{ + u8 bytes[6]; +} mac_address_t; + +extern const mac_address_t ZERO_MAC_ADDRESS; + +static_always_inline void +mac_address_from_bytes (mac_address_t * mac, const u8 * bytes) +{ + clib_memcpy (mac->bytes, bytes, sizeof (*mac)); +} + +static_always_inline int +mac_address_is_zero (const mac_address_t * mac) +{ + return (ethernet_mac_address_is_zero (mac->bytes)); +} + +static_always_inline u64 +mac_address_as_u64 (const mac_address_t * mac) +{ + return (ethernet_mac_address_u64 (mac->bytes)); +} + +static_always_inline void +mac_address_from_u64 (u64 u, mac_address_t * mac) +{ + ethernet_mac_address_from_u64 (u, mac->bytes); +} + +extern u8 *format_mac_address_t (u8 * s, va_list * args); + +#endif + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api index 5f664f33cf6..616d621577d 100644 --- a/src/vnet/ip/ip.api +++ b/src/vnet/ip/ip.api @@ -22,6 +22,7 @@ option version = "1.3.0"; import "vnet/ip/ip_types.api"; import "vnet/fib/fib_types.api"; +import "vnet/ethernet/ethernet_types.api"; /** \brief Add / del table request A table can be added multiple times, but need be deleted only once. -- 2.16.6