This patch adds per-daemon flags support to the quagga start script, and
configuration support for the quagga OSPF apiclient.
To enable the API client in runtime, you need to uncomment the -a flag for
ospfd.
--Pekka Nikander
Index: package/net/quagga-unstable/files/quagga
===================================================================
--- package/net/quagga-unstable/files/quagga (revision 19245)
+++ package/net/quagga-unstable/files/quagga (working copy)
@@ -29,6 +29,7 @@
STATEDIR=/var/run/quagga
DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
DAEMON_FLAGS=-d
+#DAEMON_ospfd_FLAGS=-a
WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
WATCHQUAGGA_CMD="$0 watchrestart"
if [ ${COMMAND} != "watchrestart" ]
@@ -316,7 +317,7 @@
${WATCHQUAGGA_DAEMONS}
status=$?
else
- "${BINDIR}/${d}" ${DAEMON_FLAGS}
+ eval '"${BINDIR}/${d}"' ${DAEMON_FLAGS}
\${DAEMON_${d}_FLAGS}
status=$?
fi
if [ $status -eq 0 ]
Index: package/net/quagga-unstable/Makefile
===================================================================
--- package/net/quagga-unstable/Makefile (revision 19245)
+++ package/net/quagga-unstable/Makefile (working copy)
@@ -21,7 +21,8 @@
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_quagga-unstable-isisd \
- CONFIG_PACKAGE_quagga-unstable-ripngd
+ CONFIG_PACKAGE_quagga-unstable-ripngd \
+ CONFIG_PACKAGE_quagga-unstable-ospfclient
include $(INCLUDE_DIR)/package.mk
@@ -72,6 +73,13 @@
TITLE:=OSPFv2 routing engine
endef
+define Package/quagga-unstable-ospfclient
+ $(call Package/quagga-unstable/Default)
+ DEPENDS+= +quagga-unstable-ospdf
+ TITLE:=OSPFv2 routing client
+endef
+
+
define Package/quagga-unstable-ospf6d
$(call Package/quagga-unstable/Default)
DEPENDS+= +quagga-unstable-libospf +quagga-unstable-libzebra @IPV6
@@ -107,6 +115,12 @@
--enable-pie=no \
--enable-multipath=8 \
+ifneq ($(CONFIG_PACKAGE_quagga-unstable-ospfclient),)
+ CONFIGURE_ARGS+= \
+ --enable-opaque-lsa \
+ --enable-ospfclient
+endif
+
ifneq ($(CONFIG_PACKAGE_quagga-unstable-isisd),)
CONFIGURE_ARGS+= --enable-isisd
endif
@@ -206,6 +220,13 @@
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
endef
+define Package/quagga-unstable-ospfclient/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfclient $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospfapiclient.so.* $(1)/usr/lib/
+endef
+
define Package/quagga-unstable-ospf6d/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
@@ -251,6 +272,7 @@
$(eval $(call BuildPackage,quagga-unstable-bgpd))
$(eval $(call BuildPackage,quagga-unstable-isisd))
$(eval $(call BuildPackage,quagga-unstable-ospfd))
+$(eval $(call BuildPackage,quagga-unstable-ospfclient))
$(eval $(call BuildPackage,quagga-unstable-ospf6d))
$(eval $(call BuildPackage,quagga-unstable-ripd))
$(eval $(call BuildPackage,quagga-unstable-ripngd))
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
