diff options
Diffstat (limited to 'zebra/connected.c')
| -rw-r--r-- | zebra/connected.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/zebra/connected.c b/zebra/connected.c index 55c3792d4f..4d8fe9f6d6 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -14,10 +14,9 @@ * 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 GNU Zebra; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * 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> @@ -32,6 +31,7 @@ #include "memory.h" #include "zebra_memory.h" +#include "vty.h" #include "zebra/debug.h" #include "zebra/zserv.h" #include "zebra/redistribute.h" @@ -58,10 +58,8 @@ connected_withdraw (struct connected *ifc) if (ifc->address->family == AF_INET) connected_down_ipv4 (ifc->ifp, ifc); -#ifdef HAVE_IPV6 else connected_down_ipv6 (ifc->ifp, ifc); -#endif UNSET_FLAG (ifc->conf, ZEBRA_IFC_REAL); } @@ -102,10 +100,8 @@ connected_announce (struct interface *ifp, struct connected *ifc) { if (ifc->address->family == AF_INET) connected_up_ipv4 (ifp, ifc); -#ifdef HAVE_IPV6 else connected_up_ipv6 (ifp, ifc); -#endif } } @@ -204,11 +200,11 @@ connected_up_ipv4 (struct interface *ifp, struct connected *ifc) return; rib_add (AFI_IP, SAFI_UNICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, - 0, 0, &p, NULL, NULL, ifp->ifindex, + 0, 0, &p, NULL, NULL, NULL, ifp->ifindex, RT_TABLE_MAIN, ifp->metric, 0, 0); rib_add (AFI_IP, SAFI_MULTICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, - 0, 0, &p, NULL, NULL, ifp->ifindex, + 0, 0, &p, NULL, NULL, NULL, ifp->ifindex, RT_TABLE_MAIN, ifp->metric, 0, 0); if (IS_ZEBRA_DEBUG_RIB_DETAILED) @@ -334,10 +330,10 @@ connected_down_ipv4 (struct interface *ifp, struct connected *ifc) /* Same logic as for connected_up_ipv4(): push the changes into the head. */ rib_delete (AFI_IP, SAFI_UNICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, - 0, 0, &p, NULL, ifp->ifindex, 0); + 0, 0, &p, NULL, NULL, ifp->ifindex, 0); rib_delete (AFI_IP, SAFI_MULTICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, - 0, 0, &p, NULL, ifp->ifindex, 0); + 0, 0, &p, NULL, NULL, ifp->ifindex, 0); if (IS_ZEBRA_DEBUG_RIB_DETAILED) zlog_debug ("%u: IF %s IPv4 address down, scheduling RIB processing", @@ -410,7 +406,7 @@ connected_up_ipv6 (struct interface *ifp, struct connected *ifc) #endif rib_add (AFI_IP6, SAFI_UNICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, - 0, 0, &p, NULL, NULL, ifp->ifindex, + 0, 0, &p, NULL, NULL, NULL, ifp->ifindex, RT_TABLE_MAIN, ifp->metric, 0, 0); if (IS_ZEBRA_DEBUG_RIB_DETAILED) @@ -510,7 +506,7 @@ connected_down_ipv6 (struct interface *ifp, struct connected *ifc) return; rib_delete (AFI_IP6, SAFI_UNICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, - 0, 0, &p, NULL, ifp->ifindex, 0); + 0, 0, &p, NULL, NULL, ifp->ifindex, 0); if (IS_ZEBRA_DEBUG_RIB_DETAILED) zlog_debug ("%u: IF %s IPv6 address down, scheduling RIB processing", |