*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: text2pcap.c,v 1.26 2003/04/27 00:41:50 guy Exp $
+ * $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
# include "config.h"
#endif
+/*
+ * 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
+ * yet defined.
+ */
+#ifndef __USE_XOPEN
+# define __USE_XOPEN
+#endif
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE
+#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)
- */
-#define __USE_XOPEN
+#include <wiretap/file_util.h>
#include <time.h>
#include <glib.h>
/* Dummy IP header */
static int hdr_ip = FALSE;
-static unsigned long hdr_ip_proto = 0;
+static long hdr_ip_proto = 0;
/* Dummy UDP header */
static int hdr_udp = FALSE;
static gint32 ts_sec = 0;
static guint32 ts_usec = 0;
static char *ts_fmt = NULL;
+static struct tm timecode_default;
/* Input file */
-static char *input_filename;
+static const char *input_filename;
static FILE *input_file = NULL;
/* Output file */
-static char *output_filename;
+static const char *output_filename;
static FILE *output_file = NULL;
/* Offset base to parse */
START_OF_LINE, /* Starting from beginning of line */
READ_OFFSET, /* Just read the offset */
READ_BYTE, /* Just read a byte */
- READ_TEXT, /* Just read text - ignore until EOL */
+ READ_TEXT /* Just read text - ignore until EOL */
} parser_state_t;
static parser_state_t state = INIT;
* Pass in TRUE if this is an offset, FALSE if not
*/
static unsigned long
-parse_num (char *str, int offset)
+parse_num (const char *str, int offset)
{
unsigned long num;
char *c;
* Write this byte into current packet
*/
static void
-write_byte (char *str)
+write_byte (const char *str)
{
unsigned long num;
num = parse_num(str, FALSE);
- packet_buf[curr_offset] = num;
+ packet_buf[curr_offset] = (unsigned char) num;
curr_offset ++;
if (curr_offset >= max_offset) /* packet full */
start_new_packet();
/* Write IP header */
if (hdr_ip) {
HDR_IP.packet_length = g_htons(ip_length);
- HDR_IP.protocol = hdr_ip_proto;
+ HDR_IP.protocol = (guint8) hdr_ip_proto;
HDR_IP.hdr_checksum = 0;
HDR_IP.hdr_checksum = in_checksum(&HDR_IP, sizeof(HDR_IP));
fwrite(&HDR_IP, sizeof(HDR_IP), 1, output_file);
pseudoh.src_addr = HDR_IP.src_addr;
pseudoh.dest_addr = HDR_IP.dest_addr;
pseudoh.zero = 0;
- pseudoh.protocol = hdr_ip_proto;
+ pseudoh.protocol = (guint8) hdr_ip_proto;
pseudoh.length = g_htons(proto_length);
/* Write UDP header */
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));
return; /* no room to add the token to the preamble */
strcpy(&packet_preamble[packet_preamble_len], str);
packet_preamble_len += toklen;
+ if (debug >= 2) {
+ char *c;
+ char xs[PACKET_PREAMBLE_MAX_LEN];
+ strcpy(xs, packet_preamble);
+ while ((c = strchr(xs, '\r')) != NULL) *c=' ';
+ fprintf (stderr, "[[append_to_preamble: \"%s\"]]", xs);
+ }
}
}
/*----------------------------------------------------------------------
* Parse the preamble to get the timecode.
*/
+
static void
parse_preamble (void)
{
if (ts_fmt == NULL)
return;
- ts_sec = 0;
+ /*
+ * Initialize to today localtime, just in case not all fields
+ * of the date and time are specified.
+ */
+
+ timecode = timecode_default;
ts_usec = 0;
/*
* This should cover line breaks etc that get counted.
*/
if ( strlen(packet_preamble) > 2 ) {
- /*
- * Initialize to the Epoch, just in case not all fields
- * of the date and time are specified.
- */
- timecode.tm_sec = 0;
- timecode.tm_min = 0;
- timecode.tm_hour = 0;
- timecode.tm_mday = 1;
- timecode.tm_mon = 0;
- timecode.tm_year = 70;
- timecode.tm_wday = 0;
- timecode.tm_yday = 0;
- timecode.tm_isdst = -1;
-
/* Get Time leaving subseconds */
subsecs = strptime( packet_preamble, ts_fmt, &timecode );
if (subsecs != NULL) {
/* Get the long time from the tm structure */
+ /* (will return -1 if failure) */
ts_sec = (gint32)mktime( &timecode );
} else
ts_sec = -1; /* we failed to parse it */
/* This will ensure incorrectly parsed dates get set to zero */
if ( -1 == ts_sec )
{
- ts_sec = 0;
+ /* Sanitize - remove all '\r' */
+ char *c;
+ while ((c = strchr(packet_preamble, '\r')) != NULL) *c=' ';
+ 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",
+ timecode.tm_mday, timecode.tm_mon, timecode.tm_year,
+ timecode.tm_hour, timecode.tm_min, timecode.tm_sec, timecode.tm_isdst);
+ }
+ ts_sec = 0; /* Jan 1,1970: 00:00 GMT; tshark/wireshark will display date/time as adjusted by timezone */
ts_usec = 0;
}
else
}
}
}
+ 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);
+ }
- /*printf("Format(%s), time(%u), subsecs(%u)\n\n", ts_fmt, ts_sec, ts_usec);*/
-
/* Clear Preamble */
packet_preamble_len = 0;
}
}
/*----------------------------------------------------------------------
- * Print helpstring and exit
+ * Print usage string and exit
*/
static void
-help (char *progname)
+usage (void)
{
fprintf(stderr,
+ "Text2pcap %s"
+#ifdef SVNVERSION
+ " (" SVNVERSION ")"
+#endif
"\n"
- "Usage: %s [-h] [-d] [-q] [-o h|o] [-l typenum] [-e l3pid] [-i proto] \n"
- " [-m max-packet] [-u srcp,destp] [-T srcp,destp] [-s srcp,destp,tag]\n"
- " [-S srcp,destp,tag] [-t timefmt] <input-filename> <output-filename>\n"
+ "Generate a capture file from an ASCII hexdump of packets.\n"
+ "See http://www.wireshark.org for more information.\n"
"\n"
- "where <input-filename> specifies input filename (use - for standard input)\n"
+ "Usage: text2pcap [options] <input-filename> <output-filename>\n"
+ "\n"
+ "where <input-filename> specifies input filename (use - for standard input)\n"
" <output-filename> specifies output filename (use - for standard output)\n"
"\n"
- "[options] are one or more of the following \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"
+ " supported by strptime.\n"
+ " Example: The time \"10:15:14.5476\" has the format code\n"
+ " \"%%H:%%M:%%S.\"\n"
+ " NOTE: The subsecond component delimiter must be given\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"
+ "\n"
+ "Output:\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"
+ "\n"
+ "Prepend dummy header:\n"
+ " -e <l3pid> prepend dummy Ethernet II header with specified L3PID\n"
+ " (in HEX)\n"
+ " Example: -e 0x800\n"
+ " -i <proto> prepend dummy IP header with specified IP protocol\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"
+ " dest and source ports (in DECIMAL).\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"
+ " dest/source ports and verification tag (in DECIMAL).\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"
+ " chunk header with payload protocol identifier ppi.\n"
+ " Example: -S 30,40,34\n"
"\n"
- " -h : Display this help message \n"
- " -d : Generate detailed debug of parser states \n"
- " -o hex|oct : Parse offsets as (h)ex or (o)ctal. Default is hex\n"
- " -l typenum : Specify link-layer type number. Default is 1 (Ethernet). \n"
- " See net/bpf.h for list of numbers.\n"
- " -q : Generate no output at all (automatically turns off -d)\n"
- " -e l3pid : Prepend dummy Ethernet II header with specified L3PID (in\n"
- " HEX)\n"
- " Example: -e 0x800\n"
- " -i proto : Prepend dummy IP header with specified IP protocol (in\n"
- " DECIMAL). \n"
- " Automatically prepends Ethernet header as well.\n"
- " Example: -i 46\n"
- " -m max-packet : Max packet length in output, default is %d\n"
- " -u srcp,destp : Prepend dummy UDP header with specified dest and source ports\n"
- " (in DECIMAL).\n"
- " Automatically prepends Ethernet and IP headers as well\n"
- " Example: -u 30,40\n"
- " -T srcp,destp : Prepend dummy TCP header with specified dest and source ports\n"
- " (in DECIMAL).\n"
- " Automatically prepends Ethernet and IP headers as well\n"
- " Example: -T 50,60\n"
- " -s srcp,dstp,tag: Prepend dummy SCTP header with specified dest/source ports\n"
- " and verification tag (in DECIMAL).\n"
- " Automatically prepends Ethernet and IP headers as well\n"
- " Example: -s 30,40,34\n"
- " -S srcp,dstp,ppi: Prepend dummy SCTP header with specified dest/source ports\n"
- " and verification tag 0. It also prepends a dummy SCTP DATA\n"
- " chunk header with payload protocol identifier ppi.\n"
- " Example: -S 30,40,34\n"
- " -t timefmt : Treats the text before the packet as a date/time code; the\n"
- " specified argument is a format string of the sort supported\n"
- " by strptime.\n"
- " Example: The time \"10:15:14.5476\" has the format code\n"
- " \"%%H:%%M:%%S.\"\n"
- " NOTE: The subsecond component delimiter must be specified\n"
- " (.) but no pattern is required; the remaining number\n"
- " is assumed to be fractions of a second.\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"
"",
- progname, MAX_PACKET);
+ VERSION, MAX_PACKET);
exit(-1);
}
/* Scan CLI parameters */
while ((c = getopt(argc, argv, "dhqe:i:l:m:o:u:s:S:t:T:")) != -1) {
switch(c) {
- case '?': help(argv[0]); break;
- case 'h': help(argv[0]); break;
+ case '?': usage(); break;
+ case 'h': usage(); break;
case 'd': if (!quiet) debug++; break;
case 'q': quiet = TRUE; debug = FALSE; break;
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') {
- fprintf(stderr, "Bad argument for '-e': %s\n", optarg);
- help(argv[0]);
+ fprintf(stderr, "Bad argument for '-o': %s\n", optarg);
+ usage();
}
offset_base = (optarg[0]=='o') ? 8 : 16;
break;
hdr_ethernet = TRUE;
if (sscanf(optarg, "%lx", &hdr_ethernet_proto) < 1) {
fprintf(stderr, "Bad argument for '-e': %s\n", optarg);
- help(argv[0]);
+ usage();
}
break;
case 'i':
hdr_ip = TRUE;
- if (sscanf(optarg, "%ld", &hdr_ip_proto) < 1) {
+ hdr_ip_proto = strtol(optarg, &p, 10);
+ if (p == optarg || *p != '\0' || hdr_ip_proto < 0 ||
+ hdr_ip_proto > 255) {
fprintf(stderr, "Bad argument for '-i': %s\n", optarg);
- help(argv[0]);
+ usage();
}
hdr_ethernet = TRUE;
hdr_ethernet_proto = 0x800;
hdr_sctp_src = strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
p++;
optarg = p;
hdr_sctp_dest = strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad dest port for '-s'\n");
- help(argv[0]);
+ usage();
}
if (*p == '\0') {
fprintf(stderr, "No tag specified for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
p++;
optarg = p;
hdr_sctp_tag = strtol(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad tag for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
hdr_ip = TRUE;
hdr_sctp_src = strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
p++;
optarg = p;
hdr_sctp_dest = strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad dest port for '-s'\n");
- help(argv[0]);
- } if (*p == '\0') {
+ usage();
+ }
+ if (*p == '\0') {
fprintf(stderr, "No ppi specified for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
p++;
optarg = p;
hdr_data_chunk_ppid = strtoul(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad ppi for '-%c'\n", c);
- help(argv[0]);
+ usage();
}
hdr_ip = TRUE;
hdr_src_port = strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-u'\n");
- help(argv[0]);
+ usage();
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- help(argv[0]);
+ usage();
}
p++;
optarg = p;
hdr_dest_port = strtol(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad dest port for '-u'\n");
- help(argv[0]);
+ usage();
}
hdr_ip = TRUE;
hdr_ip_proto = 17;
hdr_src_port = strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-T'\n");
- help(argv[0]);
+ usage();
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- help(argv[0]);
+ usage();
}
p++;
optarg = p;
hdr_dest_port = strtol(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad dest port for '-T'\n");
- help(argv[0]);
+ usage();
}
hdr_ip = TRUE;
hdr_ip_proto = 6;
break;
default:
- help(argv[0]);
+ usage();
}
}
if (optind >= argc || argc-optind < 2) {
fprintf(stderr, "Must specify input and output filename\n");
- help(argv[0]);
+ usage();
}
if (strcmp(argv[optind], "-")) {
input_filename = strdup(argv[optind]);
- input_file = fopen(input_filename, "rb");
+ input_file = eth_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_file = eth_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 = time(0); /* initialize to current time */
+ ts_sec = (gint32) time(0); /* initialize to current time */
+ timecode_default = *localtime((time_t *)&ts_sec);
/* Display summary of our state */
if (!quiet) {
git.samba.org / obnox / wireshark / wip.git / blobdiff