diff options
| author |   claudio <claudio@openbsd.org> | 2010-05-17 08:07:04 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2010-05-17 08:07:04 +0000 |
| commit | 6436f3c1ac8d0a5cb8e48f8f438f26e4a9972fc5 (patch) | |
| tree | 9f2c603c1a685efb7e9f859e74543af761112f23 | |
| parent | The function term_flushln() had effectively forked wrt to bsd.lv. (diff) | |
| download | wireguard-openbsd-6436f3c1ac8d0a5cb8e48f8f438f26e4a9972fc5.tar.xz wireguard-openbsd-6436f3c1ac8d0a5cb8e48f8f438f26e4a9972fc5.zip | |
The host address encoding of FEC was killed in RFC5036 and we're happy
about that. OK michele@
| -rw-r--r-- | usr.sbin/ldpd/labelmapping.c | 11 | ||||
| -rw-r--r-- | usr.sbin/ldpd/ldp.h | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr.sbin/ldpd/labelmapping.c b/usr.sbin/ldpd/labelmapping.c index 639ee24308c..9dcc8825af8 100644 --- a/usr.sbin/ldpd/labelmapping.c +++ b/usr.sbin/ldpd/labelmapping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: labelmapping.c,v 1.8 2010/04/15 14:47:12 claudio Exp $ */ +/* $OpenBSD: labelmapping.c,v 1.9 2010/05/17 08:07:04 claudio Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -517,8 +517,7 @@ validate_fec_elm(char *buf) type = *buf; - if (type != FEC_WILDCARD && type != FEC_PREFIX && - type != FEC_ADDRESS) + if (type != FEC_WILDCARD && type != FEC_PREFIX) return (-1); buf += sizeof(u_int8_t); @@ -552,15 +551,11 @@ decode_fec_len_elm(char *buf, u_int8_t type) switch (type) { case FEC_PREFIX: return (len); - case FEC_ADDRESS: - return (len * 8); case FEC_WILDCARD: - /* XXX: not handled for now */ + return (0); default: /* Should not happen */ return (-1); } - /* NOTREACHED */ - return (-1); } diff --git a/usr.sbin/ldpd/ldp.h b/usr.sbin/ldpd/ldp.h index 4f4a0e51b22..65ab177d9a9 100644 --- a/usr.sbin/ldpd/ldp.h +++ b/usr.sbin/ldpd/ldp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ldp.h,v 1.4 2010/04/15 14:55:12 claudio Exp $ */ +/* $OpenBSD: ldp.h,v 1.5 2010/05/17 08:07:04 claudio Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -203,7 +203,6 @@ struct fec_elm { #define FEC_WILDCARD 0x01 #define FEC_PREFIX 0x02 -#define FEC_ADDRESS 0x03 #define FEC_IPV4 0x0001 |