summaryrefslogtreecommitdiff
path: root/usr.sbin/ldpd/printconf.c
diff options
context:
space:
mode:
authorRenato Westphal <renato@cvs.openbsd.org>2016-07-01 23:14:32 +0000
committerRenato Westphal <renato@cvs.openbsd.org>2016-07-01 23:14:32 +0000
commitdfb16013b421d49c330b7e33674c5b1db89f6931 (patch)
tree51cfdf953504834c8fe109bc4dce04a5e64416f6 /usr.sbin/ldpd/printconf.c
parent5bb202e21db7646a722a95c67eb7e29ba711849e (diff)
Add GTSM support (RFC 6720).
This also finishes the missing bits from our RFC 7552 implementation because GTSM is mandatory for LDPv6. To avoid any kind of interoperability problems, I included a few knobs to enable/disable GTSM on a per-address-family and per-neighbor basis. Cisco's LDPv6 implementation, for instance, doesn't support GTSM. "reads good" claudio@
Diffstat (limited to 'usr.sbin/ldpd/printconf.c')
-rw-r--r--usr.sbin/ldpd/printconf.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/usr.sbin/ldpd/printconf.c b/usr.sbin/ldpd/printconf.c
index e26b57ebe73..32db88109df 100644
--- a/usr.sbin/ldpd/printconf.c
+++ b/usr.sbin/ldpd/printconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printconf.c,v 1.25 2016/05/23 19:14:03 renato Exp $ */
+/* $OpenBSD: printconf.c,v 1.26 2016/07/01 23:14:31 renato Exp $ */
/*
* Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -74,6 +74,11 @@ print_af(int af, struct ldpd_conf *conf, struct ldpd_af_conf *af_conf)
else
printf("\texplicit-null no\n");
+ if (af_conf->flags & F_LDPD_AF_NO_GTSM)
+ printf("\tgtsm-enable no\n");
+ else
+ printf("\tgtsm-enable yes\n");
+
printf("\tkeepalive %u\n", af_conf->keepalive);
printf("\ttransport-address %s\n", log_addr(af, &af_conf->trans_addr));
@@ -116,6 +121,16 @@ print_nbrp(struct nbr_params *nbrp)
if (nbrp->flags & F_NBRP_KEEPALIVE)
printf("\tkeepalive %u\n", nbrp->keepalive);
+ if (nbrp->flags & F_NBRP_GTSM) {
+ if (nbrp->gtsm_enabled)
+ printf("\tgtsm-enable yes\n");
+ else
+ printf("\tgtsm-enable no\n");
+ }
+
+ if (nbrp->flags & F_NBRP_GTSM_HOPS)
+ printf("\tgtsm-hops %u\n", nbrp->gtsm_hops);
+
if (nbrp->auth.method == AUTH_MD5SIG)
printf("\tpassword XXXXXX\n");