3 files changed, 12 insertions(+), 3 deletions(-)

M ip/ip.h
M pc/wavelan.c
M port/qio.c

@@ 35,7 35,7 @@ enum
 	Maxproto=	20,
 	Nhash=		64,
 	Maxincall=	5,
-	Nchans=		512,
+	Nchans=		1024,
 	MAClen=		16,		/* longest mac address */
 
 	MAXTTL=		255,

@@ 566,7 566,11 @@ w_scaninfo(Ether* ether, Ctlr *ctlr, int len)
 	for (i = 0; i < len ; i++)
 		scanbuf[i] = csr_ins(ctlr, WR_Data1);
 
+	/* calculate number of samples */
 	len /= 25;
+	if(len == 0)
+		goto out;
+
 	i = ether->scan;
 	ep = &ether->f[Ntypes];
 	for(fp = ether->f; fp < ep && i > 0; fp++){


@@ 589,6 593,7 @@ w_scaninfo(Ether* ether, Ctlr *ctlr, int len)
 		qpass(f->in, bp);
 		i--;
 	}
+out:
 	free(scanbuf);
 }
 

@@ 225,8 225,12 @@ pullupblock(Block *bp, int n)
 			nbp->rp += n;
 			QDEBUG checkb(bp, "pullupblock 1");
 			return bp;
-		}
-		else {
+		} else {
+			/* shouldn't happen but why crash if it does */
+			if(i < 0){
+				print("pullup negative length packet\n");
+				i = 0;
+			}
 			memmove(bp->wp, nbp->rp, i);
 			pullupblockcnt++;
 			bp->wp += i;