commit 1c186556cd514bc891888a669a4a9de9a1abe6aa
author guy <guy> Fri Jan 30 02:23:53 2004 +0000
committer guy <guy> Fri Jan 30 02:23:53 2004 +0000
tree 97fd278fd4409f5d38e499ba1ad00444b10dd210
parent 7ac8a0a75b572dd57666572689a3c0ff98339e32

From Jesper Peterson: fix a couple of endianness problems.

pcap-dag.c

diff --git a/pcap-dag.c b/pcap-dag.c
index 0aa82d4..b466fc7 100644
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-	"@(#) $Header: /tcpdump/master/libpcap/pcap-dag.c,v 1.16 2004-01-05 18:18:54 guy Exp $ (LBL)";
+	"@(#) $Header: /tcpdump/master/libpcap/pcap-dag.c,v 1.17 2004-01-30 02:23:53 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -211,7 +211,7 @@
 			}
 
 			p->md.dag_mem_top = dag_offset(p->fd, &(p->md.dag_mem_bottom), flags);
-			if ((p->md.dag_mem_top - p->md.dag_mem_bottom < dag_record_size) && nonblocking)
+			if (nonblocking && (p->md.dag_mem_top - p->md.dag_mem_bottom < dag_record_size))
 			{
 				/* Pcap is configured to process only available packets, and there aren't any. */
 				return 0;
@@ -274,8 +274,8 @@
 					}
 					sunatm->vpi = (rawatm >> 20) & 0x00ff;
 					sunatm->flags = ((header->flags.iface & 1) ? 0x80 : 0x00) | 
-						((sunatm->vpi == 0 && sunatm->vci == 5) ? 6 :
-						((sunatm->vpi == 0 && sunatm->vci == 16) ? 5 : 
+						((sunatm->vpi == 0 && sunatm->vci == htons(5)) ? 6 :
+						((sunatm->vpi == 0 && sunatm->vci == htons(16)) ? 5 : 
 						((dp[ATM_HDR_SIZE] == 0xaa &&
 							dp[ATM_HDR_SIZE+1] == 0xaa &&
 							dp[ATM_HDR_SIZE+2] == 0x03) ? 2 : 1)));
@@ -320,10 +320,10 @@
 
 			/* Count lost packets. */
 			if (header->lctr) {
-				if (p->md.stat.ps_drop > (UINT_MAX - header->lctr)) {
+				if (p->md.stat.ps_drop > (UINT_MAX - ntohs(header->lctr))) {
 					p->md.stat.ps_drop = UINT_MAX;
 				} else {
-					p->md.stat.ps_drop += header->lctr;
+					p->md.stat.ps_drop += ntohs(header->lctr);
 				}
 			}