X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fclassify%2Fin_out_acl.c;fp=src%2Fvnet%2Fclassify%2Finput_acl.c;h=a34f6cec61a822a98dc5fa1de5fd7ac34dffe99c;hb=815d7d5637fbffd20bf81c74fd59dac8e4fe4d94;hp=cf5053ef3ac4b8b2791db56396b9d36870716ff8;hpb=dac03527f64216e132953a1a1d47b414e6841c68;p=vpp.git diff --git a/src/vnet/classify/input_acl.c b/src/vnet/classify/in_out_acl.c similarity index 53% rename from src/vnet/classify/input_acl.c rename to src/vnet/classify/in_out_acl.c index cf5053ef3ac..a34f6cec61a 100644 --- a/src/vnet/classify/input_acl.c +++ b/src/vnet/classify/in_out_acl.c @@ -14,62 +14,69 @@ */ #include #include -#include +#include -input_acl_main_t input_acl_main; +in_out_acl_main_t in_out_acl_main; static int -vnet_inacl_ip_feature_enable (vlib_main_t * vnm, - input_acl_main_t * am, - u32 sw_if_index, - input_acl_table_id_t tid, int feature_enable) +vnet_in_out_acl_ip_feature_enable (vlib_main_t * vnm, + in_out_acl_main_t * am, + u32 sw_if_index, + in_out_acl_table_id_t tid, + int feature_enable, int is_output) { - if (tid == INPUT_ACL_TABLE_L2) + if (tid == IN_OUT_ACL_TABLE_L2) { - l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ACL, - feature_enable); + l2input_intf_bitmap_enable (sw_if_index, + is_output ? L2OUTPUT_FEAT_ACL : + L2INPUT_FEAT_ACL, feature_enable); } else { /* IP[46] */ vnet_feature_config_main_t *fcm; u8 arc; - if (tid == INPUT_ACL_TABLE_IP4) + if (tid == IN_OUT_ACL_TABLE_IP4) { - vnet_feature_enable_disable ("ip4-unicast", "ip4-inacl", + char *arc_name = is_output ? "ip4-output" : "ip4-unicast"; + vnet_feature_enable_disable (arc_name, + is_output ? "ip4-outacl" : "ip4-inacl", sw_if_index, feature_enable, 0, 0); - arc = vnet_get_feature_arc_index ("ip4-unicast"); + arc = vnet_get_feature_arc_index (arc_name); } else { - vnet_feature_enable_disable ("ip6-unicast", "ip6-inacl", + char *arc_name = is_output ? "ip6-output" : "ip6-unicast"; + vnet_feature_enable_disable (arc_name, + is_output ? "ip6-outacl" : "ip6-inacl", sw_if_index, feature_enable, 0, 0); - arc = vnet_get_feature_arc_index ("ip6-unicast"); + arc = vnet_get_feature_arc_index (arc_name); } fcm = vnet_get_feature_arc_config_main (arc); - am->vnet_config_main[tid] = &fcm->config_main; + am->vnet_config_main[is_output][tid] = &fcm->config_main; } return 0; } int -vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index, - u32 ip4_table_index, - u32 ip6_table_index, u32 l2_table_index, u32 is_add) +vnet_set_in_out_acl_intfc (vlib_main_t * vm, u32 sw_if_index, + u32 ip4_table_index, + u32 ip6_table_index, u32 l2_table_index, + u32 is_add, u32 is_output) { - input_acl_main_t *am = &input_acl_main; + in_out_acl_main_t *am = &in_out_acl_main; vnet_classify_main_t *vcm = am->vnet_classify_main; - u32 acl[INPUT_ACL_N_TABLES] = { ip4_table_index, ip6_table_index, + u32 acl[IN_OUT_ACL_N_TABLES] = { ip4_table_index, ip6_table_index, l2_table_index }; u32 ti; /* Assume that we've validated sw_if_index in the API layer */ - for (ti = 0; ti < INPUT_ACL_N_TABLES; ti++) + for (ti = 0; ti < IN_OUT_ACL_N_TABLES; ti++) { if (acl[ti] == ~0) continue; @@ -78,12 +85,14 @@ vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index, return VNET_API_ERROR_NO_SUCH_TABLE; vec_validate_init_empty - (am->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0); + (am->classify_table_index_by_sw_if_index[is_output][ti], sw_if_index, + ~0); /* Reject any DEL operation with wrong sw_if_index */ if (!is_add && (acl[ti] != - am->classify_table_index_by_sw_if_index[ti][sw_if_index])) + am->classify_table_index_by_sw_if_index[is_output][ti] + [sw_if_index])) { clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete", @@ -93,23 +102,49 @@ vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index, /* Return ok on ADD operaton if feature is already enabled */ if (is_add && - am->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0) + am->classify_table_index_by_sw_if_index[is_output][ti][sw_if_index] + != ~0) return 0; - vnet_inacl_ip_feature_enable (vm, am, sw_if_index, ti, is_add); + vnet_in_out_acl_ip_feature_enable (vm, am, sw_if_index, ti, is_add, + is_output); if (is_add) - am->classify_table_index_by_sw_if_index[ti][sw_if_index] = acl[ti]; + am->classify_table_index_by_sw_if_index[is_output][ti][sw_if_index] = + acl[ti]; else - am->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0; + am->classify_table_index_by_sw_if_index[is_output][ti][sw_if_index] = + ~0; } return 0; } +int +vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index, + u32 ip4_table_index, + u32 ip6_table_index, u32 l2_table_index, u32 is_add) +{ + return vnet_set_in_out_acl_intfc (vm, sw_if_index, ip4_table_index, + ip6_table_index, l2_table_index, is_add, + IN_OUT_ACL_INPUT_TABLE_GROUP); +} + +int +vnet_set_output_acl_intfc (vlib_main_t * vm, u32 sw_if_index, + u32 ip4_table_index, + u32 ip6_table_index, u32 l2_table_index, + u32 is_add) +{ + return vnet_set_in_out_acl_intfc (vm, sw_if_index, ip4_table_index, + ip6_table_index, l2_table_index, is_add, + IN_OUT_ACL_OUTPUT_TABLE_GROUP); +} + static clib_error_t * -set_input_acl_command_fn (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) +set_in_out_acl_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd, + u32 is_output) { vnet_main_t *vnm = vnet_get_main (); u32 sw_if_index = ~0; @@ -146,8 +181,9 @@ set_input_acl_command_fn (vlib_main_t * vm, if (idx_cnt > 1) return clib_error_return (0, "Only one table index per API is allowed."); - rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index, - ip6_table_index, l2_table_index, is_add); + rv = vnet_set_in_out_acl_intfc (vm, sw_if_index, ip4_table_index, + ip6_table_index, l2_table_index, is_add, + is_output); switch (rv) { @@ -163,8 +199,24 @@ set_input_acl_command_fn (vlib_main_t * vm, return 0; } +static clib_error_t * +set_input_acl_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + return set_in_out_acl_command_fn (vm, input, cmd, + IN_OUT_ACL_INPUT_TABLE_GROUP); +} + +static clib_error_t * +set_output_acl_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + return set_in_out_acl_command_fn (vm, input, cmd, + IN_OUT_ACL_OUTPUT_TABLE_GROUP); +} + /* - * Configure interface to enable/disble input ACL feature: + * Configure interface to enable/disble input/output ACL features: * intfc - interface name to be configured as input ACL * Ip4-table [del] - enable/disable IP4 input ACL * Ip6-table [del] - enable/disable IP6 input ACL @@ -181,15 +233,22 @@ VLIB_CLI_COMMAND (set_input_acl_command, static) = { " [ip6-table ] [l2-table ] [del]", .function = set_input_acl_command_fn, }; +VLIB_CLI_COMMAND (set_output_acl_command, static) = { + .path = "set interface output acl", + .short_help = + "set interface output acl intfc [ip4-table ]\n" + " [ip6-table ] [l2-table ] [del]", + .function = set_output_acl_command_fn, +}; /* *INDENT-ON* */ clib_error_t * -input_acl_init (vlib_main_t * vm) +in_out_acl_init (vlib_main_t * vm) { - input_acl_main_t *am = &input_acl_main; + in_out_acl_main_t *am = &in_out_acl_main; clib_error_t *error = 0; - if ((error = vlib_call_init_function (vm, ip_inacl_init))) + if ((error = vlib_call_init_function (vm, ip_in_out_acl_init))) return error; am->vlib_main = vm; @@ -199,22 +258,22 @@ input_acl_init (vlib_main_t * vm) return 0; } -VLIB_INIT_FUNCTION (input_acl_init); +VLIB_INIT_FUNCTION (in_out_acl_init); uword unformat_acl_type (unformat_input_t * input, va_list * args) { u32 *acl_type = va_arg (*args, u32 *); - u32 tid = INPUT_ACL_N_TABLES; + u32 tid = IN_OUT_ACL_N_TABLES; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "ip4")) - tid = INPUT_ACL_TABLE_IP4; + tid = IN_OUT_ACL_TABLE_IP4; else if (unformat (input, "ip6")) - tid = INPUT_ACL_TABLE_IP6; + tid = IN_OUT_ACL_TABLE_IP6; else if (unformat (input, "l2")) - tid = INPUT_ACL_TABLE_L2; + tid = IN_OUT_ACL_TABLE_L2; else break; } @@ -224,9 +283,9 @@ unformat_acl_type (unformat_input_t * input, va_list * args) } u8 * -format_vnet_inacl_info (u8 * s, va_list * va) +format_vnet_in_out_acl_info (u8 * s, va_list * va) { - input_acl_main_t *am = va_arg (*va, input_acl_main_t *); + in_out_acl_main_t *am = va_arg (*va, in_out_acl_main_t *); int sw_if_idx = va_arg (*va, int); u32 tid = va_arg (*va, u32); @@ -244,11 +303,12 @@ format_vnet_inacl_info (u8 * s, va_list * va) } static clib_error_t * -show_inacl_command_fn (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) +show_in_out_acl_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd, u32 is_output) { - input_acl_main_t *am = &input_acl_main; - u32 type = INPUT_ACL_N_TABLES; + in_out_acl_main_t *am = &in_out_acl_main; + u32 type = IN_OUT_ACL_N_TABLES; int i; u32 *vec_tbl; @@ -260,34 +320,58 @@ show_inacl_command_fn (vlib_main_t * vm, break; } - if (type == INPUT_ACL_N_TABLES) - return clib_error_return (0, "Invalid input ACL table type."); + if (type == IN_OUT_ACL_N_TABLES) + return clib_error_return (0, is_output ? "Invalid output ACL table type." + : "Invalid input ACL table type."); - vec_tbl = am->classify_table_index_by_sw_if_index[type]; + vec_tbl = am->classify_table_index_by_sw_if_index[is_output][type]; if (vec_len (vec_tbl)) - vlib_cli_output (vm, "%U", format_vnet_inacl_info, am, ~0 /* hdr */ , ~0); + vlib_cli_output (vm, "%U", format_vnet_in_out_acl_info, am, ~0 /* hdr */ , + ~0); else - vlib_cli_output (vm, "No input ACL tables configured"); + vlib_cli_output (vm, is_output ? "No output ACL tables configured" + : "No input ACL tables configured"); for (i = 0; i < vec_len (vec_tbl); i++) { if (vec_elt (vec_tbl, i) == ~0) continue; - vlib_cli_output (vm, "%U", format_vnet_inacl_info, + vlib_cli_output (vm, "%U", format_vnet_in_out_acl_info, am, i, vec_elt (vec_tbl, i)); } return 0; } +static clib_error_t * +show_inacl_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + return show_in_out_acl_command_fn (vm, input, cmd, + IN_OUT_ACL_INPUT_TABLE_GROUP); +} + +static clib_error_t * +show_outacl_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + return show_in_out_acl_command_fn (vm, input, cmd, + IN_OUT_ACL_OUTPUT_TABLE_GROUP); +} + /* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_inacl_command, static) = { .path = "show inacl", .short_help = "show inacl type [ip4|ip6|l2]", .function = show_inacl_command_fn, }; +VLIB_CLI_COMMAND (show_outacl_command, static) = { + .path = "show outacl", + .short_help = "show outacl type [ip4|ip6|l2]", + .function = show_outacl_command_fn, +}; /* *INDENT-ON* */ /*