* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*******************************************************************************/
* This utility reads in an ASCII hexdump of this common format:
*
* 00000000 00 E0 1E A7 05 6F 00 10 5A A0 B9 12 08 00 46 00 .....o..Z.....F.
- * 00000010 03 68 00 00 00 00 0A 2E EE 33 0F 19 08 7F 0F 19 .h.......3...\7f..
+ * 00000010 03 68 00 00 00 00 0A 2E EE 33 0F 19 08 7F 0F 19 .h.......3......
* 00000020 03 80 94 04 00 00 10 01 16 A2 0A 00 03 50 00 0C .............P..
* 00000030 01 01 0F 19 03 80 11 01 1E 61 00 0C 03 01 0F 19 .........a......
*
* - No text appears between the offset and the bytes (any bytes appearing after
* such text would be ignored)
*
- * - The offset must be arithmetically correct, i.e. if the offset is 00000020, then
- * exactly 32 bytes must have been read into this packet before this. If the offset
- * is wrong, the packet is immediately terminated
+ * - The offset must be arithmetically correct, i.e. if the offset is 00000020,
+ * then exactly 32 bytes must have been read into this packet before this.
+ * If the offset is wrong, the packet is immediately terminated
*
* A packet start is signaled by a zero offset.
*
*
* 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 or TCP headers to the packets in order
+ * dummy Ethernet, IP and UDP, TCP or SCTP 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
* hexdump line is dropped (including mail forwarding '>'). The offset
* can be any hex number of four digits or greater.
*
- * This converter cannot read a single packet greater than 64KiB-1. Packet
- * snaplength is automatically set to 64KiB-1.
+ * This converter cannot read a single packet greater than
+ * WTAP_MAX_PACKET_SIZE_STANDARD. The snapshot length is automatically
+ * set to WTAP_MAX_PACKET_SIZE_STANDARD.
*/
-#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 <cli_main.h>
+#include <version_info.h>
+#include <wsutil/inet_addr.h>
+
+#ifdef _WIN32
+#include <io.h> /* for _setmode */
+#include <fcntl.h> /* for O_BINARY */
+#endif
#include <time.h>
#include <glib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#include <errno.h>
#include <assert.h>
-#ifndef HAVE_GETOPT
+#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 "writecap/pcapio.h"
#include "text2pcap.h"
-#include "version.h"
-
-#ifdef _WIN32
-#include <wsutil/unicode-utils.h>
-#endif /* _WIN32 */
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h> /* needed to define AF_ values on Windows */
-#endif
-
-#ifndef HAVE_INET_ATON_H
-# include "wsutil/inet_aton.h"
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef NEED_INET_V6DEFS_H
-# include "wsutil/inet_v6defs.h"
-#endif
+#include "wiretap/wtap.h"
/*--- Options --------------------------------------------------------------------*/
/* File format */
static gboolean use_pcapng = FALSE;
+/* Interface name */
+static char *interface_name = NULL;
+
/* Debug level */
static int debug = 0;
/* Be quiet */
-static int quiet = FALSE;
+static gboolean quiet = FALSE;
/* Dummy Ethernet header */
static int hdr_ethernet = FALSE;
+static guint8 hdr_eth_dest_addr[6] = {0x0a, 0x02, 0x02, 0x02, 0x02, 0x02};
+static guint8 hdr_eth_src_addr[6] = {0x0a, 0x02, 0x02, 0x02, 0x02, 0x01};
static guint32 hdr_ethernet_proto = 0;
/* Dummy IP header */
-static int hdr_ip = FALSE;
-static int hdr_ipv6 = FALSE;
-static long hdr_ip_proto = 0;
+static gboolean hdr_ip = FALSE;
+static gboolean hdr_ipv6 = FALSE;
+static long hdr_ip_proto = -1;
/* Destination and source addresses for IP header */
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 ws_in6_addr hdr_ipv6_dest_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
+static ws_in6_addr hdr_ipv6_src_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
+static ws_in6_addr NO_IPv6_ADDRESS = {{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 gboolean hdr_udp = FALSE;
static guint32 hdr_dest_port = 0;
static guint32 hdr_src_port = 0;
/* Dummy TCP header */
-static int hdr_tcp = FALSE;
+static gboolean 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 gboolean hdr_sctp = FALSE;
static guint32 hdr_sctp_src = 0;
static guint32 hdr_sctp_dest = 0;
static guint32 hdr_sctp_tag = 0;
/* Dummy DATA chunk header */
-static int hdr_data_chunk = FALSE;
+static gboolean hdr_data_chunk = FALSE;
static guint8 hdr_data_chunk_type = 0;
static guint8 hdr_data_chunk_bits = 0;
static guint32 hdr_data_chunk_tsn = 0;
static guint32 hdr_data_chunk_ppid = 0;
/* ASCII text dump identification */
-static int identify_ascii = FALSE;
+static gboolean identify_ascii = FALSE;
static gboolean has_direction = FALSE;
static guint32 direction = 0;
-/*--- Local date -----------------------------------------------------------------*/
+/*--- Local data -----------------------------------------------------------------*/
/* This is where we store the packet currently being built */
-#define MAX_PACKET 65535
-static guint8 packet_buf[MAX_PACKET];
+static guint8 packet_buf[WTAP_MAX_PACKET_SIZE_STANDARD];
static guint32 header_length;
static guint32 ip_offset;
static guint32 curr_offset;
-static guint32 max_offset = MAX_PACKET;
+static guint32 max_offset = WTAP_MAX_PACKET_SIZE_STANDARD;
static guint32 packet_start = 0;
-static void start_new_packet(gboolean);
+static int start_new_packet(gboolean);
/* This buffer contains strings present before the packet offset 0 */
#define PACKET_PREAMBLE_MAX_LEN 2048
/* Time code of packet, derived from packet_preamble */
static time_t ts_sec = 0;
-static guint32 ts_usec = 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 char *input_filename;
static FILE *input_file = NULL;
/* Output file */
-static const char *output_filename;
+static char *output_filename;
static FILE *output_file = NULL;
/* Offset base to parse */
static guint32 offset_base = 16;
-extern FILE *yyin;
+extern FILE *text2pcap_in;
/* ----- State machine -----------------------------------------------------------*/
guint16 l3pid;
} hdr_ethernet_t;
-static hdr_ethernet_t HDR_ETHERNET = {
- {0x0a, 0x02, 0x02, 0x02, 0x02, 0x02},
- {0x0a, 0x01, 0x01, 0x01, 0x01, 0x01},
- 0};
+static hdr_ethernet_t HDR_ETHERNET;
typedef struct {
guint8 ver_hdrlen;
guint32 dest_addr;
} hdr_ip_t;
-static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 0, 0,
-#ifdef WORDS_BIGENDIAN
-0x0a010101, 0x0a020202
-#else
-0x0101010a, 0x0202020a
-#endif
-};
-
/* Fixed IP address values */
-#ifdef WORDS_BIGENDIAN
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+#define IP_ID 0x1234
#define IP_SRC 0x0a010101
#define IP_DST 0x0a020202
#else
+#define IP_ID 0x3412
#define IP_SRC 0x0101010a
#define IP_DST 0x0202020a
#endif
+static hdr_ip_t HDR_IP = {0x45, 0, 0, IP_ID, 0, 0, 0xff, 0, 0, IP_SRC, IP_DST};
+
static struct { /* pseudo header for checksum calculation */
guint32 src_addr;
guint32 dest_addr;
/* headers taken from glibc */
-/* IPv6 address */
-struct hdr_in6_addr
-{
- union
- {
- guint8 __u6_addr8[16];
- guint16 __u6_addr16[8];
- guint32 __u6_addr32[4];
- } __in6_u;
-};
-
typedef struct {
union {
struct ip6_hdrctl {
} 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 */
+ ws_in6_addr ip6_src; /* source address */
+ ws_in6_addr ip6_dst; /* destination address */
} hdr_ipv6_t;
static hdr_ipv6_t HDR_IPv6;
+/* https://tools.ietf.org/html/rfc2460#section-8.1 */
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 e_in6_addr src_addr6;
+ struct e_in6_addr dst_addr6;
+ guint32 length;
+ guint8 zero[3];
+ guint8 next_header;
} 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 */
* Will abort the program if it can't parse the number
* Pass in TRUE if this is an offset, FALSE if not
*/
-static guint32
-parse_num (const char *str, int offset)
+static int
+parse_num(const char *str, int offset, guint32* num)
{
- guint32 num;
char *c;
if (str == NULL) {
fprintf(stderr, "FATAL ERROR: str is NULL\n");
- exit(1);
+ return EXIT_FAILURE;
}
- num = (guint32)strtoul(str, &c, offset ? offset_base : 16);
+ *num = (guint32)strtoul(str, &c, offset ? offset_base : 16);
if (c == str) {
fprintf(stderr, "FATAL ERROR: Bad hex number? [%s]\n", str);
- exit(1);
+ return EXIT_FAILURE;
}
- return num;
+ return EXIT_SUCCESS;
}
/*----------------------------------------------------------------------
* Write this byte into current packet
*/
-static void
-write_byte (const char *str)
+static int
+write_byte(const char *str)
{
guint32 num;
- num = parse_num(str, FALSE);
+ if (parse_num(str, FALSE, &num) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
+
packet_buf[curr_offset] = (guint8) num;
curr_offset++;
if (curr_offset - header_length >= max_offset) /* packet full */
- start_new_packet(TRUE);
+ if (start_new_packet(TRUE) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
+
+ return EXIT_SUCCESS;
}
/*----------------------------------------------------------------------
{
guint32 i;
- if (curr_offset + nbytes < MAX_PACKET) {
+ if (curr_offset + nbytes < WTAP_MAX_PACKET_SIZE_STANDARD) {
for (i = 0; i < nbytes; i++) {
packet_buf[curr_offset] = bytes[i];
curr_offset++;
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;
/*----------------------------------------------------------------------
* Write current packet out
*/
-static void
+static int
write_current_packet (gboolean cont)
{
guint32 length = 0;
guint16 padding_length = 0;
int err;
- guint16 ihatemacros;
gboolean success;
if (curr_offset > header_length) {
/* 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) {
- hdr_ethernet_proto = 0x86DD;
- hdr_ip = FALSE;
- }
-
/* Compute packet length */
length = curr_offset;
if (hdr_sctp) {
/* Write Ethernet header */
if (hdr_ethernet) {
+ if (isInbound)
+ {
+ memcpy(HDR_ETHERNET.dest_addr, hdr_eth_src_addr, 6);
+ memcpy(HDR_ETHERNET.src_addr, hdr_eth_dest_addr, 6);
+ } else {
+ memcpy(HDR_ETHERNET.dest_addr, hdr_eth_dest_addr, 6);
+ memcpy(HDR_ETHERNET.src_addr, hdr_eth_src_addr, 6);
+ }
HDR_ETHERNET.l3pid = g_htons(hdr_ethernet_proto);
write_bytes((const char *)&HDR_ETHERNET, sizeof(HDR_ETHERNET));
}
HDR_IP.hdr_checksum = 0;
HDR_IP.hdr_checksum = in_checksum(&HDR_IP, sizeof(HDR_IP));
write_bytes((const char *)&HDR_IP, sizeof(HDR_IP));
+
+ /* 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;
+ if (hdr_tcp) {
+ pseudoh.length = g_htons(length - header_length + sizeof(HDR_TCP));
+ } else if (hdr_udp) {
+ pseudoh.length = g_htons(length - header_length + sizeof(HDR_UDP));
+ }
} else if (hdr_ipv6) {
- 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));
+ if (memcmp(isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, &NO_IPv6_ADDRESS, sizeof(ws_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_src, isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, sizeof(ws_in6_addr));
+ if (memcmp(isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, &NO_IPv6_ADDRESS, sizeof(ws_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_dst, isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, sizeof(ws_in6_addr));
HDR_IPv6.ip6_ctlun.ip6_un2_vfc &= 0x0F;
HDR_IPv6.ip6_ctlun.ip6_un2_vfc |= (6<< 4);
- HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen = g_htons(length - ip_offset + padding_length);
+ HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen = g_htons(length - ip_offset - sizeof(HDR_IPv6) + padding_length);
HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_nxt = (guint8) hdr_ip_proto;
HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_hlim = 32;
write_bytes((const char *)&HDR_IPv6, sizeof(HDR_IPv6));
/* initialize pseudo ipv6 header for checksum calculation */
pseudoh6.src_addr6 = HDR_IPv6.ip6_src;
pseudoh6.dst_addr6 = HDR_IPv6.ip6_dst;
- pseudoh6.zero = 0;
- pseudoh6.protocol = (guint8) hdr_ip_proto;
- ihatemacros = g_ntohs(HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen);
- pseudoh.length = g_htons(length - ihatemacros + sizeof(HDR_UDP));
- }
-
- if (!hdr_ipv6) {
- /* 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(length - header_length + sizeof(HDR_UDP));
+ memset(pseudoh6.zero, 0, sizeof(pseudoh6.zero));
+ pseudoh6.next_header = (guint8) hdr_ip_proto;
+ if (hdr_tcp) {
+ pseudoh6.length = g_htons(length - header_length + sizeof(HDR_TCP));
+ } else if (hdr_udp) {
+ pseudoh6.length = g_htons(length - header_length + sizeof(HDR_UDP));
+ }
}
/* Write UDP header */
/* initialize the UDP header */
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.length = hdr_ipv6 ? pseudoh6.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 */
x16 = hdr_ipv6 ? in_checksum(&pseudoh6, sizeof(pseudoh6)) : in_checksum(&pseudoh, sizeof(pseudoh));
guint16 x16;
guint32 u;
- /* 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(length - header_length + sizeof(HDR_TCP));
/* initialize the TCP header */
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);
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 */
- x16 = in_checksum(&pseudoh, sizeof(pseudoh));
+ x16 = hdr_ipv6 ? in_checksum(&pseudoh6, sizeof(pseudoh6)) : in_checksum(&pseudoh, sizeof(pseudoh));
u = g_ntohs(x16);
x16 = in_checksum(&HDR_TCP, sizeof(HDR_TCP));
u += g_ntohs(x16);
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);
+ return EXIT_FAILURE;
}
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);
packet_start += curr_offset - header_length;
curr_offset = header_length;
- return;
+ return EXIT_SUCCESS;
}
/*----------------------------------------------------------------------
* Write file header and trailer
*/
-static void
+static int
write_file_header (void)
{
int err;
gboolean success;
if (use_pcapng) {
-#ifdef GITVERSION
- const char *appname = "text2pcap (" GITVERSION " from " GITBRANCH ")";
-#else
- const char *appname = "text2pcap";
-#endif
- char comment[100];
+ char *comment;
- g_snprintf(comment, sizeof(comment), "Generated from input file %s.", input_filename);
- success = pcapng_write_session_header_block(output_file,
+ comment = g_strdup_printf("Generated from input file %s.", input_filename);
+ success = pcapng_write_section_header_block(output_file,
comment,
- NULL,
- NULL,
- appname,
- -1,
+ NULL, /* HW */
+ NULL, /* OS */
+ get_appname_and_version(),
+ -1, /* section_length */
&bytes_written,
&err);
+ g_free(comment);
if (success) {
success = pcapng_write_interface_description_block(output_file,
NULL,
- NULL,
+ interface_name,
NULL,
"",
NULL,
pcap_link_type,
- PCAP_SNAPLEN,
+ WTAP_MAX_PACKET_SIZE_STANDARD,
&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,
+ WTAP_MAX_PACKET_SIZE_STANDARD, FALSE,
+ &bytes_written, &err);
}
if (!success) {
fprintf(stderr, "File write error [%s] : %s\n",
output_filename, g_strerror(err));
- exit(1);
+ return EXIT_FAILURE;
}
-}
-static void
-write_file_trailer (void)
-{
- int err;
- gboolean success;
-
- if (use_pcapng) {
- success = pcapng_write_interface_statistics_block(output_file,
- 0,
- &bytes_written,
- "Counters provided by text2pcap",
- 0,
- 0,
- num_packets_written,
- num_packets_written - num_packets_written,
- &err);
-
- } else {
- success = TRUE;
- }
- if (!success) {
- fprintf(stderr, "File write error [%s] : %s\n",
- output_filename, g_strerror(err));
- exit(1);
- }
- return;
+ return EXIT_SUCCESS;
}
/*----------------------------------------------------------------------
*/
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
+static int
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);
+ if (write_current_packet(cont) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
num_packets_read++;
/* Ensure we parse the packet preamble as it may contain the time */
parse_preamble();
+
+ return EXIT_SUCCESS;
}
/*----------------------------------------------------------------------
/*----------------------------------------------------------------------
* Parse a single token (called from the scanner)
*/
-void
+int
parse_token (token_t token, char *str)
{
guint32 num;
process_directive(str);
break;
case T_OFFSET:
- num = parse_num(str, TRUE);
+ if (parse_num(str, TRUE, &num) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
if (num == 0) {
/* New packet starts here */
- start_new_packet(FALSE);
+ if (start_new_packet(FALSE) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
state = READ_OFFSET;
pkt_lnstart = packet_buf + num;
}
process_directive(str);
break;
case T_OFFSET:
- num = parse_num(str, TRUE);
+ if (parse_num(str, TRUE, &num) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
if (num == 0) {
/* New packet starts here */
- start_new_packet(FALSE);
+ if (start_new_packet(FALSE) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
packet_start = 0;
state = READ_OFFSET;
} else if ((num - packet_start) != curr_offset - header_length) {
if (debug >= 1)
fprintf(stderr, "Inconsistent offset. Expecting %0X, got %0X. Ignoring rest of packet\n",
curr_offset, num);
- write_current_packet(FALSE);
+ if (write_current_packet(FALSE) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
state = INIT;
}
- } else
+ } else {
state = READ_OFFSET;
- pkt_lnstart = packet_buf + num;
+ }
+ pkt_lnstart = packet_buf + num;
break;
case T_EOL:
state = START_OF_LINE;
/* Record the byte */
state = READ_BYTE;
if (!str) goto fail_null_str;
- write_byte(str);
+ if (write_byte(str) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
break;
case T_TEXT:
case T_DIRECTIVE:
switch (token) {
case T_BYTE:
/* Record the byte */
- write_byte(str);
+ if (write_byte(str) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
break;
case T_TEXT:
case T_DIRECTIVE:
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);
default:
fprintf(stderr, "FATAL ERROR: Bad state (%d)", state);
- exit(1);
+ return EXIT_FAILURE;
}
if (debug >= 2)
fprintf(stderr, ", %s)\n", state_str[state]);
- return;
+ return EXIT_SUCCESS;
fail_null_str:
fprintf(stderr, "FATAL ERROR: got NULL str pointer in state (%d)", state);
- exit(1);
-
-}
-
-static void
-print_version(FILE *output)
-{
- fprintf(output, "Text2pcap %s"
-#ifdef GITVERSION
- " (" GITVERSION " from " GITBRANCH ")"
-#endif
- "\n", VERSION);
+ return EXIT_FAILURE;
}
/*----------------------------------------------------------------------
* Print usage string and exit
*/
static void
-usage (gboolean is_error)
+print_usage (FILE *output)
{
- FILE *output;
-
- if (!is_error) {
- output = stdout;
- }
- else {
- output = stderr;
- }
-
- print_version(output);
fprintf(output,
- "Generate a capture file from an ASCII hexdump of packets.\n"
- "See http://www.wireshark.org for more information.\n"
"\n"
"Usage: text2pcap [options] <infile> <outfile>\n"
"\n"
" used as the default for unspecified fields.\n"
" -D the text before the packet starts with an I or an O,\n"
" indicating that the packet is inbound or outbound.\n"
- " This is only stored if the output format is PCAP-NG.\n"
+ " This is used when generating dummy headers.\n"
+ " The indication is only stored if the output format is pcapng.\n"
" -a enable ASCII text dump identification.\n"
" The start of the ASCII text dump can be identified\n"
" and excluded from the packet data, even if it looks\n"
" specify 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 use pcapng instead of pcap as output format.\n"
+ " -N <intf-name> assign name to the interface in the pcapng file.\n"
"\n"
"Prepend dummy header:\n"
" -e <l3pid> prepend dummy Ethernet II header with specified L3PID\n"
" -4 <srcip>,<destip> prepend dummy IPv4 header with specified\n"
" dest and source address.\n"
" Example: -4 10.0.0.1,10.0.0.2\n"
- " -6 <srcip>,<destip> replace IPv6 header with specified\n"
+ " -6 <srcip>,<destip> prepend dummy 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::202:b3ff:fe1e:8329,2001:0db8:85a3::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"
" -h display this help and exit.\n"
" -d show detailed debug of parser states.\n"
" -q generate no output at all (automatically disables -d).\n"
- " -n use PCAP-NG instead of PCAP as output format.\n"
"",
- MAX_PACKET);
-
- exit(is_error ? 1 : 0);
+ WTAP_MAX_PACKET_SIZE_STANDARD);
}
/*----------------------------------------------------------------------
* Parse CLI options
*/
-static void
+static int
parse_options (int argc, char *argv[])
{
int c;
char *p;
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
+ struct tm *now_tm;
-#ifdef _WIN32
- arg_list_utf_16to8(argc, argv);
- create_app_running_mutex();
-#endif /* _WIN32 */
+ /* Initialize the version information. */
+ ws_init_version_info("Text2pcap (Wireshark)", NULL, NULL, NULL);
/* Scan CLI parameters */
- while ((c = getopt_long(argc, argv, "aDdhqe:i:l:m:no:u:s:S:t:T:v4:6:", long_options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "aDdhqe:i:l:m:nN:o:u:s:S:t:T:v4:6:", long_options, NULL)) != -1) {
switch (c) {
- case '?': usage(TRUE); break;
- case 'h': usage(FALSE); break;
+ case 'h':
+ show_help_header("Generate a capture file from an ASCII hexdump of packets.");
+ 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 'q': quiet = TRUE; debug = 0; break;
case 'l': pcap_link_type = (guint32)strtol(optarg, NULL, 0); break;
case 'm': max_offset = (guint32)strtol(optarg, NULL, 0); break;
case 'n': use_pcapng = TRUE; break;
+ case 'N': interface_name = optarg; break;
case 'o':
if (optarg[0] != 'h' && optarg[0] != 'o' && optarg[0] != 'd') {
fprintf(stderr, "Bad argument for '-o': %s\n", optarg);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
switch (optarg[0]) {
case 'o': offset_base = 8; break;
hdr_ethernet = TRUE;
if (sscanf(optarg, "%x", &hdr_ethernet_proto) < 1) {
fprintf(stderr, "Bad argument for '-e': %s\n", optarg);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
break;
case 'i':
- hdr_ip = TRUE;
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);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
hdr_ethernet = TRUE;
- hdr_ethernet_proto = 0x800;
break;
case 's':
hdr_sctp_src = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-%c'\n", c);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No tag specified for '-%c'\n", c);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
- hdr_ip = TRUE;
hdr_ip_proto = 132;
hdr_ethernet = TRUE;
- hdr_ethernet_proto = 0x800;
break;
case 'S':
hdr_sctp = 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(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No ppi specified for '-%c'\n", c);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
- hdr_ip = TRUE;
hdr_ip_proto = 132;
hdr_ethernet = TRUE;
- hdr_ethernet_proto = 0x800;
break;
case 't':
hdr_src_port = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-u'\n");
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
- hdr_ip = TRUE;
hdr_ip_proto = 17;
hdr_ethernet = TRUE;
- hdr_ethernet_proto = 0x800;
break;
case 'T':
hdr_src_port = (guint32)strtol(optarg, &p, 10);
if (p == optarg || (*p != ',' && *p != '\0')) {
fprintf(stderr, "Bad src port for '-T'\n");
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
- hdr_ip = TRUE;
hdr_ip_proto = 6;
hdr_ethernet = TRUE;
- hdr_ethernet_proto = 0x800;
break;
case 'a':
break;
case 'v':
- print_version(stdout);
+ show_version();
exit(0);
break;
if (!p) {
fprintf(stderr, "Bad source param addr for '-%c'\n", c);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
*p = '\0';
if (c == '6')
{
hdr_ipv6 = TRUE;
- hdr_ethernet_proto = 0x86DD;
+ hdr_ip = FALSE;
}
else
{
- hdr_ip = TRUE;
- hdr_ethernet_proto = 0x800;
+ hdr_ip = TRUE;
+ hdr_ipv6 = FALSE;
}
hdr_ethernet = TRUE;
if (hdr_ipv6 == TRUE) {
- if (inet_pton( AF_INET6, optarg, hdr_ipv6_src_addr) <= 0) {
+ if (!ws_inet_pton6(optarg, &hdr_ipv6_src_addr)) {
fprintf(stderr, "Bad src addr -%c '%s'\n", c, p);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
} else {
- if (inet_pton( AF_INET, optarg, &hdr_ip_src_addr) <= 0) {
+ if (!ws_inet_pton4(optarg, &hdr_ip_src_addr)) {
fprintf(stderr, "Bad src addr -%c '%s'\n", c, p);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
}
p++;
if (*p == '\0') {
fprintf(stderr, "No dest addr specified for '-%c'\n", c);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (hdr_ipv6 == TRUE) {
- if (inet_pton( AF_INET6, p, hdr_ipv6_dest_addr) <= 0) {
+ if (!ws_inet_pton6(p, &hdr_ipv6_dest_addr)) {
fprintf(stderr, "Bad dest addr for -%c '%s'\n", c, p);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
} else {
- if (inet_pton( AF_INET, p, &hdr_ip_dest_addr) <= 0) {
+ if (!ws_inet_pton4(p, &hdr_ip_dest_addr)) {
fprintf(stderr, "Bad dest addr for -%c '%s'\n", c, p);
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
}
break;
+ case '?':
default:
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
}
if (optind >= argc || argc-optind < 2) {
fprintf(stderr, "Must specify input and output filename\n");
- usage(TRUE);
+ print_usage(stderr);
+ return EXIT_FAILURE;
+ }
+
+ if (max_offset > WTAP_MAX_PACKET_SIZE_STANDARD) {
+ fprintf(stderr, "Maximum packet length cannot be more than %d bytes\n",
+ WTAP_MAX_PACKET_SIZE_STANDARD);
+ return EXIT_FAILURE;
}
- if (strcmp(argv[optind], "-")) {
- input_filename = g_strdup(argv[optind]);
+ if (strcmp(argv[optind], "-") != 0) {
+ input_filename = argv[optind];
input_file = ws_fopen(input_filename, "rb");
if (!input_file) {
fprintf(stderr, "Cannot open file [%s] for reading: %s\n",
input_filename, g_strerror(errno));
- exit(1);
+ return EXIT_FAILURE;
}
} else {
input_filename = "Standard input";
input_file = stdin;
}
- if (strcmp(argv[optind+1], "-")) {
- output_filename = g_strdup(argv[optind+1]);
+ if (strcmp(argv[optind+1], "-") != 0) {
+ /* Write to a file. Open the file, in binary mode. */
+ output_filename = 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, g_strerror(errno));
- exit(1);
+ return EXIT_FAILURE;
}
} else {
+ /* Write to the standard output. */
+#ifdef _WIN32
+ /* Put the standard output in binary mode. */
+ if (_setmode(1, O_BINARY) == -1) {
+ /* "Should not happen" */
+ fprintf(stderr, "Cannot put standard output in binary mode: %s\n",
+ g_strerror(errno));
+ return EXIT_FAILURE;
+ }
+#endif
output_filename = "Standard output";
output_file = stdout;
}
/* 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);
+ return EXIT_FAILURE;
}
/* Set up our variables */
}
ts_sec = time(0); /* initialize to current time */
- timecode_default = *localtime(&ts_sec);
+ now_tm = localtime(&ts_sec);
+ if (now_tm == NULL) {
+ /*
+ * This shouldn't happen - on UN*X, this should Just Work, and
+ * on Windows, it won't work if ts_sec is before the Epoch,
+ * but it's long after 1970, so....
+ */
+ fprintf(stderr, "localtime(right now) failed\n");
+ return EXIT_FAILURE;
+ }
+ timecode_default = *now_tm;
timecode_default.tm_isdst = -1; /* Unknown for now, depends on time given to the strptime() function */
+ if (hdr_ip_proto != -1 && !(hdr_ip || hdr_ipv6)) {
+ /* If -i <proto> option is specified without -4 or -6 then add the default IPv4 header */
+ hdr_ip = TRUE;
+ }
+
+ if (hdr_ip_proto == -1 && (hdr_ip || hdr_ipv6)) {
+ /* if -4 or -6 option is specified without an IP protocol then fail */
+ fprintf(stderr, "IP protocol requires a next layer protocol number\n");
+ return EXIT_FAILURE;
+ }
+
+ if ((hdr_tcp || hdr_udp || hdr_sctp) && !(hdr_ip || hdr_ipv6)) {
+ /*
+ * If TCP (-T), UDP (-u) or SCTP (-s/-S) header options are specified
+ * but none of IPv4 (-4) or IPv6 (-6) options then add an IPv4 header
+ */
+ hdr_ip = TRUE;
+ }
+
+ if (hdr_ip)
+ {
+ hdr_ethernet_proto = 0x0800;
+ } else if (hdr_ipv6)
+ {
+ hdr_ethernet_proto = 0x86DD;
+ }
+
/* 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 format: %s\n", use_pcapng ? "PCAP-NG" : "PCAP");
+ fprintf(stderr, "Output format: %s\n", use_pcapng ? "pcapng" : "pcap");
if (hdr_ethernet) fprintf(stderr, "Generate dummy Ethernet header: Protocol: 0x%0X\n",
hdr_ethernet_proto);
if (hdr_ip) fprintf(stderr, "Generate dummy IP header: Protocol: %ld\n",
hdr_ip_proto);
+ if (hdr_ipv6) fprintf(stderr, "Generate dummy IPv6 header: Protocol: %ld\n",
+ hdr_ip_proto);
if (hdr_udp) fprintf(stderr, "Generate dummy UDP header: Source port: %u. Dest port: %u\n",
hdr_src_port, hdr_dest_port);
if (hdr_tcp) fprintf(stderr, "Generate dummy TCP header: Source port: %u. Dest port: %u\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);
}
+
+ return EXIT_SUCCESS;
}
int
main(int argc, char *argv[])
{
- parse_options(argc, argv);
+ int ret = EXIT_SUCCESS;
+
+#ifdef _WIN32
+ create_app_running_mutex();
+#endif /* _WIN32 */
+
+ if (parse_options(argc, argv) != EXIT_SUCCESS) {
+ ret = EXIT_FAILURE;
+ goto clean_exit;
+ }
assert(input_file != NULL);
assert(output_file != NULL);
- write_file_header();
+ if (write_file_header() != EXIT_SUCCESS) {
+ ret = EXIT_FAILURE;
+ goto clean_exit;
+ }
header_length = 0;
if (hdr_ethernet) {
}
curr_offset = header_length;
- yyin = input_file;
- yylex();
-
- write_current_packet(FALSE);
- write_file_trailer();
- fclose(input_file);
- fclose(output_file);
+ text2pcap_in = input_file;
+ if (text2pcap_scan() == EXIT_SUCCESS) {
+ if (write_current_packet(FALSE) != EXIT_SUCCESS)
+ ret = EXIT_FAILURE;
+ } else {
+ ret = EXIT_FAILURE;
+ }
if (debug)
fprintf(stderr, "\n-------------------------\n");
if (!quiet) {
num_packets_written, (num_packets_written == 1) ? "" : "s",
bytes_written, (bytes_written == 1) ? "" : "s");
}
- return 0;
+clean_exit:
+ if (input_file) {
+ fclose(input_file);
+ }
+ if (output_file) {
+ fclose(output_file);
+ }
+ return ret;
}
/*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/
-
git.samba.org / metze / wireshark / wip.git / blobdiff