diff options
author | 2019-08-23 22:55:18 +0200 | |
---|---|---|
committer | 2019-09-03 20:04:13 +0000 | |
commit | e5ff5a36dd126ee57dca4e0b03da2f7704e0a4f5 (patch) | |
tree | 2108baa60e8a697624288fe2c3050be29697bc88 /extras/vom/vom/interface_factory.cpp | |
parent | b6fde4a8bae474c6b73d08d223028f42e396d452 (diff) |
api: enforce vla is last and fixed string type
Enforce that variable length fields are the last element of API messages.
Add a 'fixed' version of string type, since dealing with
multiple variable length strings turned out too painful
for the C language bindings.
The string type is now:
{
string name[64]; // NUL terminated C-string. Essentially decays to u8 name[64]
string name[]; // Variable length string with embedded len field (vl_api_string_t)
};
The latter notation could be made available to other types as well.
e.g.
{
vl_api_address_t addresses[];
}
instead of
{
u32 n_addr;
vl_api_address_t addresses[n_addr];
};
Type: fix
Change-Id: I18fa17ef47227633752ab50453e8d20a652a9f9b
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'extras/vom/vom/interface_factory.cpp')
-rw-r--r-- | extras/vom/vom/interface_factory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extras/vom/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp index 750df96b025..2c64e321330 100644 --- a/extras/vom/vom/interface_factory.cpp +++ b/extras/vom/vom/interface_factory.cpp @@ -30,7 +30,7 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd) /** * Determine the interface type from the name and VLAN attributes */ - std::string name = reinterpret_cast<const char*>(vd.interface_name.buf); + std::string name = reinterpret_cast<const char*>(vd.interface_name); interface::type_t type = interface::type_t::from_string(name); interface::admin_state_t state = interface::admin_state_t::from_int( vd.flags & vapi_enum_if_status_flags::IF_STATUS_API_FLAG_ADMIN_UP); @@ -64,8 +64,8 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd) * if the tag is set, then we wrote that to specify a name to make * the interface type more specific */ - if (vd.tag.buf[0] != 0) { - tag = std::string(reinterpret_cast<const char*>(vd.tag.buf)); + if (vd.tag[0] != 0) { + tag = std::string(reinterpret_cast<const char*>(vd.tag)); } if (!tag.empty() && interface::type_t::LOOPBACK == type) { |