From 95f40dbe21f163d6a906bb4ac027ef44936ba89f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 6 Apr 2017 10:25:43 -0400 Subject: zebra: Get mpls building across multiple platforms. The build system for mpls is a bit convoluted. We need a way to handle builds across multiple platforms. This, I believe addresses this issue. Signed-off-by: Donald Sharp --- configure.ac | 4 ++-- zebra/Makefile.am | 2 +- zebra/zebra_mpls_null.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b4a3e37fd..2c9f64a4f 100755 --- a/configure.ac +++ b/configure.ac @@ -367,11 +367,11 @@ dnl ---------- AC_MSG_CHECKING(whether this OS has MPLS stack) case "$host" in *-linux*) - MPLS_METHOD="zebra_mpls_netlink.o" + MPLS_METHOD="zebra_mpls_netlink.o zebra_mpls.o" AC_MSG_RESULT(Linux MPLS) ;; *-openbsd*) - MPLS_METHOD="zebra_mpls_openbsd.o" + MPLS_METHOD="zebra_mpls_openbsd.o zebra_mpls.o" AC_MSG_RESULT(OpenBSD MPLS) ;; *) diff --git a/zebra/Makefile.am b/zebra/Makefile.am index 821264a15..c86f81ca7 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -31,7 +31,7 @@ zebra_SOURCES = \ redistribute.c debug.c rtadv.c zebra_vty.c \ irdp_main.c irdp_interface.c irdp_packet.c router-id.c \ zebra_ptm.c zebra_rnh.c zebra_ptm_redistribute.c \ - zebra_ns.c zebra_vrf.c zebra_static.c zebra_mpls.c zebra_mpls_vty.c \ + zebra_ns.c zebra_vrf.c zebra_static.c zebra_mpls_vty.c \ zebra_mroute.c \ label_manager.c \ # end diff --git a/zebra/zebra_mpls_null.c b/zebra/zebra_mpls_null.c index 0b4d670fd..168c8d003 100644 --- a/zebra/zebra_mpls_null.c +++ b/zebra/zebra_mpls_null.c @@ -195,3 +195,41 @@ zebra_mpls_cleanup_fecs_for_client (struct zebra_vrf *zvrf, struct zserv *client return 0; } +void mpls_ldp_lsp_uninstall_all (struct hash_backet *backet, void *ctxt) +{ + return; +} + +void mpls_ldp_ftn_uninstall_all (struct zebra_vrf *zvrf, int afi) +{ + return; +} + +void zebra_mpls_init (void) +{ + return; +} + +int mpls_lsp_install (struct zebra_vrf *zvrf, enum lsp_types_t type, + mpls_label_t in_label, mpls_label_t out_label, + enum nexthop_types_t gtype, union g_addr *gate, + ifindex_t ifindex) +{ + return 0; +} + +int mpls_lsp_uninstall (struct zebra_vrf *zvrf, enum lsp_types_t type, + mpls_label_t in_label, enum nexthop_types_t gtype, + union g_addr *gate, ifindex_t ifindex) +{ + return 0; +} + +int mpls_ftn_update (int add, struct zebra_vrf *zvrf, enum lsp_types_t type, + struct prefix *prefix, enum nexthop_types_t gtype, + union g_addr *gate, ifindex_t ifindex, u_int8_t distance, + mpls_label_t out_label) +{ + return 0; +} + -- cgit v1.2.3