diff options
Diffstat (limited to 'src/plugins/adl')
| -rw-r--r-- | src/plugins/adl/adl.api | 2 | ||||
| -rw-r--r-- | src/plugins/adl/adl.c | 8 | ||||
| -rw-r--r-- | src/plugins/adl/adl_api.c | 1 | ||||
| -rw-r--r-- | src/plugins/adl/setup.pg | 72 |
4 files changed, 37 insertions, 46 deletions
diff --git a/src/plugins/adl/adl.api b/src/plugins/adl/adl.api index cbbb026a77c..b80cdc1c90f 100644 --- a/src/plugins/adl/adl.api +++ b/src/plugins/adl/adl.api @@ -13,7 +13,7 @@ * limitations under the License. */ -option version = "0.0.1"; +option version = "1.0.1"; import "vnet/interface_types.api"; diff --git a/src/plugins/adl/adl.c b/src/plugins/adl/adl.c index 832bfd4a982..c6ea57a18be 100644 --- a/src/plugins/adl/adl.c +++ b/src/plugins/adl/adl.c @@ -150,21 +150,17 @@ adl_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (adl_init) = { .runs_after = VLIB_INITS ("ip4_allowlist_init", "ip6_allowlist_init"), }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VNET_FEATURE_INIT (adl, static) = { .arc_name = "device-input", .node_name = "adl-input", .runs_before = VNET_FEATURES ("ethernet-input"), }; -/* *INDENT-ON */ int adl_interface_enable_disable (u32 sw_if_index, int enable_disable) { @@ -389,7 +385,6 @@ adl_allowlist_enable_disable_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (adl_allowlist_command, static) = { .path = "adl allowlist", @@ -397,15 +392,12 @@ VLIB_CLI_COMMAND (adl_allowlist_command, static) = "adl allowlist <interface-name> [ip4][ip6][default][fib-id <NN>][disable]", .function = adl_allowlist_enable_disable_command_fn, }; -/* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Allow/deny list plugin", }; -/* *INDENT-ON* */ /* diff --git a/src/plugins/adl/adl_api.c b/src/plugins/adl/adl_api.c index dba3b0cc17d..8bd805d9e06 100644 --- a/src/plugins/adl/adl_api.c +++ b/src/plugins/adl/adl_api.c @@ -30,7 +30,6 @@ #include <adl/adl.api_enum.h> #include <adl/adl.api_types.h> -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define REPLY_MSG_ID_BASE am->msg_id_base #include <vlibapi/api_helper_macros.h> diff --git a/src/plugins/adl/setup.pg b/src/plugins/adl/setup.pg index 7f816bc0893..7117225789a 100644 --- a/src/plugins/adl/setup.pg +++ b/src/plugins/adl/setup.pg @@ -6,46 +6,46 @@ set int ip6 table loop0 0 set int ip address loop0 2001:db01::1/64 set int state loop0 up -packet-generator new { - name ip4 - limit 100 - rate 0 - size 128-128 - interface loop0 - node adl-input - data { IP4: 1.2.40 -> 3cfd.fed0.b6c8 - UDP: 192.168.1.2-192.168.1.10 -> 192.168.2.1 - UDP: 1234 -> 2345 - incrementing 114 - } +packet-generator new { \ + name ip4 \ + limit 100 \ + rate 0 \ + size 128-128 \ + interface loop0 \ + node adl-input \ + data { IP4: 1.2.40 -> 3cfd.fed0.b6c8 \ + UDP: 192.168.1.2-192.168.1.10 -> 192.168.2.1 \ + UDP: 1234 -> 2345 \ + incrementing 114 \ + } \ } -packet-generator new { - name ip6-allow - limit 50 - rate 0 - size 128-128 - interface loop0 - node adl-input - data { IP6: 1.2.40 -> 3cfd.fed0.b6c8 - UDP: 2001:db01::2 -> 2001:db01::1 - UDP: 1234 -> 2345 - incrementing 80 - } +packet-generator new { \ + name ip6-allow \ + limit 50 \ + rate 0 \ + size 128-128 \ + interface loop0 \ + node adl-input \ + data { IP6: 1.2.40 -> 3cfd.fed0.b6c8 \ + UDP: 2001:db01::2 -> 2001:db01::1 \ + UDP: 1234 -> 2345 \ + incrementing 80 \ + } \ } -packet-generator new { - name ip6-drop - limit 50 - rate 0 - size 128-128 - interface loop0 - node adl-input - data { IP6: 1.2.40 -> 3cfd.fed0.b6c8 - UDP: 2001:db01::3 -> 2001:db01::1 - UDP: 1234 -> 2345 - incrementing 80 - } +packet-generator new { \ + name ip6-drop \ + limit 50 \ + rate 0 \ + size 128-128 \ + interface loop0 \ + node adl-input \ + data { IP6: 1.2.40 -> 3cfd.fed0.b6c8 \ + UDP: 2001:db01::3 -> 2001:db01::1 \ + UDP: 1234 -> 2345 \ + incrementing 80 \ + } \ } ip table 1 |