diff options
| author | Renato Westphal <renato@cvs.openbsd.org> | 2016-05-23 18:58:49 +0000 |
|---|---|---|
| committer | Renato Westphal <renato@cvs.openbsd.org> | 2016-05-23 18:58:49 +0000 |
| commit | cf7a670d9f872a58664dbcb1068aa3f90ee3a358 (patch) | |
| tree | 5c5ac205ed68e30352e11e2307ed38d7076646cc /usr.sbin/ldpd/init.c | |
| parent | 2a70268000d85df755837c9e48ee7423c839ee75 (diff) | |
Add support for IPv6 (RFC 7552).
This includes:
* Full compliance to RFC 7552;
* Support for MD5 on LDPov6 sessions;
* Support for pseudowires over IPv6 LSPs (we're probably the world's
first implementation doing this);
* Support for the IPv6 explicit-null label;
* Knob to specify the prefered address-family for TCP transport
connections;
* Knob to use cisco non-compliant format to send and interpret the
Dual-Stack capability TLV.
Diffstat (limited to 'usr.sbin/ldpd/init.c')
| -rw-r--r-- | usr.sbin/ldpd/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ldpd/init.c b/usr.sbin/ldpd/init.c index cad15769b03..4e162bc8788 100644 --- a/usr.sbin/ldpd/init.c +++ b/usr.sbin/ldpd/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.24 2016/05/23 17:43:42 renato Exp $ */ +/* $OpenBSD: init.c,v 1.25 2016/05/23 18:58:48 renato Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -104,7 +104,7 @@ recv_init(struct nbr *nbr, char *buf, uint16_t len) return (-1); } - nbr->keepalive = min(nbr_get_keepalive(nbr->raddr), + nbr->keepalive = min(nbr_get_keepalive(nbr->af, nbr->id), ntohs(sess.keepalive_time)); max_pdu_len = ntohs(sess.max_pdu_len); @@ -131,7 +131,7 @@ gen_init_prms_tlv(struct ibuf *buf, struct nbr *nbr, uint16_t size) parms.type = htons(TLV_TYPE_COMMONSESSION); parms.length = htons(size - TLV_HDR_LEN); parms.proto_version = htons(LDP_VERSION); - parms.keepalive_time = htons(nbr_get_keepalive(nbr->raddr)); + parms.keepalive_time = htons(nbr_get_keepalive(nbr->af, nbr->id)); parms.reserved = 0; parms.pvlim = 0; parms.max_pdu_len = 0; |