From c68642e233564a642e7340958b0e8ec07992a0fe Mon Sep 17 00:00:00 2001 From: renato <> Date: Sun, 5 Jun 2016 03:29:33 +0000 Subject: [PATCH] The ldpd(8) sample config was terribly outdated. Passive interfaces, for example, were removed in 2013 because they don't make sense in ldpd. ok deraadt --- src/etc/examples/ldpd.conf | 43 ++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/src/etc/examples/ldpd.conf b/src/etc/examples/ldpd.conf index ea5fda79..b08b4f7e 100644 --- a/src/etc/examples/ldpd.conf +++ b/src/etc/examples/ldpd.conf @@ -1,21 +1,42 @@ -# $OpenBSD: ldpd.conf,v 1.1 2014/07/11 16:32:52 deraadt Exp $ +# $OpenBSD: ldpd.conf,v 1.2 2016/06/05 03:29:33 renato Exp $ # macros -fast="2" +password="secret" # global configuration # router-id 10.0.0.1 -# lfib-update no +# fib-update no +# transport-preference ipv4 -distribution independent -retention liberal -advertisement unsolicited +address-family ipv4 { + # explicit-null yes + # keepalive 120 + # targeted-hello-accept yes + # transport-address 10.0.0.1 -interface bge0 + interface em0 + interface vlan5 { + link-hello-holdtime 9 + link-hello-interval 3 + } + targeted-neighbor 172.16.1.10 +} -interface vlan5 { - hello-interval $fast +neighbor 192.168.1.10 { + password $password } -interface vlan6 { - passive + +l2vpn CUST_A type vpls { + bridge bridge0 + interface em1 + pseudowire mpw0 { + # control-word no + # status-tlv no + neighbor-id 10.0.1.5 + pw-id 100 + } + pseudowire mpw1 { + neighbor-id 10.0.2.8 + pw-id 100 + } }