Removed qmp-quagga package to do not conflict with the standard quagga one
This commit is contained in:
p4u
parent
8c9e26c5a2
commit
354ccf4ddf
|
|
@ -1,312 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2006-2012 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
# Contributors:
|
||||
# Simó Albert i Beltran
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=qmp-quagga
|
||||
PKG_VERSION:=0.99.21
|
||||
PKG_RELEASE:=2
|
||||
PKG_MD5SUM:=99840adbe57047c90dfba6b6ed9aec7f
|
||||
|
||||
PKG_SOURCE:=quagga-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://www.quagga.net/download/ \
|
||||
http://www.de.quagga.net/download/ \
|
||||
http://www.uk.quagga.net/download/
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/quagga-$(PKG_VERSION)
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_IPV6 \
|
||||
CONFIG_PACKAGE_qmp-quagga-watchquagga \
|
||||
CONFIG_PACKAGE_qmp-quagga-zebra \
|
||||
CONFIG_PACKAGE_qmp-quagga-libzebra \
|
||||
CONFIG_PACKAGE_qmp-quagga-libospf \
|
||||
CONFIG_PACKAGE_qmp-quagga-bgpd \
|
||||
CONFIG_PACKAGE_qmp-quagga-isisd \
|
||||
CONFIG_PACKAGE_qmp-quagga-ospf6d \
|
||||
CONFIG_PACKAGE_qmp-quagga-ripd \
|
||||
CONFIG_PACKAGE_qmp-quagga-ripngd \
|
||||
CONFIG_PACKAGE_qmp-quagga-babeld \
|
||||
CONFIG_PACKAGE_qmp-quagga-vtysh
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_INSTALL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/qmp-quagga/Default
|
||||
SECTION:=qMp
|
||||
CATEGORY:=qMp
|
||||
SUBMENU:=Routing and Redirection
|
||||
DEPENDS:=qmp-quagga
|
||||
TITLE:=The Quagga Software Routing Suite
|
||||
URL:=http://www.quagga.net
|
||||
MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS:=+qmp-quagga-vtysh +qmp-quagga-bgpd
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga/description
|
||||
A routing software package that provides TCP/IP based routing services
|
||||
with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
|
||||
OSPFv3, BGP-4, and BGP-4+
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-watchquagga
|
||||
$(call Package/qmp-quagga/Default)
|
||||
TITLE:=Quagga watchdog
|
||||
DEPENDS+=+qmp-quagga-libzebra
|
||||
DEFAULT:=y if PACKAGE_qmp-quagga
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-zebra
|
||||
$(call Package/qmp-quagga/Default)
|
||||
TITLE:=Zebra daemon
|
||||
DEPENDS+=+qmp-quagga-libzebra
|
||||
DEFAULT:=y if PACKAGE_qmp-quagga
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-libzebra
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+librt
|
||||
TITLE:=zebra library
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-libospf
|
||||
$(call Package/qmp-quagga/Default)
|
||||
TITLE:=OSPF library
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-bgpd
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libzebra
|
||||
TITLE:=BGPv4, BGPv4+, BGPv4- routing engine
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-isisd
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libzebra
|
||||
TITLE:=IS-IS routing engine
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ospfd
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libospf +qmp-quagga-libzebra
|
||||
TITLE:=OSPFv2 routing engine
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ospf6d
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libospf +qmp-quagga-libzebra @IPV6
|
||||
TITLE:=OSPFv3 routing engine
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ripd
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libzebra
|
||||
TITLE:=RIP routing engine
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ripngd
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libzebra @IPV6
|
||||
TITLE:=RIPNG routing engine
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-babeld
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libzebra
|
||||
TITLE:=Babel routing engine
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-vtysh
|
||||
$(call Package/qmp-quagga/Default)
|
||||
DEPENDS+=+qmp-quagga-libzebra +libreadline +libncurses
|
||||
TITLE:=integrated shell for Quagga routing software
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-zebra/conffiles
|
||||
/etc/quagga/zebra.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-bgpd/conffiles
|
||||
/etc/quagga/bgpd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-isisd/conffiles
|
||||
/etc/quagga/isisd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ospfd/conffiles
|
||||
/etc/quagga/ospfd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ospf6d/conffiles
|
||||
/etc/quagga/ospf6d.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ripd/conffiles
|
||||
/etc/quagga/ripd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ripngd/conffiles
|
||||
/etc/quagga/ripngd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-babeld/conffiles
|
||||
/etc/quagga/babeld.conf
|
||||
endef
|
||||
|
||||
ifneq ($(SDK),)
|
||||
CONFIG_PACKAGE_qmp-quagga-libzebra:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-libospf:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-watchquagga:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-zebra:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-bgpd:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-isisd:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-ospf6d:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-ripd:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-ripngd:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-babeld:=m
|
||||
CONFIG_PACKAGE_qmp-quagga-vtysh:=m
|
||||
endif
|
||||
|
||||
CONFIGURE_ARGS+= \
|
||||
--localstatedir=/var/run/quagga \
|
||||
--sysconfdir=/etc/quagga/ \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--enable-user=network \
|
||||
--enable-group=network \
|
||||
--enable-pie=no \
|
||||
--enable-multipath=8 \
|
||||
--disable-ospfclient \
|
||||
--disable-capabilities \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-libzebra,zebra) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-libospf,ospfd) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-bgpd,bgpd) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-isisd,isisd) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-ospf6d,ospf6d) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-ripd,ripd) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-ripngd,ripngd) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-babeld,babeld) \
|
||||
$(call autoconf_bool,CONFIG_PACKAGE_qmp-quagga-vtysh,vtysh) \
|
||||
|
||||
MAKE_FLAGS += \
|
||||
CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
|
||||
|
||||
define Package/qmp-quagga/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) ./files/quagga $(1)/usr/sbin/quagga.init
|
||||
$(INSTALL_DIR) $(1)/etc/init.d
|
||||
$(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-watchquagga/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-zebra/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/zebra.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-bgpd/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-isisd/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/isisd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ospfd/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ospf6d/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ripd/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-ripngd/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-babeld/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/babeld $(1)/usr/sbin/
|
||||
$(INSTALL_DIR) $(1)/etc/quagga
|
||||
chmod 0750 $(1)/etc/quagga
|
||||
$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/babeld.conf
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-vtysh/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-libospf/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Package/qmp-quagga-libzebra/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,qmp-quagga))
|
||||
$(eval $(call BuildPackage,qmp-quagga-libzebra))
|
||||
$(eval $(call BuildPackage,qmp-quagga-libospf))
|
||||
$(eval $(call BuildPackage,qmp-quagga-watchquagga))
|
||||
$(eval $(call BuildPackage,qmp-quagga-zebra))
|
||||
$(eval $(call BuildPackage,qmp-quagga-bgpd))
|
||||
$(eval $(call BuildPackage,qmp-quagga-isisd))
|
||||
$(eval $(call BuildPackage,qmp-quagga-ospfd))
|
||||
$(eval $(call BuildPackage,qmp-quagga-ospf6d))
|
||||
$(eval $(call BuildPackage,qmp-quagga-ripd))
|
||||
$(eval $(call BuildPackage,qmp-quagga-ripngd))
|
||||
$(eval $(call BuildPackage,qmp-quagga-babeld))
|
||||
$(eval $(call BuildPackage,qmp-quagga-vtysh))
|
||||
|
|
@ -1,335 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# quagga Starts/stops quagga daemons and watchquagga.
|
||||
# Create a daemon.conf file to have that routing daemon
|
||||
# started/stopped automagically when using this script
|
||||
# without any daemon names as args.
|
||||
# If watchquagga is available, it will also be
|
||||
# started/stopped if the script is called without
|
||||
# any daemon names.
|
||||
#
|
||||
|
||||
ME=$(basename $0)
|
||||
|
||||
usage() {
|
||||
echo "Usage: ${ME} {start|stop|restart} [daemon ...]"
|
||||
exit 2
|
||||
}
|
||||
|
||||
if [ -z "$1" ]
|
||||
then
|
||||
usage
|
||||
else
|
||||
COMMAND=$1
|
||||
fi
|
||||
shift
|
||||
ARG_DAEMONS=$*
|
||||
BINDIR=/usr/sbin
|
||||
CONFDIR=/etc/quagga
|
||||
STATEDIR=/var/run/quagga
|
||||
RUNUSER=network
|
||||
RUNGROUP=$RUNUSER
|
||||
DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
|
||||
DAEMON_FLAGS=-d
|
||||
WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
|
||||
WATCHQUAGGA_CMD="$0 watchrestart"
|
||||
if [ ${COMMAND} != "watchrestart" ]
|
||||
then
|
||||
DAEMONS="${DAEMONS} watchquagga"
|
||||
fi
|
||||
DAEMONS_STARTSEQ=${DAEMONS}
|
||||
|
||||
reverse()
|
||||
{
|
||||
local revlist r
|
||||
revlist=
|
||||
for r
|
||||
do
|
||||
revlist="$r $revlist"
|
||||
done
|
||||
echo $revlist
|
||||
}
|
||||
|
||||
DAEMONS_STOPSEQ=$(reverse ${DAEMONS_STARTSEQ})
|
||||
|
||||
#pidof() {
|
||||
# ps ax | awk 'match($5, "(^|/)'"$1"'$") > 0 { printf " %s", $1 }'
|
||||
#}
|
||||
|
||||
quit() {
|
||||
echo "${ME}: $1"
|
||||
exit 0
|
||||
}
|
||||
|
||||
die() {
|
||||
echo "${ME}: $1"
|
||||
exit 1
|
||||
}
|
||||
|
||||
is_in() {
|
||||
local i
|
||||
for i in $2
|
||||
do
|
||||
[ "$1" = "$i" ] && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
select_subset() {
|
||||
local unknown i j
|
||||
unknown=
|
||||
RESULT=
|
||||
for i in $1
|
||||
do
|
||||
is_in $i "$2" || unknown="$unknown $i"
|
||||
done
|
||||
if [ -n "$unknown" ]
|
||||
then
|
||||
RESULT=$unknown
|
||||
return 1
|
||||
else
|
||||
for j in $2
|
||||
do
|
||||
is_in $j "$1" && RESULT="$RESULT $j"
|
||||
done
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
# check command
|
||||
|
||||
case ${COMMAND}
|
||||
in
|
||||
start|stop|restart)
|
||||
;;
|
||||
watchrestart)
|
||||
if [ -n "$ARG_DAEMONS" ]
|
||||
then
|
||||
echo "${ME}: watchrestart mode is only for use by watchquagga"
|
||||
exit 2
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
|
||||
# select daemons to start
|
||||
|
||||
case ${COMMAND}
|
||||
in
|
||||
start|restart|watchrestart)
|
||||
START_DAEMONS=
|
||||
for d in ${DAEMONS_STARTSEQ}
|
||||
do
|
||||
[ -x "${BINDIR}/${d}" -a -f "${CONFDIR}/${d}.conf" ] \
|
||||
&& START_DAEMONS="${START_DAEMONS}${d} "
|
||||
done
|
||||
WATCHQUAGGA_DAEMONS=${START_DAEMONS}
|
||||
if is_in watchquagga "${DAEMONS_STARTSEQ}"
|
||||
then
|
||||
START_DAEMONS="${START_DAEMONS} watchquagga"
|
||||
fi
|
||||
if [ -n "${ARG_DAEMONS}" ]
|
||||
then
|
||||
if select_subset "${ARG_DAEMONS}" "${DAEMONS}"
|
||||
then
|
||||
if select_subset "${ARG_DAEMONS}" "${START_DAEMONS}"
|
||||
then
|
||||
START_DAEMONS=${RESULT}
|
||||
else
|
||||
die "these daemons are not startable:${RESULT}."
|
||||
fi
|
||||
else
|
||||
die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# select daemons to stop
|
||||
|
||||
case ${COMMAND}
|
||||
in
|
||||
stop|restart|watchrestart)
|
||||
STOP_DAEMONS=${DAEMONS_STOPSEQ}
|
||||
if [ -n "${ARG_DAEMONS}" ]
|
||||
then
|
||||
if select_subset "${ARG_DAEMONS}" "${STOP_DAEMONS}"
|
||||
then
|
||||
STOP_DAEMONS=${RESULT}
|
||||
else
|
||||
die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
|
||||
fi
|
||||
fi
|
||||
stop_daemons=
|
||||
for d in ${STOP_DAEMONS}
|
||||
do
|
||||
pidfile=${STATEDIR}/${d}.pid
|
||||
if [ -f "${pidfile}" -o -n "$(pidof ${d})" ]
|
||||
then
|
||||
stop_daemons="${stop_daemons}${d} "
|
||||
elif [ -n "${ARG_DAEMONS}" ]
|
||||
then
|
||||
echo "${ME}: found no ${d} process running."
|
||||
fi
|
||||
done
|
||||
STOP_DAEMONS=${stop_daemons}
|
||||
;;
|
||||
esac
|
||||
|
||||
# stop daemons
|
||||
|
||||
for d in $STOP_DAEMONS
|
||||
do
|
||||
echo -n "${ME}: Stopping ${d} ... "
|
||||
pidfile=${STATEDIR}/${d}.pid
|
||||
if [ -f "${pidfile}" ]
|
||||
then
|
||||
file_pid=$(cat ${pidfile})
|
||||
if [ -z "${file_pid}" ]
|
||||
then
|
||||
echo -n "no pid file entry found ... "
|
||||
fi
|
||||
else
|
||||
file_pid=
|
||||
echo -n "no pid file found ... "
|
||||
fi
|
||||
proc_pid=$(pidof ${d})
|
||||
if [ -z "${proc_pid}" ]
|
||||
then
|
||||
echo -n "found no ${d} process running ... "
|
||||
else
|
||||
count=0
|
||||
notinpidfile=
|
||||
for p in ${proc_pid}
|
||||
do
|
||||
count=$((${count}+1))
|
||||
if kill ${p}
|
||||
then
|
||||
echo -n "killed ${p} ... "
|
||||
else
|
||||
echo -n "failed to kill ${p} ... "
|
||||
fi
|
||||
[ "${p}" = "${file_pid}" ] \
|
||||
|| notinpidfile="${notinpidfile} ${p}"
|
||||
done
|
||||
[ ${count} -le 1 ] \
|
||||
|| echo -n "WARNING: ${count} ${d} processes were found running ... "
|
||||
for n in ${notinpidfile}
|
||||
do
|
||||
echo -n "WARNING: process ${n} was not in pid file ... "
|
||||
done
|
||||
fi
|
||||
count=0
|
||||
survivors=$(pidof ${d})
|
||||
while [ -n "${survivors}" ]
|
||||
do
|
||||
sleep 1
|
||||
count=$((${count}+1))
|
||||
survivors=$(pidof ${d})
|
||||
[ -z "${survivors}" -o ${count} -gt 5 ] && break
|
||||
for p in ${survivors}
|
||||
do
|
||||
sleep 1
|
||||
echo -n "${p} "
|
||||
kill ${p}
|
||||
done
|
||||
done
|
||||
survivors=$(pidof ${d})
|
||||
[ -n "${survivors}" ] && \
|
||||
if kill -KILL ${survivors}
|
||||
then
|
||||
echo -n "KILLed ${survivors} ... "
|
||||
else
|
||||
echo -n "failed to KILL ${survivors} ... "
|
||||
fi
|
||||
sleep 1
|
||||
survivors=$(pidof ${d})
|
||||
if [ -z "${survivors}" ]
|
||||
then
|
||||
echo -n "done."
|
||||
if [ -f "${pidfile}" ]
|
||||
then
|
||||
rm -f ${pidfile} \
|
||||
|| echo -n " Failed to remove pidfile."
|
||||
fi
|
||||
else
|
||||
echo -n "failed to stop ${survivors} - giving up."
|
||||
if [ "${survivors}" != "${file_pid}" ]
|
||||
then
|
||||
if echo "${survivors}" > ${pidfile}
|
||||
then
|
||||
chown ${RUNUSER}:${RUNGROUP} ${pidfile}
|
||||
echo -n " Wrote ${survivors} to pidfile."
|
||||
else
|
||||
echo -n " Failed to write ${survivors} to pidfile."
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
echo
|
||||
done
|
||||
|
||||
# start daemons
|
||||
|
||||
if [ -n "$START_DAEMONS" ]
|
||||
then
|
||||
[ -d ${CONFDIR} ] \
|
||||
|| quit "${ME}: no config directory ${CONFDIR} - exiting."
|
||||
chown -R ${RUNUSER}:${RUNGROUP} ${CONFDIR}
|
||||
[ -d ${STATEDIR} ] || mkdir -p ${STATEDIR} \
|
||||
|| die "${ME}: could not create state directory ${STATEDIR} - exiting."
|
||||
chown -R ${RUNUSER}:${RUNGROUP} ${STATEDIR}
|
||||
|
||||
for d in $START_DAEMONS
|
||||
do
|
||||
echo -n "${ME}: Starting ${d} ... "
|
||||
proc_pid=$(pidof ${d})
|
||||
pidfile=${STATEDIR}/${d}.pid
|
||||
file_pid=
|
||||
if [ -f "${pidfile}" ]
|
||||
then
|
||||
file_pid=$(cat ${pidfile})
|
||||
if [ -n "${file_pid}" ]
|
||||
then
|
||||
echo -n "found old pid file entry ${file_pid} ... "
|
||||
fi
|
||||
fi
|
||||
if [ -n "${proc_pid}" ]
|
||||
then
|
||||
echo -n "found ${d} running (${proc_pid}) - skipping ${d}."
|
||||
if [ "${proc_pid}" != "${file_pid}" ]
|
||||
then
|
||||
if echo "${proc_pid}" > ${pidfile}
|
||||
then
|
||||
chown ${RUNUSER}:${RUNGROUP} ${pidfile}
|
||||
echo -n " Wrote ${proc_pid} to pidfile."
|
||||
else
|
||||
echo -n " Failed to write ${proc_pid} to pidfile."
|
||||
fi
|
||||
fi
|
||||
elif rm -f "${pidfile}"
|
||||
then
|
||||
if [ "${d}" = "watchquagga" ]
|
||||
then
|
||||
"${BINDIR}/${d}" \
|
||||
${WATCHQUAGGA_FLAGS} \
|
||||
"${WATCHQUAGGA_CMD}" \
|
||||
${WATCHQUAGGA_DAEMONS}
|
||||
status=$?
|
||||
else
|
||||
"${BINDIR}/${d}" ${DAEMON_FLAGS}
|
||||
status=$?
|
||||
fi
|
||||
if [ $status -eq 0 ]
|
||||
then
|
||||
echo -n "done."
|
||||
else
|
||||
echo -n "failed."
|
||||
fi
|
||||
else
|
||||
echo -n " failed to remove pidfile."
|
||||
fi
|
||||
echo
|
||||
done
|
||||
fi
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
password zebra
|
||||
!
|
||||
access-list vty permit 127.0.0.0/8
|
||||
access-list vty deny any
|
||||
!
|
||||
line vty
|
||||
access-class vty
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
#!/bin/sh /etc/rc.common
|
||||
# Copyright (C) 2006 OpenWrt.org
|
||||
|
||||
START=60
|
||||
start() {
|
||||
/usr/sbin/quagga.init start
|
||||
}
|
||||
|
||||
stop() {
|
||||
/usr/sbin/quagga.init stop
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Add definitions for IPCTL_FORWARDING and IP6CTL_FORWARDING.
|
||||
|
||||
Inspired from
|
||||
http://svn.gnumonks.org/trunk/grouter/build/src/quagga/quagga/quagga-0.99.1-forward_sysctl-2.6.14.patch
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
--- a/zebra/ipforward_sysctl.c
|
||||
+++ b/zebra/ipforward_sysctl.c
|
||||
@@ -31,6 +31,15 @@
|
||||
|
||||
#define MIB_SIZ 4
|
||||
|
||||
+/* Fix for recent (2.6.14) kernel headers */
|
||||
+#ifndef IPCTL_FORWARDING
|
||||
+#define IPCTL_FORWARDING NET_IPV4_FORWARD
|
||||
+#endif
|
||||
+
|
||||
+#ifndef IP6CTL_FORWARDING
|
||||
+#define IP6CTL_FORWARDING NET_IPV6_FORWARDING
|
||||
+#endif
|
||||
+
|
||||
extern struct zebra_privs_t zserv_privs;
|
||||
|
||||
/* IPv4 forwarding control MIB. */
|
||||
|
|
@ -1,243 +0,0 @@
|
|||
--- a/lib/log.c
|
||||
+++ b/lib/log.c
|
||||
@@ -929,13 +929,19 @@ proto_redistnum(int afi, const char *s)
|
||||
return ZEBRA_ROUTE_STATIC;
|
||||
else if (strncmp (s, "r", 1) == 0)
|
||||
return ZEBRA_ROUTE_RIP;
|
||||
- else if (strncmp (s, "o", 1) == 0)
|
||||
+ else if (strncmp (s, "os", 2) == 0)
|
||||
return ZEBRA_ROUTE_OSPF;
|
||||
else if (strncmp (s, "i", 1) == 0)
|
||||
return ZEBRA_ROUTE_ISIS;
|
||||
else if (strncmp (s, "bg", 2) == 0)
|
||||
return ZEBRA_ROUTE_BGP;
|
||||
- else if (strncmp (s, "ba", 2) == 0)
|
||||
+ else if (strncmp (s, "h", 1) == 0)
|
||||
+ return ZEBRA_ROUTE_HSLS;
|
||||
+ else if (strncmp (s, "ol", 2) == 0)
|
||||
+ return ZEBRA_ROUTE_OLSR;
|
||||
+ else if (strncmp (s, "bat", 3) == 0)
|
||||
+ return ZEBRA_ROUTE_BATMAN;
|
||||
+ else if (strncmp (s, "bab", 3) == 0)
|
||||
return ZEBRA_ROUTE_BABEL;
|
||||
}
|
||||
if (afi == AFI_IP6)
|
||||
@@ -948,13 +954,19 @@ proto_redistnum(int afi, const char *s)
|
||||
return ZEBRA_ROUTE_STATIC;
|
||||
else if (strncmp (s, "r", 1) == 0)
|
||||
return ZEBRA_ROUTE_RIPNG;
|
||||
- else if (strncmp (s, "o", 1) == 0)
|
||||
+ else if (strncmp (s, "os", 2) == 0)
|
||||
return ZEBRA_ROUTE_OSPF6;
|
||||
else if (strncmp (s, "i", 1) == 0)
|
||||
return ZEBRA_ROUTE_ISIS;
|
||||
else if (strncmp (s, "bg", 2) == 0)
|
||||
return ZEBRA_ROUTE_BGP;
|
||||
- else if (strncmp (s, "ba", 2) == 0)
|
||||
+ else if (strncmp (s, "h", 1) == 0)
|
||||
+ return ZEBRA_ROUTE_HSLS;
|
||||
+ else if (strncmp (s, "ol", 2) == 0)
|
||||
+ return ZEBRA_ROUTE_OLSR;
|
||||
+ else if (strncmp (s, "bat", 3) == 0)
|
||||
+ return ZEBRA_ROUTE_BATMAN;
|
||||
+ else if (strncmp (s, "bab", 3) == 0)
|
||||
return ZEBRA_ROUTE_BABEL;
|
||||
}
|
||||
return -1;
|
||||
--- a/lib/route_types.txt
|
||||
+++ b/lib/route_types.txt
|
||||
@@ -51,13 +51,9 @@ ZEBRA_ROUTE_OSPF, ospf, ospfd
|
||||
ZEBRA_ROUTE_OSPF6, ospf6, ospf6d, 'O', 0, 1, "OSPFv6"
|
||||
ZEBRA_ROUTE_ISIS, isis, isisd, 'I', 1, 1, "IS-IS"
|
||||
ZEBRA_ROUTE_BGP, bgp, bgpd, 'B', 1, 1, "BGP"
|
||||
-# HSLS and OLSR both are AFI independent (so: 1, 1), however
|
||||
-# we want to disable for them for general Quagga distribution.
|
||||
-# This at least makes it trivial for users of these protocols
|
||||
-# to 'switch on' redist support (direct numeric entry remaining
|
||||
-# possible).
|
||||
-ZEBRA_ROUTE_HSLS, hsls, hslsd, 'H', 0, 0, "HSLS"
|
||||
-ZEBRA_ROUTE_OLSR, olsr, olsrd, 'o', 0, 0, "OLSR"
|
||||
+ZEBRA_ROUTE_HSLS, hsls, hslsd, 'H', 1, 1, "HSLS"
|
||||
+ZEBRA_ROUTE_OLSR, olsr, olsrd, 'o', 1, 1, "OLSR"
|
||||
+ZEBRA_ROUTE_BATMAN, batman, batmand,'b', 1, 1, "BATMAN"
|
||||
ZEBRA_ROUTE_BABEL, babel, babeld, 'A', 1, 1, "Babel"
|
||||
|
||||
## help strings
|
||||
@@ -72,5 +68,6 @@ ZEBRA_ROUTE_OSPF6, "Open Shortest Path
|
||||
ZEBRA_ROUTE_ISIS, "Intermediate System to Intermediate System (IS-IS)"
|
||||
ZEBRA_ROUTE_BGP, "Border Gateway Protocol (BGP)"
|
||||
ZEBRA_ROUTE_HSLS, "Hazy-Sighted Link State Protocol (HSLS)"
|
||||
-ZEBRA_ROUTE_OLSR, "Optimised Link State Routing (OLSR)"
|
||||
+ZEBRA_ROUTE_OLSR, "Optimized Link State Routing (OLSR)"
|
||||
+ZEBRA_ROUTE_BATMAN, "Better Approach to Mobile Ad-Hoc Networking (BATMAN)"
|
||||
ZEBRA_ROUTE_BABEL, "Babel routing protocol (Babel)"
|
||||
--- a/ripd/rip_zebra.c
|
||||
+++ b/ripd/rip_zebra.c
|
||||
@@ -206,9 +206,12 @@ static struct {
|
||||
{ZEBRA_ROUTE_KERNEL, 1, "kernel"},
|
||||
{ZEBRA_ROUTE_CONNECT, 1, "connected"},
|
||||
{ZEBRA_ROUTE_STATIC, 1, "static"},
|
||||
- {ZEBRA_ROUTE_OSPF, 1, "ospf"},
|
||||
+ {ZEBRA_ROUTE_OSPF, 2, "ospf"},
|
||||
{ZEBRA_ROUTE_BGP, 2, "bgp"},
|
||||
- {ZEBRA_ROUTE_BABEL, 2, "babel"},
|
||||
+ {ZEBRA_ROUTE_HSLS, 1, "hsls"},
|
||||
+ {ZEBRA_ROUTE_OLSR, 2, "olsr"},
|
||||
+ {ZEBRA_ROUTE_BATMAN, 3, "batman"},
|
||||
+ {ZEBRA_ROUTE_BABEL, 3, "babel"},
|
||||
{0, 0, NULL}
|
||||
};
|
||||
|
||||
--- a/ripngd/ripng_zebra.c
|
||||
+++ b/ripngd/ripng_zebra.c
|
||||
@@ -216,9 +216,12 @@ static struct {
|
||||
{ZEBRA_ROUTE_KERNEL, 1, "kernel"},
|
||||
{ZEBRA_ROUTE_CONNECT, 1, "connected"},
|
||||
{ZEBRA_ROUTE_STATIC, 1, "static"},
|
||||
- {ZEBRA_ROUTE_OSPF6, 1, "ospf6"},
|
||||
+ {ZEBRA_ROUTE_OSPF6, 2, "ospf6"},
|
||||
{ZEBRA_ROUTE_BGP, 2, "bgp"},
|
||||
- {ZEBRA_ROUTE_BABEL, 2, "babel"},
|
||||
+ {ZEBRA_ROUTE_HSLS, 1, "hsls"},
|
||||
+ {ZEBRA_ROUTE_OLSR, 2, "olsr"},
|
||||
+ {ZEBRA_ROUTE_BATMAN, 3, "batman"},
|
||||
+ {ZEBRA_ROUTE_BABEL, 3, "babel"},
|
||||
{0, 0, NULL}
|
||||
};
|
||||
|
||||
--- a/zebra/rt_netlink.c
|
||||
+++ b/zebra/rt_netlink.c
|
||||
@@ -1623,6 +1623,9 @@ netlink_route_multipath (int cmd, struct
|
||||
addattr_l (&req.n, sizeof req, RTA_PREFSRC,
|
||||
&nexthop->src.ipv4, bytelen);
|
||||
|
||||
+ if (rib->type == ZEBRA_ROUTE_OLSR)
|
||||
+ req.r.rtm_scope = RT_SCOPE_LINK;
|
||||
+
|
||||
if (IS_ZEBRA_DEBUG_KERNEL)
|
||||
zlog_debug("netlink_route_multipath() (single hop): "
|
||||
"nexthop via if %u", nexthop->ifindex);
|
||||
--- a/zebra/zebra_rib.c
|
||||
+++ b/zebra/zebra_rib.c
|
||||
@@ -67,6 +67,9 @@ static const struct
|
||||
[ZEBRA_ROUTE_OSPF6] = {ZEBRA_ROUTE_OSPF6, 110},
|
||||
[ZEBRA_ROUTE_ISIS] = {ZEBRA_ROUTE_ISIS, 115},
|
||||
[ZEBRA_ROUTE_BGP] = {ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */},
|
||||
+ [ZEBRA_ROUTE_HSLS] = {ZEBRA_ROUTE_HSLS, 0},
|
||||
+ [ZEBRA_ROUTE_OLSR] = {ZEBRA_ROUTE_OLSR, 0},
|
||||
+ [ZEBRA_ROUTE_BATMAN] = {ZEBRA_ROUTE_BATMAN, 0},
|
||||
[ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 95},
|
||||
/* no entry/default: 150 */
|
||||
};
|
||||
@@ -403,6 +406,18 @@ nexthop_active_ipv4 (struct rib *rib, st
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+ else if (match->type == ZEBRA_ROUTE_OLSR)
|
||||
+ {
|
||||
+ for (newhop = match->nexthop; newhop; newhop = newhop->next)
|
||||
+ if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB)
|
||||
+ && newhop->type == NEXTHOP_TYPE_IFINDEX)
|
||||
+ {
|
||||
+ if (nexthop->type == NEXTHOP_TYPE_IPV4)
|
||||
+ nexthop->ifindex = newhop->ifindex;
|
||||
+ return 1;
|
||||
+ }
|
||||
+ return 0;
|
||||
+ }
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
@@ -507,6 +522,18 @@ nexthop_active_ipv6 (struct rib *rib, st
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+ else if (match->type == ZEBRA_ROUTE_OLSR)
|
||||
+ {
|
||||
+ for (newhop = match->nexthop; newhop; newhop = newhop->next)
|
||||
+ if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB)
|
||||
+ && newhop->type == NEXTHOP_TYPE_IFINDEX)
|
||||
+ {
|
||||
+ if (nexthop->type == NEXTHOP_TYPE_IPV6)
|
||||
+ nexthop->ifindex = newhop->ifindex;
|
||||
+ return 1;
|
||||
+ }
|
||||
+ return 0;
|
||||
+ }
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
@@ -1236,6 +1263,8 @@ static const u_char meta_queue_map[ZEBRA
|
||||
[ZEBRA_ROUTE_ISIS] = 2,
|
||||
[ZEBRA_ROUTE_BGP] = 3,
|
||||
[ZEBRA_ROUTE_HSLS] = 4,
|
||||
+ [ZEBRA_ROUTE_OLSR] = 4,
|
||||
+ [ZEBRA_ROUTE_BATMAN] = 4,
|
||||
[ZEBRA_ROUTE_BABEL] = 2,
|
||||
};
|
||||
|
||||
--- a/zebra/zebra_snmp.c
|
||||
+++ b/zebra/zebra_snmp.c
|
||||
@@ -251,6 +251,12 @@ proto_trans(int type)
|
||||
return 1; /* shouldn't happen */
|
||||
case ZEBRA_ROUTE_BGP:
|
||||
return 14; /* bgp */
|
||||
+ case ZEBRA_ROUTE_HSLS:
|
||||
+ return 1; /* other */
|
||||
+ case ZEBRA_ROUTE_OLSR:
|
||||
+ return 1; /* other */
|
||||
+ case ZEBRA_ROUTE_BATMAN:
|
||||
+ return 1; /* other */
|
||||
default:
|
||||
return 1; /* other */
|
||||
}
|
||||
--- a/zebra/zebra_vty.c
|
||||
+++ b/zebra/zebra_vty.c
|
||||
@@ -558,7 +558,10 @@ vty_show_ip_route_detail (struct vty *vt
|
||||
|| rib->type == ZEBRA_ROUTE_OSPF
|
||||
|| rib->type == ZEBRA_ROUTE_BABEL
|
||||
|| rib->type == ZEBRA_ROUTE_ISIS
|
||||
- || rib->type == ZEBRA_ROUTE_BGP)
|
||||
+ || rib->type == ZEBRA_ROUTE_BGP
|
||||
+ || rib->type == ZEBRA_ROUTE_HSLS
|
||||
+ || rib->type == ZEBRA_ROUTE_OLSR
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
@@ -777,7 +780,10 @@ vty_show_ip_route (struct vty *vty, stru
|
||||
|| rib->type == ZEBRA_ROUTE_OSPF
|
||||
|| rib->type == ZEBRA_ROUTE_BABEL
|
||||
|| rib->type == ZEBRA_ROUTE_ISIS
|
||||
- || rib->type == ZEBRA_ROUTE_BGP)
|
||||
+ || rib->type == ZEBRA_ROUTE_BGP
|
||||
+ || rib->type == ZEBRA_ROUTE_HSLS
|
||||
+ || rib->type == ZEBRA_ROUTE_OLSR
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
@@ -1536,7 +1542,10 @@ vty_show_ipv6_route_detail (struct vty *
|
||||
|| rib->type == ZEBRA_ROUTE_OSPF6
|
||||
|| rib->type == ZEBRA_ROUTE_BABEL
|
||||
|| rib->type == ZEBRA_ROUTE_ISIS
|
||||
- || rib->type == ZEBRA_ROUTE_BGP)
|
||||
+ || rib->type == ZEBRA_ROUTE_BGP
|
||||
+ || rib->type == ZEBRA_ROUTE_HSLS
|
||||
+ || rib->type == ZEBRA_ROUTE_OLSR
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
@@ -1716,7 +1725,10 @@ vty_show_ipv6_route (struct vty *vty, st
|
||||
|| rib->type == ZEBRA_ROUTE_OSPF6
|
||||
|| rib->type == ZEBRA_ROUTE_BABEL
|
||||
|| rib->type == ZEBRA_ROUTE_ISIS
|
||||
- || rib->type == ZEBRA_ROUTE_BGP)
|
||||
+ || rib->type == ZEBRA_ROUTE_BGP
|
||||
+ || rib->type == ZEBRA_ROUTE_HSLS
|
||||
+ || rib->type == ZEBRA_ROUTE_OLSR
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
--- a/lib/log.c
|
||||
+++ b/lib/log.c
|
||||
@@ -941,6 +941,8 @@ proto_redistnum(int afi, const char *s)
|
||||
return ZEBRA_ROUTE_OLSR;
|
||||
else if (strncmp (s, "bat", 3) == 0)
|
||||
return ZEBRA_ROUTE_BATMAN;
|
||||
+ else if (strncmp (s, "bmx", 3) == 0)
|
||||
+ return ZEBRA_ROUTE_BMX6;
|
||||
else if (strncmp (s, "bab", 3) == 0)
|
||||
return ZEBRA_ROUTE_BABEL;
|
||||
}
|
||||
@@ -966,6 +968,8 @@ proto_redistnum(int afi, const char *s)
|
||||
return ZEBRA_ROUTE_OLSR;
|
||||
else if (strncmp (s, "bat", 3) == 0)
|
||||
return ZEBRA_ROUTE_BATMAN;
|
||||
+ else if (strncmp (s, "bmx", 3) == 0)
|
||||
+ return ZEBRA_ROUTE_BMX6;
|
||||
else if (strncmp (s, "bab", 3) == 0)
|
||||
return ZEBRA_ROUTE_BABEL;
|
||||
}
|
||||
--- a/lib/route_types.txt
|
||||
+++ b/lib/route_types.txt
|
||||
@@ -54,6 +54,7 @@ ZEBRA_ROUTE_BGP, bgp, bgpd,
|
||||
ZEBRA_ROUTE_HSLS, hsls, hslsd, 'H', 1, 1, "HSLS"
|
||||
ZEBRA_ROUTE_OLSR, olsr, olsrd, 'o', 1, 1, "OLSR"
|
||||
ZEBRA_ROUTE_BATMAN, batman, batmand,'b', 1, 1, "BATMAN"
|
||||
+ZEBRA_ROUTE_BMX6, bmx6, bmx6, 'x', 1, 1, "BMX6"
|
||||
ZEBRA_ROUTE_BABEL, babel, babeld, 'A', 1, 1, "Babel"
|
||||
|
||||
## help strings
|
||||
@@ -70,4 +71,5 @@ ZEBRA_ROUTE_BGP, "Border Gateway Prot
|
||||
ZEBRA_ROUTE_HSLS, "Hazy-Sighted Link State Protocol (HSLS)"
|
||||
ZEBRA_ROUTE_OLSR, "Optimized Link State Routing (OLSR)"
|
||||
ZEBRA_ROUTE_BATMAN, "Better Approach to Mobile Ad-Hoc Networking (BATMAN)"
|
||||
+ZEBRA_ROUTE_BMX6, "BMX6 networking protocol"
|
||||
ZEBRA_ROUTE_BABEL, "Babel routing protocol (Babel)"
|
||||
--- a/ripd/rip_zebra.c
|
||||
+++ b/ripd/rip_zebra.c
|
||||
@@ -211,6 +211,7 @@ static struct {
|
||||
{ZEBRA_ROUTE_HSLS, 1, "hsls"},
|
||||
{ZEBRA_ROUTE_OLSR, 2, "olsr"},
|
||||
{ZEBRA_ROUTE_BATMAN, 3, "batman"},
|
||||
+ {ZEBRA_ROUTE_BMX6, 3, "bmx6"},
|
||||
{ZEBRA_ROUTE_BABEL, 3, "babel"},
|
||||
{0, 0, NULL}
|
||||
};
|
||||
--- a/ripngd/ripng_zebra.c
|
||||
+++ b/ripngd/ripng_zebra.c
|
||||
@@ -221,6 +221,7 @@ static struct {
|
||||
{ZEBRA_ROUTE_HSLS, 1, "hsls"},
|
||||
{ZEBRA_ROUTE_OLSR, 2, "olsr"},
|
||||
{ZEBRA_ROUTE_BATMAN, 3, "batman"},
|
||||
+ {ZEBRA_ROUTE_BMX6, 3, "bmx6"},
|
||||
{ZEBRA_ROUTE_BABEL, 3, "babel"},
|
||||
{0, 0, NULL}
|
||||
};
|
||||
--- a/zebra/zebra_rib.c
|
||||
+++ b/zebra/zebra_rib.c
|
||||
@@ -70,6 +70,7 @@ static const struct
|
||||
[ZEBRA_ROUTE_HSLS] = {ZEBRA_ROUTE_HSLS, 0},
|
||||
[ZEBRA_ROUTE_OLSR] = {ZEBRA_ROUTE_OLSR, 0},
|
||||
[ZEBRA_ROUTE_BATMAN] = {ZEBRA_ROUTE_BATMAN, 0},
|
||||
+ [ZEBRA_ROUTE_BMX6] = {ZEBRA_ROUTE_BMX6, 0},
|
||||
[ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 95},
|
||||
/* no entry/default: 150 */
|
||||
};
|
||||
@@ -1265,6 +1266,7 @@ static const u_char meta_queue_map[ZEBRA
|
||||
[ZEBRA_ROUTE_HSLS] = 4,
|
||||
[ZEBRA_ROUTE_OLSR] = 4,
|
||||
[ZEBRA_ROUTE_BATMAN] = 4,
|
||||
+ [ZEBRA_ROUTE_BMX6] = 4,
|
||||
[ZEBRA_ROUTE_BABEL] = 2,
|
||||
};
|
||||
|
||||
--- a/zebra/zebra_snmp.c
|
||||
+++ b/zebra/zebra_snmp.c
|
||||
@@ -257,6 +257,8 @@ proto_trans(int type)
|
||||
return 1; /* other */
|
||||
case ZEBRA_ROUTE_BATMAN:
|
||||
return 1; /* other */
|
||||
+ case ZEBRA_ROUTE_BMX6:
|
||||
+ return 1; /* other */
|
||||
default:
|
||||
return 1; /* other */
|
||||
}
|
||||
--- a/zebra/zebra_vty.c
|
||||
+++ b/zebra/zebra_vty.c
|
||||
@@ -561,7 +561,8 @@ vty_show_ip_route_detail (struct vty *vt
|
||||
|| rib->type == ZEBRA_ROUTE_BGP
|
||||
|| rib->type == ZEBRA_ROUTE_HSLS
|
||||
|| rib->type == ZEBRA_ROUTE_OLSR
|
||||
- || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN
|
||||
+ || rib->type == ZEBRA_ROUTE_BMX6)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
@@ -783,7 +784,8 @@ vty_show_ip_route (struct vty *vty, stru
|
||||
|| rib->type == ZEBRA_ROUTE_BGP
|
||||
|| rib->type == ZEBRA_ROUTE_HSLS
|
||||
|| rib->type == ZEBRA_ROUTE_OLSR
|
||||
- || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN
|
||||
+ || rib->type == ZEBRA_ROUTE_BMX6)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
@@ -1545,7 +1547,8 @@ vty_show_ipv6_route_detail (struct vty *
|
||||
|| rib->type == ZEBRA_ROUTE_BGP
|
||||
|| rib->type == ZEBRA_ROUTE_HSLS
|
||||
|| rib->type == ZEBRA_ROUTE_OLSR
|
||||
- || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN
|
||||
+ || rib->type == ZEBRA_ROUTE_BMX6)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
@@ -1728,7 +1731,8 @@ vty_show_ipv6_route (struct vty *vty, st
|
||||
|| rib->type == ZEBRA_ROUTE_BGP
|
||||
|| rib->type == ZEBRA_ROUTE_HSLS
|
||||
|| rib->type == ZEBRA_ROUTE_OLSR
|
||||
- || rib->type == ZEBRA_ROUTE_BATMAN)
|
||||
+ || rib->type == ZEBRA_ROUTE_BATMAN
|
||||
+ || rib->type == ZEBRA_ROUTE_BMX6)
|
||||
{
|
||||
time_t uptime;
|
||||
struct tm *tm;
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/vtysh/extract.pl.in
|
||||
+++ b/vtysh/extract.pl.in
|
||||
@@ -63,7 +63,7 @@ $ignore{'"show history"'} = "ignore";
|
||||
foreach (@ARGV) {
|
||||
$file = $_;
|
||||
|
||||
- open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ @CPPFLAGS@ $file |");
|
||||
+ open (FH, "@CPP@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ @CPPFLAGS@ $file |");
|
||||
local $/; undef $/;
|
||||
$line = <FH>;
|
||||
close (FH);
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
--- a/bgpd/bgp_network.c
|
||||
+++ b/bgpd/bgp_network.c
|
||||
@@ -193,8 +193,7 @@ bgp_accept (struct thread *thread)
|
||||
peer->fd = bgp_sock;
|
||||
peer->status = Active;
|
||||
peer->local_id = peer1->local_id;
|
||||
- peer->v_holdtime = peer1->v_holdtime;
|
||||
- peer->v_keepalive = peer1->v_keepalive;
|
||||
+ peer->v_holdtime = BGP_LARGE_HOLDTIME;
|
||||
|
||||
/* Make peer's address string. */
|
||||
sockunion2str (&su, buf, SU_ADDRSTRLEN);
|
||||
--- a/bgpd/bgpd.h
|
||||
+++ b/bgpd/bgpd.h
|
||||
@@ -718,6 +718,7 @@ struct bgp_nlri
|
||||
/* BGP timers default value. */
|
||||
#define BGP_INIT_START_TIMER 5
|
||||
#define BGP_ERROR_START_TIMER 30
|
||||
+#define BGP_LARGE_HOLDTIME 240
|
||||
#define BGP_DEFAULT_HOLDTIME 180
|
||||
#define BGP_DEFAULT_KEEPALIVE 60
|
||||
#define BGP_DEFAULT_ASORIGINATE 15
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
--- a/lib/command.c
|
||||
+++ b/lib/command.c
|
||||
@@ -2601,6 +2601,13 @@ DEFUN (config_write_file,
|
||||
VTY_NEWLINE);
|
||||
goto finished;
|
||||
}
|
||||
+
|
||||
+#if 0
|
||||
+ /* This code fails on UNION MOUNTs and similar filesystems if the
|
||||
+ * config file is still on the RO layer. Hardlinks across layers
|
||||
+ * will not work and cause quagga to fail saving the configuration...
|
||||
+ * should use rename() to move files around...
|
||||
+ */
|
||||
if (link (config_file, config_file_sav) != 0)
|
||||
{
|
||||
vty_out (vty, "Can't backup old configuration file %s.%s", config_file_sav,
|
||||
@@ -2614,7 +2621,23 @@ DEFUN (config_write_file,
|
||||
VTY_NEWLINE);
|
||||
goto finished;
|
||||
}
|
||||
+#else
|
||||
+ /* And this is the code that hopefully does work */
|
||||
+ if (rename (config_file, config_file_sav) != 0)
|
||||
+ {
|
||||
+ vty_out (vty, "Can't backup old configuration file %s.%s", config_file_sav,
|
||||
+ VTY_NEWLINE);
|
||||
+ goto finished;
|
||||
+ }
|
||||
+ sync ();
|
||||
+#endif
|
||||
+
|
||||
+#if 0
|
||||
+ /* same here. Please no cross-filesystem hardlinks... */
|
||||
if (link (config_file_tmp, config_file) != 0)
|
||||
+#else
|
||||
+ if (rename (config_file_tmp, config_file) != 0)
|
||||
+#endif
|
||||
{
|
||||
vty_out (vty, "Can't save configuration file %s.%s", config_file,
|
||||
VTY_NEWLINE);
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,318 +0,0 @@
|
|||
From: Paul Jakma <paul.jakma@sun.com>
|
||||
Date: Thu, 4 Sep 2008 22:27:13 +0000 (+0100)
|
||||
Subject: [bgp/pgbgp] Add some pgbgp commands to restricted-mode and other command tweaks
|
||||
X-Git-Url: http://git.ozo.com/?p=quagga-pgbg.git;a=commitdiff_plain;h=06ac72f9f6021635e9e1e5105c3e22bf7eb0d6c3
|
||||
|
||||
[bgp/pgbgp] Add some pgbgp commands to restricted-mode and other command tweaks
|
||||
|
||||
* bgp_pgbgp.c:
|
||||
(edge_neighbor_iterator) make ASN==0 mean 'iterate over all ASNs'
|
||||
(bgp_pgbgp_stats_origin_one) new function, to display one origin AS status.
|
||||
(bgp_pgbgp_stats_origins) adapt to use previous.
|
||||
Adapt to iterate over all stats if no prefix was giving.
|
||||
(show_ip_bgp_pgbgp_neighbors_cmd) recognise no ASN argument case
|
||||
(show_ip_bgp_pgbgp_neighbors_all_cmd) Iterate over all
|
||||
(show_ip_bgp_pgbgp_origins_cmd) similar
|
||||
(show_ip_bgp_pgbgp_origins_all_cmd)
|
||||
(bgp_pgbgp_enable) install the lookup commands to ther new RESTRICTED_NODE
|
||||
* bgp_route.c:
|
||||
(route_vty_short_status_out) only allowed to print one char for anomalous
|
||||
status.
|
||||
(route_vty_out_detail) Add support for printing out more detail on
|
||||
PG-BGP status
|
||||
---
|
||||
|
||||
--- a/bgpd/bgp_pgbgp.c
|
||||
+++ b/bgpd/bgp_pgbgp.c
|
||||
@@ -227,7 +227,7 @@ static void
|
||||
edge_neighbor_iterator (struct hash_backet *backet, struct nsearch *pns)
|
||||
{
|
||||
struct bgp_pgbgp_edge *hedge = backet->data;
|
||||
- if ((hedge->e.a == pns->asn || hedge->e.b == pns->asn)
|
||||
+ if ((!pns->asn || hedge->e.a == pns->asn || hedge->e.b == pns->asn)
|
||||
&& hedge->e.a != hedge->e.b)
|
||||
{
|
||||
struct vty *vty = pns->pvty;
|
||||
@@ -254,13 +254,39 @@ bgp_pgbgp_stats_neighbors (struct vty *v
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
+static void
|
||||
+bgp_pgbgp_stats_origin_one (struct vty *vty, struct bgp_node *rn,
|
||||
+ time_t t_now)
|
||||
+{
|
||||
+ char str[INET6_BUFSIZ];
|
||||
+
|
||||
+ if (!rn->hist)
|
||||
+ return;
|
||||
+
|
||||
+ prefix2str (&rn->p, str, sizeof(str));
|
||||
+ vty_out (vty, "%s%s", str, VTY_NEWLINE);
|
||||
+
|
||||
+ for (struct bgp_pgbgp_origin * cur = rn->hist->o; cur != NULL;
|
||||
+ cur = cur->next)
|
||||
+ {
|
||||
+ if (cur->deprefUntil > t_now)
|
||||
+ vty_out (vty, "Untrusted Origin AS: %d%s", cur->originAS,
|
||||
+ VTY_NEWLINE);
|
||||
+ else
|
||||
+ vty_out (vty, "Trusted Origin AS: %d%s", cur->originAS,
|
||||
+ VTY_NEWLINE);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static int
|
||||
bgp_pgbgp_stats_origins (struct vty *vty, afi_t afi, safi_t safi,
|
||||
const char *prefix)
|
||||
{
|
||||
struct bgp *bgp;
|
||||
struct bgp_table *table;
|
||||
+ struct bgp_node *rn;
|
||||
time_t t_now = time (NULL);
|
||||
+
|
||||
bgp = bgp_get_default ();
|
||||
if (bgp == NULL)
|
||||
return CMD_WARNING;
|
||||
@@ -269,28 +295,22 @@ bgp_pgbgp_stats_origins (struct vty *vty
|
||||
table = bgp->rib[afi][safi];
|
||||
if (table == NULL)
|
||||
return CMD_WARNING;
|
||||
-
|
||||
- struct prefix p;
|
||||
- str2prefix (prefix, &p);
|
||||
- struct bgp_node *rn = bgp_node_match (table, &p);
|
||||
- vty_out (vty, "%s%s", prefix, VTY_NEWLINE);
|
||||
- if (rn)
|
||||
+
|
||||
+ if (prefix)
|
||||
{
|
||||
+ struct prefix p;
|
||||
+ str2prefix (prefix, &p);
|
||||
+ rn = bgp_node_match (table, &p);
|
||||
if (rn->hist)
|
||||
- {
|
||||
- for (struct bgp_pgbgp_origin * cur = rn->hist->o; cur != NULL;
|
||||
- cur = cur->next)
|
||||
- {
|
||||
- if (cur->deprefUntil > t_now)
|
||||
- vty_out (vty, "Untrusted Origin AS: %d%s", cur->originAS,
|
||||
- VTY_NEWLINE);
|
||||
- else
|
||||
- vty_out (vty, "Trusted Origin AS: %d%s", cur->originAS,
|
||||
- VTY_NEWLINE);
|
||||
- }
|
||||
- }
|
||||
+ bgp_pgbgp_stats_origin_one (vty, rn, t_now);
|
||||
bgp_unlock_node (rn);
|
||||
+ return CMD_SUCCESS;
|
||||
}
|
||||
+
|
||||
+ for (rn = bgp_table_top (table); rn; rn = bgp_route_next (rn))
|
||||
+ if (rn->hist)
|
||||
+ bgp_pgbgp_stats_origin_one (vty, rn, t_now);
|
||||
+
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -377,7 +397,7 @@ bgp_pgbgp_stats (struct vty *vty, afi_t
|
||||
DEFUN (show_ip_bgp_pgbgp,
|
||||
show_ip_bgp_pgbgp_cmd,
|
||||
"show ip bgp pgbgp",
|
||||
- SHOW_STR IP_STR BGP_STR "Display PGBGP statistics\n")
|
||||
+ SHOW_STR IP_STR BGP_STR "Pretty-Good BGP statistics\n")
|
||||
{
|
||||
return bgp_pgbgp_stats (vty, AFI_IP, SAFI_UNICAST);
|
||||
}
|
||||
@@ -385,29 +405,46 @@ DEFUN (show_ip_bgp_pgbgp,
|
||||
DEFUN (show_ip_bgp_pgbgp_neighbors,
|
||||
show_ip_bgp_pgbgp_neighbors_cmd,
|
||||
"show ip bgp pgbgp neighbors WORD",
|
||||
- SHOW_STR
|
||||
- IP_STR
|
||||
- BGP_STR
|
||||
- "BGP pgbgp\n"
|
||||
- "BGP pgbgp neighbors\n" "ASN whos neighbors should be displayed\n")
|
||||
+ SHOW_STR IP_STR BGP_STR
|
||||
+ "Pretty-Good BGP statistics\n"
|
||||
+ "PG-BGP neighbor information\n"
|
||||
+ "AS to show neighbors of\n")
|
||||
{
|
||||
return bgp_pgbgp_stats_neighbors (vty, AFI_IP, SAFI_UNICAST,
|
||||
- atoi (argv[0]));
|
||||
+ argc == 1 ? atoi (argv[0]) : 0);
|
||||
}
|
||||
|
||||
+ALIAS (show_ip_bgp_pgbgp_neighbors,
|
||||
+ show_ip_bgp_pgbgp_neighbors_all_cmd,
|
||||
+ "show ip bgp pgbgp neighbors",
|
||||
+ SHOW_STR
|
||||
+ IP_STR
|
||||
+ BGP_STR
|
||||
+ "Pretty-Good BGP statistics\n"
|
||||
+ "PG-BGP neighbors information\n")
|
||||
+
|
||||
DEFUN (show_ip_bgp_pgbgp_origins,
|
||||
show_ip_bgp_pgbgp_origins_cmd,
|
||||
"show ip bgp pgbgp origins A.B.C.D/M",
|
||||
SHOW_STR
|
||||
IP_STR
|
||||
BGP_STR
|
||||
- "BGP pgbgp\n"
|
||||
- "BGP pgbgp neighbors\n" "Prefix to look up origin ASes of\n")
|
||||
+ "Pretty-Good BGP statistics\n"
|
||||
+ "PG-BGP prefix origin information\n"
|
||||
+ "Prefix to look up origin ASes of\n")
|
||||
{
|
||||
- return bgp_pgbgp_stats_origins (vty, AFI_IP, SAFI_UNICAST, argv[0]);
|
||||
+ return bgp_pgbgp_stats_origins (vty, AFI_IP, SAFI_UNICAST,
|
||||
+ argc == 1 ? argv[0] : NULL);
|
||||
}
|
||||
|
||||
-
|
||||
+ALIAS (show_ip_bgp_pgbgp_origins,
|
||||
+ show_ip_bgp_pgbgp_origins_all_cmd,
|
||||
+ "show ip bgp pgbgp origins",
|
||||
+ SHOW_STR
|
||||
+ IP_STR
|
||||
+ BGP_STR
|
||||
+ "Pretty-Good BGP statistics\n"
|
||||
+ "PG-BGP prefixes origin information")
|
||||
|
||||
|
||||
/*! --------------- VTY (others exist in bgp_route.c) ------------------ !*/
|
||||
@@ -749,12 +786,19 @@ bgp_pgbgp_enable (struct bgp *bgp, afi_t
|
||||
pgbgp->lastgc = time (NULL);
|
||||
pgbgp->lastStore = time (NULL);
|
||||
pgbgp->startTime = time (NULL);
|
||||
+ install_element (RESTRICTED_NODE, &show_ip_bgp_pgbgp_cmd);
|
||||
+ install_element (RESTRICTED_NODE, &show_ip_bgp_pgbgp_neighbors_cmd);
|
||||
+ install_element (RESTRICTED_NODE, &show_ip_bgp_pgbgp_origins_cmd);
|
||||
install_element (VIEW_NODE, &show_ip_bgp_pgbgp_cmd);
|
||||
- install_element (ENABLE_NODE, &show_ip_bgp_pgbgp_cmd);
|
||||
install_element (VIEW_NODE, &show_ip_bgp_pgbgp_neighbors_cmd);
|
||||
- install_element (ENABLE_NODE, &show_ip_bgp_pgbgp_neighbors_cmd);
|
||||
install_element (VIEW_NODE, &show_ip_bgp_pgbgp_origins_cmd);
|
||||
+ install_element (VIEW_NODE, &show_ip_bgp_pgbgp_neighbors_all_cmd);
|
||||
+ install_element (VIEW_NODE, &show_ip_bgp_pgbgp_origins_all_cmd);
|
||||
+ install_element (ENABLE_NODE, &show_ip_bgp_pgbgp_cmd);
|
||||
+ install_element (ENABLE_NODE, &show_ip_bgp_pgbgp_neighbors_cmd);
|
||||
install_element (ENABLE_NODE, &show_ip_bgp_pgbgp_origins_cmd);
|
||||
+ install_element (ENABLE_NODE, &show_ip_bgp_pgbgp_neighbors_all_cmd);
|
||||
+ install_element (ENABLE_NODE, &show_ip_bgp_pgbgp_origins_all_cmd);
|
||||
pgbgp->edgeT = hash_create_size (131072, edge_key_make, edge_cmp);
|
||||
bgp_pgbgp_restore ();
|
||||
return 0;
|
||||
--- a/bgpd/bgp_route.c
|
||||
+++ b/bgpd/bgp_route.c
|
||||
@@ -5581,20 +5581,6 @@ enum bgp_display_type
|
||||
static void
|
||||
route_vty_short_status_out (struct vty *vty, struct bgp_info *binfo)
|
||||
{
|
||||
- if (ANOMALOUS(binfo->flags))
|
||||
- {
|
||||
- vty_out(vty, "a[");
|
||||
- if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_P))
|
||||
- vty_out(vty, "i");
|
||||
- if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_O))
|
||||
- vty_out(vty, "p");
|
||||
- if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_E))
|
||||
- vty_out(vty, "e");
|
||||
- if (CHECK_FLAG(binfo->flags, BGP_INFO_IGNORED_P))
|
||||
- vty_out(vty, "s");
|
||||
- vty_out(vty, "] ");
|
||||
- }
|
||||
-
|
||||
/* Route status display. */
|
||||
if (CHECK_FLAG (binfo->flags, BGP_INFO_REMOVED))
|
||||
vty_out (vty, "R");
|
||||
@@ -5610,6 +5596,17 @@ route_vty_short_status_out (struct vty *
|
||||
/* Selected */
|
||||
if (CHECK_FLAG (binfo->flags, BGP_INFO_HISTORY))
|
||||
vty_out (vty, "h");
|
||||
+ else if (ANOMALOUS(binfo->flags))
|
||||
+ {
|
||||
+ if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_O))
|
||||
+ vty_out(vty, "p");
|
||||
+ else if (CHECK_FLAG(binfo->flags, BGP_INFO_IGNORED_P))
|
||||
+ vty_out(vty, "P");
|
||||
+ else if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_P))
|
||||
+ vty_out(vty, "a");
|
||||
+ if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_E))
|
||||
+ vty_out(vty, "a");
|
||||
+ }
|
||||
else if (CHECK_FLAG (binfo->flags, BGP_INFO_DAMPED))
|
||||
vty_out (vty, "d");
|
||||
else if (CHECK_FLAG (binfo->flags, BGP_INFO_SELECTED))
|
||||
@@ -6088,7 +6085,22 @@ route_vty_out_detail (struct vty *vty, s
|
||||
if (binfo->extra && binfo->extra->damp_info)
|
||||
bgp_damp_info_vty (vty, binfo);
|
||||
|
||||
- /* Line 7 display Uptime */
|
||||
+ /* 8: PGBGP status */
|
||||
+ if (ANOMALOUS(binfo->flags))
|
||||
+ {
|
||||
+ vty_out (vty, " Anomalous:");
|
||||
+ if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_P))
|
||||
+ vty_out (vty, " divergent sub-prefixes,");
|
||||
+ if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_O))
|
||||
+ vty_out (vty, " origin AS (prefix hijack?),");
|
||||
+ if (CHECK_FLAG(binfo->flags, BGP_INFO_SUSPICIOUS_E))
|
||||
+ vty_out (vty, " new edge in path,");
|
||||
+ if (CHECK_FLAG(binfo->flags, BGP_INFO_IGNORED_P))
|
||||
+ vty_out (vty, " origin AS (sub-prefix hijack?),");
|
||||
+ vty_out (vty, "%s", VTY_NEWLINE);
|
||||
+ }
|
||||
+
|
||||
+ /* Line 9 display Uptime */
|
||||
#ifdef HAVE_CLOCK_MONOTONIC
|
||||
tbuf = time(NULL) - (bgp_clock() - binfo->uptime);
|
||||
vty_out (vty, " Last update: %s", ctime(&tbuf));
|
||||
@@ -6099,8 +6111,9 @@ route_vty_out_detail (struct vty *vty, s
|
||||
vty_out (vty, "%s", VTY_NEWLINE);
|
||||
}
|
||||
|
||||
-#define BGP_SHOW_SCODE_HEADER "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal,%s r RIB-failure, S Stale, R Removed%s"
|
||||
-#define BGP_SHOW_PCODE_HEADER "Status code: a (anomalous) of: [p] prefix hijack, [s] sub-prefix hijack,%s [i] informant of sub-prefix [e] new edge%s"
|
||||
+#define BGP_SHOW_SCODE_HEADER "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal,%s" \
|
||||
+ " r RIB-failure, S Stale, R Removed, %s" \
|
||||
+ " p prefix hijack, P sub-prefix hijack, a other anomaly%s"
|
||||
#define BGP_SHOW_OCODE_HEADER "Origin codes: i - IGP, e - EGP, ? - incomplete%s%s"
|
||||
#define BGP_SHOW_HEADER " Network Next Hop Metric LocPrf Weight Path%s"
|
||||
#define BGP_SHOW_DAMP_HEADER " Network From Reuse Path%s"
|
||||
@@ -6309,8 +6322,7 @@ bgp_show_table (struct vty *vty, struct
|
||||
if (header)
|
||||
{
|
||||
vty_out (vty, "BGP table version is 0, local router ID is %s%s", inet_ntoa (*router_id), VTY_NEWLINE);
|
||||
- vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
- vty_out (vty, BGP_SHOW_PCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
+ vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
|
||||
vty_out (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
if (type == bgp_show_type_dampend_paths
|
||||
|| type == bgp_show_type_damp_neighbor)
|
||||
@@ -9842,7 +9854,7 @@ show_adj_route (struct vty *vty, struct
|
||||
PEER_STATUS_DEFAULT_ORIGINATE))
|
||||
{
|
||||
vty_out (vty, "BGP table version is 0, local router ID is %s%s", inet_ntoa (bgp->router_id), VTY_NEWLINE);
|
||||
- vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
+ vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
|
||||
vty_out (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
|
||||
vty_out (vty, "Originating default network 0.0.0.0%s%s",
|
||||
@@ -9859,7 +9871,7 @@ show_adj_route (struct vty *vty, struct
|
||||
if (header1)
|
||||
{
|
||||
vty_out (vty, "BGP table version is 0, local router ID is %s%s", inet_ntoa (bgp->router_id), VTY_NEWLINE);
|
||||
- vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
+ vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
|
||||
vty_out (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
header1 = 0;
|
||||
}
|
||||
@@ -9883,7 +9895,7 @@ show_adj_route (struct vty *vty, struct
|
||||
if (header1)
|
||||
{
|
||||
vty_out (vty, "BGP table version is 0, local router ID is %s%s", inet_ntoa (bgp->router_id), VTY_NEWLINE);
|
||||
- vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
+ vty_out (vty, BGP_SHOW_SCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
|
||||
vty_out (vty, BGP_SHOW_OCODE_HEADER, VTY_NEWLINE, VTY_NEWLINE);
|
||||
header1 = 0;
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- a/vtysh/vtysh.c
|
||||
+++ b/vtysh/vtysh.c
|
||||
@@ -269,7 +269,7 @@ vtysh_pager_init (void)
|
||||
if (pager_defined)
|
||||
vtysh_pager_name = strdup (pager_defined);
|
||||
else
|
||||
- vtysh_pager_name = strdup ("more");
|
||||
+ vtysh_pager_name = strdup ("cat");
|
||||
}
|
||||
|
||||
/* Command execution over the vty interface. */
|
||||
@@ -1885,7 +1885,7 @@ DEFUN (vtysh_terminal_length,
|
||||
{
|
||||
int lines;
|
||||
char *endptr = NULL;
|
||||
- char default_pager[10];
|
||||
+ char default_pager[12];
|
||||
|
||||
lines = strtol (argv[0], &endptr, 10);
|
||||
if (lines < 0 || lines > 512 || *endptr != '\0')
|
||||
@@ -1902,7 +1902,7 @@ DEFUN (vtysh_terminal_length,
|
||||
|
||||
if (lines != 0)
|
||||
{
|
||||
- snprintf(default_pager, 10, "more -%i", lines);
|
||||
+ snprintf(default_pager, 12, "head -n %i", lines);
|
||||
vtysh_pager_name = strdup (default_pager);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue