From 031ce3bc62d273c5bd99596e01aa95c7ed33bbd7 Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Tue, 27 Jun 2000 18:03:23 +0000
Subject: [PATCH] Return better errors (TRAILINGDATA, not UNEXPECTEDEND), and
 style changes.

---
 lib/lwres/lwres_gabn.c | 23 +++++++++++------------
 lib/lwres/lwres_gnba.c |  6 +++---
 lib/lwres/lwres_noop.c |  6 +++---
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/lib/lwres/lwres_gabn.c b/lib/lwres/lwres_gabn.c
index 1b47e1c324..6c05c3aa81 100644
--- a/lib/lwres/lwres_gabn.c
+++ b/lib/lwres/lwres_gabn.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: lwres_gabn.c,v 1.21 2000/06/22 21:59:34 tale Exp $ */
+/* $Id: lwres_gabn.c,v 1.22 2000/06/27 18:03:21 bwelling Exp $ */
 
 #include <config.h>
 
@@ -248,7 +248,6 @@ lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
 	/* encode the addresses */
 	addr = LWRES_LIST_HEAD(req->addrs);
 	while (addr != NULL) {
-		datalen = addr->length + 2 + 4;
 		lwres_buffer_putuint32(b, addr->family);
 		lwres_buffer_putuint16(b, addr->length);
 		lwres_buffer_putmem(b, addr->address, addr->length);
@@ -256,7 +255,7 @@ lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
 	}
 
 	INSIST(LWRES_BUFFER_AVAILABLECOUNT(b) == 0);
-	INSIST(b->used == pkt->length);
+	INSIST(LWRES_BUFFER_USEDCOUNT(b) == pkt->length);
 
 	return (LWRES_R_SUCCESS);
 }
@@ -294,7 +293,7 @@ lwres_gabnrequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 		return (ret);
 
 	if (LWRES_BUFFER_REMAINING(b) != 0)
-		return (LWRES_R_UNEXPECTEDEND);
+		return (LWRES_R_TRAILINGDATA);
 
 	gabn = CTXMALLOC(sizeof(lwres_gabnrequest_t));
 	if (gabn == NULL)
@@ -313,14 +312,14 @@ lwres_result_t
 lwres_gabnresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 			lwres_lwpacket_t *pkt, lwres_gabnresponse_t **structp)
 {
-	lwres_result_t			ret;
-	unsigned int			x;
-	lwres_uint32_t			flags;
-	lwres_uint16_t			naliases;
-	lwres_uint16_t			naddrs;
-	lwres_gabnresponse_t	       *gabn;
-	lwres_addrlist_t		addrlist;
-	lwres_addr_t		       *addr;
+	lwres_result_t ret;
+	unsigned int x;
+	lwres_uint32_t flags;
+	lwres_uint16_t naliases;
+	lwres_uint16_t naddrs;
+	lwres_gabnresponse_t *gabn;
+	lwres_addrlist_t addrlist;
+	lwres_addr_t *addr;
 
 	REQUIRE(ctx != NULL);
 	REQUIRE(pkt != NULL);
diff --git a/lib/lwres/lwres_gnba.c b/lib/lwres/lwres_gnba.c
index 64a0bcf080..2bafa63b1a 100644
--- a/lib/lwres/lwres_gnba.c
+++ b/lib/lwres/lwres_gnba.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: lwres_gnba.c,v 1.16 2000/06/22 21:59:35 tale Exp $ */
+/* $Id: lwres_gnba.c,v 1.17 2000/06/27 18:03:22 bwelling Exp $ */
 
 #include <config.h>
 
@@ -188,7 +188,7 @@ lwres_gnbarequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 		goto out;
 
 	if (LWRES_BUFFER_REMAINING(b) != 0) {
-		ret = LWRES_R_UNEXPECTEDEND;
+		ret = LWRES_R_TRAILINGDATA;
 		goto out;
 	}
 
@@ -223,7 +223,7 @@ lwres_gnbaresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 		return (LWRES_R_FAILURE);
 
 	/*
-	 * Pull off the name itself
+	 * Pull off flags & naliases
 	 */
 	if (!SPACE_REMAINING(b, 4 + 2))
 		return (LWRES_R_UNEXPECTEDEND);
diff --git a/lib/lwres/lwres_noop.c b/lib/lwres/lwres_noop.c
index c3126366f3..a1e4c6d010 100644
--- a/lib/lwres/lwres_noop.c
+++ b/lib/lwres/lwres_noop.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: lwres_noop.c,v 1.10 2000/06/22 21:59:37 tale Exp $ */
+/* $Id: lwres_noop.c,v 1.11 2000/06/27 18:03:23 bwelling Exp $ */
 
 #include <config.h>
 
@@ -165,7 +165,7 @@ lwres_nooprequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 	lwres_buffer_forward(b, req->datalength);
 
 	if (LWRES_BUFFER_REMAINING(b) != 0) {
-		ret = LWRES_R_UNEXPECTEDEND;
+		ret = LWRES_R_TRAILINGDATA;
 		goto out;
 	}
 
@@ -212,7 +212,7 @@ lwres_noopresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 
 	lwres_buffer_forward(b, req->datalength);
 	if (LWRES_BUFFER_REMAINING(b) != 0) {
-		ret = LWRES_R_UNEXPECTEDEND;
+		ret = LWRES_R_TRAILINGDATA;
 		goto out;
 	}