*
* (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 <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>
+#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 "svnversion.h"
+
+#include "wiretap/wtap.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
-
/*--- Options --------------------------------------------------------------------*/
/* File format */
/* 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 struct e_in6_addr hdr_ipv6_dest_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
+static struct e_in6_addr hdr_ipv6_src_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
+static struct e_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 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;
/*--- Local date -----------------------------------------------------------------*/
/* 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
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 char *input_filename;
+static FILE *input_file = NULL;
/* Output file */
-static const char *output_filename;
-static FILE *output_file = NULL;
+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 -----------------------------------------------------------*/
#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;
/* 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 {
- 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 e_in6_addr ip6_src; /* source address */
+ struct e_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 e_in6_addr src_addr6;
+ struct e_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 */
* 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;
+ char *c;
- num = (guint32)strtoul(str, &c, offset ? offset_base : 16);
- if (c==str) {
+ if (str == NULL) {
+ fprintf(stderr, "FATAL ERROR: str is NULL\n");
+ return EXIT_FAILURE;
+ }
+
+ *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 ++;
+ 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;
}
/*----------------------------------------------------------------------
*/
static void
-write_bytes(const char bytes[], guint32 nbytes)
+write_bytes (const char bytes[], guint32 nbytes)
{
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++;
#define CRC32C(c,d) (c=(c>>8)^crc_c[(c^(d))&0xFF])
static guint32 crc_c[256] =
{
-0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L,
-0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL,
-0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL,
-0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L,
-0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL,
-0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L,
-0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L,
-0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL,
-0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL,
-0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L,
-0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L,
-0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL,
-0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L,
-0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL,
-0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL,
-0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L,
-0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L,
-0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L,
-0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L,
-0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L,
-0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L,
-0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L,
-0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L,
-0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L,
-0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L,
-0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L,
-0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L,
-0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L,
-0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L,
-0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L,
-0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L,
-0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L,
-0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL,
-0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L,
-0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L,
-0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL,
-0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L,
-0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL,
-0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL,
-0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L,
-0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L,
-0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL,
-0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL,
-0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L,
-0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL,
-0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L,
-0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L,
-0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL,
-0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L,
-0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL,
-0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL,
-0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L,
-0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL,
-0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L,
-0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L,
-0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL,
-0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL,
-0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L,
-0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L,
-0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL,
-0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L,
-0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL,
-0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL,
-0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L,
+0x00000000U, 0xF26B8303U, 0xE13B70F7U, 0x1350F3F4U,
+0xC79A971FU, 0x35F1141CU, 0x26A1E7E8U, 0xD4CA64EBU,
+0x8AD958CFU, 0x78B2DBCCU, 0x6BE22838U, 0x9989AB3BU,
+0x4D43CFD0U, 0xBF284CD3U, 0xAC78BF27U, 0x5E133C24U,
+0x105EC76FU, 0xE235446CU, 0xF165B798U, 0x030E349BU,
+0xD7C45070U, 0x25AFD373U, 0x36FF2087U, 0xC494A384U,
+0x9A879FA0U, 0x68EC1CA3U, 0x7BBCEF57U, 0x89D76C54U,
+0x5D1D08BFU, 0xAF768BBCU, 0xBC267848U, 0x4E4DFB4BU,
+0x20BD8EDEU, 0xD2D60DDDU, 0xC186FE29U, 0x33ED7D2AU,
+0xE72719C1U, 0x154C9AC2U, 0x061C6936U, 0xF477EA35U,
+0xAA64D611U, 0x580F5512U, 0x4B5FA6E6U, 0xB93425E5U,
+0x6DFE410EU, 0x9F95C20DU, 0x8CC531F9U, 0x7EAEB2FAU,
+0x30E349B1U, 0xC288CAB2U, 0xD1D83946U, 0x23B3BA45U,
+0xF779DEAEU, 0x05125DADU, 0x1642AE59U, 0xE4292D5AU,
+0xBA3A117EU, 0x4851927DU, 0x5B016189U, 0xA96AE28AU,
+0x7DA08661U, 0x8FCB0562U, 0x9C9BF696U, 0x6EF07595U,
+0x417B1DBCU, 0xB3109EBFU, 0xA0406D4BU, 0x522BEE48U,
+0x86E18AA3U, 0x748A09A0U, 0x67DAFA54U, 0x95B17957U,
+0xCBA24573U, 0x39C9C670U, 0x2A993584U, 0xD8F2B687U,
+0x0C38D26CU, 0xFE53516FU, 0xED03A29BU, 0x1F682198U,
+0x5125DAD3U, 0xA34E59D0U, 0xB01EAA24U, 0x42752927U,
+0x96BF4DCCU, 0x64D4CECFU, 0x77843D3BU, 0x85EFBE38U,
+0xDBFC821CU, 0x2997011FU, 0x3AC7F2EBU, 0xC8AC71E8U,
+0x1C661503U, 0xEE0D9600U, 0xFD5D65F4U, 0x0F36E6F7U,
+0x61C69362U, 0x93AD1061U, 0x80FDE395U, 0x72966096U,
+0xA65C047DU, 0x5437877EU, 0x4767748AU, 0xB50CF789U,
+0xEB1FCBADU, 0x197448AEU, 0x0A24BB5AU, 0xF84F3859U,
+0x2C855CB2U, 0xDEEEDFB1U, 0xCDBE2C45U, 0x3FD5AF46U,
+0x7198540DU, 0x83F3D70EU, 0x90A324FAU, 0x62C8A7F9U,
+0xB602C312U, 0x44694011U, 0x5739B3E5U, 0xA55230E6U,
+0xFB410CC2U, 0x092A8FC1U, 0x1A7A7C35U, 0xE811FF36U,
+0x3CDB9BDDU, 0xCEB018DEU, 0xDDE0EB2AU, 0x2F8B6829U,
+0x82F63B78U, 0x709DB87BU, 0x63CD4B8FU, 0x91A6C88CU,
+0x456CAC67U, 0xB7072F64U, 0xA457DC90U, 0x563C5F93U,
+0x082F63B7U, 0xFA44E0B4U, 0xE9141340U, 0x1B7F9043U,
+0xCFB5F4A8U, 0x3DDE77ABU, 0x2E8E845FU, 0xDCE5075CU,
+0x92A8FC17U, 0x60C37F14U, 0x73938CE0U, 0x81F80FE3U,
+0x55326B08U, 0xA759E80BU, 0xB4091BFFU, 0x466298FCU,
+0x1871A4D8U, 0xEA1A27DBU, 0xF94AD42FU, 0x0B21572CU,
+0xDFEB33C7U, 0x2D80B0C4U, 0x3ED04330U, 0xCCBBC033U,
+0xA24BB5A6U, 0x502036A5U, 0x4370C551U, 0xB11B4652U,
+0x65D122B9U, 0x97BAA1BAU, 0x84EA524EU, 0x7681D14DU,
+0x2892ED69U, 0xDAF96E6AU, 0xC9A99D9EU, 0x3BC21E9DU,
+0xEF087A76U, 0x1D63F975U, 0x0E330A81U, 0xFC588982U,
+0xB21572C9U, 0x407EF1CAU, 0x532E023EU, 0xA145813DU,
+0x758FE5D6U, 0x87E466D5U, 0x94B49521U, 0x66DF1622U,
+0x38CC2A06U, 0xCAA7A905U, 0xD9F75AF1U, 0x2B9CD9F2U,
+0xFF56BD19U, 0x0D3D3E1AU, 0x1E6DCDEEU, 0xEC064EEDU,
+0xC38D26C4U, 0x31E6A5C7U, 0x22B65633U, 0xD0DDD530U,
+0x0417B1DBU, 0xF67C32D8U, 0xE52CC12CU, 0x1747422FU,
+0x49547E0BU, 0xBB3FFD08U, 0xA86F0EFCU, 0x5A048DFFU,
+0x8ECEE914U, 0x7CA56A17U, 0x6FF599E3U, 0x9D9E1AE0U,
+0xD3D3E1ABU, 0x21B862A8U, 0x32E8915CU, 0xC083125FU,
+0x144976B4U, 0xE622F5B7U, 0xF5720643U, 0x07198540U,
+0x590AB964U, 0xAB613A67U, 0xB831C993U, 0x4A5A4A90U,
+0x9E902E7BU, 0x6CFBAD78U, 0x7FAB5E8CU, 0x8DC0DD8FU,
+0xE330A81AU, 0x115B2B19U, 0x020BD8EDU, 0xF0605BEEU,
+0x24AA3F05U, 0xD6C1BC06U, 0xC5914FF2U, 0x37FACCF1U,
+0x69E9F0D5U, 0x9B8273D6U, 0x88D28022U, 0x7AB90321U,
+0xAE7367CAU, 0x5C18E4C9U, 0x4F48173DU, 0xBD23943EU,
+0xF36E6F75U, 0x0105EC76U, 0x12551F82U, 0xE03E9C81U,
+0x34F4F86AU, 0xC69F7B69U, 0xD5CF889DU, 0x27A40B9EU,
+0x79B737BAU, 0x8BDCB4B9U, 0x988C474DU, 0x6AE7C44EU,
+0xBE2DA0A5U, 0x4C4623A6U, 0x5F16D052U, 0xAD7D5351U,
};
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)
+static int
+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 e_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_src, isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, sizeof(struct e_in6_addr));
+ if (memcmp(isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, &NO_IPv6_ADDRESS, sizeof(struct e_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_dst, isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, sizeof(struct e_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);
+ 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);
}
- num_packets_written ++;
+ num_packets_written++;
}
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;
+ 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);
+ 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;
}
/*----------------------------------------------------------------------
* 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)
+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);
- num_packets_read ++;
+ 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;
- 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;
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;
}
/* ----- 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;
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;
/* ----- Processing packet, read offset -----------------------------------*/
case READ_OFFSET:
- switch(token) {
+ switch (token) {
case T_BYTE:
/* Record the byte */
state = READ_BYTE;
- write_byte(str);
+ if (!str) goto fail_null_str;
+ if (write_byte(str) != EXIT_SUCCESS)
+ return EXIT_FAILURE;
break;
case T_TEXT:
case T_DIRECTIVE:
/* ----- Processing packet, read byte -------------------------------------*/
case READ_BYTE:
- switch(token) {
+ 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);
/* ----- 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);
+ return EXIT_FAILURE;
}
- if (debug>=2)
+ if (debug >= 2)
fprintf(stderr, ", %s)\n", state_str[state]);
+ return EXIT_SUCCESS;
+
+fail_null_str:
+ fprintf(stderr, "FATAL ERROR: got NULL str pointer in state (%d)", state);
+ return EXIT_FAILURE;
}
/*----------------------------------------------------------------------
* 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);
-
- exit(-1);
+ WTAP_MAX_PACKET_SIZE_STANDARD);
}
/*----------------------------------------------------------------------
* Parse CLI options
*/
-static void
+static int
parse_options (int argc, char *argv[])
{
- int c;
+ GString *comp_info_str;
+ GString *runtime_info_str;
+ int c;
char *p;
+ static const struct option long_options[] = {
+ {"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 */
+ /* Get the compile-time version information string */
+ comp_info_str = get_compiled_version_info(NULL, NULL);
+
+ /* get the run-time version information string */
+ runtime_info_str = get_runtime_version_info(NULL);
+
+ /* 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);
+ g_string_free(comp_info_str, TRUE);
+ g_string_free(runtime_info_str, TRUE);
+
/* 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 https://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);
+ return EXIT_FAILURE;
}
- 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);
+ return EXIT_FAILURE;
}
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);
+ return EXIT_FAILURE;
}
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);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- usage();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No tag specified for '-%c'\n", c);
- usage();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-%c'\n", c);
- usage();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No ppi specified for '-%c'\n", c);
- usage();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- usage();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
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);
+ return EXIT_FAILURE;
}
if (*p == '\0') {
fprintf(stderr, "No dest port specified for '-u'\n");
- usage();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
hdr_ip = TRUE;
hdr_ip_proto = 6;
identify_ascii = TRUE;
break;
+ case 'v':
+ comp_info_str = get_compiled_version_info(NULL, NULL);
+ runtime_info_str = get_runtime_version_info(NULL);
+ 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);
+ return EXIT_FAILURE;
}
*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 (!ws_inet_pton6(optarg, &hdr_ipv6_src_addr)) {
fprintf(stderr, "Bad src addr -%c '%s'\n", c, p);
- usage();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
}
p++;
if (*p == '\0') {
fprintf(stderr, "No dest addr specified for '-%c'\n", c);
- usage();
+ 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();
+ 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();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
}
break;
+ case '?':
default:
- usage();
+ print_usage(stderr);
+ return EXIT_FAILURE;
}
}
if (optind >= argc || argc-optind < 2) {
fprintf(stderr, "Must specify input and output filename\n");
- usage();
+ 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 */
/* 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);
}
+
+ return EXIT_SUCCESS;
}
int
main(int argc, char *argv[])
{
- parse_options(argc, argv);
+ int ret = EXIT_SUCCESS;
- assert(input_file != NULL);
+ 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_lex() == 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:
+ text2pcap_lex_destroy();
+ if (input_file) {
+ fclose(input_file);
+ }
+ if (output_file) {
+ fclose(output_file);
+ }
+ return ret;
}
/*
*
* 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:
*/
git.samba.org / metze / wireshark / wip.git / blobdiff