Skip to content
Permalink
Browse files

Merge pull request #2872 from donaldsharp/tcp_zebra

doc, debianpkg: Cleanup tcp-zebra configure options
  • Loading branch information...
eqvinox committed Aug 20, 2018
2 parents a55a8b4 + 1491ad1 commit 919925782ce7765c237f41ab8995d5af27a51cc7
@@ -10,7 +10,6 @@
WANT_LDP ?= 1
WANT_PIM ?= 1
WANT_OSPFAPI ?= 1
WANT_TCP_ZEBRA ?= 0
WANT_BGP_VNC ?= 1
WANT_CUMULUS_MODE ?= 0
WANT_MULTIPATH ?= 1
@@ -65,12 +64,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no
endif

ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra
else
USE_TCP_ZEBRA=--disable-tcp-zebra
endif

ifeq ($(WANT_BGP_VNC), 1)
USE_BGP_VNC=--enable-bgp-vnc=yes
else
@@ -123,7 +116,6 @@ override_dh_auto_configure:
$(USE_OSPFAPI) \
$(USE_MULTIPATH) \
$(USE_LDP) \
$(USE_TCP_ZEBRA) \
--enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \
@@ -10,7 +10,6 @@
WANT_LDP ?= 1
WANT_PIM ?= 1
WANT_OSPFAPI ?= 1
WANT_TCP_ZEBRA ?= 0
WANT_BGP_VNC ?= 1
WANT_CUMULUS_MODE ?= 0
WANT_MULTIPATH ?= 1
@@ -75,12 +74,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no
endif

ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra
else
USE_TCP_ZEBRA=--disable-tcp-zebra
endif

ifeq ($(WANT_BGP_VNC), 1)
USE_BGP_VNC=--enable-bgp-vnc=yes
else
@@ -152,7 +145,6 @@ override_dh_auto_configure:
$(USE_OSPFAPI) \
$(USE_MULTIPATH) \
$(USE_LDP) \
$(USE_TCP_ZEBRA) \
--enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \
@@ -10,7 +10,6 @@
WANT_LDP ?= 1
WANT_PIM ?= 1
WANT_OSPFAPI ?= 1
WANT_TCP_ZEBRA ?= 0
WANT_BGP_VNC ?= 1
WANT_CUMULUS_MODE ?= 0
WANT_MULTIPATH ?= 1
@@ -75,12 +74,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no
endif

ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra
else
USE_TCP_ZEBRA=--disable-tcp-zebra
endif

ifeq ($(WANT_BGP_VNC), 1)
USE_BGP_VNC=--enable-bgp-vnc=yes
else
@@ -152,7 +145,6 @@ override_dh_auto_configure:
$(USE_OSPFAPI) \
$(USE_MULTIPATH) \
$(USE_LDP) \
$(USE_TCP_ZEBRA) \
--enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \
@@ -126,7 +126,7 @@ These following options control the daemon's VTY (interactive command line) inte
staticd 2616
bfdd 2617

Port 2607 is used for ospfd's Opaque LSA API, while port 2600 is used for the (insecure) TCP-ZEBRA interface.
Port 2607 is used for ospfd's Opaque LSA API.

.. option:: --vty_socket vty-path

0 comments on commit 9199257

Please sign in to comment.
You can’t perform that action at this time.