ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for build failure due to iOAM plugin header file path

Browse Source 
Change-Id: Ie5d270a01e3ca0687a407aeebc42aacc53a01ddc
Signed-off-by: Shwetha <shwethab@cisco.com>
This commit is contained in:
Shwetha
2016-06-21 05:02:32 +01:00
committed by Ole Trøan
parent 010972a95d
commit 355cf68f92
9 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build-data/packages/plugins.mk
View File

@ -1,11 +1,16 @@
plugins_configure_depend = \ plugins_configure_depend = \
vppinfra-install \ vppinfra-install \
vlib-api-install \ vlib-api-install \
vpp-api-test-install \
vnet-install \
vlib-install vlib-install
plugins_CPPFLAGS = $(call installed_includes_fn, \ plugins_CPPFLAGS = $(call installed_includes_fn, \
vppinfra \ vppinfra \
vlib \ vlib \
vnet \
svm \
vpp-api-test \
vlib-api) vlib-api)
plugins_LDFLAGS = $(call installed_libs_fn, \ plugins_LDFLAGS = $(call installed_libs_fn, \

4
plugins/Makefile.am
View File

@ -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 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 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 SUFFIXES = .api.h .api
%.api.h: %.api %.api.h: %.api
@ -43,7 +43,7 @@ SUFFIXES = .api.h .api
$(CC) $(CPPFLAGS) -E -P -C -x c $^ \ $(CC) $(CPPFLAGS) -E -P -C -x c $^ \
| vppapigen --input - --output $@ --show-name $@ | 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_all_api_h.h \
plugins/ioam/lib-pot/pot_msg_enum.h \ plugins/ioam/lib-pot/pot_msg_enum.h \
plugins/ioam/lib-pot/pot.api.h \ plugins/ioam/lib-pot/pot.api.h \

2
plugins/plugins/ioam/encap/ip6_ioam_pot.c
View File

@ -25,7 +25,7 @@
#include <vppinfra/error.h> #include <vppinfra/error.h>
#include <vppinfra/elog.h> #include <vppinfra/elog.h>
#include <lib-pot/pot_util.h> #include <plugins/ioam/lib-pot/pot_util.h>
typedef CLIB_PACKED(struct { typedef CLIB_PACKED(struct {
ip6_hop_by_hop_option_t hdr; ip6_hop_by_hop_option_t hdr;

2
plugins/plugins/ioam/lib-pot/pot_all_api_h.h
View File

@ -13,4 +13,4 @@
* limitations under the License. * limitations under the License.
*/ */
/* Include the generated file, see BUILT_SOURCES in Makefile.am */ /* Include the generated file, see BUILT_SOURCES in Makefile.am */
#include <lib-pot/pot.api.h> #include <plugins/ioam/lib-pot/pot.api.h>

12
plugins/plugins/ioam/lib-pot/pot_api.c
View File

@ -21,34 +21,34 @@
#include <vnet/vnet.h> #include <vnet/vnet.h>
#include <vnet/plugin/plugin.h> #include <vnet/plugin/plugin.h>
#include <lib-pot/pot_util.h> #include <plugins/ioam/lib-pot/pot_util.h>
#include <vlibapi/api.h> #include <vlibapi/api.h>
#include <vlibmemory/api.h> #include <vlibmemory/api.h>
#include <vlibsocket/api.h> #include <vlibsocket/api.h>
/* define message IDs */ /* define message IDs */
#include <lib-pot/pot_msg_enum.h> #include <plugins/ioam/lib-pot/pot_msg_enum.h>
/* define message structures */ /* define message structures */
#define vl_typedefs #define vl_typedefs
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_typedefs #undef vl_typedefs
/* define generated endian-swappers */ /* define generated endian-swappers */
#define vl_endianfun #define vl_endianfun
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_endianfun #undef vl_endianfun
/* instantiate all the print functions we know about */ /* instantiate all the print functions we know about */
#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
#define vl_printfun #define vl_printfun
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_printfun #undef vl_printfun
/* Get the API version number */ /* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v); #define vl_api_version(n,v) static u32 api_version=(v);
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_api_version #undef vl_api_version
/* /*

2
plugins/plugins/ioam/lib-pot/pot_msg_enum.h
View File

@ -19,7 +19,7 @@
#define vl_msg_id(n,h) n, #define vl_msg_id(n,h) n,
typedef enum { typedef enum {
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
/* We'll want to know how many messages IDs we need... */ /* We'll want to know how many messages IDs we need... */
VL_MSG_FIRST_AVAILABLE, VL_MSG_FIRST_AVAILABLE,
} vl_msg_id_t; } vl_msg_id_t;

10
plugins/plugins/ioam/lib-pot/pot_test.c
View File

@ -25,28 +25,28 @@
#include <vppinfra/error.h> #include <vppinfra/error.h>
/* Declare message IDs */ /* Declare message IDs */
#include <lib-pot/pot_msg_enum.h> #include <plugins/ioam/lib-pot/pot_msg_enum.h>
/* define message structures */ /* define message structures */
#define vl_typedefs #define vl_typedefs
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_typedefs #undef vl_typedefs
/* declare message handlers for each api */ /* declare message handlers for each api */
#define vl_endianfun /* define message structures */ #define vl_endianfun /* define message structures */
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_endianfun #undef vl_endianfun
/* instantiate all the print functions we know about */ /* instantiate all the print functions we know about */
#define vl_print(handle, ...) #define vl_print(handle, ...)
#define vl_printfun #define vl_printfun
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_printfun #undef vl_printfun
/* Get the API version number. */ /* Get the API version number. */
#define vl_api_version(n,v) static u32 api_version=(v); #define vl_api_version(n,v) static u32 api_version=(v);
#include <lib-pot/pot_all_api_h.h> #include <plugins/ioam/lib-pot/pot_all_api_h.h>
#undef vl_api_version #undef vl_api_version

2
plugins/plugins/sixrd/sixrd.h
View File

@ -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); u32 ai = ip6_fib_lookup_with_table(im6, 0, addr);
ip_adjacency_t *adj6 = ip_get_adjacency (lm6, ai); 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; uword *p = (uword *)adj6->rewrite_data;
*sixrd_domain_index = p[0]; *sixrd_domain_index = p[0];
return pool_elt_at_index(mm->domains, *sixrd_domain_index); return pool_elt_at_index(mm->domains, *sixrd_domain_index);

1
vnet/vnet/ip/ip6.h
View File

@ -44,6 +44,7 @@
#include <vnet/ip/ip6_packet.h> #include <vnet/ip/ip6_packet.h>
#include <vnet/ip/ip6_hop_by_hop_packet.h> #include <vnet/ip/ip6_hop_by_hop_packet.h>
#include <vnet/ip/lookup.h> #include <vnet/ip/lookup.h>
#include <vnet/ip/ip_feature_registration.h>
#include <stdbool.h> #include <stdbool.h>
#include <vppinfra/bihash_24_8.h> #include <vppinfra/bihash_24_8.h>
#include <vppinfra/bihash_template.h> #include <vppinfra/bihash_template.h>