Remove unnecessary #include "../isprint.h"

[obnox/wireshark/wip.git] / text2pcap.c

diff --git a/text2pcap.c b/text2pcap.c
index 2b47f9f835857f9258c33c80c479f6bf75233628..4b0ee8a23617d4e2de7e4037b726ab7f85b326af 100644 (file)
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -128,14 +128,15 @@
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #else
-#include "wsgetopt.h"
+#include "wsutil/wsgetopt.h"
 #endif
 
 #ifdef NEED_STRPTIME_H
-# include "strptime.h"
+# include "wsutil/strptime.h"
 #endif
 
 #include "text2pcap.h"
+#include "svnversion.h"
 
 /*--- Options --------------------------------------------------------------------*/
 
@@ -249,8 +250,8 @@ typedef struct {
 } hdr_ethernet_t;
 
 static hdr_ethernet_t HDR_ETHERNET = {
-    {0x02, 0x02, 0x02, 0x02, 0x02, 0x02},
-    {0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
+    {0x0a, 0x02, 0x02, 0x02, 0x02, 0x02},
+    {0x0a, 0x01, 0x01, 0x01, 0x01, 0x01},
     0};
 
 typedef struct {
@@ -267,7 +268,7 @@ typedef struct {
     guint32 dest_addr;
 } hdr_ip_t;
 
-static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 0, 0, 0x01010101, 0x02020202};
+static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 0, 0, 0x0101010a, 0x0202020a};
 
 static struct {                        /* pseudo header for checksum calculation */
        guint32 src_addr;
@@ -1074,7 +1075,7 @@ usage (void)
             "  -u <srcp>,<destp>      prepend dummy UDP header with specified\n"
             "                         dest and source ports (in DECIMAL).\n"
             "                         Automatically prepends Ethernet & IP headers as well.\n"
-            "                         Example: -u 1000 69 to make the packets look like TFTP/UDP packets.\n" 
+            "                         Example: -u 1000 69 to make the packets look like TFTP/UDP packets.\n"
             "  -T <srcp>,<destp>      prepend dummy TCP header with specified\n"
             "                         dest and source ports (in DECIMAL).\n"
             "                         Automatically prepends Ethernet & IP headers as well.\n"
@@ -1328,6 +1329,7 @@ parse_options (int argc, char *argv[])
 
     ts_sec = time(0);          /* initialize to current time */
     timecode_default = *localtime(&ts_sec);
+    timecode_default.tm_isdst = -1;    /* Unknown for now, depends on time given to the strptime() function */
 
     /* Display summary of our state */
     if (!quiet) {