diff options
author | Ole Troan <ot@cisco.com> | 2020-11-18 19:17:48 +0100 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2020-11-25 08:25:50 +0000 |
commit | df87f8092f5b6b54eef0d5acf3c27c2e398a401a (patch) | |
tree | 762a3da5d6757c6f475ffce6dcfae2b65b2c3850 /src/plugins/dns | |
parent | c95cfa218b214bd1c67dc165b4ed1fb7a224bdad (diff) |
api: vat2 and json autogeneration for api messages
VAT2: A completely auto-generated replacement of VAT.
Reads input message in JSON from stdin and outputs received messages in JSON.
A VAT2 plugin is automatically built for a .api file.
There no longer a need for a separate _test.c.
Example:
vat2 show_version {}
{
"_msgname": "show_version_reply",
"retval": 0,
"program": "vpe",
"version": "21.01-rc0~411-gf6eb348a6",
"build_date": "2020-11-19T09:49:25",
"build_directory": "/vpp/autogen3"
}
vat2 sw_interface_dump '{"sw_if_index": -1,
"name_filter_valid": 0,
"name_filter": ""}'
[{
"_msgname": "sw_interface_details",
"sw_if_index": 0,
"sup_sw_if_index": 0,
"l2_address": "00:00:00:00:00:00",
"flags": "Invalid ENUM",
"type": "IF_API_TYPE_HARDWARE",
"link_duplex": "LINK_DUPLEX_API_UNKNOWN",
"link_speed": 0,
"link_mtu": 0,
"mtu": [0, 0, 0, 0],
"sub_id": 0,
"sub_number_of_tags": 0,
"sub_outer_vlan_id": 0,
"sub_inner_vlan_id": 0,
"sub_if_flags": "Invalid ENUM",
"vtr_op": 0,
"vtr_push_dot1q": 0,
"vtr_tag1": 0,
"vtr_tag2": 0,
"outer_tag": 0,
"b_dmac": "00:00:00:00:00:00",
"b_smac": "00:00:00:00:00:00",
"b_vlanid": 0,
"i_sid": 0,
"interface_name": "local0",
"interface_dev_type": "local",
"tag": ""
}]
This is the first phase and vat2 is not integrated in packaging yet.
Type: feature
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: Ib45ddeafb180ea7da8c5dc274a9274d7a4edc876
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/dns')
-rw-r--r-- | src/plugins/dns/dns.api | 8 | ||||
-rw-r--r-- | src/plugins/dns/dns.c | 53 |
2 files changed, 4 insertions, 57 deletions
diff --git a/src/plugins/dns/dns.api b/src/plugins/dns/dns.api index 866ed8abae3..17ab5244388 100644 --- a/src/plugins/dns/dns.api +++ b/src/plugins/dns/dns.api @@ -21,7 +21,7 @@ option version = "1.0.0"; @param context - sender context, to match reply w/ request @param is_enable - 1 = enable, 0 = disable */ -autoreply manual_print define dns_enable_disable { +autoreply define dns_enable_disable { u32 client_index; u32 context; u8 enable; @@ -36,7 +36,7 @@ autoreply manual_print define dns_enable_disable { @param is_add - add = 1, delete = 0 @param server_address - server ip address */ -autoreply manual_print define dns_name_server_add_del { +autoreply define dns_name_server_add_del { u32 client_index; u32 context; u8 is_ip6; @@ -51,7 +51,7 @@ autoreply manual_print define dns_name_server_add_del { @param context - sender context, to match reply w/ request @param name - the name to resolve */ -manual_print define dns_resolve_name { +define dns_resolve_name { u32 client_index; u32 context; u8 name[256]; @@ -84,7 +84,7 @@ define dns_resolve_name_reply { @param is_ip6 - set if the reverse-DNS request is an ip6 address @param address - the address to map to a name */ -manual_print define dns_resolve_ip { +define dns_resolve_ip { u32 client_index; u32 context; u8 is_ip6; diff --git a/src/plugins/dns/dns.c b/src/plugins/dns/dns.c index 045f4d616a3..de1862dd52c 100644 --- a/src/plugins/dns/dns.c +++ b/src/plugins/dns/dns.c @@ -2992,59 +2992,6 @@ found_src_address: } } -static void *vl_api_dns_enable_disable_t_print - (vl_api_dns_enable_disable_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dns_enable_disable "); - s = format (s, "%s ", mp->enable ? "enable" : "disable"); - - FINISH; -} - -static void *vl_api_dns_name_server_add_del_t_print - (vl_api_dns_name_server_add_del_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dns_name_server_add_del "); - if (mp->is_ip6) - s = format (s, "%U ", format_ip6_address, - (ip6_address_t *) mp->server_address); - else - s = format (s, "%U ", format_ip4_address, - (ip4_address_t *) mp->server_address); - - if (mp->is_add == 0) - s = format (s, "del "); - - FINISH; -} - -static void *vl_api_dns_resolve_name_t_print - (vl_api_dns_resolve_name_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dns_resolve_name "); - s = format (s, "%s ", mp->name); - FINISH; -} - -static void *vl_api_dns_resolve_ip_t_print - (vl_api_dns_resolve_ip_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: dns_resolve_ip "); - if (mp->is_ip6) - s = format (s, "%U ", format_ip6_address, mp->address); - else - s = format (s, "%U ", format_ip4_address, mp->address); - FINISH; -} - #include <dns/dns.api.c> static clib_error_t * dns_init (vlib_main_t * vm) |