diff options
| author |   Hongjun Ni <hongjun.ni@intel.com> | 2017-03-28 18:08:52 +0800 |
|---|---|---|
| committer | Hongjun Ni <hongjun.ni@intel.com> | 2017-04-05 19:27:24 +0800 |
| commit | ffd582515ce0e12b11c0d23e080ff64c20301073 (patch) | |
| tree | 7efe271242d4367c6286c0fd8227fb8b4c60c962 /router/router/tap_inject.c | |
| parent | a54fc6bd0805d7f60451d608cd4b4781197de34b (diff) | |
FIx compile issue for netlink and router plugin
Change-Id: I8a6f069af4acce97fd0ee262c217af645afd476d
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'router/router/tap_inject.c')
| -rw-r--r-- | router/router/tap_inject.c | 47 |
1 files changed, 41 insertions, 6 deletions
diff --git a/router/router/tap_inject.c b/router/router/tap_inject.c index 8d6f5af..75d6df2 100644 --- a/router/router/tap_inject.c +++ b/router/router/tap_inject.c @@ -16,7 +16,17 @@ #include "tap_inject.h" +#include <vnet/ip/ip.h> +#include <vnet/ip/lookup.h> +#ifdef ip6_add_del_route_next_hop +#define FIB_VERSION 1 +#else +#include <vnet/fib/fib.h> +#define FIB_VERSION 2 +#endif + static tap_inject_main_t tap_inject_main; +extern dpo_type_t tap_inject_dpo_type; tap_inject_main_t * tap_inject_get_main (void) @@ -84,12 +94,12 @@ tap_inject_lookup_sw_if_index_from_tap_if_index (u32 tap_if_index) return sw_if_index ? *(u32 *)sw_if_index : ~0; } - -clib_error_t * -vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h, int f) -{ - return 0; -} +/* *INDENT-OFF* */ +VLIB_PLUGIN_REGISTER () = { + // .version = VPP_BUILD_VER, FIXME + .description = "router", +}; +/* *INDENT-ON* */ static void @@ -135,6 +145,7 @@ tap_inject_enable (void) ip6_register_protocol (IP_PROTOCOL_TCP, im->tx_node_index); ip6_register_protocol (IP_PROTOCOL_UDP, im->tx_node_index); +#if FIB_VERSION == 1 /* Add IPv4 multicast route. */ { ip4_add_del_route_args_t a; @@ -163,6 +174,30 @@ tap_inject_enable (void) ip4_add_del_route (&ip4_main, &a); } +#else + { + dpo_proto_t proto = 0; + dpo_id_t dpo = DPO_INVALID; + fib_prefix_t pfx = {}; + + pfx.fp_addr.ip4.as_u32 = 0x000000E0; /* 224.0.0.0 */ + pfx.fp_len = 24; + pfx.fp_proto = FIB_PROTOCOL_IP4; + proto = DPO_PROTO_IP4; + + vlib_node_add_next (vm, ip4_lookup_node.index, im->tx_node_index); + + dpo_set(&dpo, tap_inject_dpo_type, proto, ~0); + + fib_table_entry_special_dpo_add(0, + &pfx, + FIB_SOURCE_API, + FIB_ENTRY_FLAG_EXCLUSIVE, + &dpo); + + dpo_reset(&dpo); + } +#endif /* FIB_VERSION == 1 */ im->flags |= TAP_INJECT_F_ENABLED; |