Improve parsing of label mapping messages and merge all recv_label*

functions into a single generic function.

Add a few error checks and implement parsing of optional tlvs.
Putting it all together helps avoid to code duplication and improve
maintainability.

4 files changed, 204 insertions, 388 deletions

diff --git a/usr.sbin/ldpd/labelmapping.c b/usr.sbin/ldpd/labelmapping.c
index 170a1092b90..8a4fc65344b 100644
--- a/usr.sbin/ldpd/labelmapping.c
+++ b/usr.sbin/ldpd/labelmapping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: labelmapping.c,v 1.26 2013/10/15 20:27:40 renato Exp $ */
+/*	$OpenBSD: labelmapping.c,v 1.27 2013/10/17 17:47:03 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -45,7 +45,6 @@ void		gen_fec_tlv(struct ibuf *, struct in_addr, u_int8_t);
 
 int	tlv_decode_label(struct nbr *, struct ldp_msg *, char *, u_int16_t,
     u_int32_t *);
-int	tlv_decode_reqid(char *, u_int16_t, u_int32_t *);
 int	tlv_decode_fec_elm(struct nbr *, struct ldp_msg *, char *, u_int16_t,
     u_int8_t *, u_int32_t *, u_int8_t *);
 
@@ -80,7 +79,7 @@ send_labelmapping(struct nbr *nbr)
 	}
 
 	/* XXX: should we remove them first? */
-	nbr_mapping_list_clr(nbr, &nbr->mapping_list);
+	mapping_list_clr(&nbr->mapping_list);
 
 	ldp_hdr = ibuf_seek(buf, 0, sizeof(struct ldp_hdr));
 	ldp_hdr->length = htons(size);
@@ -89,70 +88,6 @@ send_labelmapping(struct nbr *nbr)
 	nbr_fsm(nbr, NBR_EVT_PDU_SENT);
 }
 
-int
-recv_labelmapping(struct nbr *nbr, char *buf, u_int16_t len)
-{
-	struct ldp_msg		lm;
-	struct tlv		ft;
-	struct map		map;
-	u_int32_t		label;
-	int			feclen, lbllen, tlen;
-	u_int8_t		addr_type;
-
-	bcopy(buf, &lm, sizeof(lm));
-
-	buf += sizeof(struct ldp_msg);
-	len -= sizeof(struct ldp_msg);
-
-	if (len < sizeof(ft)) {
-		session_shutdown(nbr, S_BAD_TLV_LEN, lm.msgid, lm.type);
-		return (-1);
-	}
-
-	bcopy(buf, &ft, sizeof(ft));
-	if (ntohs(ft.type) != TLV_TYPE_FEC) {
-		send_notification_nbr(nbr, S_MISS_MSG, lm.msgid, lm.type);
-		return (-1);
-	}
-	feclen = ntohs(ft.length);
-
-	if (feclen > len - TLV_HDR_LEN) {
-		session_shutdown(nbr, S_BAD_TLV_LEN, lm.msgid, lm.type);
-		return (-1);
-	}
-
-	buf += TLV_HDR_LEN;	/* just advance to the end of the fec header */
-	len -= TLV_HDR_LEN;
-
-	lbllen = tlv_decode_label(nbr, &lm, buf + feclen, len - feclen,
-	    &label);
-	if (lbllen == -1)
-		return (-1);
-
-	/* TODO opt label request msg id, hop cnt and path vektor TLV */
-
-	bzero(&map, sizeof(map));
-	map.messageid = lm.msgid;
-	map.label = label;
-	do {
-		if ((tlen = tlv_decode_fec_elm(nbr, &lm, buf, feclen,
-		    &addr_type, &map.prefix.s_addr, &map.prefixlen)) == -1)
-			return (-1);
-		if (addr_type == FEC_WILDCARD) {
-			session_shutdown(nbr, S_BAD_TLV_VAL, lm.msgid, lm.type);
-			return (-1);
-		}
-
-		ldpe_imsg_compose_lde(IMSG_LABEL_MAPPING, nbr->peerid, 0, &map,
-		    sizeof(map));
-
-		buf += tlen;
-		feclen -= tlen;
-	} while (feclen > 0);
-
-	return (ntohs(lm.length));
-}
-
 /* Label Request Message */
 void
 send_labelrequest(struct nbr *nbr)
@@ -179,7 +114,7 @@ send_labelrequest(struct nbr *nbr)
 	}
 
 	/* XXX: should we remove them first? */
-	nbr_mapping_list_clr(nbr, &nbr->request_list);
+	mapping_list_clr(&nbr->request_list);
 
 	ldp_hdr = ibuf_seek(buf, 0, sizeof(struct ldp_hdr));
 	ldp_hdr->length = htons(size);
@@ -188,63 +123,6 @@ send_labelrequest(struct nbr *nbr)
 	nbr_fsm(nbr, NBR_EVT_PDU_SENT);
 }
 
-int
-recv_labelrequest(struct nbr *nbr, char *buf, u_int16_t len)
-{
-	struct ldp_msg	lr;
-	struct tlv	ft;
-	struct map	map;
-	int		feclen, tlen;
-	u_int8_t	addr_type;
-
-	bcopy(buf, &lr, sizeof(lr));
-
-	buf += sizeof(struct ldp_msg);
-	len -= sizeof(struct ldp_msg);
-
-	if (len < sizeof(ft)) {
-		session_shutdown(nbr, S_BAD_MSG_LEN, lr.msgid, lr.type);
-		return (-1);
-	}
-
-	bcopy(buf, &ft, sizeof(ft));
-	if (ntohs(ft.type) != TLV_TYPE_FEC) {
-		send_notification_nbr(nbr, S_MISS_MSG, lr.msgid, lr.type);
-		return (-1);
-	}
-	feclen = ntohs(ft.length);
-
-	if (feclen > len - TLV_HDR_LEN) {
-		session_shutdown(nbr, S_BAD_TLV_LEN, lr.msgid, lr.type);
-		return (-1);
-	}
-
-	buf += TLV_HDR_LEN;	/* just advance to the end of the fec header */
-	len -= TLV_HDR_LEN;
-
-	/* TODO opt hop cnt and path vektor TLV */
-
-	bzero(&map, sizeof(map));
-	map.messageid = lr.msgid;
-	do {
-		if ((tlen = tlv_decode_fec_elm(nbr, &lr, buf, feclen,
-		    &addr_type, &map.prefix.s_addr, &map.prefixlen)) == -1)
-			return (-1);
-		if (addr_type == FEC_WILDCARD) {
-			session_shutdown(nbr, S_BAD_TLV_VAL, lr.msgid, lr.type);
-			return (-1);
-		}
-
-		ldpe_imsg_compose_lde(IMSG_LABEL_REQUEST, nbr->peerid, 0, &map,
-		    sizeof(map));
-
-		buf += tlen;
-		feclen -= tlen;
-	} while (feclen > 0);
-
-	return (ntohs(lr.length));
-}
-
 /* Label Withdraw Message */
 void
 send_labelwithdraw(struct nbr *nbr)
@@ -279,7 +157,7 @@ send_labelwithdraw(struct nbr *nbr)
 	}
 
 	/* XXX: should we remove them first? */
-	nbr_mapping_list_clr(nbr, &nbr->withdraw_list);
+	mapping_list_clr(&nbr->withdraw_list);
 
 	ldp_hdr = ibuf_seek(buf, 0, sizeof(struct ldp_hdr));
 	ldp_hdr->length = htons(size);
@@ -288,97 +166,6 @@ send_labelwithdraw(struct nbr *nbr)
 	nbr_fsm(nbr, NBR_EVT_PDU_SENT);
 }
 
-int
-recv_labelwithdraw(struct nbr *nbr, char *buf, u_int16_t len)
-{
-	struct map	map;
-	struct ldp_msg	lw;
-	struct tlv	ft;
-	u_int32_t	label = NO_LABEL;
-	int		feclen, tlen, numfec = 0;
-	u_int8_t	addr_type;
-
-	bcopy(buf, &lw, sizeof(lw));
-
-	buf += sizeof(struct ldp_msg);
-	len -= sizeof(struct ldp_msg);
-
-	if (len < sizeof(ft)) {
-		session_shutdown(nbr, S_BAD_MSG_LEN, lw.msgid, lw.type);
-		return (-1);
-	}
-
-	bcopy(buf, &ft, sizeof(ft));
-	if (ntohs(ft.type) != TLV_TYPE_FEC) {
-		send_notification_nbr(nbr, S_MISS_MSG, lw.msgid, lw.type);
-		return (-1);
-	}
-	feclen = ntohs(ft.length);
-
-	if (feclen > len - TLV_HDR_LEN) {
-		session_shutdown(nbr, S_BAD_TLV_LEN, lw.msgid, lw.type);
-		return (-1);
-	}
-
-	buf += TLV_HDR_LEN;	/* just advance to the end of the fec header */
-	len -= TLV_HDR_LEN;
-
-	/* withdraw may include optional label */
-	if (len > feclen) {
-		int r;
-
-		r = tlv_decode_label(nbr, &lw, buf + feclen, len - feclen,
-		    &label);
-		if (r == -1 || len != feclen + r) {
-			session_shutdown(nbr, S_BAD_TLV_VAL, lw.msgid,
-			    lw.type);
-			return (-1);
-		}
-	}
-
-	bzero(&map, sizeof(map));
-	map.messageid = lw.msgid;
-	if (label != NO_LABEL) {
-		map.label = label;
-		map.flags = F_MAP_OPTLABEL;
-	}
-	do {
-		if ((tlen = tlv_decode_fec_elm(nbr, &lw, buf, feclen,
-		    &addr_type, &map.prefix.s_addr, &map.prefixlen)) == -1)
-			return (-1);
-
-		if (addr_type == FEC_WILDCARD) {
-			/* Wildcard FEC must be the only FEC element */
-			if (numfec != 0) {
-				session_shutdown(nbr, S_BAD_TLV_VAL, lw.msgid,
-				    lw.type);
-				return (-1);
-			}
-			map.prefix.s_addr = 0;
-			map.prefixlen = 0;
-			map.flags |= F_MAP_WILDCARD;
-			numfec = -1;
-		} else {
-			/* Wildcard FEC must be the only FEC element */
-			if (numfec == -1) {
-				session_shutdown(nbr, S_BAD_TLV_VAL, lw.msgid,
-				    lw.type);
-				return (-1);
-			}
-			numfec++;
-			map.flags &= ~F_MAP_WILDCARD;
-		}
-
-		ldpe_imsg_compose_lde(IMSG_LABEL_WITHDRAW, nbr->peerid, 0, &map,
-		    sizeof(map));
-
-		buf += tlen;
-		feclen -= tlen;
-	} while (feclen > 0);
-
-	return (ntohs(lw.length));
-}
-
 /* Label Release Message */
 void
 send_labelrelease(struct nbr *nbr)
@@ -413,7 +200,7 @@ send_labelrelease(struct nbr *nbr)
 	}
 
 	/* XXX: should we remove them first? */
-	nbr_mapping_list_clr(nbr, &nbr->release_list);
+	mapping_list_clr(&nbr->release_list);
 
 	ldp_hdr = ibuf_seek(buf, 0, sizeof(struct ldp_hdr));
 	ldp_hdr->length = htons(size);
@@ -422,96 +209,6 @@ send_labelrelease(struct nbr *nbr)
 	nbr_fsm(nbr, NBR_EVT_PDU_SENT);
 }
 
-int
-recv_labelrelease(struct nbr *nbr, char *buf, u_int16_t len)
-{
-	struct map	map;
-	struct ldp_msg	lr;
-	struct tlv	ft;
-	u_int32_t	label = NO_LABEL;
-	int		feclen, tlen, numfec = 0;
-	u_int8_t	addr_type;
-
-	bcopy(buf, &lr, sizeof(lr));
-
-	buf += sizeof(struct ldp_msg);
-	len -= sizeof(struct ldp_msg);
-
-	if (len < sizeof(ft)) {
-		session_shutdown(nbr, S_BAD_MSG_LEN, lr.msgid, lr.type);
-		return (-1);
-	}
-
-	bcopy(buf, &ft, sizeof(ft));
-	if (ntohs(ft.type) != TLV_TYPE_FEC) {
-		send_notification_nbr(nbr, S_MISS_MSG, lr.msgid, lr.type);
-		return (-1);
-	}
-	feclen = ntohs(ft.length);
-
-	if (feclen > len - TLV_HDR_LEN) {
-		session_shutdown(nbr, S_BAD_TLV_LEN, lr.msgid, lr.type);
-		return (-1);
-	}
-
-	buf += TLV_HDR_LEN;	/* just advance to the end of the fec header */
-	len -= TLV_HDR_LEN;
-
-	/* release may include optional label */
-	if (len > feclen) {
-		int r;
-
-		r = tlv_decode_label(nbr, &lr, buf + feclen, len - feclen,
-		    &label);
-		if (r == -1 || len != feclen + r) {
-			session_shutdown(nbr, S_BAD_TLV_VAL, lr.msgid,
-			    lr.type);
-			return (-1);
-		}
-	}
-
-	bzero(&map, sizeof(map));
-	map.messageid = lr.msgid;
-	if (label != NO_LABEL) {
-		map.label = label;
-		map.flags = F_MAP_OPTLABEL;
-	}
-	do {
-		if ((tlen = tlv_decode_fec_elm(nbr, &lr, buf, feclen,
-		    &addr_type, &map.prefix.s_addr, &map.prefixlen)) == -1)
-			return (-1);
-
-		if (addr_type == FEC_WILDCARD) {
-			/* Wildcard FEC must be the only FEC element */
-			if (numfec != 0) {
-				session_shutdown(nbr, S_BAD_TLV_VAL, lr.msgid,
-				    lr.type);
-				return (-1);
-			}
-			map.prefix.s_addr = 0;
-			map.prefixlen = 0;
-			map.flags |= F_MAP_WILDCARD;
-
-		} else {
-			/* Wildcard FEC must be the only FEC element */
-			if (numfec == -1) {
-				session_shutdown(nbr, S_BAD_TLV_VAL, lr.msgid,
-				    lr.type);
-				return (-1);
-			}
-			map.flags &= ~F_MAP_WILDCARD;
-		}
-
-		ldpe_imsg_compose_lde(IMSG_LABEL_RELEASE, nbr->peerid, 0, &map,
-		    sizeof(map));
-
-		buf += tlen;
-		feclen -= tlen;
-	} while (feclen > 0);
-
-	return (ntohs(lr.length));
-}
-
 /* Label Abort Req Message */
 void
 send_labelabortreq(struct nbr *nbr)
@@ -534,76 +231,225 @@ send_labelabortreq(struct nbr *nbr)
 	nbr_fsm(nbr, NBR_EVT_PDU_SENT);
 }
 
+/* Generic function that handles all Label Message types */
 int
-recv_labelabortreq(struct nbr *nbr, char *buf, u_int16_t len)
+recv_labelmessage(struct nbr *nbr, char *buf, u_int16_t len, u_int16_t type)
 {
-	struct map	map;
-	struct ldp_msg	la;
-	struct tlv	ft;
-	int		feclen, tlen;
-	u_int8_t	addr_type;
+	struct ldp_msg		 	 lm;
+	struct tlv			 ft;
+	u_int32_t			 label, reqid;
+	u_int8_t			 flags = 0;
+	int				 feclen, lbllen, tlen;
+	u_int8_t			 addr_type;
+	struct mapping_entry		*me;
+	struct mapping_head		 mh;
 
-	log_debug("recv_labelabortreq: neighbor ID %s", inet_ntoa(nbr->id));
-
-	bcopy(buf, &la, sizeof(la));
+	bcopy(buf, &lm, sizeof(lm));
 
 	buf += sizeof(struct ldp_msg);
 	len -= sizeof(struct ldp_msg);
 
+	/* FEC TLV */
 	if (len < sizeof(ft)) {
-		session_shutdown(nbr, S_BAD_MSG_LEN, la.msgid, la.type);
+		session_shutdown(nbr, S_BAD_TLV_LEN, lm.msgid, lm.type);
 		return (-1);
 	}
 
 	bcopy(buf, &ft, sizeof(ft));
 	if (ntohs(ft.type) != TLV_TYPE_FEC) {
-		send_notification_nbr(nbr, S_MISS_MSG, la.msgid, la.type);
+		send_notification_nbr(nbr, S_MISS_MSG, lm.msgid, lm.type);
 		return (-1);
 	}
 	feclen = ntohs(ft.length);
 
 	if (feclen > len - TLV_HDR_LEN) {
-		session_shutdown(nbr, S_BAD_TLV_LEN, la.msgid, la.type);
+		session_shutdown(nbr, S_BAD_TLV_LEN, lm.msgid, lm.type);
 		return (-1);
 	}
 
 	buf += TLV_HDR_LEN;	/* just advance to the end of the fec header */
 	len -= TLV_HDR_LEN;
 
-	bzero(&map, sizeof(map));
-	map.messageid = la.msgid;
-
-	/* abort request may include optional request msg id */
-	if (len > feclen) {
-		int r;
+	TAILQ_INIT(&mh);
+	do {
+		me = calloc(1, sizeof(*me));
+		me->map.messageid = lm.msgid;
+		TAILQ_INSERT_HEAD(&mh, me, entry);
 
-		r = tlv_decode_reqid(buf + feclen, len - feclen,
-		    &map.requestid);
-		if (r == -1 || len != feclen + r) {
-			session_shutdown(nbr, S_BAD_TLV_VAL, la.msgid,
-			    la.type);
-			return (-1);
-		}
-		map.flags = F_MAP_REQ_ID;
-	}
+		if ((tlen = tlv_decode_fec_elm(nbr, &lm, buf, feclen,
+		    &addr_type, &me->map.prefix.s_addr, &me->map.prefixlen)) == -1)
+			goto err;
 
-	do {
-		if ((tlen = tlv_decode_fec_elm(nbr, &la, buf, feclen,
-		    &addr_type, &map.prefix.s_addr, &map.prefixlen)) == -1)
-			return (-1);
+		/*
+		 * The Wildcard FEC Element can be used only in the
+		 * Label Withdraw and Label Release messages.
+		 */
 		if (addr_type == FEC_WILDCARD) {
-			session_shutdown(nbr, S_BAD_TLV_VAL, la.msgid, la.type);
-			return (-1);
+			switch (type) {
+			case MSG_TYPE_LABELWITHDRAW:
+			case MSG_TYPE_LABELRELEASE:
+				me->map.flags |= F_MAP_WILDCARD;
+				break;
+			default:
+				session_shutdown(nbr, S_BAD_TLV_VAL, lm.msgid,
+				    lm.type);
+				goto err;
+				break;
+			}
 		}
 
-		ldpe_imsg_compose_lde(IMSG_LABEL_ABORT, nbr->peerid, 0, &map,
-		    sizeof(map));
+		/*
+		 * LDP supports the use of multiple FEC Elements per
+		 * FEC for the Label Mapping message only.
+		 */
+		if (type != MSG_TYPE_LABELMAPPING &&
+		    tlen != feclen) {
+			session_shutdown(nbr, S_BAD_TLV_VAL, lm.msgid,
+			    lm.type);
+			goto err;
+		}
 
 		buf += tlen;
+		len -= tlen;
 		feclen -= tlen;
 	} while (feclen > 0);
 
-	return (ntohs(la.length));
+	/* Mandatory Label TLV */
+	if (type == MSG_TYPE_LABELMAPPING) {
+		lbllen = tlv_decode_label(nbr, &lm, buf, len, &label);
+		if (lbllen == -1)
+			goto err;
+
+		buf += lbllen;
+		len -= lbllen;
+	}
+
+	/* Optional Parameters */
+	while (len > 0) {
+		struct tlv 	tlv;
+
+		if (len < sizeof(tlv)) {
+			session_shutdown(nbr, S_BAD_TLV_LEN, lm.msgid,
+			    lm.type);
+			goto err;
+		}
+
+		bcopy(buf, &tlv, sizeof(tlv));
+		buf += TLV_HDR_LEN;
+		len -= TLV_HDR_LEN;
+
+		switch (ntohs(tlv.type)) {
+		case TLV_TYPE_LABELREQUEST:
+			switch (type) {
+			case MSG_TYPE_LABELMAPPING:
+			case MSG_TYPE_LABELABORTREQ:
+				if (ntohs(tlv.length) != 4) {
+					session_shutdown(nbr, S_BAD_TLV_LEN,
+					    lm.msgid, lm.type);
+					goto err;
+				}
+
+				flags |= F_MAP_REQ_ID;
+				reqid = ntohl(*(u_int32_t *)buf);
+				break;
+			default:
+				/* ignore */
+				break;
+			}
+			break;
+		case TLV_TYPE_HOPCOUNT:
+		case TLV_TYPE_PATHVECTOR:
+			/* TODO just ignore for now */
+			break;
+		case TLV_TYPE_GENERICLABEL:
+			switch (type) {
+			case MSG_TYPE_LABELWITHDRAW:
+			case MSG_TYPE_LABELRELEASE:
+				if (ntohs(tlv.length) != 4) {
+					session_shutdown(nbr, S_BAD_TLV_LEN,
+					    lm.msgid, lm.type);
+					goto err;
+				}
+
+				label = ntohl(*(u_int32_t *)buf);
+				flags |= F_MAP_OPTLABEL;
+				break;
+			default:
+				/* ignore */
+				break;
+			}
+			break;
+		case TLV_TYPE_ATMLABEL:
+		case TLV_TYPE_FRLABEL:
+			switch (type) {
+			case MSG_TYPE_LABELWITHDRAW:
+			case MSG_TYPE_LABELRELEASE:
+				/* unsupported */
+				session_shutdown(nbr, S_BAD_TLV_VAL, lm.msgid,
+				    lm.type);
+				goto err;
+				break;
+			default:
+				/* ignore */
+				break;
+			}
+			break;
+		default:
+			if (!(ntohs(tlv.type) & UNKNOWN_FLAG)) {
+				send_notification_nbr(nbr, S_UNKNOWN_TLV,
+				    lm.msgid, lm.type);
+			}
+			/* ignore unknown tlv */
+			break;
+		}
+		buf += ntohs(tlv.length);
+		len -= ntohs(tlv.length);
+	}
+
+	/* notify lde about the received message. */
+	while ((me = TAILQ_FIRST(&mh)) != NULL) {
+		int imsg_type = IMSG_NONE;
+
+		me->map.flags |= flags;
+		if (type == MSG_TYPE_LABELMAPPING ||
+		    me->map.flags & F_MAP_OPTLABEL)
+			me->map.label = label;
+		if (me->map.flags & F_MAP_REQ_ID)
+			me->map.requestid = reqid;
+
+		switch (type) {
+		case MSG_TYPE_LABELMAPPING:
+			imsg_type = IMSG_LABEL_MAPPING;
+			break;
+		case MSG_TYPE_LABELREQUEST:
+			imsg_type = IMSG_LABEL_REQUEST;
+			break;
+		case MSG_TYPE_LABELWITHDRAW:
+			imsg_type = IMSG_LABEL_WITHDRAW;
+			break;
+		case MSG_TYPE_LABELRELEASE:
+			imsg_type = IMSG_LABEL_RELEASE;
+			break;
+		case MSG_TYPE_LABELABORTREQ:
+			imsg_type = IMSG_LABEL_ABORT;
+			break;
+		default:
+			break;
+		}
+
+		ldpe_imsg_compose_lde(imsg_type, nbr->peerid, 0, &me->map,
+		    sizeof(struct map));
+
+		TAILQ_REMOVE(&mh, me, entry);
+		free(me);
+	}
+
+	return (ntohs(lm.length));
+
+err:
+	mapping_list_clr(&mh);
+
+	return (-1);
 }
 
 /* Other TLV related functions */
@@ -677,26 +523,6 @@ gen_reqid_tlv(struct ibuf *buf, u_int32_t reqid)
 	ibuf_add(buf, &rt, sizeof(rt));
 }
 
-int
-tlv_decode_reqid(char *buf, u_int16_t len, u_int32_t *reqid)
-{
-	struct reqid_tlv rt;
-
-	if (len < sizeof(rt))
-		return (-1);
-	bcopy(buf, &rt, sizeof(rt));
-
-	if (ntohs(rt.length) != sizeof(rt) - TLV_HDR_LEN)
-		return (-1);
-
-	if (rt.type != htons(TLV_TYPE_LABELREQUEST))
-		return (-1);
-
-	*reqid = ntohl(rt.reqid);
-
-	return (sizeof(rt));
-}
-
 void
 gen_fec_tlv(struct ibuf *buf, struct in_addr prefix, u_int8_t prefixlen)
 {
diff --git a/usr.sbin/ldpd/ldpe.h b/usr.sbin/ldpd/ldpe.h
index 3b7e7730c39..8b25e9a86c4 100644
--- a/usr.sbin/ldpd/ldpe.h
+++ b/usr.sbin/ldpd/ldpe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpe.h,v 1.29 2013/10/15 20:21:26 renato Exp $ */
+/*	$OpenBSD: ldpe.h,v 1.30 2013/10/17 17:47:04 renato Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org>
@@ -122,16 +122,12 @@ void	 send_address_withdraw(struct nbr *, struct if_addr *);
 
 /* labelmapping.c */
 #define PREFIX_SIZE(x)	(((x) + 7) / 8)
+int	 recv_labelmessage(struct nbr *, char *, u_int16_t, u_int16_t);
 void	 send_labelmapping(struct nbr *);
-int	 recv_labelmapping(struct nbr *, char *, u_int16_t);
 void	 send_labelrequest(struct nbr *);
-int	 recv_labelrequest(struct nbr *, char *, u_int16_t);
 void	 send_labelwithdraw(struct nbr *);
-int	 recv_labelwithdraw(struct nbr *, char *, u_int16_t);
 void	 send_labelrelease(struct nbr *);
-int	 recv_labelrelease(struct nbr *, char *, u_int16_t);
 void	 send_labelabortreq(struct nbr *);
-int	 recv_labelabortreq(struct nbr *, char *, u_int16_t);
 
 /* ldpe.c */
 pid_t		 ldpe(struct ldpd_conf *, int[2], int[2], int[2]);
@@ -209,8 +205,7 @@ struct mapping_entry	*nbr_mapping_find(struct nbr *, struct mapping_head *,
 			    struct map *);
 void			 nbr_mapping_del(struct nbr *, struct mapping_head *,
 			    struct map *);
-void			 nbr_mapping_list_clr(struct nbr *,
-			    struct mapping_head *);
+void			 mapping_list_clr(struct mapping_head *);
 
 struct ctl_nbr	*nbr_to_ctl(struct nbr *);
 void		 ldpe_nbr_ctl(struct ctl_conn *);
diff --git a/usr.sbin/ldpd/neighbor.c b/usr.sbin/ldpd/neighbor.c
index f8f77ad1ecf..282d13e6bc8 100644
--- a/usr.sbin/ldpd/neighbor.c
+++ b/usr.sbin/ldpd/neighbor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: neighbor.c,v 1.42 2013/10/15 20:41:10 renato Exp $ */
+/*	$OpenBSD: neighbor.c,v 1.43 2013/10/17 17:47:04 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -256,11 +256,11 @@ nbr_del(struct nbr *nbr)
 	nbr_stop_ktimeout(nbr);
 	nbr_stop_idtimer(nbr);
 
-	nbr_mapping_list_clr(nbr, &nbr->mapping_list);
-	nbr_mapping_list_clr(nbr, &nbr->withdraw_list);
-	nbr_mapping_list_clr(nbr, &nbr->request_list);
-	nbr_mapping_list_clr(nbr, &nbr->release_list);
-	nbr_mapping_list_clr(nbr, &nbr->abortreq_list);
+	mapping_list_clr(&nbr->mapping_list);
+	mapping_list_clr(&nbr->withdraw_list);
+	mapping_list_clr(&nbr->request_list);
+	mapping_list_clr(&nbr->release_list);
+	mapping_list_clr(&nbr->abortreq_list);
 
 	RB_REMOVE(nbr_pid_head, &nbrs_by_pid, nbr);
 	RB_REMOVE(nbr_id_head, &nbrs_by_id, nbr);
@@ -583,7 +583,7 @@ nbr_mapping_del(struct nbr *nbr, struct mapping_head *mh, struct map *map)
 }
 
 void
-nbr_mapping_list_clr(struct nbr *nbr, struct mapping_head *mh)
+mapping_list_clr(struct mapping_head *mh)
 {
 	struct mapping_entry	*me;
 
diff --git a/usr.sbin/ldpd/packet.c b/usr.sbin/ldpd/packet.c
index 8172e09a3e8..c063b115652 100644
--- a/usr.sbin/ldpd/packet.c
+++ b/usr.sbin/ldpd/packet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: packet.c,v 1.32 2013/10/15 20:31:14 renato Exp $ */
+/*	$OpenBSD: packet.c,v 1.33 2013/10/17 17:47:05 renato Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -461,18 +461,13 @@ session_read(int fd, short event, void *arg)
 				msg_size = recv_address(nbr, pdu, pdu_len);
 				break;
 			case MSG_TYPE_LABELMAPPING:
-				msg_size = recv_labelmapping(nbr, pdu, pdu_len);
-				break;
 			case MSG_TYPE_LABELREQUEST:
-				msg_size = recv_labelrequest(nbr, pdu, pdu_len);
-				break;
 			case MSG_TYPE_LABELWITHDRAW:
-				msg_size = recv_labelwithdraw(nbr, pdu, pdu_len);
-				break;
 			case MSG_TYPE_LABELRELEASE:
-				msg_size = recv_labelrelease(nbr, pdu, pdu_len);
-				break;
 			case MSG_TYPE_LABELABORTREQ:
+				msg_size = recv_labelmessage(nbr, pdu,
+				    pdu_len, type);
+				break;
 			default:
 				log_debug("session_read: unknown LDP packet "
 				    "from nbr %s", inet_ntoa(nbr->id));