diff options
author | Damjan Marion <damarion@cisco.com> | 2016-11-09 19:54:20 +0100 |
---|---|---|
committer | Dave Barach <openvpp@barachs.net> | 2016-11-11 14:39:00 +0000 |
commit | 8b3191e6d715760deefe550b59c7d92be4b5cda9 (patch) | |
tree | 721dd977986d12864346081fec6b245ea5a250e0 /vnet/vnet/ip/ip6.h | |
parent | 0178d52384e0428368f1acf3163e664ecda7b64c (diff) |
feature: convert all feature nodes to new feature infra
Change-Id: I34c527ba910fb282a95458b78d1d684eb337905e
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/ip/ip6.h')
-rw-r--r-- | vnet/vnet/ip/ip6.h | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/vnet/vnet/ip/ip6.h b/vnet/vnet/ip/ip6.h index 8b3b9973bf4..428a16f60aa 100644 --- a/vnet/vnet/ip/ip6.h +++ b/vnet/vnet/ip/ip6.h @@ -46,7 +46,6 @@ #include <vnet/ip/ip6_packet.h> #include <vnet/ip/ip6_hop_by_hop_packet.h> #include <vnet/ip/lookup.h> -#include <vnet/feature/feature.h> #include <stdbool.h> #include <vppinfra/bihash_24_8.h> #include <vppinfra/bihash_template.h> @@ -160,30 +159,6 @@ typedef struct ip6_main_t { u32 lookup_table_nbuckets; uword lookup_table_size; - /* feature path configuration lists */ - vnet_feature_registration_t * next_feature[VNET_N_IP_FEAT]; - - /* Built-in unicast feature path indices, see vnet_feature_arc_init(...) */ - u32 ip6_unicast_rx_feature_check_access; - u32 ip6_unicast_rx_feature_policer_classify; - u32 ip6_unicast_rx_feature_flow_classify; - u32 ip6_unicast_rx_feature_ipsec; - u32 ip6_unicast_rx_feature_l2tp_decap; - u32 ip6_unicast_rx_feature_vpath; - u32 ip6_unicast_rx_feature_lookup; - u32 ip6_unicast_rx_feature_drop; - - /* Built-in multicast feature path indices */ - u32 ip6_multicast_rx_feature_drop; - u32 ip6_multicast_rx_feature_vpath; - u32 ip6_multicast_rx_feature_lookup; - - /* Built-in tx feature path index */ - u32 ip6_tx_feature_interface_output; - - /* Save results for show command */ - char ** feature_nodes[VNET_N_IP_FEAT]; - /* Seed for Jenkins hash used to compute ip6 flow hash. */ u32 flow_hash_seed; @@ -201,43 +176,6 @@ typedef struct ip6_main_t { /* Global ip6 main structure. */ extern ip6_main_t ip6_main; -#define VNET_IP6_UNICAST_FEATURE_INIT(x,...) \ - __VA_ARGS__ vnet_feature_registration_t uc_##x; \ -static void __vnet_add_feature_registration_uc_##x (void) \ - __attribute__((__constructor__)) ; \ -static void __vnet_add_feature_registration_uc_##x (void) \ -{ \ - ip6_main_t * im = &ip6_main; \ - uc_##x.next = im->next_feature[VNET_IP_RX_UNICAST_FEAT]; \ - im->next_feature[VNET_IP_RX_UNICAST_FEAT] = &uc_##x; \ -} \ -__VA_ARGS__ vnet_feature_registration_t uc_##x - -#define VNET_IP6_MULTICAST_FEATURE_INIT(x,...) \ - __VA_ARGS__ vnet_feature_registration_t mc_##x; \ -static void __vnet_add_feature_registration_mc_##x (void) \ - __attribute__((__constructor__)) ; \ -static void __vnet_add_feature_registration_mc_##x (void) \ -{ \ - ip6_main_t * im = &ip6_main; \ - mc_##x.next = im->next_feature[VNET_IP_RX_MULTICAST_FEAT]; \ - im->next_feature[VNET_IP_RX_MULTICAST_FEAT] = &mc_##x; \ -} \ -__VA_ARGS__ vnet_feature_registration_t mc_##x - -#define VNET_IP6_TX_FEATURE_INIT(x,...) \ - __VA_ARGS__ vnet_feature_registration_t tx_##x; \ -static void __vnet_add_feature_registration_tx_##x (void) \ - __attribute__((__constructor__)) ; \ -static void __vnet_add_feature_registration_tx_##x (void) \ -{ \ - ip6_main_t * im = &ip6_main; \ - tx_##x.next = im->next_feature[VNET_IP_TX_FEAT]; \ - im->next_feature[VNET_IP_TX_FEAT] = &tx_##x; \ -} \ -__VA_ARGS__ vnet_feature_registration_t tx_##x - - /* Global ip6 input node. Errors get attached to ip6 input node. */ extern vlib_node_registration_t ip6_input_node; extern vlib_node_registration_t ip6_rewrite_node; |