diff options
author | Ole Troan <ot@cisco.com> | 2019-08-23 22:55:18 +0200 |
---|---|---|
committer | Ole Trøan <otroan@employees.org> | 2019-09-09 09:59:48 +0000 |
commit | 30d28bdfd8aca4d6d3c70482ad9ebfdb753610aa (patch) | |
tree | 1ae268835577d69dd982370487215d2049f87ea1 /test/ext/vapi_cpp_test.cpp | |
parent | 157f1cd34952759fd8c35976e68c9885537168ad (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>
(cherry picked from commit e5ff5a36dd126ee57dca4e0b03da2f7704e0a4f5)
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test/ext/vapi_cpp_test.cpp')
-rw-r--r-- | test/ext/vapi_cpp_test.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp index 68366af2ac8..2c2a82c8a9d 100644 --- a/test/ext/vapi_cpp_test.cpp +++ b/test/ext/vapi_cpp_test.cpp @@ -49,11 +49,8 @@ void verify_show_version_reply (const Show_version_reply &r) auto &p = r.get_payload (); printf ("show_version_reply: program: `%s', version: `%s', build directory: " "`%s', build date: `%s'\n", - vl_api_from_api_string (&p.program), - vl_api_from_api_string (&p.version), - vl_api_from_api_string (&p.build_directory), - vl_api_from_api_string (&p.build_date)); - ck_assert_str_eq ("vpe", (char *)vl_api_from_api_string (&p.program)); + p.program, p.version, p.build_directory, p.build_date); + ck_assert_str_eq ("vpe", (char *)p.program); } Connection con; |