From 355cf68f926b5971d94c1e59b358b5447430e8e3 Mon Sep 17 00:00:00 2001 From: Shwetha Date: Tue, 21 Jun 2016 05:02:32 +0100 Subject: [PATCH] Fix for build failure due to iOAM plugin header file path Change-Id: Ie5d270a01e3ca0687a407aeebc42aacc53a01ddc Signed-off-by: Shwetha --- build-data/packages/plugins.mk | 5 +++++ plugins/Makefile.am | 4 ++-- plugins/plugins/ioam/encap/ip6_ioam_pot.c | 2 +- plugins/plugins/ioam/lib-pot/pot_all_api_h.h | 2 +- plugins/plugins/ioam/lib-pot/pot_api.c | 12 ++++++------ plugins/plugins/ioam/lib-pot/pot_msg_enum.h | 2 +- plugins/plugins/ioam/lib-pot/pot_test.c | 10 +++++----- plugins/plugins/sixrd/sixrd.h | 2 +- vnet/vnet/ip/ip6.h | 1 + 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/build-data/packages/plugins.mk b/build-data/packages/plugins.mk index f06986299e2..5d217c75cd4 100644 --- a/build-data/packages/plugins.mk +++ b/build-data/packages/plugins.mk @@ -1,11 +1,16 @@ plugins_configure_depend = \ vppinfra-install \ vlib-api-install \ + vpp-api-test-install \ + vnet-install \ vlib-install plugins_CPPFLAGS = $(call installed_includes_fn, \ vppinfra \ vlib \ + vnet \ + svm \ + vpp-api-test \ vlib-api) plugins_LDFLAGS = $(call installed_libs_fn, \ diff --git a/plugins/Makefile.am b/plugins/Makefile.am index fee7493d771..34b31b45466 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -35,7 +35,7 @@ ioam_pot_plugin_la_SOURCES = plugins/ioam/lib-pot/pot_util.c plugins/ioam/encap/ plugins/ioam/lib-pot/pot_util.h plugins/ioam/lib-pot/math64.h plugins/ioam/lib-pot/pot_api.c ioam_pot_plugin_la_LDFLAGS = -module -BUILT_SOURCES = plugins/ioam/lib-pot/pot.api.h +BUILT_SOURCES += plugins/ioam/lib-pot/pot.api.h SUFFIXES = .api.h .api %.api.h: %.api @@ -43,7 +43,7 @@ SUFFIXES = .api.h .api $(CC) $(CPPFLAGS) -E -P -C -x c $^ \ | vppapigen --input - --output $@ --show-name $@ -nobase_include_HEADERS = \ +nobase_include_HEADERS += \ plugins/ioam/lib-pot/pot_all_api_h.h \ plugins/ioam/lib-pot/pot_msg_enum.h \ plugins/ioam/lib-pot/pot.api.h \ diff --git a/plugins/plugins/ioam/encap/ip6_ioam_pot.c b/plugins/plugins/ioam/encap/ip6_ioam_pot.c index e90a6649909..7af805e3fc5 100644 --- a/plugins/plugins/ioam/encap/ip6_ioam_pot.c +++ b/plugins/plugins/ioam/encap/ip6_ioam_pot.c @@ -25,7 +25,7 @@ #include #include -#include +#include typedef CLIB_PACKED(struct { ip6_hop_by_hop_option_t hdr; diff --git a/plugins/plugins/ioam/lib-pot/pot_all_api_h.h b/plugins/plugins/ioam/lib-pot/pot_all_api_h.h index 574b8979bf4..74dfc48444d 100644 --- a/plugins/plugins/ioam/lib-pot/pot_all_api_h.h +++ b/plugins/plugins/ioam/lib-pot/pot_all_api_h.h @@ -13,4 +13,4 @@ * limitations under the License. */ /* Include the generated file, see BUILT_SOURCES in Makefile.am */ -#include +#include diff --git a/plugins/plugins/ioam/lib-pot/pot_api.c b/plugins/plugins/ioam/lib-pot/pot_api.c index 656626339a7..e5af1faec1d 100644 --- a/plugins/plugins/ioam/lib-pot/pot_api.c +++ b/plugins/plugins/ioam/lib-pot/pot_api.c @@ -21,34 +21,34 @@ #include #include -#include +#include #include #include #include /* define message IDs */ -#include +#include /* define message structures */ #define vl_typedefs -#include +#include #undef vl_typedefs /* define generated endian-swappers */ #define vl_endianfun -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define vl_printfun -#include +#include #undef vl_printfun /* Get the API version number */ #define vl_api_version(n,v) static u32 api_version=(v); -#include +#include #undef vl_api_version /* diff --git a/plugins/plugins/ioam/lib-pot/pot_msg_enum.h b/plugins/plugins/ioam/lib-pot/pot_msg_enum.h index bcd7159d50f..87fae74062e 100644 --- a/plugins/plugins/ioam/lib-pot/pot_msg_enum.h +++ b/plugins/plugins/ioam/lib-pot/pot_msg_enum.h @@ -19,7 +19,7 @@ #define vl_msg_id(n,h) n, typedef enum { -#include +#include /* We'll want to know how many messages IDs we need... */ VL_MSG_FIRST_AVAILABLE, } vl_msg_id_t; diff --git a/plugins/plugins/ioam/lib-pot/pot_test.c b/plugins/plugins/ioam/lib-pot/pot_test.c index 706be44ff65..a6d9330f21c 100644 --- a/plugins/plugins/ioam/lib-pot/pot_test.c +++ b/plugins/plugins/ioam/lib-pot/pot_test.c @@ -25,28 +25,28 @@ #include /* Declare message IDs */ -#include +#include /* define message structures */ #define vl_typedefs -#include +#include #undef vl_typedefs /* declare message handlers for each api */ #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include +#include #undef vl_printfun /* Get the API version number. */ #define vl_api_version(n,v) static u32 api_version=(v); -#include +#include #undef vl_api_version diff --git a/plugins/plugins/sixrd/sixrd.h b/plugins/plugins/sixrd/sixrd.h index 1581649c9f5..2f0912f0626 100644 --- a/plugins/plugins/sixrd/sixrd.h +++ b/plugins/plugins/sixrd/sixrd.h @@ -134,7 +134,7 @@ ip4_sixrd_get_domain (u32 adj_index, ip6_address_t *addr, u32 ai = ip6_fib_lookup_with_table(im6, 0, addr); ip_adjacency_t *adj6 = ip_get_adjacency (lm6, ai); - if (PREDICT_TRUE(adj6->lookup_next_index == IP_LOOKUP_NEXT_SIXRD)) { + if (PREDICT_TRUE(adj6->lookup_next_index == mm->ip6_lookup_next_index)) { uword *p = (uword *)adj6->rewrite_data; *sixrd_domain_index = p[0]; return pool_elt_at_index(mm->domains, *sixrd_domain_index); diff --git a/vnet/vnet/ip/ip6.h b/vnet/vnet/ip/ip6.h index 3c27db0455b..312e39845b4 100644 --- a/vnet/vnet/ip/ip6.h +++ b/vnet/vnet/ip/ip6.h @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include -- 2.16.6