Changeset 23971d0

Timestamp:

04/08/06 16:23:04 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

33e1501

Parents:

9ee7134

Message:

Portability fixes for windows

Location:

lib

Files:

• dagformat.h (modified) (2 diffs)
• daglegacy.h (modified) (2 diffs)
• format_erf.c (modified) (3 diffs)
• format_helper.c (modified) (3 diffs)
• libtrace.h (modified) (1 diff)

lib/dagformat.h

@@ -45 +45 @@
         unsigned int   dserror:1;
         unsigned int   pad:2;
-} __attribute__((packed)) flags_t;
+} PACKED flags_t;
 
 /** GPP Global type */
@@ -61 +61 @@
                 aal5_rec_t      aal5;
         } rec;
-} __attribute__((packed)) dag_record_t;
+} PACKED dag_record_t;
 
 /** Dynamic(?) Universal Clock Kit Information packet */

lib/daglegacy.h

@@ -5 +5 @@
         uint64_t  ts;
         uint32_t  crc;
-} __attribute__ ((packed)) legacy_cell_t;
+} PACKED legacy_cell_t;
 
 typedef struct legacy_ether {
         uint64_t  ts;
         uint16_t  wlen;
-} __attribute__ ((packed)) legacy_ether_t;
+} PACKED legacy_ether_t;
 
 typedef struct legacy_pos {
@@ -16 +16 @@
         uint32_t  slen;
         uint32_t  wlen;
-} __attribute__ ((packed)) legacy_pos_t;
+} PACKED legacy_pos_t;
 
 #endif

lib/format_erf.c

@@ -37 +37 @@
 #include "parse_cmd.h"
 
-#ifdef HAVE_INTTYPES_H
-#  include <inttypes.h>
-#else
-#  error "Can't find inttypes.h - this needs to be fixed"
-#endif 
-
-#ifdef HAVE_STDDEF_H
-#  include <stddef.h>
-#else
-# error "Can't find stddef.h - do you define ptrdiff_t elsewhere?"
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
-#include <netdb.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
+#ifdef WIN32
+#  include <io.h>
+#  include <share.h>
+#  define PATH_MAX _MAX_PATH
+#  define snprintf sprintf_s
+#else
+#  include <netdb.h>
+#endif
 
 
@@ -373 +364 @@
         remote.sin_port = htons(CONNINFO.rt.port);
         remote.sin_addr = *((struct in_addr *)he->h_addr);
-        bzero(&(remote.sin_zero), 8);
+        memset(&(remote.sin_zero), 0, 8);
 
         if (connect(INPUT.fd, (struct sockaddr *)&remote,
@@ -1014 +1005 @@
 };
 
-void __attribute__((constructor)) erf_constructor() {
+void CONSTRUCTOR erf_constructor() {
         register_format(&rtclient);
         register_format(&erf);

lib/format_helper.c

@@ -39 +39 @@
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_INTTYPES_H
-#  include <inttypes.h>
-#else
-#  error "Can't find inttypes.h - this needs to be fixed"
-#endif
 #include  "format_helper.h"
 
@@ -49 +44 @@
 #include <assert.h>
 #include <stdarg.h>
+
+#ifdef WIN32
+#  include <io.h>
+#  include <share.h>
+#  define snprintf sprintf_s
+
+struct libtrace_eventobj_t trace_event_device(struct libtrace_t *trace, struct libtrace_packet_t *packet) {
+    struct libtrace_eventobj_t event = {0,0,0.0,0};
+
+    trace_set_err(trace,TRACE_ERR_OPTION_UNAVAIL, "trace_event() is not "
+            "supported on devices under windows in this version");
+
+    event.type = TRACE_EVENT_TERMINATE;
+    return event;
+}
+#else
+#  include <sys/ioctl.h>
 
 struct libtrace_eventobj_t trace_event_device(struct libtrace_t *trace, struct libtrace_packet_t *packet) {
@@ -75 +87 @@
         return event;
 }
+#endif
 
 struct libtrace_eventobj_t trace_event_trace(struct libtrace_t *trace, struct libtrace_packet_t *packet) {

lib/libtrace.h

@@ -73 +73 @@
 #  define UNUSED __attribute__((unused))
 #  define PACKED __attribute__((packed))
+#  define CONSTRUCTOR __attribute__((constructor))
 #else
 #  define SIMPLE_FUNCTION
 #  define UNUSED
+#  define PACKED
+#  define CONSTRUCTOR
 #endif