For John

1 files changed, 5 insertions, 12 deletions

diff --git a/lib/ZRecvPkt.c b/lib/ZRecvPkt.c
index 33a48c0..03bf070 100644
--- a/lib/ZRecvPkt.c
+++ b/lib/ZRecvPkt.c
@@ -25,24 +25,17 @@ Code_t ZReceivePacket(buffer, ret_len, from)
     int *ret_len;
     struct sockaddr_in *from;
 {
-    int retval;
+    Code_t retval;
     struct _Z_InputQ *nextq;
     
-    if (ZGetFD() < 0)
-	return (ZERR_NOPORT);
-
-    if (ZQLength()) {
-	if ((retval = Z_ReadEnqueue()) != ZERR_NONE)
-	    return (retval);
-    }
-    else {
-	if ((retval = Z_ReadWait()) != ZERR_NONE)
-	    return (retval);
-    }
+    if ((retval = Z_WaitForComplete()) != ZERR_NONE)
+	return (retval);
 
     nextq = (struct _Z_InputQ *) Z_GetFirstComplete();
 
     *ret_len = nextq->packet_len;
+    if (*ret_len > Z_MAXPKTLEN)
+	return (ZERR_PKTLEN);
     
     bcopy(nextq->packet, buffer, *ret_len);