bgpd: remove encap safi vty related files bgp_encap.h|c

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index 4ea045552510da7f7e3105c179562df75122be8a..a57a66488f03a4112697867c5e8a5ee155ae2161 100644 (file)
--- a/bgpd/Makefile.am
+++ b/bgpd/Makefile.am
@@ -80,7 +80,7 @@ libbgp_a_SOURCES = \
        bgp_mplsvpn.c bgp_nexthop.c \
        bgp_damp.c bgp_table.c bgp_advertise.c bgp_vty.c bgp_mpath.c \
        bgp_nht.c bgp_updgrp.c bgp_updgrp_packet.c bgp_updgrp_adv.c bgp_bfd.c \
-       bgp_encap.c bgp_encap_tlv.c $(BGP_VNC_RFAPI_SRC) bgp_attr_evpn.c \
+       bgp_encap_tlv.c $(BGP_VNC_RFAPI_SRC) bgp_attr_evpn.c \
        bgp_evpn.c bgp_evpn_vty.c bgp_vpn.c bgp_label.c
 
 noinst_HEADERS = \
@@ -91,7 +91,7 @@ noinst_HEADERS = \
        bgp_ecommunity.h bgp_lcommunity.h \
        bgp_mplsvpn.h bgp_nexthop.h bgp_damp.h bgp_table.h \
        bgp_advertise.h bgp_vty.h bgp_mpath.h bgp_nht.h \
-       bgp_updgrp.h bgp_bfd.h bgp_encap.h bgp_encap_tlv.h bgp_encap_types.h \
+       bgp_updgrp.h bgp_bfd.h bgp_encap_tlv.h bgp_encap_types.h \
        $(BGP_VNC_RFAPI_HD) bgp_attr_evpn.h bgp_evpn.h bgp_evpn_vty.h \
         bgp_vpn.h bgp_label.h
 

diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c
deleted file mode 100644 (file)
index d554f35..0000000
--- a/bgpd/bgp_encap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file created by LabN Consulting, L.L.C.
- *
- * This file is based on bgp_mplsvpn.c which is Copyright (C) 2000
- * Kunihiro Ishiguro <kunihiro@zebra.org>
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <zebra.h>
-
-#include "command.h"
-#include "prefix.h"
-#include "log.h"
-#include "memory.h"
-#include "stream.h"
-#include "filter.h"
-
-#include "bgpd/bgpd.h"
-#include "bgpd/bgp_table.h"
-#include "bgpd/bgp_route.h"
-#include "bgpd/bgp_attr.h"
-#include "bgpd/bgp_ecommunity.h"
-#include "bgpd/bgp_lcommunity.h"
-#include "bgpd/bgp_mplsvpn.h"
-#include "bgpd/bgp_vty.h"
-#include "bgpd/bgp_encap.h"
-
-#if ENABLE_BGP_VNC
-#include "bgpd/rfapi/rfapi_backend.h"
-#endif
-
-void
-bgp_encap_init (void)
-{
-}

diff --git a/bgpd/bgp_encap.h b/bgpd/bgp_encap.h
deleted file mode 100644 (file)
index 08986e4..0000000
--- a/bgpd/bgp_encap.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 
- *
- * Copyright 2009-2015, LabN Consulting, L.L.C.
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _QUAGGA_BGP_ENCAP_H
-#define _QUAGGA_BGP_ENCAP_H
-#include "bgpd/bgp_route.h"
-
-extern void bgp_encap_init (void);
-#include "bgp_encap_types.h"
-#endif /* _QUAGGA_BGP_ENCAP_H */

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 9d35702367d11c651af97eb11bfa712bd6c6fd65..da6bf5c3cb178f36cc6a67c59e7ca53d9de8a06d 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -50,8 +50,6 @@
 #include "bgpd/bgp_network.h"
 #include "bgpd/bgp_mplsvpn.h"
 #include "bgpd/bgp_evpn.h"
-#include "bgpd/bgp_encap.h"
-#include "bgpd/bgp_evpn.h"
 #include "bgpd/bgp_advertise.h"
 #include "bgpd/bgp_vty.h"
 #include "bgpd/bgp_updgrp.h"

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 8f13c26c2dd05d9105655d8e21b15f33deb9cec2..7a328e79d7f4ebbb54923973eb32e49e9f27bfaa 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -54,7 +54,6 @@
 #include "bgpd/bgp_filter.h"
 #include "bgpd/bgp_fsm.h"
 #include "bgpd/bgp_mplsvpn.h"
-#include "bgpd/bgp_encap.h"
 #include "bgpd/bgp_nexthop.h"
 #include "bgpd/bgp_damp.h"
 #include "bgpd/bgp_advertise.h"

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 655431b015bcb8cdcaaaf0454a0447cad6c8051a..92a0cd6acc145c3a2e86ba3393df50a9777cb9f3 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -61,7 +61,6 @@
 #include "bgpd/bgp_nexthop.h"
 #include "bgpd/bgp_damp.h"
 #include "bgpd/bgp_mplsvpn.h"
-#include "bgpd/bgp_encap.h"
 #if ENABLE_BGP_VNC
 #include "bgpd/rfapi/bgp_rfapi_cfg.h"
 #include "bgpd/rfapi/rfapi_backend.h"
@@ -7701,7 +7700,6 @@ bgp_init (void)
   bgp_route_map_init ();
   bgp_scan_vty_init();
   bgp_mplsvpn_init ();
-  bgp_encap_init ();
 #if ENABLE_BGP_VNC
   rfapi_init ();
 #endif

diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index bb6bbbe87e50ebadd87584fab591ad61b42ef38f..29ffa7e22b7e4a199dfe8b20a3b929d844917c65 100644 (file)
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -47,7 +47,6 @@ if BGPD
 vtysh_scan += $(top_srcdir)/bgpd/bgp_bfd.c
 vtysh_scan += $(top_srcdir)/bgpd/bgp_debug.c
 vtysh_scan += $(top_srcdir)/bgpd/bgp_dump.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_encap.c
 vtysh_scan += $(top_srcdir)/bgpd/bgp_evpn_vty.c
 vtysh_scan += $(top_srcdir)/bgpd/bgp_filter.c
 vtysh_scan += $(top_srcdir)/bgpd/bgp_mplsvpn.c