[Netnice-commitlog] netnice : FreeBSD/net vif_input.c,1.1.10.3,1.1.10.4 vif_output.c,1.1.10.2,1.1.10.3 vif_subr.c,1.1.10.2,1.1.10.3

[Takashi O. <ta...@us...>]

Update of /cvsroot/netnice/FreeBSD/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10826/net

Modified Files:
      Tag: netnice411
	vif_input.c vif_output.c vif_subr.c 
Log Message:
Several bugs in calculation of VIF dir entries are fixed.


Index: vif_input.c
===================================================================
RCS file: /cvsroot/netnice/FreeBSD/net/Attic/vif_input.c,v
retrieving revision 1.1.10.3
retrieving revision 1.1.10.4
diff -u -d -r1.1.10.3 -r1.1.10.4
--- vif_input.c	23 Jul 2005 11:06:07 -0000	1.1.10.3
+++ vif_input.c	26 Apr 2006 16:49:47 -0000	1.1.10.4
@@ -720,7 +720,7 @@
 		m->m_len  += NPF_HDRSIZE;
 		*(int *) m->m_data = AF_INET;
 
-		if (!bpf_filter(pipe->finsn, (u_char *)m, len, 0))
+		if (!bpf_filter(pipe->finsn, (u_char *)m, len, 0)) {
 			m->m_data += NPF_HDRSIZE;
 			m->m_len  -= NPF_HDRSIZE;
 			goto drop;
@@ -852,12 +852,10 @@
 		return 0;	/* no pkt to process */
 	}
 
-	pipe->sndbyte += len;
-
 	/*
 	 * dequeue
 	 */
-
+	pipe->sndbyte += len;  /* snd_byte and sndbyte are different! */
 	next = *(pkt->pc + pkt->nextvif--);
 
 	if (pkt->nextvif < -1 || !next) {

Index: vif_output.c
===================================================================
RCS file: /cvsroot/netnice/FreeBSD/net/Attic/vif_output.c,v
retrieving revision 1.1.10.2
retrieving revision 1.1.10.3
diff -u -d -r1.1.10.2 -r1.1.10.3
--- vif_output.c	23 Jul 2005 11:06:07 -0000	1.1.10.2
+++ vif_output.c	26 Apr 2006 16:49:47 -0000	1.1.10.3
@@ -677,7 +677,7 @@
 
 found:
 	assert(pkt);
-	pipe->sndbyte += pkt->len;
+	pipe->sndbyte += pkt->len; /* snd_byte and sndbyte are different! */
 
 	/*
 	 * dequeuing

Index: vif_subr.c
===================================================================
RCS file: /cvsroot/netnice/FreeBSD/net/Attic/vif_subr.c,v
retrieving revision 1.1.10.2
retrieving revision 1.1.10.3
diff -u -d -r1.1.10.2 -r1.1.10.3
--- vif_subr.c	23 Jul 2005 11:06:07 -0000	1.1.10.2
+++ vif_subr.c	26 Apr 2006 16:49:47 -0000	1.1.10.3
@@ -491,7 +491,6 @@
 vif_checkrm(pipe)
 	register struct vifnet *pipe;
 {
-	struct vifnet *vif = NULL;
 
 	if (pipe->in.p_queue || pipe->in.d_queue || !pipe->in.ndsched)
 		return false;