Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
acl-plugin: acl-as-a-service: VPP-1248: fix the error if exports.h included in more...
[vpp.git]
/
src
/
plugins
/
acl
/
acl.c
diff --git
a/src/plugins/acl/acl.c
b/src/plugins/acl/acl.c
index
4f63a97
..
aab18c6
100644
(file)
--- a/
src/plugins/acl/acl.c
+++ b/
src/plugins/acl/acl.c
@@
-54,7
+54,6
@@
#include "public_inlines.h"
acl_main_t acl_main;
#include "public_inlines.h"
acl_main_t acl_main;
-acl_main_t *p_acl_main = &acl_main;
#define REPLY_MSG_ID_BASE am->msg_id_base
#include <vlibapi/api_helper_macros.h>
#define REPLY_MSG_ID_BASE am->msg_id_base
#include <vlibapi/api_helper_macros.h>
@@
-95,6
+94,9
@@
VLIB_PLUGIN_REGISTER () = {
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */
+/* methods exported from ACL-as-a-service */
+static acl_plugin_methods_t acl_plugin;
+
/* Format vec16. */
u8 *
format_vec16 (u8 * s, va_list * va)
/* Format vec16. */
u8 *
format_vec16 (u8 * s, va_list * va)
@@
-111,19
+113,6
@@
format_vec16 (u8 * s, va_list * va)
return s;
}
return s;
}
-
-
-u8
-acl_plugin_acl_exists (u32 acl_index)
-{
- acl_main_t *am = &acl_main;
-
- if (pool_is_free_index (am->acls, acl_index))
- return 0;
-
- return 1;
-}
-
static void *
acl_set_heap (acl_main_t * am)
{
static void *
acl_set_heap (acl_main_t * am)
{
@@
-1349,20
+1338,20
@@
acl_interface_set_inout_acl_list (acl_main_t * am, u32 sw_if_index,
{
if (~0 == am->interface_acl_user_id)
am->interface_acl_user_id =
{
if (~0 == am->interface_acl_user_id)
am->interface_acl_user_id =
- acl_plugin
_
register_user_module ("interface ACL", "sw_if_index",
+ acl_plugin
.
register_user_module ("interface ACL", "sw_if_index",
"is_input");
lc_index =
"is_input");
lc_index =
- acl_plugin
_
get_lookup_context_index (am->interface_acl_user_id,
+ acl_plugin
.
get_lookup_context_index (am->interface_acl_user_id,
sw_if_index, is_input);
(*pinout_lc_index_by_sw_if_index)[sw_if_index] = lc_index;
}
sw_if_index, is_input);
(*pinout_lc_index_by_sw_if_index)[sw_if_index] = lc_index;
}
- acl_plugin
_
set_acl_vec_for_context (lc_index, vec_acl_list_index);
+ acl_plugin
.
set_acl_vec_for_context (lc_index, vec_acl_list_index);
}
else
{
if (~0 != (*pinout_lc_index_by_sw_if_index)[sw_if_index])
{
}
else
{
if (~0 != (*pinout_lc_index_by_sw_if_index)[sw_if_index])
{
- acl_plugin
_
put_lookup_context_index ((*pinout_lc_index_by_sw_if_index)[sw_if_index]);
+ acl_plugin
.
put_lookup_context_index ((*pinout_lc_index_by_sw_if_index)[sw_if_index]);
(*pinout_lc_index_by_sw_if_index)[sw_if_index] = ~0;
}
}
(*pinout_lc_index_by_sw_if_index)[sw_if_index] = ~0;
}
}
@@
-4164,6
+4153,14
@@
acl_init (vlib_main_t * vm)
vec_free (name);
vec_free (name);
+ if (error)
+ return error;
+
+ error = acl_plugin_exports_init (&acl_plugin);
+
+ if (error)
+ return error;
+
acl_setup_fa_nodes ();
am->acl_mheap_size = 0; /* auto size when initializing */
acl_setup_fa_nodes ();
am->acl_mheap_size = 0; /* auto size when initializing */