# include "config.h"
#endif
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/*
* Just make sure we include the prototype for strptime as well
* (needed for glibc 2.2) but make sure we do this only if not
#ifndef __USE_XOPEN
# define __USE_XOPEN
#endif
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE
+#endif
+
+/*
+ * Defining _XOPEN_SOURCE is needed on some platforms, e.g. platforms
+ * using glibc, to expand the set of things system header files define.
+ *
+ * Unfortunately, on other platforms, such as some versions of Solaris
+ * (including Solaris 10), it *reduces* that set as well, causing
+ * strptime() not to be declared, presumably because the version of the
+ * X/Open spec that _XOPEN_SOURCE implies doesn't include strptime() and
+ * blah blah blah namespace pollution blah blah blah.
+ *
+ * So we define __EXTENSIONS__ so that "strptime()" is declared.
+ */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wsutil/file_util.h>
#include <time.h>
#include <glib.h>
#include <errno.h>
#include <assert.h>
-#ifdef NEED_GETOPT_H
-# include "getopt.h"
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "wsutil/wsgetopt.h"
#endif
#ifdef NEED_STRPTIME_H
-# include "strptime.h"
+# include "wsutil/strptime.h"
#endif
#include "text2pcap.h"
+#include "svnversion.h"
/*--- Options --------------------------------------------------------------------*/
static unsigned long num_packets_written = 0;
/* Time code of packet, derived from packet_preamble */
-static gint32 ts_sec = 0;
+static time_t ts_sec = 0;
static guint32 ts_usec = 0;
static char *ts_fmt = NULL;
static struct tm timecode_default;
} 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 {
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;
/* "libpcap" record header. */
struct pcaprec_hdr {
- gint32 ts_sec; /* timestamp seconds */
+ guint32 ts_sec; /* timestamp seconds */
guint32 ts_usec; /* timestamp microseconds */
guint32 incl_len; /* number of octets of packet saved in file */
guint32 orig_len; /* actual length of packet */
}
}
- /* Write PCap header */
- ph.ts_sec = ts_sec;
+ /* Write PCAP header */
+ ph.ts_sec = (guint32)ts_sec;
ph.ts_usec = ts_usec;
if (ts_fmt == NULL) { ts_usec++; } /* fake packet counter */
ph.incl_len = length;
HDR_UDP.length = g_htons(proto_length);
HDR_UDP.checksum = 0;
- u = g_ntohs(in_checksum(&pseudoh, sizeof(pseudoh))) +
+ u = g_ntohs(in_checksum(&pseudoh, sizeof(pseudoh))) +
g_ntohs(in_checksum(&HDR_UDP, sizeof(HDR_UDP))) +
g_ntohs(in_checksum(packet_buf, curr_offset));
HDR_UDP.checksum = g_htons((u & 0xffff) + (u>>16));
HDR_TCP.window = g_htons(0x2000);
HDR_TCP.checksum = 0;
- u = g_ntohs(in_checksum(&pseudoh, sizeof(pseudoh))) +
+ u = g_ntohs(in_checksum(&pseudoh, sizeof(pseudoh))) +
g_ntohs(in_checksum(&HDR_TCP, sizeof(HDR_TCP))) +
g_ntohs(in_checksum(packet_buf, curr_offset));
HDR_TCP.checksum = g_htons((u & 0xffff) + (u>>16));
if (toklen != 0) {
if (packet_preamble_len + toklen > PACKET_PREAMBLE_MAX_LEN)
return; /* no room to add the token to the preamble */
- strcpy(&packet_preamble[packet_preamble_len], str);
- packet_preamble_len += toklen;
+ g_strlcpy(&packet_preamble[packet_preamble_len], str, PACKET_PREAMBLE_MAX_LEN);
+ packet_preamble_len += (int) toklen;
if (debug >= 2) {
char *c;
char xs[PACKET_PREAMBLE_MAX_LEN];
- strcpy(xs, packet_preamble);
+ g_strlcpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN);
while ((c = strchr(xs, '\r')) != NULL) *c=' ';
- fprintf (stderr, "[[append_to_preamble: \"%s\"]]", xs);
+ fprintf (stderr, "[[append_to_preamble: \"%s\"]]", xs);
}
}
}
if (subsecs != NULL) {
/* Get the long time from the tm structure */
/* (will return -1 if failure) */
- ts_sec = (gint32)mktime( &timecode );
+ ts_sec = mktime( &timecode );
} else
ts_sec = -1; /* we failed to parse it */
fprintf (stderr, "Failure processing time \"%s\" using time format \"%s\"\n (defaulting to Jan 1,1970 00:00:00 GMT)\n",
packet_preamble, ts_fmt);
if (debug >= 2) {
- fprintf(stderr, "timecode: %02d/%02d/%d %02d:%02d:%02d %d\n",
+ fprintf(stderr, "timecode: %02d/%02d/%d %02d:%02d:%02d %d\n",
timecode.tm_mday, timecode.tm_mon, timecode.tm_year,
timecode.tm_hour, timecode.tm_min, timecode.tm_sec, timecode.tm_isdst);
}
* 10^-6 seconds, we multiply by
* 10^(6-N).
*/
- subseclen = p - subsecs;
+ subseclen = (int) (p - subsecs);
if (subseclen > 6) {
/*
* *More* than 6 digits; 6-N is
if (debug >= 2) {
char *c;
while ((c = strchr(packet_preamble, '\r')) != NULL) *c=' ';
- fprintf(stderr, "[[parse_preamble: \"%s\"]]\n", packet_preamble);
- fprintf(stderr, "Format(%s), time(%u), subsecs(%u)\n", ts_fmt, ts_sec, ts_usec);
+ fprintf(stderr, "[[parse_preamble: \"%s\"]]\n", packet_preamble);
+ fprintf(stderr, "Format(%s), time(%u), subsecs(%u)\n", ts_fmt, (guint32)ts_sec, ts_usec);
}
fprintf(stderr,
"Text2pcap %s"
#ifdef SVNVERSION
- " (" SVNVERSION ")"
+ " (" SVNVERSION " from " SVNPATH ")"
#endif
"\n"
"Generate a capture file from an ASCII hexdump of packets.\n"
"See http://www.wireshark.org for more information.\n"
"\n"
- "Usage: text2pcap [options] <input-filename> <output-filename>\n"
+ "Usage: text2pcap [options] <infile> <outfile>\n"
"\n"
- "where <input-filename> specifies input filename (use - for standard input)\n"
- " <output-filename> specifies output filename (use - for standard output)\n"
+ "where <infile> specifies input filename (use - for standard input)\n"
+ " <outfile> specifies output filename (use - for standard output)\n"
"\n"
"Input:\n"
- " -o hex|oct parse offsets as (h)ex or (o)ctal, default is hex\n"
- " -t <timefmt> treats the text before the packet as a date/time code;\n"
- " the specified argument is a format string of the sort \n"
+ " -o hex|oct|dec parse offsets as (h)ex, (o)ctal or (d)ecimal; default is hex.\n"
+ " -t <timefmt> treat the text before the packet as a date/time code;\n"
+ " the specified argument is a format string of the sort\n"
" supported by strptime.\n"
" Example: The time \"10:15:14.5476\" has the format code\n"
" \"%%H:%%M:%%S.\"\n"
" (.) but no pattern is required; the remaining number\n"
" is assumed to be fractions of a second.\n"
" NOTE: Date/time fields from the current date/time are\n"
- " used as the default for unspecified fields.\n"
+ " used as the default for unspecified fields.\n"
"\n"
"Output:\n"
- " -l <typenum> link-layer type number. Default is 1 (Ethernet). \n"
+ " -l <typenum> link-layer type number; default is 1 (Ethernet).\n"
" See the file net/bpf.h for list of numbers.\n"
- " -m <max-packet> max packet length in output, default is %d\n"
+ " Use this option if your dump is a complete hex dump\n"
+ " of an encapsulated packet and you wish to specify\n"
+ " the exact type of encapsulation.\n"
+ " Example: -l 7 for ARCNet packets.\n"
+ " -m <max-packet> max packet length in output; default is %d\n"
"\n"
"Prepend dummy header:\n"
" -e <l3pid> prepend dummy Ethernet II header with specified L3PID\n"
- " (in HEX)\n"
- " Example: -e 0x800\n"
+ " (in HEX).\n"
+ " Example: -e 0x806 to specify an ARP packet.\n"
" -i <proto> prepend dummy IP header with specified IP protocol\n"
- " (in DECIMAL). \n"
+ " (in DECIMAL).\n"
" Automatically prepends Ethernet header as well.\n"
" Example: -i 46\n"
" -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 30,40\n"
- " -T <srcp>,<destp> prepend dummy TCP header with specified \n"
+ " Automatically prepends Ethernet & IP headers as well.\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"
+ " Automatically prepends Ethernet & IP headers as well.\n"
" Example: -T 50,60\n"
- " -s <srcp>,<dstp>,<tag> prepend dummy SCTP header with specified \n"
+ " -s <srcp>,<dstp>,<tag> prepend dummy SCTP header with specified\n"
" dest/source ports and verification tag (in DECIMAL).\n"
- " Automatically prepends Ethernet & IP headers as well\n"
+ " Automatically prepends Ethernet & IP headers as well.\n"
" Example: -s 30,40,34\n"
- " -S <srcp>,<dstp>,<ppi> prepend dummy SCTP header with specified \n"
- " dest/source ports and verification tag 0. \n"
- " It also prepends a dummy SCTP DATA \n"
+ " -S <srcp>,<dstp>,<ppi> prepend dummy SCTP header with specified\n"
+ " dest/source ports and verification tag 0.\n"
+ " Automatically prepends a dummy SCTP DATA\n"
" chunk header with payload protocol identifier ppi.\n"
" Example: -S 30,40,34\n"
"\n"
"Miscellaneous:\n"
- " -h display this help and exit\n"
- " -d detailed debug of parser states \n"
- " -q generate no output at all (automatically turns off -d)\n"
+ " -h display this help and exit.\n"
+ " -d show detailed debug of parser states.\n"
+ " -q generate no output at all (automatically turns off -d).\n"
"",
VERSION, MAX_PACKET);
case 'l': pcap_link_type = strtol(optarg, NULL, 0); break;
case 'm': max_offset = strtol(optarg, NULL, 0); break;
case 'o':
- if (optarg[0]!='h' && optarg[0] != 'o') {
+ if (optarg[0]!='h' && optarg[0] != 'o' && optarg[0] != 'd') {
fprintf(stderr, "Bad argument for '-o': %s\n", optarg);
usage();
}
- offset_base = (optarg[0]=='o') ? 8 : 16;
+ switch(optarg[0]) {
+ case 'o': offset_base = 8; break;
+ case 'h': offset_base = 16; break;
+ case 'd': offset_base = 10; break;
+ }
break;
case 'e':
hdr_ethernet = TRUE;
}
if (strcmp(argv[optind], "-")) {
- input_filename = strdup(argv[optind]);
- input_file = fopen(input_filename, "rb");
+ input_filename = g_strdup(argv[optind]);
+ input_file = ws_fopen(input_filename, "rb");
if (!input_file) {
fprintf(stderr, "Cannot open file [%s] for reading: %s\n",
input_filename, strerror(errno));
}
if (strcmp(argv[optind+1], "-")) {
- output_filename = strdup(argv[optind+1]);
- output_file = fopen(output_filename, "wb");
+ output_filename = g_strdup(argv[optind+1]);
+ output_file = ws_fopen(output_filename, "wb");
if (!output_file) {
fprintf(stderr, "Cannot open file [%s] for writing: %s\n",
output_filename, strerror(errno));
output_filename = "Standard output";
}
- ts_sec = (gint32) time(0); /* initialize to current time */
- timecode_default = *localtime((time_t *)&ts_sec);
+ 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) {
if (debug)
fprintf(stderr, "\n-------------------------\n");
if (!quiet) {
- fprintf(stderr, "Read %ld potential packets, wrote %ld packets\n",
- num_packets_read, num_packets_written);
+ fprintf(stderr, "Read %ld potential packet%s, wrote %ld packet%s\n",
+ num_packets_read, (num_packets_read==1) ?"":"s",
+ num_packets_written, (num_packets_written==1)?"":"s");
}
return 0;
}