Changeset dfef05d

Timestamp:

08/12/04 14:34:54 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

a4ce365

Parents:

476df56

Message:

fixes for AMD64

Files:

• ChangeLog (modified) (1 diff)
• config.h (modified) (1 diff)
• config.h.in (modified) (1 diff)
• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• lib/fifo.c (modified) (3 diffs)
• lib/trace.c (modified) (4 diffs)

ChangeLog

@@ -3 +3 @@
 ##
 ## Copyright (c) 2004 The University of Waikato, Hamilton, New Zealand.
-## Authors: Daniel Lawson 
-##          Perry Lorier 
+## Authors: Daniel Lawson, WAND Group
+##          Perry Lorier, WAND Group
 ##          
 ## All rights reserved.

config.h

@@ -39 +39 @@
 #define HAVE_PCAP_H 1
 
+/* Define if you have the <stddef.h> header file.  */
+#define HAVE_STDDEF_H 1
+
+/* Define if you have the <stdint.h> header file.  */
+#define HAVE_STDINT_H 1
+
 /* Define if you have the <sys/limits.h> header file.  */
 /* #undef HAVE_SYS_LIMITS_H */

config.h.in

@@ -38 +38 @@
 #undef HAVE_PCAP_H
 
+/* Define if you have the <stddef.h> header file.  */
+#undef HAVE_STDDEF_H
+
+/* Define if you have the <stdint.h> header file.  */
+#undef HAVE_STDINT_H
+
 /* Define if you have the <sys/limits.h> header file.  */
 #undef HAVE_SYS_LIMITS_H

configure

@@ -7480 +7480 @@
 
 
-for ac_header in pcap.h zlib.h pcap-bpf.h net/bpf.h sys/limits.h
+
+
+for ac_header in pcap.h zlib.h pcap-bpf.h net/bpf.h sys/limits.h stddef.h stdint.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

configure.in

@@ -20 +20 @@
 AC_HEADER_STDC
 dnl AC_CHECK_HEADERS(errno.h stdlib.h stdio.h assert.h string.h netinet/in.h assert.h errno.h fcntl.h net/ethernet.h netdb.h pcap.h stdio.h stdlib.h string.h sys/stat.h sys/types.h sys/socket.h sys/un.h unistd.h time.h sys/ioctl.h net/bpf.h pcap.h zlib.h pcap-bpf.h)
-AC_CHECK_HEADERS(pcap.h zlib.h pcap-bpf.h net/bpf.h sys/limits.h)
+AC_CHECK_HEADERS(pcap.h zlib.h pcap-bpf.h net/bpf.h sys/limits.h stddef.h stdint.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.

lib/fifo.c

@@ -37 +37 @@
 #include <string.h> /* bzero */
 #include "fifo.h"
+
+#include <stdint.h>
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#else
+# error "Can't find stddef.h - do you define ptrdiff_t elsewhere"
+#endif
 
 #include <netinet/in.h>
@@ -205 +212 @@
                 size = MIN( ( fifo->length - fifo->datamap[which]), lenleft);
                 memcpy(buffer, 
-                                (char *)((int)fifo->base + fifo->datamap[which]), 
+                                (char *)((ptrdiff_t)fifo->base + fifo->datamap[which]), 
                                 size);
                 increment_pointer(fifo,which,size);
@@ -232 +239 @@
         while (lenleft > 0) {
                 size = MIN((fifo->length - fifo->datamap[IN]), lenleft );
-                memcpy((char *)((int)fifo->base + fifo->datamap[IN]), 
+                memcpy((char *)((ptrdiff_t)fifo->base + fifo->datamap[IN]), 
                                 buffer, 
                                 size);

lib/trace.c

@@ -60 +60 @@
 #include <time.h>
 #include <sys/ioctl.h>
+
+#include <stdint.h>
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#else
+# error "Can't find stddef.h - do you define ptrdiff_t elsewhere"
+#endif
 
 #include "libtrace.h"
@@ -690 +697 @@
         }
         if (ipptr->ip_p == 6) {
-                tcpptr = (struct libtrace_tcp *)((int)ipptr + (ipptr->ip_hl * 4));
+                tcpptr = (struct libtrace_tcp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4));
         }
         return tcpptr;
@@ -710 +717 @@
         }
         if (ipptr->ip_p == 17) {
-                udpptr = (struct libtrace_udp *)((int)ipptr + (ipptr->ip_hl * 4));
+                udpptr = (struct libtrace_udp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4));
         }
         return udpptr;
@@ -730 +737 @@
         }
         if (ipptr->ip_p == 1) {
-                icmpptr = (struct libtrace_icmp *)((int)ipptr + (ipptr->ip_hl * 4));
+                icmpptr = (struct libtrace_icmp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4));
         }
         return icmpptr;