Use *, not *.*, as the wildcard pattern on UN*X.
[metze/wireshark/wip.git] / text2pcap.c
index a2c39e4d45879a67cce96af0157d3b768abb06eb..bc958cbb4fe15c4aa538d35b8c2196407f5c516c 100644 (file)
@@ -6,8 +6,6 @@
  *
  * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -24,7 +22,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  *******************************************************************************/
 
  * 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 64K. Packet
- * snaplength is automatically set to 64K.
+ * This converter cannot read a single packet greater than 64KiB-1. Packet
+ * snaplength is automatically set to 64KiB-1.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /*
  * Just make sure we include the prototype for strptime as well
@@ -90,7 +86,9 @@
 #  define __USE_XOPEN
 #endif
 #ifndef _XOPEN_SOURCE
-#  define _XOPEN_SOURCE
+#  ifndef __sun
+#    define _XOPEN_SOURCE 600
+#  endif
 #endif
 
 /*
 #  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 <wsutil/inet_addr.h>
 
 #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
+#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>
 
 /*--- Options --------------------------------------------------------------------*/
 
+/* File format */
+static gboolean use_pcapng = FALSE;
+
 /* Debug level */
 static int debug = 0;
 /* Be quiet */
@@ -149,73 +157,93 @@ static int quiet = FALSE;
 
 /* Dummy Ethernet header */
 static int hdr_ethernet = FALSE;
-static unsigned long hdr_ethernet_proto = 0;
+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;
 
+/* Destination and source addresses for IP header */
+static guint32 hdr_ip_dest_addr = 0;
+static guint32 hdr_ip_src_addr = 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 unsigned long hdr_dest_port = 0;
-static unsigned long hdr_src_port = 0;
+static int     hdr_udp       = FALSE;
+static guint32 hdr_dest_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 unsigned long hdr_sctp_src  = 0;
-static unsigned long hdr_sctp_dest = 0;
-static unsigned long hdr_sctp_tag  = 0;
+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 unsigned char  hdr_data_chunk_type = 0;
-static unsigned char  hdr_data_chunk_bits = 3;
-static unsigned long  hdr_data_chunk_tsn  = 0;
-static unsigned short hdr_data_chunk_sid  = 0;
-static unsigned short hdr_data_chunk_ssn  = 0;
-static unsigned long  hdr_data_chunk_ppid = 0;
+static guint8  hdr_data_chunk_type = 0;
+static guint8  hdr_data_chunk_bits = 0;
+static guint32 hdr_data_chunk_tsn  = 0;
+static guint16 hdr_data_chunk_sid  = 0;
+static guint16 hdr_data_chunk_ssn  = 0;
+static guint32 hdr_data_chunk_ppid = 0;
+
+/* ASCII text dump identification */
+static int identify_ascii = FALSE;
 
+static gboolean has_direction = FALSE;
+static guint32 direction = 0;
 
 /*--- Local date -----------------------------------------------------------------*/
 
 /* This is where we store the packet currently being built */
-#define MAX_PACKET 64000
-static unsigned char packet_buf[MAX_PACKET];
-static unsigned long curr_offset = 0;
-static unsigned long max_offset = MAX_PACKET;
-static unsigned long packet_start = 0;
-static void start_new_packet (void);
+#define MAX_PACKET 65535
+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 unsigned char packet_preamble[PACKET_PREAMBLE_MAX_LEN+1];
-static int packet_preamble_len = 0;
+#define PACKET_PREAMBLE_MAX_LEN     2048
+static guint8 packet_preamble[PACKET_PREAMBLE_MAX_LEN+1];
+static int    packet_preamble_len = 0;
 
 /* Number of packets read and written */
-static unsigned long num_packets_read = 0;
-static unsigned long num_packets_written = 0;
+static guint32 num_packets_read    = 0;
+static guint32 num_packets_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 char new_date_fmt = 0;
-static char* pkt_lnstart;
+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 unsigned long offset_base = 16;
+static guint32 offset_base = 16;
 
 extern FILE *yyin;
 
@@ -273,16 +301,58 @@ typedef struct {
     guint32 dest_addr;
 } hdr_ip_t;
 
-static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 0, 0, 0x0101010a, 0x0202020a};
+static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 0, 0,
+#ifdef WORDS_BIGENDIAN
+0x0a010101, 0x0a020202
+#else
+0x0101010a, 0x0202020a
+#endif
+};
 
-static struct {                        /* pseudo header for checksum calculation */
-       guint32 src_addr;
-       guint32 dest_addr;
-       guint8  zero;
-       guint8  protocol;
-       guint16 length;
+/* 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;
+    guint8  zero;
+    guint8  protocol;
+    guint16 length;
 } pseudoh;
 
+
+/* headers taken from glibc */
+
+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 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  e_in6_addr src_addr6;
+    struct  e_in6_addr dst_addr6;
+    guint32 protocol;
+    guint32 zero;
+} pseudoh6;
+
+
 typedef struct {
     guint16 source_port;
     guint16 dest_port;
@@ -332,45 +402,31 @@ static char tempbuf[64];
 /*----------------------------------------------------------------------
  * Stuff for writing a PCap file
  */
-#define        PCAP_MAGIC                      0xa1b2c3d4
-
-/* "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 */
-};
+#define PCAP_SNAPLEN        0xffff
 
-/* "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 net/bpf.h for details */
-static unsigned long pcap_link_type = 1;   /* Default is DLT-EN10MB */
+/* Link-layer type; see http://www.tcpdump.org/linktypes.html for details */
+static guint32 pcap_link_type = 1;   /* Default is LINKTYPE_ETHERNET */
 
 /*----------------------------------------------------------------------
  * Parse a single hex number
  * Will abort the program if it can't parse the number
  * Pass in TRUE if this is an offset, FALSE if not
  */
-static unsigned long
+static guint32
 parse_num (const char *str, int offset)
 {
-    unsigned long num;
-    char *c;
+    guint32  num;
+    char    *c;
 
-    num = strtoul(str, &c, offset ? offset_base : 16);
-    if (c==str) {
+    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) {
         fprintf(stderr, "FATAL ERROR: Bad hex number? [%s]\n", str);
-        exit(-1);
+        exit(1);
     }
     return num;
 }
@@ -381,20 +437,37 @@ parse_num (const char *str, int offset)
 static void
 write_byte (const char *str)
 {
-    unsigned long num;
+    guint32 num;
 
     num = parse_num(str, FALSE);
-    packet_buf[curr_offset] = (unsigned char) num;
-    curr_offset ++;
-    if (curr_offset >= max_offset) /* packet full */
-           start_new_packet();
+    packet_buf[curr_offset] = (guint8) num;
+    curr_offset++;
+    if (curr_offset - header_length >= max_offset) /* packet full */
+        start_new_packet(TRUE);
+}
+
+/*----------------------------------------------------------------------
+ * Write a number of bytes into current packet
+ */
+
+static void
+write_bytes (const char bytes[], guint32 nbytes)
+{
+    guint32 i;
+
+    if (curr_offset + nbytes < MAX_PACKET) {
+        for (i = 0; i < nbytes; i++) {
+            packet_buf[curr_offset] = bytes[i];
+            curr_offset++;
+        }
+    }
 }
 
 /*----------------------------------------------------------------------
  * Remove bytes from the current packet
  */
 static void
-unwrite_bytes (unsigned long nbytes)
+unwrite_bytes (guint32 nbytes)
 {
     curr_offset -= nbytes;
 }
@@ -403,20 +476,20 @@ unwrite_bytes (unsigned long nbytes)
  * Compute one's complement checksum (from RFC1071)
  */
 static guint16
-in_checksum (void *buf, unsigned long count)
+in_checksum (void *buf, guint32 count)
 {
-    unsigned long sum = 0;
-    guint16 *addr = buf;
+    guint32 sum = 0;
+    guint16 *addr = (guint16 *)buf;
 
-    while( count > 1 )  {
+    while (count > 1) {
         /*  This is the inner loop */
         sum += g_ntohs(* (guint16 *) addr);
-       addr++;
+        addr++;
         count -= 2;
     }
 
     /*  Add left-over byte, if any */
-    if( count > 0 )
+    if (count > 0)
         sum += g_ntohs(* (guint8 *) addr);
 
     /*  Fold 32-bit sum to 16 bits */
@@ -434,314 +507,424 @@ in_checksum (void *buf, unsigned long count)
 #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;
+    unsigned int i;
+    guint32 crc;
 
-  crc32 = crc32_init;
-  for (i = 0; i < len; i++)
-    CRC32C(crc32, buf[i]);
+    crc = crc32_init;
+    for (i = 0; i < len; 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;
-  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 );
+    guint32 result;
+    guint8 byte0,byte1,byte2,byte3;
+
+    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;
 }
 
-static unsigned long
-number_of_padding_bytes (unsigned long length)
+static guint16
+number_of_padding_bytes (guint32 length)
 {
-  unsigned long remainder;
+    guint16 remainder;
 
-  remainder = length % 4;
+    remainder = length % 4;
 
-  if (remainder == 0)
-    return 0;
-  else
-    return 4 - remainder;
+    if (remainder == 0)
+        return 0;
+    else
+        return 4 - remainder;
 }
 
 /*----------------------------------------------------------------------
  * Write current packet out
  */
 static void
-write_current_packet (void)
+write_current_packet (gboolean cont)
 {
-    int length = 0;
-    int proto_length = 0;
-    int ip_length = 0;
-    int eth_trailer_length = 0;
-    int i, padding_length;
-    guint32 u;
-    struct pcaprec_hdr ph;
-
-    if (curr_offset > 0) {
+    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) {
+            hdr_ethernet_proto = 0x86DD;
+            hdr_ip = FALSE;
+        }
+
         /* Compute packet length */
         length = curr_offset;
-        if (hdr_data_chunk) { length += sizeof(HDR_DATA_CHUNK) + number_of_padding_bytes(curr_offset); }
-        if (hdr_sctp) { length += sizeof(HDR_SCTP); }
-        if (hdr_udp) { length += sizeof(HDR_UDP); proto_length = length; }
-        if (hdr_tcp) { length += sizeof(HDR_TCP); proto_length = length; }
-        if (hdr_ip) { length += sizeof(HDR_IP); ip_length = length; }
-        if (hdr_ethernet) {
-            length += sizeof(HDR_ETHERNET);
-            /* Pad trailer */
-            if (length < 60) {
-                eth_trailer_length = 60 - length;
-                length = 60;
-            }
+        if (hdr_sctp) {
+            padding_length = number_of_padding_bytes(length - header_length );
+        } else {
+            padding_length = 0;
         }
-
-        /* Write PCAP header */
-        ph.ts_sec = (guint32)ts_sec;
-        ph.ts_usec = ts_usec;
-        if (ts_fmt == NULL) { ts_usec++; }     /* fake packet counter */
-        ph.incl_len = length;
-        ph.orig_len = length;
-        if (fwrite(&ph, sizeof(ph), 1, output_file) != 1)
-            goto write_current_packet_err;
+        /* Reset curr_offset, since we now write the headers */
+        curr_offset = 0;
 
         /* Write Ethernet header */
         if (hdr_ethernet) {
             HDR_ETHERNET.l3pid = g_htons(hdr_ethernet_proto);
-            if (fwrite(&HDR_ETHERNET, sizeof(HDR_ETHERNET), 1, output_file) != 1)
-                goto write_current_packet_err;
+            write_bytes((const char *)&HDR_ETHERNET, sizeof(HDR_ETHERNET));
         }
 
         /* Write IP header */
         if (hdr_ip) {
-            HDR_IP.packet_length = g_htons(ip_length);
+            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 = 0;
             HDR_IP.hdr_checksum = in_checksum(&HDR_IP, sizeof(HDR_IP));
-            if (fwrite(&HDR_IP, sizeof(HDR_IP), 1, output_file) != 1)
-                goto write_current_packet_err;
+            write_bytes((const char *)&HDR_IP, sizeof(HDR_IP));
+        } else if (hdr_ipv6) {
+            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);
+            HDR_IPv6.ip6_ctlun.ip6_un1.ip6_un1_plen = g_htons(length - ip_offset + 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));
         }
 
-       /* initialize pseudo header for checksum calculation */
-       pseudoh.src_addr    = HDR_IP.src_addr;
-       pseudoh.dest_addr   = HDR_IP.dest_addr;
-       pseudoh.zero        = 0;
-       pseudoh.protocol    = (guint8) hdr_ip_proto;
-       pseudoh.length      = g_htons(proto_length);
+        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));
+        }
 
         /* Write UDP header */
         if (hdr_udp) {
             guint16 x16;
-            HDR_UDP.source_port = g_htons(hdr_src_port);
-            HDR_UDP.dest_port = g_htons(hdr_dest_port);
-            HDR_UDP.length = g_htons(proto_length);
+            guint32 u;
 
+            /* 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.checksum = 0;
             /* Note: g_ntohs()/g_htons() macro arg may be eval'd twice so calc value before invoking macro */
-           HDR_UDP.checksum = 0;
-            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_UDP, sizeof(HDR_UDP));
             u   += g_ntohs(x16);
-            x16  = in_checksum(packet_buf, curr_offset);
+            x16  = in_checksum(packet_buf + header_length, length - header_length);
             u   += g_ntohs(x16);
             x16  = (u & 0xffff) + (u>>16);
-           HDR_UDP.checksum = g_htons(x16);
-           if (HDR_UDP.checksum == 0) /* differentiate between 'none' and 0 */
-                   HDR_UDP.checksum = g_htons(1);
-
-            if (fwrite(&HDR_UDP, sizeof(HDR_UDP), 1, output_file) != 1)
-                goto write_current_packet_err;
+            HDR_UDP.checksum = g_htons(x16);
+            if (HDR_UDP.checksum == 0) /* differentiate between 'none' and 0 */
+                HDR_UDP.checksum = g_htons(1);
+            write_bytes((const char *)&HDR_UDP, sizeof(HDR_UDP));
         }
 
         /* Write TCP header */
         if (hdr_tcp) {
             guint16 x16;
-            HDR_TCP.source_port = g_htons(hdr_src_port);
-            HDR_TCP.dest_port = g_htons(hdr_dest_port);
-           /* HDR_TCP.seq_num already correct */
-           HDR_TCP.window = g_htons(0x2000);
-
+            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);
+            /* 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 */
-           HDR_TCP.checksum = 0;
             x16  = in_checksum(&pseudoh, sizeof(pseudoh));
             u    = g_ntohs(x16);
             x16  = in_checksum(&HDR_TCP, sizeof(HDR_TCP));
             u   += g_ntohs(x16);
-            x16  = in_checksum(packet_buf, curr_offset);
+            x16  = in_checksum(packet_buf + header_length, length - header_length);
             u   += g_ntohs(x16);
             x16  = (u & 0xffff) + (u>>16);
-           HDR_TCP.checksum = g_htons(x16);
-           if (HDR_TCP.checksum == 0) /* differentiate between 'none' and 0 */
+            HDR_TCP.checksum = g_htons(x16);
+            if (HDR_TCP.checksum == 0) /* differentiate between 'none' and 0 */
                 HDR_TCP.checksum = g_htons(1);
-
-            if (fwrite(&HDR_TCP, sizeof(HDR_TCP), 1, output_file) != 1)
-                goto write_current_packet_err;
+            write_bytes((const char *)&HDR_TCP, sizeof(HDR_TCP));
+            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 and append padding */
+        /* Compute DATA chunk header */
         if (hdr_data_chunk) {
+            hdr_data_chunk_bits = 0;
+            if (packet_start == 0) {
+                hdr_data_chunk_bits |= 0x02;
+            }
+            if (!cont) {
+                hdr_data_chunk_bits |= 0x01;
+            }
             HDR_DATA_CHUNK.type   = hdr_data_chunk_type;
             HDR_DATA_CHUNK.bits   = hdr_data_chunk_bits;
-            HDR_DATA_CHUNK.length = g_htons(curr_offset + sizeof(HDR_DATA_CHUNK));
+            HDR_DATA_CHUNK.length = g_htons(length - header_length + sizeof(HDR_DATA_CHUNK));
             HDR_DATA_CHUNK.tsn    = g_htonl(hdr_data_chunk_tsn);
             HDR_DATA_CHUNK.sid    = g_htons(hdr_data_chunk_sid);
             HDR_DATA_CHUNK.ssn    = g_htons(hdr_data_chunk_ssn);
             HDR_DATA_CHUNK.ppid   = g_htonl(hdr_data_chunk_ppid);
-
-            padding_length = number_of_padding_bytes(curr_offset);
-            for (i=0; i<padding_length; i++)
-              write_byte("0");
+            hdr_data_chunk_tsn++;
+            if (!cont) {
+                hdr_data_chunk_ssn++;
+            }
         }
 
-        /* Write SCTP header */
+        /* Write SCTP common header */
         if (hdr_sctp) {
-            guint32 x32;
-            HDR_SCTP.src_port  = g_htons(hdr_sctp_src);
-            HDR_SCTP.dest_port = g_htons(hdr_sctp_dest);
+            guint32 zero = 0;
+
+            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);
-            if (hdr_data_chunk)
-              HDR_SCTP.checksum  = crc32c((guint8 *)&HDR_DATA_CHUNK, sizeof(HDR_DATA_CHUNK), HDR_SCTP.checksum);
-            /* Note: g_ntohl() macro arg may be eval'd twice so calc value before invoking macro */
-            x32 = finalize_crc32c(crc32c(packet_buf, curr_offset, HDR_SCTP.checksum));
-            HDR_SCTP.checksum  = g_htonl(x32);
-
-            if (fwrite(&HDR_SCTP, sizeof(HDR_SCTP), 1, output_file) != 1)
-                goto write_current_packet_err;
+            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);
+                HDR_SCTP.checksum  = crc32c((guint8 *)&zero, padding_length, HDR_SCTP.checksum);
+            } else {
+                HDR_SCTP.checksum  = crc32c((guint8 *)packet_buf + header_length, length - header_length, HDR_SCTP.checksum);
+            }
+            HDR_SCTP.checksum = finalize_crc32c(HDR_SCTP.checksum);
+            HDR_SCTP.checksum  = g_htonl(HDR_SCTP.checksum);
+            write_bytes((const char *)&HDR_SCTP, sizeof(HDR_SCTP));
         }
 
         /* Write DATA chunk header */
         if (hdr_data_chunk) {
-            if (fwrite(&HDR_DATA_CHUNK, sizeof(HDR_DATA_CHUNK), 1, output_file) != 1)
-                goto write_current_packet_err;
+            write_bytes((const char *)&HDR_DATA_CHUNK, sizeof(HDR_DATA_CHUNK));
         }
-        /* Write packet */
-        if (fwrite(packet_buf, curr_offset, 1, output_file) != 1)
-            goto write_current_packet_err;
 
-        /* Write Ethernet trailer */
-        if (hdr_ethernet && eth_trailer_length > 0) {
-            memset(tempbuf, 0, eth_trailer_length);
-            if (fwrite(tempbuf, eth_trailer_length, 1, output_file) != 1)
-                goto write_current_packet_err;
+        /* Reset curr_offset, since we now write the trailers */
+        curr_offset = length;
+
+        /* Write DATA chunk padding */
+        if (hdr_data_chunk && (padding_length > 0)) {
+            memset(tempbuf, 0, padding_length);
+            write_bytes((const char *)&tempbuf, padding_length);
+            length += padding_length;
         }
 
-        if (!quiet)
-            fprintf(stderr, "Wrote packet of %lu bytes at %u\n", curr_offset, g_ntohl(HDR_TCP.seq_num));
-        num_packets_written ++;
+        /* Write Ethernet trailer */
+        if (hdr_ethernet && (length < 60)) {
+            memset(tempbuf, 0, 60 - length);
+            write_bytes((const char *)&tempbuf, 60 - length);
+            length = 60;
+        }
+        if (use_pcapng) {
+            success = pcapng_write_enhanced_packet_block(output_file,
+                                                         NULL,
+                                                         ts_sec, ts_nsec,
+                                                         length, length,
+                                                         0,
+                                                         1000000000,
+                                                         packet_buf, direction,
+                                                         &bytes_written, &err);
+        } else {
+            success = libpcap_write_packet(output_file,
+                                           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);
+        }
+        if (ts_fmt == NULL) {
+            /* fake packet counter */
+            if (use_pcapng)
+                ts_nsec++;
+            else
+                ts_nsec += 1000;
+        }
+        if (!quiet) {
+            fprintf(stderr, "Wrote packet of %u bytes.\n", length);
+        }
+        num_packets_written++;
     }
-    HDR_TCP.seq_num = g_ntohl(HDR_TCP.seq_num) + curr_offset;
-    HDR_TCP.seq_num = g_htonl(HDR_TCP.seq_num);
 
-    packet_start += curr_offset;
-    curr_offset = 0;
+    packet_start += curr_offset - header_length;
+    curr_offset = header_length;
     return;
-
-write_current_packet_err:
-    fprintf(stderr, "File write error [%s] : %s\n",
-            output_filename, g_strerror(errno));
-    exit(-1);
 }
 
 /*----------------------------------------------------------------------
- * Write the PCap file header
+ * Write file header and trailer
  */
 static void
 write_file_header (void)
 {
-    struct pcap_hdr fh;
-
-    fh.magic = PCAP_MAGIC;
-    fh.version_major = 2;
-    fh.version_minor = 4;
-    fh.thiszone = 0;
-    fh.sigfigs = 0;
-    fh.snaplen = 102400;
-    fh.network = pcap_link_type;
-
-    if (fwrite(&fh, sizeof(fh), 1, output_file) != 1) {
+    int      err;
+    gboolean success;
+
+    if (use_pcapng) {
+        char *appname;
+        char *comment;
+
+        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,    /* HW */
+                                                    NULL,    /* OS */
+                                                    appname,
+                                                    -1,      /* section_length */
+                                                    &bytes_written,
+                                                    &err);
+        g_free(appname);
+        g_free(comment);
+        if (success) {
+            success = pcapng_write_interface_description_block(output_file,
+                                                               NULL,
+                                                               NULL,
+                                                               NULL,
+                                                               "",
+                                                               NULL,
+                                                               pcap_link_type,
+                                                               PCAP_SNAPLEN,
+                                                               &bytes_written,
+                                                               0,
+                                                               9,
+                                                               &err);
+        }
+    } else {
+        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(errno));
-        exit(-1);
+                output_filename, g_strerror(err));
+        exit(1);
     }
 }
 
@@ -749,29 +932,29 @@ write_file_header (void)
  * Append a token to the packet preamble.
  */
 static void
-append_to_preamble(char *str)
+append_to_preamble (char *str)
 {
     size_t toklen;
 
     if (packet_preamble_len != 0) {
         if (packet_preamble_len == PACKET_PREAMBLE_MAX_LEN)
-            return;    /* no room to add more preamble */
+            return; /* no room to add more preamble */
         /* Add a blank separator between the previous token and this token. */
         packet_preamble[packet_preamble_len++] = ' ';
     }
     toklen = strlen(str);
     if (toklen != 0) {
         if (packet_preamble_len + toklen > PACKET_PREAMBLE_MAX_LEN)
-            return;    /* no room to add the token to the preamble */
+            return; /* no room to add the token to the preamble */
         g_strlcpy(&packet_preamble[packet_preamble_len], str, PACKET_PREAMBLE_MAX_LEN);
         packet_preamble_len += (int) toklen;
-       if (debug >= 2) {
-               char *c;
-               char xs[PACKET_PREAMBLE_MAX_LEN];
-               g_strlcpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN);
-               while ((c = strchr(xs, '\r')) != NULL) *c=' ';
-               fprintf (stderr, "[[append_to_preamble: \"%s\"]]", xs);
-       }
+        if (debug >= 2) {
+            char *c;
+            char xs[PACKET_PREAMBLE_MAX_LEN];
+            g_strlcpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN);
+            while ((c = strchr(xs, '\r')) != NULL) *c=' ';
+            fprintf (stderr, "[[append_to_preamble: \"%s\"]]", xs);
+        }
     }
 }
 
@@ -782,117 +965,147 @@ append_to_preamble(char *str)
 static void
 parse_preamble (void)
 {
-       struct tm timecode;
-       char *subsecs;
-       char *p;
-       int  subseclen;
-       int  i;
-
-       /*
-        * If no "-t" flag was specified, don't attempt to parse a packet
-        * preamble to extract a time stamp.
-        */
-       if (ts_fmt == NULL)
-           return;
-
-       /*
-        * Initialize to today localtime, just in case not all fields
-        * of the date and time are specified.
-        */
-
-       timecode = timecode_default;
-       ts_usec = 0;
-
-       /*
-        * Null-terminate the preamble.
-        */
-       packet_preamble[packet_preamble_len] = '\0';
-
-       /* Ensure preamble has more than two chars before attempting to parse.
-        * This should cover line breaks etc that get counted.
-        */
-       if ( strlen(packet_preamble) > 2 ) {
-               /* Get Time leaving subseconds */
-               subsecs = strptime( packet_preamble, ts_fmt, &timecode );
-               if (subsecs != NULL) {
-                       /* Get the long time from the tm structure */
-                        /*  (will return -1 if failure)            */
-                       ts_sec  = mktime( &timecode );
-               } else
-                       ts_sec = -1;    /* we failed to parse it */
-
-               /* This will ensure incorrectly parsed dates get set to zero */
-               if ( -1 == ts_sec )
-               {
-                       /* Sanitize - remove all '\r' */
-                       char *c;
-                       while ((c = strchr(packet_preamble, '\r')) != NULL) *c=' ';
-                       fprintf (stderr, "Failure processing time \"%s\" using time format \"%s\"\n   (defaulting to Jan 1,1970 00:00:00 GMT)\n",
-                                packet_preamble, ts_fmt);
-                       if (debug >= 2) {
-                               fprintf(stderr, "timecode: %02d/%02d/%d %02d:%02d:%02d %d\n",
-                                       timecode.tm_mday, timecode.tm_mon, timecode.tm_year,
-                                       timecode.tm_hour, timecode.tm_min, timecode.tm_sec, timecode.tm_isdst);
-                       }
-                       ts_sec  = 0;  /* Jan 1,1970: 00:00 GMT; tshark/wireshark will display date/time as adjusted by timezone */
-                       ts_usec = 0;
-               }
-               else
-               {
-                       /* Parse subseconds */
-                       ts_usec = strtol(subsecs, &p, 10);
-                       if (subsecs == p) {
-                               /* Error */
-                               ts_usec = 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).
-                                */
-                               subseclen = (int) (p - subsecs);
-                               if (subseclen > 6) {
-                                       /*
-                                        * *More* than 6 digits; 6-N is
-                                        * negative, so we divide by
-                                        * 10^(N-6).
-                                        */
-                                       for (i = subseclen - 6; i != 0; i--)
-                                               ts_usec /= 10;
-                               } else if (subseclen < 6) {
-                                       for (i = 6 - subseclen; i != 0; i--)
-                                               ts_usec *= 10;
-                               }
-                       }
-               }
-       }
-       if (debug >= 2) {
-               char *c;
-               while ((c = strchr(packet_preamble, '\r')) != NULL) *c=' ';
-               fprintf(stderr, "[[parse_preamble: \"%s\"]]\n", packet_preamble);
-               fprintf(stderr, "Format(%s), time(%u), subsecs(%u)\n", ts_fmt, (guint32)ts_sec, ts_usec);
-       }
-
-
-       /* Clear Preamble */
-       packet_preamble_len = 0;
+    struct tm  timecode;
+    char      *subsecs;
+    char      *p;
+    int        subseclen;
+    int        i;
+
+     /*
+     * Null-terminate the preamble.
+     */
+    packet_preamble[packet_preamble_len] = '\0';
+    if (debug > 0)
+        fprintf(stderr, "[[parse_preamble: \"%s\"]]\n", packet_preamble);
+
+    if (has_direction) {
+        switch (packet_preamble[0]) {
+        case 'i':
+        case 'I':
+            direction = 0x00000001;
+            packet_preamble[0] = ' ';
+            break;
+        case 'o':
+        case 'O':
+            direction = 0x00000002;
+            packet_preamble[0] = ' ';
+            break;
+        default:
+            direction = 0x00000000;
+            break;
+        }
+        i = 0;
+        while (packet_preamble[i] == ' ' ||
+               packet_preamble[i] == '\r' ||
+               packet_preamble[i] == '\t') {
+            i++;
+        }
+        packet_preamble_len -= i;
+        /* Also move the trailing '\0'. */
+        memmove(packet_preamble, packet_preamble + i, packet_preamble_len + 1);
+    }
+
+
+    /*
+     * If no "-t" flag was specified, don't attempt to parse the packet
+     * preamble to extract a time stamp.
+     */
+    if (ts_fmt == NULL) {
+        /* Clear Preamble */
+        packet_preamble_len = 0;
+        return;
+    }
+
+    /*
+     * Initialize to today localtime, just in case not all fields
+     * of the date and time are specified.
+     */
+
+    timecode = timecode_default;
+    ts_nsec = 0;
+
+    /* Ensure preamble has more than two chars before attempting to parse.
+     * This should cover line breaks etc that get counted.
+     */
+    if (strlen(packet_preamble) > 2) {
+        /* Get Time leaving subseconds */
+        subsecs = strptime( packet_preamble, ts_fmt, &timecode );
+        if (subsecs != NULL) {
+            /* Get the long time from the tm structure */
+            /*  (will return -1 if failure)            */
+            ts_sec  = mktime( &timecode );
+        } else
+            ts_sec = -1;    /* we failed to parse it */
+
+        /* This will ensure incorrectly parsed dates get set to zero */
+        if (-1 == ts_sec) {
+            /* Sanitize - remove all '\r' */
+            char *c;
+            while ((c = strchr(packet_preamble, '\r')) != NULL) *c=' ';
+            fprintf (stderr, "Failure processing time \"%s\" using time format \"%s\"\n   (defaulting to Jan 1,1970 00:00:00 GMT)\n",
+                 packet_preamble, ts_fmt);
+            if (debug >= 2) {
+                fprintf(stderr, "timecode: %02d/%02d/%d %02d:%02d:%02d %d\n",
+                    timecode.tm_mday, timecode.tm_mon, timecode.tm_year,
+                    timecode.tm_hour, timecode.tm_min, timecode.tm_sec, timecode.tm_isdst);
+            }
+            ts_sec  = 0;  /* Jan 1,1970: 00:00 GMT; tshark/wireshark will display date/time as adjusted by timezone */
+            ts_nsec = 0;
+        } else {
+            /* Parse subseconds */
+            ts_nsec = (guint32)strtol(subsecs, &p, 10);
+            if (subsecs == p) {
+                /* Error */
+                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^-9 seconds, we multiply by
+                 * 10^(9-N).
+                 */
+                subseclen = (int) (p - subsecs);
+                if (subseclen > 9) {
+                    /*
+                     * *More* than 9 digits; 9-N is
+                     * negative, so we divide by
+                     * 10^(N-9).
+                     */
+                    for (i = subseclen - 9; i != 0; i--)
+                        ts_nsec /= 10;
+                } else if (subseclen < 9) {
+                    for (i = 9 - subseclen; i != 0; i--)
+                        ts_nsec *= 10;
+                }
+            }
+        }
+    }
+    if (debug >= 2) {
+        char *c;
+        while ((c = strchr(packet_preamble, '\r')) != NULL) *c=' ';
+        fprintf(stderr, "[[parse_preamble: \"%s\"]]\n", packet_preamble);
+        fprintf(stderr, "Format(%s), time(%u), subsecs(%u)\n", ts_fmt, (guint32)ts_sec, ts_nsec);
+    }
+
+
+    /* Clear Preamble */
+    packet_preamble_len = 0;
 }
 
 /*----------------------------------------------------------------------
  * Start a new packet
  */
 static void
-start_new_packet (void)
+start_new_packet (gboolean cont)
 {
-    if (debug>=1)
-        fprintf(stderr, "Start new packet\n");
+    if (debug >= 1)
+        fprintf(stderr, "Start new packet (cont = %s).\n", cont ? "TRUE" : "FALSE");
 
     /* Write out the current packet, if required */
-    write_current_packet();
-    num_packets_read ++;
+    write_current_packet(cont);
+    num_packets_read++;
 
     /* Ensure we parse the packet preamble as it may contain the time */
     parse_preamble();
@@ -904,8 +1117,7 @@ start_new_packet (void)
 static void
 process_directive (char *str)
 {
-    fprintf(stderr, "\n--- Directive [%s] currently unsupported ---\n", str+10);
-
+    fprintf(stderr, "\n--- Directive [%s] currently unsupported ---\n", str + 10);
 }
 
 /*----------------------------------------------------------------------
@@ -914,21 +1126,21 @@ process_directive (char *str)
 void
 parse_token (token_t token, char *str)
 {
-    unsigned long num;
-    int by_eol;
-    int rollback = 0;
-    int line_size;
-    int i;
-    chars2;
-    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) {
+    if (debug >= 2) {
         /* Sanitize - remove all '\r' */
         char *c;
         if (str!=NULL) { while ((c = strchr(str, '\r')) != NULL) *c=' '; }
@@ -936,20 +1148,13 @@ parse_token (token_t token, char *str)
         fprintf(stderr, "(%s, %s \"%s\") -> (",
                 state_str[state], token_str[token], str ? str : "");
     }
-    
-    /* First token must be treated as a timestamp if time strip format is
-       not empty */
-    if (state == INIT || state == START_OF_LINE) {
-        if (ts_fmt != NULL && new_date_fmt) {
-            token = T_TEXT;
-        }
-    }
 
-    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;
@@ -958,9 +1163,9 @@ parse_token (token_t token, char *str)
             break;
         case T_OFFSET:
             num = parse_num(str, TRUE);
-            if (num==0) {
+            if (num == 0) {
                 /* New packet starts here */
-                start_new_packet();
+                start_new_packet(FALSE);
                 state = READ_OFFSET;
                 pkt_lnstart = packet_buf + num;
             }
@@ -978,7 +1183,8 @@ parse_token (token_t token, char *str)
 
     /* ----- 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;
@@ -987,12 +1193,12 @@ parse_token (token_t token, char *str)
             break;
         case T_OFFSET:
             num = parse_num(str, TRUE);
-            if (num==0) {
+            if (num == 0) {
                 /* New packet starts here */
-                start_new_packet();
+                start_new_packet(FALSE);
                 packet_start = 0;
                 state = READ_OFFSET;
-            } else if ((num - packet_start) != curr_offset) {
+            } else if ((num - packet_start) != curr_offset - header_length) {
                 /*
                  * The offset we read isn't the one we expected.
                  * This may only mean that we mistakenly interpreted
@@ -1007,15 +1213,16 @@ parse_token (token_t token, char *str)
                     state = READ_OFFSET;
                 } else {
                     /* Bad offset; switch to INIT state */
-                    if (debug>=1)
-                        fprintf(stderr, "Inconsistent offset. Expecting %0lX, got %0lX. Ignoring rest of packet\n",
+                    if (debug >= 1)
+                        fprintf(stderr, "Inconsistent offset. Expecting %0X, got %0X. Ignoring rest of packet\n",
                                 curr_offset, num);
-                    write_current_packet();
+                    write_current_packet(FALSE);
                     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;
@@ -1027,10 +1234,11 @@ parse_token (token_t token, char *str)
 
     /* ----- 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:
@@ -1048,7 +1256,7 @@ parse_token (token_t token, char *str)
 
     /* ----- Processing packet, read byte -------------------------------------*/
     case READ_BYTE:
-        switch(token) {
+        switch (token) {
         case T_BYTE:
             /* Record the byte */
             write_byte(str);
@@ -1063,51 +1271,53 @@ parse_token (token_t token, char *str)
                 by_eol = 1;
                 state = START_OF_LINE;
             }
-            /* Here a line of pkt bytes reading is finished
-               compare the ascii and hex to avoid such situation:
-               "61 62 20 ab ", when ab is ascii dump then it should 
-               not be treat as byte */
-            rollback = 0;
-            /* s2 is the ASCII string, s1 is the HEX string, e.g, when 
-               s2 = "ab ", s1 = "616220" 
-               we should find out the largest tail of s1 matches the head
-               of s2, it means the matched part in tail is the ASCII dump
-               of the head byte. These matched should be rollback */
-            line_size = curr_offset-((int)pkt_lnstart-(int)packet_buf);
-            s2 = (char*)malloc((line_size+1)/4+1);
-            /* gather the possible pattern */
-            for(i=0; i<(line_size+1)/4; i++) {
-                tmp_str[0] = pkt_lnstart[i*3];
-                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])) {
-                    break;
-                }
-                s2[i] = (char)strtoul(tmp_str, (char **)NULL, 16);
-                rollback++;
-                /* the 3rd entry is not a delimiter, so the possible byte pattern will not shown */
-                if (!(pkt_lnstart[i*3+2] == ' ')) {
-                    if (by_eol != 1)
-                        rollback--;
-                    break;
-                }
-            }
-            /* If packet line start contains possible byte pattern, the line end
-               should contain the matched pattern if the user open the -a flag.
-               The packet will be possible invalid if the byte pattern cannot find 
-               a matched one in the line of packet buffer.*/
-            if (rollback > 0) {
-                if (strncmp(pkt_lnstart+line_size-rollback, s2, rollback) == 0) {
-                    unwrite_bytes(rollback);
+            if (identify_ascii) {
+                /* Here a line of pkt bytes reading is finished
+                   compare the ascii and hex to avoid such situation:
+                   "61 62 20 ab ", when ab is ascii dump then it should
+                   not be treat as byte */
+                rollback = 0;
+                /* s2 is the ASCII string, s1 is the HEX string, e.g, when
+                   s2 = "ab ", s1 = "616220"
+                   we should find out the largest tail of s1 matches the head
+                   of s2, it means the matched part in tail is the ASCII dump
+                   of the head byte. These matched should be rollback */
+                line_size = curr_offset-(int)(pkt_lnstart-packet_buf);
+                s2 = (char*)g_malloc((line_size+1)/4+1);
+                /* gather the possible pattern */
+                for (i = 0; i < (line_size+1)/4; i++) {
+                    tmp_str[0] = pkt_lnstart[i*3];
+                    tmp_str[1] = pkt_lnstart[i*3+1];
+                    tmp_str[2] = '\0';
+                    /* it is a valid convertable string */
+                    if (!g_ascii_isxdigit(tmp_str[0]) || !g_ascii_isxdigit(tmp_str[1])) {
+                        break;
+                    }
+                    s2[i] = (char)strtoul(tmp_str, (char **)NULL, 16);
+                    rollback++;
+                    /* the 3rd entry is not a delimiter, so the possible byte pattern will not shown */
+                    if (!(pkt_lnstart[i*3+2] == ' ')) {
+                        if (by_eol != 1)
+                            rollback--;
+                        break;
+                    }
                 }
-                /* Not matched. This line contains invalid packet bytes, so
-                   discard the whole line */
-                else {
-                    unwrite_bytes(line_size);
+                /* If packet line start contains possible byte pattern, the line end
+                   should contain the matched pattern if the user open the -a flag.
+                   The packet will be possible invalid if the byte pattern cannot find
+                   a matched one in the line of packet buffer.*/
+                if (rollback > 0) {
+                    if (strncmp(pkt_lnstart+line_size-rollback, s2, rollback) == 0) {
+                        unwrite_bytes(rollback);
+                    }
+                    /* Not matched. This line contains invalid packet bytes, so
+                       discard the whole line */
+                    else {
+                        unwrite_bytes(line_size);
+                    }
                 }
+                g_free(s2);
             }
-            free(s2);
             break;
         default:
             break;
@@ -1116,7 +1326,7 @@ parse_token (token_t token, char *str)
 
     /* ----- Processing packet, read text -------------------------------------*/
     case READ_TEXT:
-        switch(token) {
+        switch (token) {
         case T_EOL:
             state = START_OF_LINE;
             break;
@@ -1127,28 +1337,27 @@ parse_token (token_t token, char *str)
 
     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"
@@ -1168,13 +1377,22 @@ usage (void)
             "                         number is assumed to be fractions of a second.\n"
             "                         NOTE: Date/time fields from the current date/time are\n"
             "                         used as the default for unspecified fields.\n"
+            "  -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"
+            "  -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"
+            "                         like a HEX dump.\n"
+            "                         NOTE: Do not enable it if the input file does not\n"
+            "                         contain the ASCII text dump.\n"
             "\n"
             "Output:\n"
-            "  -l <typenum>           link-layer type number; default is 1 (Ethernet).\n"
-            "                         See the file net/bpf.h for list of numbers.\n"
-            "                         Use this option if your dump is a complete hex dump\n"
-            "                         of an encapsulated packet and you wish to specify\n"
-            "                         the exact type of encapsulation.\n"
+            "  -l <typenum>           link-layer type number; default is 1 (Ethernet).  See\n"
+            "                         http://www.tcpdump.org/linktypes.html for a list of\n"
+            "                         numbers.  Use this option if your dump is a complete\n"
+            "                         hex dump of an encapsulated packet and you wish to\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"
@@ -1186,21 +1404,27 @@ usage (void)
             "                         (in DECIMAL).\n"
             "                         Automatically prepends Ethernet header as well.\n"
             "                         Example: -i 46\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"
+            "                         dest and source address.\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"
-            "                         dest and source ports (in DECIMAL).\n"
+            "                         source and destination ports (in DECIMAL).\n"
             "                         Automatically prepends Ethernet & IP headers as well.\n"
             "                         Example: -u 1000,69 to make the packets look like\n"
             "                         TFTP/UDP packets.\n"
             "  -T <srcp>,<destp>      prepend dummy TCP header with specified\n"
-            "                         dest and source ports (in DECIMAL).\n"
+            "                         source and destination ports (in DECIMAL).\n"
             "                         Automatically prepends Ethernet & IP headers as well.\n"
             "                         Example: -T 50,60\n"
             "  -s <srcp>,<dstp>,<tag> prepend dummy SCTP header with specified\n"
-            "                         dest/source ports and verification tag (in DECIMAL).\n"
+            "                         source/dest ports and verification tag (in DECIMAL).\n"
             "                         Automatically prepends Ethernet & IP headers as well.\n"
             "                         Example: -s 30,40,34\n"
             "  -S <srcp>,<dstp>,<ppi> prepend dummy SCTP header with specified\n"
-            "                         dest/source ports and verification tag 0.\n"
+            "                         source/dest ports and verification tag 0.\n"
             "                         Automatically prepends a dummy SCTP DATA\n"
             "                         chunk header with payload protocol identifier ppi.\n"
             "                         Example: -S 30,40,34\n"
@@ -1208,11 +1432,36 @@ usage (void)
             "Miscellaneous:\n"
             "  -h                     display this help and exit.\n"
             "  -d                     show detailed debug of parser states.\n"
-            "  -q                     generate no output at all (automatically turns off -d).\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);
+}
 
-    exit(-1);
+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 */
+}
+
+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
 }
 
 /*----------------------------------------------------------------------
@@ -1221,39 +1470,70 @@ usage (void)
 static void
 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 }
+    };
 
 #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, "Ddhqe:i:l:m:o:u:s:S:t:T:")) != -1) {
-        switch(c) {
-        case '?': usage(); break;
-        case 'h': usage(); break;
-        case 'D': new_date_fmt = 1; 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 'l': pcap_link_type = strtol(optarg, NULL, 0); break;
-        case 'm': max_offset = strtol(optarg, NULL, 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 '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;
+            case 'h': offset_base = 16; break;
+            case 'd': offset_base = 10; break;
             }
-                       switch(optarg[0]) {
-                       case 'o': offset_base = 8; break;
-                       case 'h': offset_base = 16; break;
-                       case 'd': offset_base = 10; break;
-                       }
             break;
         case 'e':
             hdr_ethernet = TRUE;
-            if (sscanf(optarg, "%lx", &hdr_ethernet_proto) < 1) {
+            if (sscanf(optarg, "%x", &hdr_ethernet_proto) < 1) {
                 fprintf(stderr, "Bad argument for '-e': %s\n", optarg);
-                usage();
+                print_usage(stderr);
+                exit(1);
             }
             break;
 
@@ -1263,40 +1543,49 @@ parse_options (int argc, char *argv[])
             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;
             break;
 
         case 's':
-            hdr_sctp       = TRUE;
-            hdr_sctp_src   = strtol(optarg, &p, 10);
+            hdr_sctp = TRUE;
+            hdr_data_chunk = FALSE;
+            hdr_tcp = FALSE;
+            hdr_udp = FALSE;
+            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 = strtol(optarg, &p, 10);
+            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 = strtol(optarg, &p, 10);
+            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;
@@ -1305,34 +1594,41 @@ parse_options (int argc, char *argv[])
             hdr_ethernet_proto = 0x800;
             break;
         case 'S':
-            hdr_sctp       = TRUE;
+            hdr_sctp = TRUE;
             hdr_data_chunk = TRUE;
-            hdr_sctp_src   = strtol(optarg, &p, 10);
+            hdr_tcp = FALSE;
+            hdr_udp = FALSE;
+            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 = strtol(optarg, &p, 10);
+            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 = strtoul(optarg, &p, 10);
+            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;
@@ -1348,21 +1644,26 @@ parse_options (int argc, char *argv[])
         case 'u':
             hdr_udp = TRUE;
             hdr_tcp = FALSE;
-            hdr_src_port = strtol(optarg, &p, 10);
+            hdr_sctp = FALSE;
+            hdr_data_chunk = FALSE;
+            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 = strtol(optarg, &p, 10);
+            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;
@@ -1373,21 +1674,26 @@ parse_options (int argc, char *argv[])
         case 'T':
             hdr_tcp = TRUE;
             hdr_udp = FALSE;
-            hdr_src_port = strtol(optarg, &p, 10);
+            hdr_sctp = FALSE;
+            hdr_data_chunk = FALSE;
+            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 = strtol(optarg, &p, 10);
+            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;
@@ -1395,14 +1701,88 @@ parse_options (int argc, char *argv[])
             hdr_ethernet_proto = 0x800;
             break;
 
+        case 'a':
+            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);
+                print_usage(stderr);
+                exit(1);
+            }
+
+            *p = '\0';
+            if (c == '6')
+            {
+                hdr_ipv6 = TRUE;
+                hdr_ethernet_proto = 0x86DD;
+            }
+            else
+            {
+                hdr_ip = TRUE;
+                hdr_ethernet_proto = 0x800;
+            }
+            hdr_ethernet = TRUE;
+
+            if (hdr_ipv6 == TRUE) {
+                if (!ws_inet_pton6(optarg, &hdr_ipv6_src_addr)) {
+                        fprintf(stderr, "Bad src addr -%c '%s'\n", c, p);
+                        print_usage(stderr);
+                        exit(1);
+                }
+            } else {
+                if (!ws_inet_pton4(optarg, &hdr_ip_src_addr)) {
+                        fprintf(stderr, "Bad src addr -%c '%s'\n", c, p);
+                        print_usage(stderr);
+                        exit(1);
+                }
+            }
+
+            p++;
+            if (*p == '\0') {
+                fprintf(stderr, "No dest addr specified for '-%c'\n", c);
+                print_usage(stderr);
+                exit(1);
+            }
+
+            if (hdr_ipv6 == TRUE) {
+                if (!ws_inet_pton6(p, &hdr_ipv6_dest_addr)) {
+                        fprintf(stderr, "Bad dest addr for -%c '%s'\n", c, p);
+                        print_usage(stderr);
+                        exit(1);
+                }
+            } else {
+                if (!ws_inet_pton4(p, &hdr_ip_dest_addr)) {
+                        fprintf(stderr, "Bad dest addr for -%c '%s'\n", c, p);
+                        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], "-")) {
@@ -1411,7 +1791,7 @@ parse_options (int argc, char *argv[])
         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";
@@ -1424,7 +1804,7 @@ parse_options (int argc, char *argv[])
         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";
@@ -1434,7 +1814,7 @@ parse_options (int argc, char *argv[])
     /* 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 */
@@ -1447,26 +1827,27 @@ parse_options (int argc, char *argv[])
         output_filename = "Standard output";
     }
 
-    ts_sec = time(0);          /* initialize to current time */
+    ts_sec = time(0);               /* initialize to current time */
     timecode_default = *localtime(&ts_sec);
-    timecode_default.tm_isdst = -1;    /* Unknown for now, depends on time given to the strptime() function */
+    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%0lX\n",
+        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_udp) fprintf(stderr, "Generate dummy UDP header: Source port: %ld. Dest port: %ld\n",
+        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: %ld. Dest port: %ld\n",
+        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: %ld. Dest port: %ld. Tag: %ld\n",
+        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: %lu. SID: %d. SSN: %d. PPID: %lu\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);
     }
 }
@@ -1476,23 +1857,63 @@ main(int argc, char *argv[])
 {
     parse_options(argc, argv);
 
-    assert(input_file != NULL);
+    assert(input_file  != NULL);
     assert(output_file != NULL);
 
     write_file_header();
 
+    header_length = 0;
+    if (hdr_ethernet) {
+        header_length += (int)sizeof(HDR_ETHERNET);
+    }
+    if (hdr_ip) {
+        ip_offset = header_length;
+        header_length += (int)sizeof(HDR_IP);
+    } else if (hdr_ipv6) {
+        ip_offset = header_length;
+        header_length += (int)sizeof(HDR_IPv6);
+    }
+    if (hdr_sctp) {
+        header_length += (int)sizeof(HDR_SCTP);
+    }
+    if (hdr_data_chunk) {
+        header_length += (int)sizeof(HDR_DATA_CHUNK);
+    }
+    if (hdr_tcp) {
+        header_length += (int)sizeof(HDR_TCP);
+    }
+    if (hdr_udp) {
+        header_length += (int)sizeof(HDR_UDP);
+    }
+    curr_offset = header_length;
+
     yyin = input_file;
     yylex();
 
-    write_current_packet();
+    write_current_packet(FALSE);
     fclose(input_file);
     fclose(output_file);
     if (debug)
         fprintf(stderr, "\n-------------------------\n");
     if (!quiet) {
-    fprintf(stderr, "Read %ld potential packet%s, wrote %ld packet%s\n",
-            num_packets_read,    (num_packets_read==1)   ?"":"s",
-            num_packets_written, (num_packets_written==1)?"":"s");
+        fprintf(stderr, "Read %u potential packet%s, wrote %u packet%s (%" G_GINT64_MODIFIER "u byte%s).\n",
+                num_packets_read, (num_packets_read == 1) ? "" : "s",
+                num_packets_written, (num_packets_written == 1) ? "" : "s",
+                bytes_written, (bytes_written == 1) ? "" : "s");
     }
     return 0;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
+