*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: text2pcap.c,v 1.24 2002/10/17 20:02:00 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
*
* The output is a libpcap packet containing Ethernet frames by
* default. This program takes options which allow the user to add
- * dummy Ethernet, IP and UDP headers to the packets in order to allow
- * dumps of L3 or higher protocols to be decoded.
+ * dummy Ethernet, IP and UDP or TCP headers to the packets in order
+ * to allow dumps of L3 or higher protocols to be decoded.
*
* Considerable flexibility is built into this code to read hexdumps
* of slightly different formats. For example, any text prefixing the
# 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 unsigned long hdr_udp_dest = 0;
-static unsigned long hdr_udp_src = 0;
+static unsigned long hdr_dest_port = 0;
+static unsigned long hdr_src_port = 0;
+
+/* Dummy TCP header */
+static int hdr_tcp = FALSE;
/* Dummy SCTP header */
static int hdr_sctp = FALSE;
#define MAX_PACKET 64000
static unsigned char packet_buf[MAX_PACKET];
static unsigned long curr_offset = 0;
+static unsigned long max_offset = MAX_PACKET;
+static unsigned long packet_start = 0;
+static void start_new_packet (void);
/* This buffer contains strings present before the packet offset 0 */
#define PACKET_PREAMBLE_MAX_LEN 2048
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;
/* ----- Skeleton Packet Headers --------------------------------------------------*/
typedef struct {
- guint8 src_addr[6];
guint8 dest_addr[6];
+ guint8 src_addr[6];
guint16 l3pid;
} hdr_ethernet_t;
static hdr_ethernet_t HDR_ETHERNET = {
- {0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
{0x02, 0x02, 0x02, 0x02, 0x02, 0x02},
+ {0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
0};
typedef struct {
static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 0, 0, 0x01010101, 0x02020202};
+static struct { /* pseudo header for checksum calculation */
+ guint32 src_addr;
+ guint32 dest_addr;
+ guint8 zero;
+ guint8 protocol;
+ guint16 length;
+} pseudoh;
+
typedef struct {
guint16 source_port;
guint16 dest_port;
static hdr_udp_t HDR_UDP = {0, 0, 0, 0};
+typedef struct {
+ guint16 source_port;
+ guint16 dest_port;
+ guint32 seq_num;
+ guint32 ack_num;
+ guint8 hdr_length;
+ guint8 flags;
+ guint16 window;
+ guint16 checksum;
+ guint16 urg;
+} hdr_tcp_t;
+
+static hdr_tcp_t HDR_TCP = {0, 0, 0, 0, 0x50, 0, 0, 0, 0};
+
typedef struct {
guint16 src_port;
guint16 dest_port;
* 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();
}
/*----------------------------------------------------------------------
/* Add left-over byte, if any */
if( count > 0 )
- sum += * (guint8 *) addr;
+ sum += g_ntohs(* (guint8 *) addr);
/* Fold 32-bit sum to 16 bits */
while (sum>>16)
write_current_packet (void)
{
int length = 0;
- int udp_length = 0;
+ int proto_length = 0;
int ip_length = 0;
int eth_trailer_length = 0;
int i, padding_length;
+ guint32 u;
struct pcaprec_hdr ph;
if (curr_offset > 0) {
length = curr_offset;
if (hdr_data_chunk) { length += sizeof(HDR_DATA_CHUNK) + number_of_padding_bytes(curr_offset); }
if (hdr_sctp) { length += sizeof(HDR_SCTP); }
- if (hdr_udp) { length += sizeof(HDR_UDP); udp_length = length; }
+ if (hdr_udp) { length += sizeof(HDR_UDP); proto_length = length; }
+ if (hdr_tcp) { length += sizeof(HDR_TCP); proto_length = length; }
if (hdr_ip) { length += sizeof(HDR_IP); ip_length = length; }
if (hdr_ethernet) {
length += sizeof(HDR_ETHERNET);
/* Write PCap header */
ph.ts_sec = ts_sec;
ph.ts_usec = ts_usec;
+ if (ts_fmt == NULL) { ts_usec++; } /* fake packet counter */
ph.incl_len = length;
ph.orig_len = length;
fwrite(&ph, sizeof(ph), 1, output_file);
/* 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);
}
+ /* initialize pseudo header for checksum calculation */
+ pseudoh.src_addr = HDR_IP.src_addr;
+ pseudoh.dest_addr = HDR_IP.dest_addr;
+ pseudoh.zero = 0;
+ pseudoh.protocol = (guint8) hdr_ip_proto;
+ pseudoh.length = g_htons(proto_length);
+
/* Write UDP header */
if (hdr_udp) {
- HDR_UDP.source_port = g_htons(hdr_udp_src);
- HDR_UDP.dest_port = g_htons(hdr_udp_dest);
- HDR_UDP.length = g_htons(udp_length);
+ HDR_UDP.source_port = g_htons(hdr_src_port);
+ HDR_UDP.dest_port = g_htons(hdr_dest_port);
+ HDR_UDP.length = g_htons(proto_length);
+
+ HDR_UDP.checksum = 0;
+ 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));
+ if (HDR_UDP.checksum == 0) /* differenciate between 'none' and 0 */
+ HDR_UDP.checksum = g_htons(1);
fwrite(&HDR_UDP, sizeof(HDR_UDP), 1, output_file);
}
+ /* Write TCP header */
+ if (hdr_tcp) {
+ HDR_TCP.source_port = g_htons(hdr_src_port);
+ HDR_TCP.dest_port = g_htons(hdr_dest_port);
+ /* HDR_TCP.seq_num already correct */
+ HDR_TCP.window = g_htons(0x2000);
+
+ HDR_TCP.checksum = 0;
+ 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 (HDR_TCP.checksum == 0) /* differenciate between 'none' and 0 */
+ HDR_TCP.checksum = g_htons(1);
+
+ fwrite(&HDR_TCP, sizeof(HDR_TCP), 1, output_file);
+ }
+
/* Compute DATA chunk header and append padding */
if (hdr_data_chunk) {
HDR_DATA_CHUNK.type = hdr_data_chunk_type;
}
if (!quiet)
- fprintf(stderr, "Wrote packet of %lu bytes\n", curr_offset);
+ fprintf(stderr, "Wrote packet of %lu bytes at %u\n", curr_offset, g_ntohl(HDR_TCP.seq_num));
num_packets_written ++;
}
+
+ HDR_TCP.seq_num = g_htonl(g_ntohl(HDR_TCP.seq_num) + curr_offset);
+
+ packet_start += curr_offset;
curr_offset = 0;
}
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);
+ strncpy(&packet_preamble[packet_preamble_len], str, PACKET_PREAMBLE_MAX_LEN - packet_preamble_len);
packet_preamble_len += toklen;
+ if (debug >= 2) {
+ char *c;
+ char xs[PACKET_PREAMBLE_MAX_LEN];
+ strncpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN);
+ 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;
}
/* Write out the current packet, if required */
write_current_packet();
- curr_offset = 0;
num_packets_read ++;
/* Ensure we parse the packet preamble as it may contain the time */
if (num==0) {
/* New packet starts here */
start_new_packet();
+ packet_start = 0;
state = READ_OFFSET;
- } else if (num != curr_offset) {
+ } else if ((num - packet_start) != curr_offset) {
/*
* The offset we read isn't the one we expected.
* This may only mean that we mistakenly interpreted
}
/*----------------------------------------------------------------------
- * 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"
- " [-u srcp,destp] [-s srcp,destp,tag] [-S srcp,destp,tag] [-t timefmt]\n"
- " <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|dec parse offsets as (h)ex, (o)ctal or (d)ecimal, 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"
- " -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"
- " -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"
- " -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"
+ "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"
+ "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);
+ VERSION, MAX_PACKET);
exit(-1);
}
char *p;
/* Scan CLI parameters */
- while ((c = getopt(argc, argv, "dhqe:i:l:o:u:s:S:t:")) != -1) {
+ 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 = atoi(optarg); 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]);
+ 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 (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;
case 'u':
hdr_udp = TRUE;
- hdr_udp_src = strtol(optarg, &p, 10);
+ hdr_tcp = FALSE;
+ 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_udp_dest = strtol(optarg, &p, 10);
+ 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_ethernet_proto = 0x800;
break;
+ case 'T':
+ hdr_tcp = TRUE;
+ hdr_udp = FALSE;
+ hdr_src_port = strtol(optarg, &p, 10);
+ if (p == optarg || (*p != ',' && *p != '\0')) {
+ fprintf(stderr, "Bad src port for '-T'\n");
+ usage();
+ }
+ if (*p == '\0') {
+ fprintf(stderr, "No dest port specified for '-u'\n");
+ usage();
+ }
+ p++;
+ optarg = p;
+ hdr_dest_port = strtol(optarg, &p, 10);
+ if (p == optarg || *p != '\0') {
+ fprintf(stderr, "Bad dest port for '-T'\n");
+ usage();
+ }
+ hdr_ip = TRUE;
+ hdr_ip_proto = 6;
+ hdr_ethernet = TRUE;
+ hdr_ethernet_proto = 0x800;
+ 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));
/* Some validation */
if (pcap_link_type != 1 && hdr_ethernet) {
- fprintf(stderr, "Dummy headers (-e, -i, -u, -s, -S) cannot be specified with link type override (-l)\n");
+ fprintf(stderr, "Dummy headers (-e, -i, -u, -s, -S -T) cannot be specified with link type override (-l)\n");
exit(-1);
}
output_filename = "Standard output";
}
+ ts_sec = (gint32) time(0); /* initialize to current time */
+ timecode_default = *localtime((time_t *)&ts_sec);
+
/* Display summary of our state */
if (!quiet) {
fprintf(stderr, "Input from: %s\n", input_filename);
if (hdr_ip) fprintf(stderr, "Generate dummy IP header: Protocol: %ld\n",
hdr_ip_proto);
if (hdr_udp) fprintf(stderr, "Generate dummy UDP header: Source port: %ld. Dest port: %ld\n",
- hdr_udp_src, hdr_udp_dest);
+ hdr_src_port, hdr_dest_port);
+ if (hdr_tcp) fprintf(stderr, "Generate dummy TCP header: Source port: %ld. Dest port: %ld\n",
+ hdr_src_port, hdr_dest_port);
if (hdr_sctp) fprintf(stderr, "Generate dummy SCTP header: Source port: %ld. Dest port: %ld. Tag: %ld\n",
hdr_sctp_src, hdr_sctp_dest, hdr_sctp_tag);
if (hdr_data_chunk) fprintf(stderr, "Generate dummy DATA chunk header: TSN: %lu. SID: %d. SSN: %d. PPID: %lu\n",
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;
}
git.samba.org / obnox / wireshark / wip.git / blobdiff