*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id$
- *
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
* snaplength is automatically set to 64KiB-1.
*/
-#include "config.h"
+#include <config.h>
/*
* Just make sure we include the prototype for strptime as well
# define __EXTENSIONS__
#endif
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <wsutil/file_util.h>
+#include <wsutil/crash_info.h>
+#include <wsutil/ws_diag_control.h>
+#include <wsutil/ws_version_info.h>
#include <time.h>
#include <glib.h>
# include <unistd.h>
#endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
#include <errno.h>
#include <assert.h>
-#ifndef HAVE_GETOPT
+#ifdef HAVE_LIBZ
+#include <zlib.h> /* to get the libz version number */
+#endif
+
+#ifndef HAVE_GETOPT_LONG
#include "wsutil/wsgetopt.h"
#endif
-#ifdef NEED_STRPTIME_H
+#ifndef HAVE_STRPTIME
# include "wsutil/strptime.h"
#endif
#include "pcapio.h"
#include "text2pcap.h"
-#include "svnversion.h"
#ifdef _WIN32
#include <wsutil/unicode-utils.h>
#include <winsock2.h> /* needed to define AF_ values on Windows */
#endif
-#ifndef HAVE_INET_ATON_H
+#ifndef HAVE_INET_ATON
# include "wsutil/inet_aton.h"
#endif
static guint32 hdr_ip_dest_addr = 0;
static guint32 hdr_ip_src_addr = 0;
static guint8 hdr_ipv6_dest_addr[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-static guint8 hdr_ipv6_src_addr[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-static guint8 NO_IPv6_ADDRESS[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static guint8 hdr_ipv6_src_addr[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static guint8 NO_IPv6_ADDRESS[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
/* Dummy UDP header */
-static int hdr_udp = FALSE;
+static int hdr_udp = FALSE;
static guint32 hdr_dest_port = 0;
-static guint32 hdr_src_port = 0;
+static guint32 hdr_src_port = 0;
/* Dummy TCP header */
static int hdr_tcp = FALSE;
+/* TCP sequence numbers when has_direction is true */
+static guint32 tcp_in_seq_num = 0;
+static guint32 tcp_out_seq_num = 0;
+
/* Dummy SCTP header */
static int hdr_sctp = FALSE;
static guint32 hdr_sctp_src = 0;
/* This is where we store the packet currently being built */
#define MAX_PACKET 65535
-static guint8 packet_buf[MAX_PACKET];
+static guint8 packet_buf[MAX_PACKET];
static guint32 header_length;
static guint32 ip_offset;
static guint32 curr_offset;
static guint32 max_offset = MAX_PACKET;
static guint32 packet_start = 0;
+
static void start_new_packet(gboolean);
/* This buffer contains strings present before the packet offset 0 */
#define PACKET_PREAMBLE_MAX_LEN 2048
static guint8 packet_preamble[PACKET_PREAMBLE_MAX_LEN+1];
-static int packet_preamble_len = 0;
+static int packet_preamble_len = 0;
/* Number of packets read and written */
-static guint32 num_packets_read = 0;
+static guint32 num_packets_read = 0;
static guint32 num_packets_written = 0;
-static guint64 bytes_written = 0;
+static guint64 bytes_written = 0;
/* Time code of packet, derived from packet_preamble */
-static time_t ts_sec = 0;
-static guint32 ts_usec = 0;
-static char *ts_fmt = NULL;
+static time_t ts_sec = 0;
+static guint32 ts_nsec = 0;
+static char *ts_fmt = NULL;
static struct tm timecode_default;
static guint8* pkt_lnstart;
/* Input file */
static const char *input_filename;
-static FILE *input_file = NULL;
+static FILE *input_file = NULL;
/* Output file */
static const char *output_filename;
-static FILE *output_file = NULL;
+static FILE *output_file = NULL;
/* Offset base to parse */
static guint32 offset_base = 16;
#endif
};
+/* Fixed IP address values */
+#ifdef WORDS_BIGENDIAN
+#define IP_SRC 0x0a010101
+#define IP_DST 0x0a020202
+#else
+#define IP_SRC 0x0101010a
+#define IP_DST 0x0202020a
+#endif
+
static struct { /* pseudo header for checksum calculation */
guint32 src_addr;
guint32 dest_addr;
};
typedef struct {
- union {
- struct ip6_hdrctl {
- guint32 ip6_un1_flow; /* 24 bits of flow-ID */
- guint16 ip6_un1_plen; /* payload length */
- guint8 ip6_un1_nxt; /* next header */
- guint8 ip6_un1_hlim; /* hop limit */
- } ip6_un1;
- guint8 ip6_un2_vfc; /* 4 bits version, 4 bits priority */
- } ip6_ctlun;
- struct hdr_in6_addr ip6_src; /* source address */
- struct hdr_in6_addr ip6_dst; /* destination address */
+ union {
+ struct ip6_hdrctl {
+ guint32 ip6_un1_flow; /* 24 bits of flow-ID */
+ guint16 ip6_un1_plen; /* payload length */
+ guint8 ip6_un1_nxt; /* next header */
+ guint8 ip6_un1_hlim; /* hop limit */
+ } ip6_un1;
+ guint8 ip6_un2_vfc; /* 4 bits version, 4 bits priority */
+ } ip6_ctlun;
+ struct hdr_in6_addr ip6_src; /* source address */
+ struct hdr_in6_addr ip6_dst; /* destination address */
} hdr_ipv6_t;
static hdr_ipv6_t HDR_IPv6;
static struct { /* pseudo header ipv6 for checksum calculation */
- struct hdr_in6_addr src_addr6;
- struct hdr_in6_addr dst_addr6;
- guint32 protocol;
- guint32 zero;
+ struct hdr_in6_addr src_addr6;
+ struct hdr_in6_addr dst_addr6;
+ guint32 protocol;
+ guint32 zero;
} pseudoh6;
/*----------------------------------------------------------------------
* Stuff for writing a PCap file
*/
-#define PCAP_MAGIC 0xa1b2c3d4
#define PCAP_SNAPLEN 0xffff
-/* "libpcap" file header (minus magic number). */
-struct pcap_hdr {
- guint32 magic; /* magic */
- guint16 version_major; /* major version number */
- guint16 version_minor; /* minor version number */
- guint32 thiszone; /* GMT to local correction */
- guint32 sigfigs; /* accuracy of timestamps */
- guint32 snaplen; /* max length of captured packets, in octets */
- guint32 network; /* data link type */
-};
-
-/* "libpcap" record header. */
-struct pcaprec_hdr {
- 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 */
-};
-
/* Link-layer type; see http://www.tcpdump.org/linktypes.html for details */
static guint32 pcap_link_type = 1; /* Default is LINKTYPE_ETHERNET */
static guint32
parse_num (const char *str, int offset)
{
- guint32 num;
- char *c;
+ guint32 num;
+ char *c;
+
+ if (str == NULL) {
+ fprintf(stderr, "FATAL ERROR: str is NULL\n");
+ exit(1);
+ }
num = (guint32)strtoul(str, &c, offset ? offset_base : 16);
- if (c==str) {
+ if (c == str) {
fprintf(stderr, "FATAL ERROR: Bad hex number? [%s]\n", str);
- exit(-1);
+ exit(1);
}
return num;
}
num = parse_num(str, FALSE);
packet_buf[curr_offset] = (guint8) num;
- curr_offset ++;
+ curr_offset++;
if (curr_offset - header_length >= max_offset) /* packet full */
start_new_packet(TRUE);
}
*/
static void
-write_bytes(const char bytes[], guint32 nbytes)
+write_bytes (const char bytes[], guint32 nbytes)
{
guint32 i;
};
static guint32
-crc32c(const guint8* buf, unsigned int len, guint32 crc32_init)
+crc32c (const guint8* buf, unsigned int len, guint32 crc32_init)
{
unsigned int i;
- guint32 crc32;
+ guint32 crc;
- crc32 = crc32_init;
+ crc = crc32_init;
for (i = 0; i < len; i++)
- CRC32C(crc32, buf[i]);
+ CRC32C(crc, buf[i]);
- return ( crc32 );
+ return crc;
}
static guint32
-finalize_crc32c(guint32 crc32)
+finalize_crc32c (guint32 crc)
{
guint32 result;
guint8 byte0,byte1,byte2,byte3;
- result = ~crc32;
+ result = ~crc;
byte0 = result & 0xff;
byte1 = (result>>8) & 0xff;
byte2 = (result>>16) & 0xff;
byte3 = (result>>24) & 0xff;
result = ((byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3);
- return ( result );
+ return result;
}
static guint16
* Write current packet out
*/
static void
-write_current_packet(gboolean cont)
+write_current_packet (gboolean cont)
{
- guint32 length = 0;
- guint16 padding_length = 0;
- int err;
- guint16 ihatemacros;
+ guint32 length = 0;
+ guint16 padding_length = 0;
+ int err;
+ guint16 ihatemacros;
gboolean success;
if (curr_offset > header_length) {
/* Write the packet */
+ /* Is direction indication on with an inbound packet? */
+ gboolean isInbound = has_direction && (direction == 2);
+
/* if defined IPv6 we should rewrite hdr_ethernet_proto anyways */
- if(hdr_ipv6) {
+ if (hdr_ipv6) {
hdr_ethernet_proto = 0x86DD;
hdr_ip = FALSE;
}
/* Write IP header */
if (hdr_ip) {
- if(hdr_ip_src_addr) HDR_IP.src_addr = hdr_ip_src_addr;
- if(hdr_ip_dest_addr) HDR_IP.dest_addr = hdr_ip_dest_addr;
+ if (isInbound) {
+ HDR_IP.src_addr = hdr_ip_dest_addr ? hdr_ip_dest_addr : IP_DST;
+ HDR_IP.dest_addr = hdr_ip_src_addr? hdr_ip_src_addr : IP_SRC;
+ }
+ else {
+ HDR_IP.src_addr = hdr_ip_src_addr? hdr_ip_src_addr : IP_SRC;
+ HDR_IP.dest_addr = hdr_ip_dest_addr ? hdr_ip_dest_addr : IP_DST;
+ }
HDR_IP.packet_length = g_htons(length - ip_offset + padding_length);
HDR_IP.protocol = (guint8) hdr_ip_proto;
HDR_IP.hdr_checksum = in_checksum(&HDR_IP, sizeof(HDR_IP));
write_bytes((const char *)&HDR_IP, sizeof(HDR_IP));
} else if (hdr_ipv6) {
- if(memcmp(hdr_ipv6_src_addr, NO_IPv6_ADDRESS, sizeof(struct hdr_in6_addr)))
- memcpy(&HDR_IPv6.ip6_src, &hdr_ipv6_src_addr, sizeof(struct hdr_in6_addr));
- if(memcmp(hdr_ipv6_dest_addr, NO_IPv6_ADDRESS, sizeof(struct hdr_in6_addr)))
- memcpy(&HDR_IPv6.ip6_dst, &hdr_ipv6_dest_addr, sizeof(struct hdr_in6_addr));
+ if (memcmp(isInbound ? hdr_ipv6_dest_addr : hdr_ipv6_src_addr, NO_IPv6_ADDRESS, sizeof(struct hdr_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_src, isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, sizeof(struct hdr_in6_addr));
+ if (memcmp(isInbound ? hdr_ipv6_src_addr : hdr_ipv6_dest_addr, NO_IPv6_ADDRESS, sizeof(struct hdr_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_dst, isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, sizeof(struct hdr_in6_addr));
HDR_IPv6.ip6_ctlun.ip6_un2_vfc &= 0x0F;
HDR_IPv6.ip6_ctlun.ip6_un2_vfc |= (6<< 4);
pseudoh.length = g_htons(length - ihatemacros + sizeof(HDR_UDP));
}
- if(!hdr_ipv6) {
+ if (!hdr_ipv6) {
/* initialize pseudo header for checksum calculation */
pseudoh.src_addr = HDR_IP.src_addr;
pseudoh.dest_addr = HDR_IP.dest_addr;
guint32 u;
/* initialize the UDP header */
- HDR_UDP.source_port = g_htons(hdr_src_port);
- HDR_UDP.dest_port = g_htons(hdr_dest_port);
+ HDR_UDP.source_port = isInbound ? g_htons(hdr_dest_port): g_htons(hdr_src_port);
+ HDR_UDP.dest_port = isInbound ? g_htons(hdr_src_port) : g_htons(hdr_dest_port);
HDR_UDP.length = pseudoh.length;
HDR_UDP.checksum = 0;
/* Note: g_ntohs()/g_htons() macro arg may be eval'd twice so calc value before invoking macro */
pseudoh.protocol = (guint8) hdr_ip_proto;
pseudoh.length = g_htons(length - header_length + sizeof(HDR_TCP));
/* initialize the TCP header */
- 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.source_port = isInbound ? g_htons(hdr_dest_port): g_htons(hdr_src_port);
+ HDR_TCP.dest_port = isInbound ? g_htons(hdr_src_port) : g_htons(hdr_dest_port);
+ /* set ack number if we have direction */
+ if (has_direction) {
+ HDR_TCP.flags = 0x10;
+ HDR_TCP.ack_num = g_ntohl(isInbound ? tcp_out_seq_num : tcp_in_seq_num);
+ HDR_TCP.ack_num = g_htonl(HDR_TCP.ack_num);
+ }
+ else {
+ HDR_TCP.flags = 0;
+ HDR_TCP.ack_num = 0;
+ }
+ HDR_TCP.seq_num = isInbound ? tcp_in_seq_num : tcp_out_seq_num;
HDR_TCP.window = g_htons(0x2000);
HDR_TCP.checksum = 0;
/* Note: g_ntohs()/g_htons() macro arg may be eval'd twice so calc value before invoking macro */
if (HDR_TCP.checksum == 0) /* differentiate between 'none' and 0 */
HDR_TCP.checksum = g_htons(1);
write_bytes((const char *)&HDR_TCP, sizeof(HDR_TCP));
- HDR_TCP.seq_num = g_ntohl(HDR_TCP.seq_num) + length - header_length;
- HDR_TCP.seq_num = g_htonl(HDR_TCP.seq_num);
+ if (isInbound) {
+ tcp_in_seq_num = g_ntohl(tcp_in_seq_num) + length - header_length;
+ tcp_in_seq_num = g_htonl(tcp_in_seq_num);
+ }
+ else {
+ tcp_out_seq_num = g_ntohl(tcp_out_seq_num) + length - header_length;
+ tcp_out_seq_num = g_htonl(tcp_out_seq_num);
+ }
}
/* Compute DATA chunk header */
if (hdr_sctp) {
guint32 zero = 0;
- HDR_SCTP.src_port = g_htons(hdr_sctp_src);
- HDR_SCTP.dest_port = g_htons(hdr_sctp_dest);
+ HDR_SCTP.src_port = isInbound ? g_htons(hdr_sctp_dest): g_htons(hdr_sctp_src);
+ HDR_SCTP.dest_port = isInbound ? g_htons(hdr_sctp_src) : g_htons(hdr_sctp_dest);
HDR_SCTP.tag = g_htonl(hdr_sctp_tag);
HDR_SCTP.checksum = g_htonl(0);
- HDR_SCTP.checksum = crc32c((guint8 *)&HDR_SCTP, sizeof(HDR_SCTP), ~0L);
+ HDR_SCTP.checksum = crc32c((guint8 *)&HDR_SCTP, sizeof(HDR_SCTP), ~0);
if (hdr_data_chunk) {
HDR_SCTP.checksum = crc32c((guint8 *)&HDR_DATA_CHUNK, sizeof(HDR_DATA_CHUNK), HDR_SCTP.checksum);
HDR_SCTP.checksum = crc32c((guint8 *)packet_buf + header_length, length - header_length, HDR_SCTP.checksum);
if (use_pcapng) {
success = pcapng_write_enhanced_packet_block(output_file,
NULL,
- ts_sec, ts_usec,
+ ts_sec, ts_nsec,
length, length,
0,
- 1000000,
+ 1000000000,
packet_buf, direction,
&bytes_written, &err);
} else {
success = libpcap_write_packet(output_file,
- ts_sec, ts_usec,
+ ts_sec, ts_nsec/1000,
length, length,
packet_buf,
&bytes_written, &err);
if (!success) {
fprintf(stderr, "File write error [%s] : %s\n",
output_filename, g_strerror(err));
- exit(-1);
+ exit(1);
}
if (ts_fmt == NULL) {
/* fake packet counter */
- ts_usec++;
+ if (use_pcapng)
+ ts_nsec++;
+ else
+ ts_nsec += 1000;
}
if (!quiet) {
fprintf(stderr, "Wrote packet of %u bytes.\n", length);
}
- num_packets_written ++;
+ num_packets_written++;
}
packet_start += curr_offset - header_length;
static void
write_file_header (void)
{
- int err;
+ int err;
gboolean success;
if (use_pcapng) {
-#ifdef SVNVERSION
- const char *appname = "text2pcap (" SVNVERSION " from " SVNPATH ")";
-#else
- const char *appname = "text2pcap";
-#endif
- char comment[100];
+ char *appname;
+ char *comment;
- g_snprintf(comment, sizeof(comment), "Generated from input file %s.", input_filename);
+ appname = g_strdup_printf("text2pcap (Wireshark) %s", get_ws_vcs_version_info());
+ comment = g_strdup_printf("Generated from input file %s.", input_filename);
success = pcapng_write_session_header_block(output_file,
comment,
- NULL,
- NULL,
+ NULL, /* HW */
+ NULL, /* OS */
appname,
- -1,
+ -1, /* section_length */
&bytes_written,
&err);
+ g_free(appname);
+ g_free(comment);
if (success) {
success = pcapng_write_interface_description_block(output_file,
NULL,
PCAP_SNAPLEN,
&bytes_written,
0,
- 6,
+ 9,
&err);
}
} else {
- success = libpcap_write_file_header(output_file, pcap_link_type, PCAP_SNAPLEN,
- FALSE, &bytes_written, &err);
+ success = libpcap_write_file_header(output_file, pcap_link_type,
+ PCAP_SNAPLEN, FALSE,
+ &bytes_written, &err);
}
if (!success) {
fprintf(stderr, "File write error [%s] : %s\n",
output_filename, g_strerror(err));
- exit(-1);
+ exit(1);
}
}
static void
write_file_trailer (void)
{
- int err;
+ int err;
gboolean success;
if (use_pcapng) {
if (!success) {
fprintf(stderr, "File write error [%s] : %s\n",
output_filename, g_strerror(err));
- exit(-1);
+ exit(1);
}
return;
}
* Append a token to the packet preamble.
*/
static void
-append_to_preamble(char *str)
+append_to_preamble (char *str)
{
size_t toklen;
static void
parse_preamble (void)
{
- struct tm timecode;
- char *subsecs;
- char *p;
- int subseclen;
- int i;
+ struct tm timecode;
+ char *subsecs;
+ char *p;
+ int subseclen;
+ int i;
/*
* Null-terminate the preamble.
*/
timecode = timecode_default;
- ts_usec = 0;
+ ts_nsec = 0;
/* Ensure preamble has more than two chars before attempting to parse.
* This should cover line breaks etc that get counted.
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;
+ ts_nsec = 0;
} else {
/* Parse subseconds */
- ts_usec = (guint32)strtol(subsecs, &p, 10);
+ ts_nsec = (guint32)strtol(subsecs, &p, 10);
if (subsecs == p) {
/* Error */
- ts_usec = 0;
+ ts_nsec = 0;
} else {
/*
* Convert that number to a number
* of microseconds; if it's N digits
* long, it's in units of 10^(-N) seconds,
* so, to convert it to units of
- * 10^-6 seconds, we multiply by
- * 10^(6-N).
+ * 10^-9 seconds, we multiply by
+ * 10^(9-N).
*/
subseclen = (int) (p - subsecs);
- if (subseclen > 6) {
+ if (subseclen > 9) {
/*
- * *More* than 6 digits; 6-N is
+ * *More* than 9 digits; 9-N is
* negative, so we divide by
- * 10^(N-6).
+ * 10^(N-9).
*/
- for (i = subseclen - 6; i != 0; i--)
- ts_usec /= 10;
- } else if (subseclen < 6) {
- for (i = 6 - subseclen; i != 0; i--)
- ts_usec *= 10;
+ for (i = subseclen - 9; i != 0; i--)
+ ts_nsec /= 10;
+ } else if (subseclen < 9) {
+ for (i = 9 - subseclen; i != 0; i--)
+ ts_nsec *= 10;
}
}
}
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, (guint32)ts_sec, ts_usec);
+ fprintf(stderr, "Format(%s), time(%u), subsecs(%u)\n", ts_fmt, (guint32)ts_sec, ts_nsec);
}
* Start a new packet
*/
static void
-start_new_packet(gboolean cont)
+start_new_packet (gboolean cont)
{
if (debug >= 1)
fprintf(stderr, "Start new packet (cont = %s).\n", cont ? "TRUE" : "FALSE");
/* Write out the current packet, if required */
write_current_packet(cont);
- num_packets_read ++;
+ num_packets_read++;
/* Ensure we parse the packet preamble as it may contain the time */
parse_preamble();
void
parse_token (token_t token, char *str)
{
- guint32 num;
- int by_eol;
- int rollback = 0;
- int line_size;
- int i;
- char* s2;
- char tmp_str[3];
+ guint32 num;
+ int by_eol;
+ int rollback = 0;
+ int line_size;
+ int i;
+ char *s2;
+ char tmp_str[3];
/*
* This is implemented as a simple state machine of five states.
* State transitions are caused by tokens being received from the
- * scanner. The code should be self_documenting.
+ * scanner. The code should be self-documenting.
*/
if (debug >= 2) {
state_str[state], token_str[token], str ? str : "");
}
- switch(state) {
+ switch (state) {
/* ----- Waiting for new packet -------------------------------------------*/
case INIT:
- switch(token) {
+ if (!str && token != T_EOL) goto fail_null_str;
+ switch (token) {
case T_TEXT:
append_to_preamble(str);
break;
/* ----- Processing packet, start of new line -----------------------------*/
case START_OF_LINE:
- switch(token) {
+ if (!str && token != T_EOL) goto fail_null_str;
+ switch (token) {
case T_TEXT:
append_to_preamble(str);
break;
/* ----- Processing packet, read offset -----------------------------------*/
case READ_OFFSET:
- switch(token) {
+ switch (token) {
case T_BYTE:
/* Record the byte */
state = READ_BYTE;
+ if (!str) goto fail_null_str;
write_byte(str);
break;
case T_TEXT:
/* ----- Processing packet, read byte -------------------------------------*/
case READ_BYTE:
- switch(token) {
+ switch (token) {
case T_BYTE:
/* Record the byte */
write_byte(str);
tmp_str[1] = pkt_lnstart[i*3+1];
tmp_str[2] = '\0';
/* it is a valid convertable string */
- if (!isxdigit(tmp_str[0]) || !isxdigit(tmp_str[0])) {
+ if (!g_ascii_isxdigit(tmp_str[0]) || !g_ascii_isxdigit(tmp_str[1])) {
break;
}
s2[i] = (char)strtoul(tmp_str, (char **)NULL, 16);
/* ----- Processing packet, read text -------------------------------------*/
case READ_TEXT:
- switch(token) {
+ switch (token) {
case T_EOL:
state = START_OF_LINE;
break;
default:
fprintf(stderr, "FATAL ERROR: Bad state (%d)", state);
- exit(-1);
+ exit(1);
}
- if (debug>=2)
+ if (debug >= 2)
fprintf(stderr, ", %s)\n", state_str[state]);
+ return;
+
+fail_null_str:
+ fprintf(stderr, "FATAL ERROR: got NULL str pointer in state (%d)", state);
+ exit(1);
+
}
/*----------------------------------------------------------------------
* Print usage string and exit
*/
static void
-usage (void)
+print_usage (FILE *output)
{
- fprintf(stderr,
- "Text2pcap %s"
-#ifdef 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"
+ fprintf(output,
"\n"
"Usage: text2pcap [options] <infile> <outfile>\n"
"\n"
" Example: -4 10.0.0.1,10.0.0.2\n"
" -6 <srcip>,<destip> replace IPv6 header with specified\n"
" dest and source address.\n"
- " Example: -6 fe80:0:0:0:202:b3ff:fe1e:8329, 2001:0db8:85a3:0000:0000:8a2e:0370:7334\n"
+ " Example: -6 fe80:0:0:0:202:b3ff:fe1e:8329,2001:0db8:85a3:0000:0000:8a2e:0370:7334\n"
" -u <srcp>,<destp> prepend dummy UDP header with specified\n"
" source and destination ports (in DECIMAL).\n"
" Automatically prepends Ethernet & IP headers as well.\n"
" -q generate no output at all (automatically disables -d).\n"
" -n use PCAP-NG instead of PCAP as output format.\n"
"",
- VERSION, MAX_PACKET);
+ MAX_PACKET);
+}
+
+static void
+get_text2pcap_compiled_info(GString *str)
+{
+ /* LIBZ */
+ g_string_append(str, ", ");
+#ifdef HAVE_LIBZ
+ g_string_append(str, "with libz ");
+#ifdef ZLIB_VERSION
+ g_string_append(str, ZLIB_VERSION);
+#else /* ZLIB_VERSION */
+ g_string_append(str, "(version unknown)");
+#endif /* ZLIB_VERSION */
+#else /* HAVE_LIBZ */
+ g_string_append(str, "without libz");
+#endif /* HAVE_LIBZ */
+}
- exit(-1);
+static void
+get_text2pcap_runtime_info(GString *str)
+{
+ /* zlib */
+#if defined(HAVE_LIBZ) && !defined(_WIN32)
+ g_string_append_printf(str, ", with libz %s", zlibVersion());
+#endif
}
/*----------------------------------------------------------------------
static void
parse_options (int argc, char *argv[])
{
- int c;
+ GString *comp_info_str;
+ GString *runtime_info_str;
+ int c;
char *p;
+DIAG_OFF(cast-qual)
+ static const struct option long_options[] = {
+ {(char *)"help", no_argument, NULL, 'h'},
+ {(char *)"version", no_argument, NULL, 'v'},
+ {0, 0, 0, 0 }
+ };
+DIAG_ON(cast-qual)
#ifdef _WIN32
arg_list_utf_16to8(argc, argv);
create_app_running_mutex();
#endif /* _WIN32 */
+ /* Get the compile-time version information string */
+ comp_info_str = get_compiled_version_info(NULL, get_text2pcap_compiled_info);
+
+ /* get the run-time version information string */
+ runtime_info_str = get_runtime_version_info(get_text2pcap_runtime_info);
+
+ /* Add it to the information to be reported on a crash. */
+ ws_add_crash_info("Text2pcap (Wireshark) %s\n"
+ "\n"
+ "%s"
+ "\n"
+ "%s",
+ get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
+
/* Scan CLI parameters */
- while ((c = getopt(argc, argv, "aDdhqe:i:l:m:no:u:s:S:t:T:4:6:")) != -1) {
- switch(c) {
- case '?': usage(); break;
- case 'h': usage(); break;
+ while ((c = getopt_long(argc, argv, "aDdhqe:i:l:m:no:u:s:S:t:T:v4:6:", long_options, NULL)) != -1) {
+ switch (c) {
+ case 'h':
+ printf("Text2pcap (Wireshark) %s\n"
+ "Generate a capture file from an ASCII hexdump of packets.\n"
+ "See http://www.wireshark.org for more information.\n",
+ get_ws_vcs_version_info());
+ print_usage(stdout);
+ exit(0);
+ break;
case 'd': if (!quiet) debug++; break;
case 'D': has_direction = TRUE; break;
case 'q': quiet = TRUE; debug = FALSE; break;
case 'm': max_offset = (guint32)strtol(optarg, NULL, 0); break;
case 'n': use_pcapng = TRUE; break;
case 'o':
- if (optarg[0]!='h' && optarg[0] != 'o' && optarg[0] != 'd') {
+ if (optarg[0] != 'h' && optarg[0] != 'o' && optarg[0] != 'd') {
fprintf(stderr, "Bad argument for '-o': %s\n", optarg);
- usage();
+ print_usage(stderr);
+ exit(1);
}
- switch(optarg[0]) {
- case 'o': offset_base = 8; break;
+ switch (optarg[0]) {
+ case 'o': offset_base = 8; break;
case 'h': offset_base = 16; break;
case 'd': offset_base = 10; break;
}
hdr_ethernet = TRUE;
if (sscanf(optarg, "%x", &hdr_ethernet_proto) < 1) {
fprintf(stderr, "Bad argument for '-e': %s\n", optarg);
- usage();
+ print_usage(stderr);
+ exit(1);
}
break;
if (p == optarg || *p != '\0' || hdr_ip_proto < 0 ||
hdr_ip_proto > 255) {
fprintf(stderr, "Bad argument for '-i': %s\n", optarg);
- usage();
+ print_usage(stderr);
+ exit(1);
}
hdr_ethernet = TRUE;
hdr_ethernet_proto = 0x800;
hdr_sctp_src = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
p++;
optarg = p;
hdr_sctp_dest = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad dest port for '-s'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (*p == '\0') {
fprintf(stderr, "No tag specified for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
p++;
optarg = p;
hdr_sctp_tag = (guint32)strtol(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad tag for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
hdr_ip = TRUE;
hdr_sctp_src = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
p++;
optarg = p;
hdr_sctp_dest = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad dest port for '-s'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (*p == '\0') {
fprintf(stderr, "No ppi specified for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
p++;
optarg = p;
hdr_data_chunk_ppid = (guint32)strtoul(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad ppi for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
hdr_ip = TRUE;
hdr_src_port = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-u'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
p++;
optarg = p;
hdr_dest_port = (guint32)strtol(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad dest port for '-u'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
hdr_ip = TRUE;
hdr_ip_proto = 17;
hdr_src_port = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-T'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
p++;
optarg = p;
hdr_dest_port = (guint32)strtol(optarg, &p, 10);
if (p == optarg || *p != '\0') {
fprintf(stderr, "Bad dest port for '-T'\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
hdr_ip = TRUE;
hdr_ip_proto = 6;
identify_ascii = TRUE;
break;
+ case 'v':
+ show_version("Text2pcap (Wireshark)", comp_info_str, runtime_info_str);
+ g_string_free(comp_info_str, TRUE);
+ g_string_free(runtime_info_str, TRUE);
+ exit(0);
+ break;
+
case '4':
case '6':
p = strchr(optarg, ',');
if (!p) {
fprintf(stderr, "Bad source param addr for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
*p = '\0';
- if(c == '6')
+ if (c == '6')
{
hdr_ipv6 = TRUE;
hdr_ethernet_proto = 0x86DD;
hdr_ethernet = TRUE;
if (hdr_ipv6 == TRUE) {
- if(inet_pton( AF_INET6, optarg, hdr_ipv6_src_addr) <= 0) {
+ if (inet_pton( AF_INET6, optarg, hdr_ipv6_src_addr) <= 0) {
fprintf(stderr, "Bad src addr -%c '%s'\n", c, p);
- usage();
+ print_usage(stderr);
+ exit(1);
}
} else {
- if(inet_pton( AF_INET, optarg, &hdr_ip_src_addr) <= 0) {
+ if (inet_pton( AF_INET, optarg, &hdr_ip_src_addr) <= 0) {
fprintf(stderr, "Bad src addr -%c '%s'\n", c, p);
- usage();
+ print_usage(stderr);
+ exit(1);
}
}
p++;
if (*p == '\0') {
fprintf(stderr, "No dest addr specified for '-%c'\n", c);
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (hdr_ipv6 == TRUE) {
- if(inet_pton( AF_INET6, p, hdr_ipv6_dest_addr) <= 0) {
+ if (inet_pton( AF_INET6, p, hdr_ipv6_dest_addr) <= 0) {
fprintf(stderr, "Bad dest addr for -%c '%s'\n", c, p);
- usage();
+ print_usage(stderr);
+ exit(1);
}
} else {
- if(inet_pton( AF_INET, p, &hdr_ip_dest_addr) <= 0) {
+ if (inet_pton( AF_INET, p, &hdr_ip_dest_addr) <= 0) {
fprintf(stderr, "Bad dest addr for -%c '%s'\n", c, p);
- usage();
+ print_usage(stderr);
+ exit(1);
}
}
break;
+ case '?':
default:
- usage();
+ print_usage(stderr);
+ exit(1);
}
}
if (optind >= argc || argc-optind < 2) {
fprintf(stderr, "Must specify input and output filename\n");
- usage();
+ print_usage(stderr);
+ exit(1);
}
if (strcmp(argv[optind], "-")) {
if (!input_file) {
fprintf(stderr, "Cannot open file [%s] for reading: %s\n",
input_filename, g_strerror(errno));
- exit(-1);
+ exit(1);
}
} else {
input_filename = "Standard input";
if (!output_file) {
fprintf(stderr, "Cannot open file [%s] for writing: %s\n",
output_filename, g_strerror(errno));
- exit(-1);
+ exit(1);
}
} else {
output_filename = "Standard output";
/* Some validation */
if (pcap_link_type != 1 && hdr_ethernet) {
fprintf(stderr, "Dummy headers (-e, -i, -u, -s, -S -T) cannot be specified with link type override (-l)\n");
- exit(-1);
+ exit(1);
}
/* Set up our variables */
/* Display summary of our state */
if (!quiet) {
fprintf(stderr, "Input from: %s\n", input_filename);
- fprintf(stderr, "Output to: %s\n", output_filename);
+ fprintf(stderr, "Output to: %s\n", output_filename);
fprintf(stderr, "Output format: %s\n", use_pcapng ? "PCAP-NG" : "PCAP");
if (hdr_ethernet) fprintf(stderr, "Generate dummy Ethernet header: Protocol: 0x%0X\n",
hdr_src_port, hdr_dest_port);
if (hdr_sctp) fprintf(stderr, "Generate dummy SCTP header: Source port: %u. Dest port: %u. Tag: %u\n",
hdr_sctp_src, hdr_sctp_dest, hdr_sctp_tag);
- if (hdr_data_chunk) fprintf(stderr, "Generate dummy DATA chunk header: TSN: %u. SID: %d. SSN: %d. PPID: %u\n",
+ if (hdr_data_chunk) fprintf(stderr, "Generate dummy DATA chunk header: TSN: %u. SID: %u. SSN: %u. PPID: %u\n",
hdr_data_chunk_tsn, hdr_data_chunk_sid, hdr_data_chunk_ssn, hdr_data_chunk_ppid);
}
}
{
parse_options(argc, argv);
- assert(input_file != NULL);
+ assert(input_file != NULL);
assert(output_file != NULL);
write_file_header();
*
* Local variables:
* c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/