Move the new files to the same places as in automake.
[obnox/wireshark/wip.git] / wiretap / file_access.c
index 26f782e593d1281168977440ba3cf46b7c6276a4..3b604217b56a41a3af0c8f6a6bc9a87b2538b363 100644 (file)
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #include <errno.h>
 
-#ifdef HAVE_IO_H
-#include <io.h>        /* open/close on win32 */
-#endif
+#include <wsutil/file_util.h>
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
 #include "airopeek9.h"
 #include "ngsniffer.h"
 #include "radcom.h"
-#include "ascend.h"
+#include "ascendtext.h"
 #include "nettl.h"
 #include "libpcap.h"
 #include "snoop.h"
 #include "iptrace.h"
+#include "iseries.h"
 #include "netmon.h"
 #include "netxray.h"
 #include "toshiba.h"
 #include "erf.h"
 #include "hcidump.h"
 #include "network_instruments.h"
+#include "k12.h"
+#include "ber.h"
+#include "catapult_dct2000.h"
+#include "mpeg.h"
+#include "netscreen.h"
+#include "commview.h"
+#include "pcapng.h"
+#include "aethra.h"
+#include "btsnoop.h"
+#include "tnef.h"
+#include "dct3trace.h"
+#include "packetlogger.h"
+#include "daintree-sna.h"
+#include "netscaler.h"
+#include "mime_file.h"
+#include "ipfix.h"
+#include "pcap-encap.h"
 
 /* The open_file_* routines should return:
  *
  * should be discovered as a libpcap file, not a toshiba file.
  */
 
-static int (*const open_routines[])(wtap *, int *, char **) = {
+
+static wtap_open_routine_t open_routines_base[] = {
        /* Files that have magic bytes in fixed locations. These
         * are easy to identify.
         */
@@ -110,15 +123,36 @@ static int (*const open_routines[])(wtap *, int *, char **) = {
        network_instruments_open,
        airopeek9_open,
        dbs_etherwatch_open,
-
+       k12_open,
+       catapult_dct2000_open,
+       ber_open,
+       pcapng_open,
+       aethra_open,
+       btsnoop_open,
+       packetlogger_open, /* This type does not have a magic number, but its
+                           * files are sometimes grabbed by mpeg_open. */
+       mpeg_open,
+       tnef_open,
+       dct3trace_open,
+       daintree_sna_open,
+       mime_file_open,
        /* Files that don't have magic bytes at a fixed location,
         * but that instead require a heuristic of some sort to
         * identify them.  This includes the ASCII trace files that
         * would be, for example, saved copies of a Telnet session
         * to some box.
         */
+
+       /* I put NetScreen *before* erf, because there were some
+        * false positives with my test-files (Sake Blok, July 2007)
+        */
+       netscreen_open,
+       erf_open,
+       ipfix_open,
+       k12text_open,
        etherpeek_open,
        pppdump_open,
+       iseries_open,
        ascend_open,
        eyesdn_open,
        toshiba_open,
@@ -126,11 +160,40 @@ static int (*const open_routines[])(wtap *, int *, char **) = {
        csids_open,
        vms_open,
        cosine_open,
-       erf_open,
        hcidump_open,
+       commview_open,
+       nstrace_open
 };
 
-#define        N_FILE_TYPES    (sizeof open_routines / sizeof open_routines[0])
+#define        N_FILE_TYPES    (sizeof open_routines_base / sizeof open_routines_base[0])
+
+static wtap_open_routine_t* open_routines = NULL;
+
+static GArray* open_routines_arr = NULL;
+
+
+/* initialize the open routines array if it has not been initialized yet */
+static void init_open_routines(void) {
+
+       if (open_routines_arr) return;
+
+       open_routines_arr = g_array_new(FALSE,TRUE,sizeof(wtap_open_routine_t));
+
+       g_array_append_vals(open_routines_arr,open_routines_base,N_FILE_TYPES);
+
+       open_routines = (wtap_open_routine_t*)(void *)open_routines_arr->data;
+}
+
+void wtap_register_open_routine(wtap_open_routine_t open_routine, gboolean has_magic) {
+       init_open_routines();
+
+       if (has_magic)
+               g_array_prepend_val(open_routines_arr,open_routine);
+       else
+               g_array_append_val(open_routines_arr,open_routine);
+
+       open_routines = (wtap_open_routine_t*)(void *)open_routines_arr->data;
+}
 
 /*
  * Visual C++ on Win32 systems doesn't define these.  (Old UNIX systems don't
@@ -154,14 +217,15 @@ static int (*const open_routines[])(wtap *, int *, char **) = {
 /* Opens a file and prepares a wtap struct.
    If "do_random" is TRUE, it opens the file twice; the second open
    allows the application to do random-access I/O without moving
-   the seek offset for sequential I/O, which is used by Ethereal
+   the seek offset for sequential I/O, which is used by Wireshark
    so that it can do sequential I/O to a capture file that's being
    written to as new packets arrive independently of random I/O done
    to display protocol trees for packets when they're selected. */
 wtap* wtap_open_offline(const char *filename, int *err, char **err_info,
-    gboolean do_random)
+                       gboolean do_random)
 {
-       struct stat statb;
+       int     fd;
+       ws_statb64 statb;
        wtap    *wth;
        unsigned int    i;
        gboolean use_stdin = FALSE;
@@ -172,12 +236,12 @@ wtap* wtap_open_offline(const char *filename, int *err, char **err_info,
 
        /* First, make sure the file is valid */
        if (use_stdin) {
-               if (fstat(0, &statb) < 0) {
+               if (ws_fstat64(0, &statb) < 0) {
                        *err = errno;
                        return NULL;
                }
        } else {
-               if (stat(filename, &statb) < 0) {
+               if (ws_stat64(filename, &statb) < 0) {
                        *err = errno;
                        return NULL;
                }
@@ -225,45 +289,46 @@ wtap* wtap_open_offline(const char *filename, int *err, char **err_info,
        }
 
        errno = ENOMEM;
-       wth = g_malloc(sizeof(wtap));
-       if (wth == NULL) {
-               *err = errno;
-               return NULL;
-       }
-
-/* Win32 needs the O_BINARY flag for open() */
-#ifndef O_BINARY
-#define O_BINARY       0
-#endif
+       wth = (wtap *)g_malloc0(sizeof(wtap));
 
        /* Open the file */
        errno = WTAP_ERR_CANT_OPEN;
        if (use_stdin) {
                /*
                 * We dup FD 0, so that we don't have to worry about
-                * an fclose or gzclose of wth->fh closing the standard
+                * a file_close of wth->fh closing the standard
                 * input of the process.
                 */
-               wth->fd = dup(0);
+               fd = ws_dup(0);
+               if (fd < 0) {
+                       *err = errno;
+                       g_free(wth);
+                       return NULL;
+               }
 #ifdef _WIN32
-               _setmode(wth->fd, O_BINARY);
+               if (_setmode(fd, O_BINARY) == -1) {
+                       /* "Shouldn't happen" */
+                       *err = errno;
+                       g_free(wth);
+                       return NULL;
+               }
 #endif
-       } else
-               wth->fd = open(filename, O_RDONLY|O_BINARY);
-       if (wth->fd < 0) {
-               *err = errno;
-               g_free(wth);
-               return NULL;
-       }
-       if (!(wth->fh = filed_open(wth->fd, "rb"))) {
-               *err = errno;
-               close(wth->fd);
-               g_free(wth);
-               return NULL;
+               if (!(wth->fh = filed_open(fd))) {
+                       *err = errno;
+                       ws_close(fd);
+                       g_free(wth);
+                       return NULL;
+               }
+       } else {
+               if (!(wth->fh = file_open(filename))) {
+                       *err = errno;
+                       g_free(wth);
+                       return NULL;
+               }
        }
 
        if (do_random) {
-               if (!(wth->random_fh = file_open(filename, "rb"))) {
+               if (!(wth->random_fh = file_open(filename))) {
                        *err = errno;
                        file_close(wth->fh);
                        g_free(wth);
@@ -277,9 +342,19 @@ wtap* wtap_open_offline(const char *filename, int *err, char **err_info,
        wth->data_offset = 0;
        wth->subtype_sequential_close = NULL;
        wth->subtype_close = NULL;
+       wth->tsprecision = WTAP_FILE_TSPREC_USEC;
+       wth->priv = NULL;
+
+       init_open_routines();
+       if (wth->random_fh) {
+               wth->fast_seek = g_ptr_array_new();
+
+               file_set_random_access(wth->fh, FALSE, wth->fast_seek);
+               file_set_random_access(wth->random_fh, TRUE, wth->fast_seek);
+       }
 
        /* Try all file types */
-       for (i = 0; i < N_FILE_TYPES; i++) {
+       for (i = 0; i < open_routines_arr->len; i++) {
                /* Seek back to the beginning of the file; the open routine
                   for the previous file type may have left the file
                   position somewhere other than the beginning, and the
@@ -296,6 +371,7 @@ wtap* wtap_open_offline(const char *filename, int *err, char **err_info,
                        return NULL;
                }
                wth->data_offset = 0;
+
                switch ((*open_routines[i])(wth, err, err_info)) {
 
                case -1:
@@ -317,193 +393,386 @@ wtap* wtap_open_offline(const char *filename, int *err, char **err_info,
        }
 
        /* Well, it's not one of the types of file we know about. */
-       if (wth->random_fh != NULL)
-               file_close(wth->random_fh);
-       file_close(wth->fh);
-       g_free(wth);
+       wtap_close(wth);
        *err = WTAP_ERR_FILE_UNKNOWN_FORMAT;
        return NULL;
 
 success:
-       wth->frame_buffer = g_malloc(sizeof(struct Buffer));
+       wth->frame_buffer = (struct Buffer *)g_malloc(sizeof(struct Buffer));
        buffer_init(wth->frame_buffer, 1500);
        return wth;
 }
 
 /* Table of the file types we know about. */
-static const struct file_type_info {
-       const char *name;
-       const char *short_name;
-       int     (*can_write_encap)(int);
-       int     (*dump_open)(wtap_dumper *, gboolean, int *);
-} dump_open_table[WTAP_NUM_FILE_TYPES] = {
-       /* WTAP_FILE_UNKNOWN */
-       { NULL, NULL,
-         NULL, NULL },
-
-       /* WTAP_FILE_WTAP */
-       { "Wiretap (Ethereal)", NULL,
+static const struct file_type_info dump_open_table_base[] = {
+       /* WTAP_FILE_UNKNOWN (only used internally for initialization) */
+       { NULL, NULL, NULL, NULL, FALSE, FALSE,
          NULL, NULL },
 
        /* WTAP_FILE_PCAP */
-       { "libpcap (tcpdump, Ethereal, etc.)", "libpcap",
+        /* Gianluca Varenni suggests that we add "deprecated" to the description. */
+       { "Wireshark/tcpdump/... - libpcap", "libpcap", "pcap", "cap", FALSE, FALSE,
          libpcap_dump_can_write_encap, libpcap_dump_open },
 
-       /* WTAP_FILE_PCAP_SS990417 */
-       { "RedHat Linux 6.1 libpcap (tcpdump)", "rh6_1libpcap",
-         libpcap_dump_can_write_encap, libpcap_dump_open },
+       /* WTAP_FILE_PCAPNG */
+       { "Wireshark - pcapng", "pcapng", "pcapng", NULL, FALSE, TRUE,
+         pcapng_dump_can_write_encap, pcapng_dump_open },
 
-       /* WTAP_FILE_PCAP_SS990915 */
-       { "SuSE Linux 6.3 libpcap (tcpdump)", "suse6_3libpcap",
+       /* WTAP_FILE_PCAP_NSEC */
+       { "Wireshark - nanosecond libpcap", "nseclibpcap", "pcap", "cap", FALSE, FALSE,
          libpcap_dump_can_write_encap, libpcap_dump_open },
 
+       /* WTAP_FILE_PCAP_AIX */
+       { "AIX tcpdump - libpcap", "aixlibpcap", "pcap", "cap", FALSE, FALSE,
+         NULL, NULL },
+
        /* WTAP_FILE_PCAP_SS991029 */
-       { "modified libpcap (tcpdump)", "modlibpcap",
+       { "Modified tcpdump - libpcap", "modlibpcap", "pcap", "cap", FALSE, FALSE,
          libpcap_dump_can_write_encap, libpcap_dump_open },
 
        /* WTAP_FILE_PCAP_NOKIA */
-       { "Nokia libpcap (tcpdump)", "nokialibpcap",
+       { "Nokia tcpdump - libpcap ", "nokialibpcap", "pcap", "cap", FALSE, FALSE,
          libpcap_dump_can_write_encap, libpcap_dump_open },
 
-       /* WTAP_FILE_PCAP_AIX */
-       { "AIX libpcap (tcpdump)", NULL,
+       /* WTAP_FILE_PCAP_SS990417 */
+       { "RedHat 6.1 tcpdump - libpcap", "rh6_1libpcap", "pcap", "cap", FALSE, FALSE,
+         libpcap_dump_can_write_encap, libpcap_dump_open },
+
+       /* WTAP_FILE_PCAP_SS990915 */
+       { "SuSE 6.3 tcpdump - libpcap", "suse6_3libpcap", "pcap", "cap", FALSE, FALSE,
+         libpcap_dump_can_write_encap, libpcap_dump_open },
+
+       /* WTAP_FILE_5VIEWS */
+       { "Accellent 5Views capture", "5views", "5vw", NULL, TRUE, FALSE,
+         _5views_dump_can_write_encap, _5views_dump_open },
+
+       /* WTAP_FILE_IPTRACE_1_0 */
+       { "AIX iptrace 1.0", "iptrace_1", NULL, NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_LANALYZER */
-       { "Novell LANalyzer","lanalyzer",
-         lanalyzer_dump_can_write_encap, lanalyzer_dump_open },
+       /* WTAP_FILE_IPTRACE_2_0 */
+       { "AIX iptrace 2.0", "iptrace_2", NULL, NULL, FALSE, FALSE,
+         NULL, NULL },
 
-       /* WTAP_FILE_NGSNIFFER_UNCOMPRESSED */
-       { "Network Associates Sniffer (DOS-based)", "ngsniffer",
-         ngsniffer_dump_can_write_encap, ngsniffer_dump_open },
+       /* WTAP_FILE_BER */
+       { "ASN.1 Basic Encoding Rules", "ber", NULL, NULL, FALSE, FALSE,
+               NULL, NULL },
 
-       /* WTAP_FILE_NGSNIFFER_COMPRESSED */
-       { "Network Associates Sniffer (DOS-based), compressed", "ngsniffer_comp",
+       /* WTAP_FILE_HCIDUMP */
+       { "Bluetooth HCI dump", "hcidump", NULL, NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_SNOOP */
-       { "Sun snoop", "snoop",
-         snoop_dump_can_write_encap, snoop_dump_open },
+       /* WTAP_FILE_CATAPULT_DCT2000 */
+       { "Catapult DCT2000 trace (.out format)", "dct2000", "out", NULL, FALSE, FALSE,
+         catapult_dct2000_dump_can_write_encap, catapult_dct2000_dump_open },
 
-       /* WTAP_FILE_SHOMITI */
-       { "Shomiti/Finisar Surveyor", "shomiti",
+       /* WTAP_FILE_NETXRAY_OLD */
+       { "Cinco Networks NetXRay 1.x", "netxray1", "cap", NULL, TRUE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_IPTRACE_1_0 */
-       { "AIX iptrace 1.0", NULL,
+       /* WTAP_FILE_NETXRAY_1_0 */
+       { "Cinco Networks NetXRay 2.0 or later", "netxray2", "cap", NULL, TRUE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_IPTRACE_2_0 */
-       { "AIX iptrace 2.0", NULL,
+       /* WTAP_FILE_COSINE */
+       { "CoSine IPSX L2 capture", "cosine", "txt", NULL, FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_FILE_CSIDS */
+       { "CSIDS IPLog", "csids", NULL, NULL, FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_FILE_DBS_ETHERWATCH */
+       { "DBS Etherwatch (VMS)", "etherwatch", "txt", NULL, FALSE, FALSE,
+         NULL, NULL},
+
+       /* WTAP_FILE_ERF */
+       { "Endace ERF capture", "erf", "erf", NULL, FALSE, FALSE,
+         erf_dump_can_write_encap, erf_dump_open },
+
+       /* WTAP_FILE_EYESDN */
+       { "EyeSDN USB S0/E1 ISDN trace format", "eyesdn", "trc", NULL, FALSE, FALSE,
+          eyesdn_dump_can_write_encap, eyesdn_dump_open },
+
+       /* WTAP_FILE_NETTL */
+       { "HP-UX nettl trace", "nettl", "trc0", "trc1", FALSE, FALSE,
+         nettl_dump_can_write_encap, nettl_dump_open },
+
+       /* WTAP_FILE_ISERIES */
+       { "IBM iSeries comm. trace (ASCII)", "iseries_ascii", "txt", NULL, FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_FILE_ISERIES_UNICODE */
+       { "IBM iSeries comm. trace (UNICODE)", "iseries_unicode", "txt", NULL, FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_FILE_I4BTRACE */
+       { "I4B ISDN trace", "i4btrace", NULL, NULL, FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_FILE_ASCEND */
+       { "Lucent/Ascend access server trace", "ascend", "txt", NULL, FALSE, FALSE,
          NULL, NULL },
 
        /* WTAP_FILE_NETMON_1_x */
-       { "Microsoft Network Monitor 1.x", "netmon1",
-         netmon_dump_can_write_encap, netmon_dump_open },
+       { "Microsoft NetMon 1.x", "netmon1", "cap", NULL, TRUE, FALSE,
+         netmon_dump_can_write_encap_1_x, netmon_dump_open },
 
        /* WTAP_FILE_NETMON_2_x */
-       { "Microsoft Network Monitor 2.x", "netmon2",
-         netmon_dump_can_write_encap, netmon_dump_open },
+       { "Microsoft NetMon 2.x", "netmon2", "cap", NULL, TRUE, FALSE,
+         netmon_dump_can_write_encap_2_x, netmon_dump_open },
 
-       /* WTAP_FILE_NETXRAY_OLD */
-       { "Cinco Networks NetXRay 1.x", NULL,
-         NULL, NULL },
+       /* WTAP_FILE_NGSNIFFER_UNCOMPRESSED */
+       { "NA Sniffer (DOS)", "ngsniffer", "cap", "enc;trc;fdc;syc", FALSE, FALSE,
+         ngsniffer_dump_can_write_encap, ngsniffer_dump_open },
 
-       /* WTAP_FILE_NETXRAY_1_0 */
-       { "Cinco Networks NetXRay 2.0 or later", NULL,
+       /* WTAP_FILE_NGSNIFFER_COMPRESSED */
+       { "NA Sniffer (DOS), compressed", "ngsniffer_comp", "caz", NULL, FALSE, FALSE,
          NULL, NULL },
 
        /* WTAP_FILE_NETXRAY_1_1 */
-       { "Network Associates Sniffer (Windows-based) 1.1", "ngwsniffer_1_1",
+       { "NA Sniffer (Windows) 1.1", "ngwsniffer_1_1", "cap", NULL, TRUE, FALSE,
          netxray_dump_can_write_encap_1_1, netxray_dump_open_1_1 },
 
        /* WTAP_FILE_NETXRAY_2_00x */
-       { "Network Associates Sniffer (Windows-based) 2.00x", "ngwsniffer_2_0",
+       { "NA Sniffer (Windows) 2.00x", "ngwsniffer_2_0", "cap", NULL, TRUE, FALSE,
          netxray_dump_can_write_encap_2_0, netxray_dump_open_2_0 },
 
-       /* WTAP_FILE_RADCOM */
-       { "RADCOM WAN/LAN analyzer", NULL,
+       /* WTAP_FILE_NETWORK_INSTRUMENTS */
+       { "Network Instruments Observer", "niobserver", "bfr", NULL, FALSE, FALSE,
+         network_instruments_dump_can_write_encap, network_instruments_dump_open },
+
+       /* WTAP_FILE_LANALYZER */
+       { "Novell LANalyzer","lanalyzer", "tr1", NULL, TRUE, FALSE,
+         lanalyzer_dump_can_write_encap, lanalyzer_dump_open },
+
+       /* WTAP_FILE_PPPDUMP */
+       { "pppd log (pppdump format)", "pppd", NULL, NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_ASCEND */
-       { "Lucent/Ascend access server trace", NULL,
+       /* WTAP_FILE_RADCOM */
+       { "RADCOM WAN/LAN analyzer", "radcom", NULL, NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_NETTL */
-       { "HP-UX nettl trace", "nettl",
-         nettl_dump_can_write_encap, nettl_dump_open },
+       /* WTAP_FILE_SNOOP */
+       { "Sun snoop", "snoop", "snoop", "cap", FALSE, FALSE,
+         snoop_dump_can_write_encap, snoop_dump_open },
 
-       /* WTAP_FILE_TOSHIBA */
-       { "Toshiba Compact ISDN Router snoop trace", NULL,
+       /* WTAP_FILE_SHOMITI */
+       { "Shomiti/Finisar Surveyor", "shomiti", "cap", NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_I4BTRACE */
-       { "I4B ISDN trace", NULL,
-         NULL, NULL },
+       /* WTAP_FILE_VMS */
+       { "TCPIPtrace (VMS)", "tcpiptrace", "txt", NULL, FALSE, FALSE,
+         NULL, NULL},
 
-        /* WTAP_FILE_CSIDS */
-        { "CSIDS IPLog", NULL,
-          NULL, NULL },
+       /* WTAP_FILE_K12 */
+       { "Tektronix K12xx 32-bit .rf5 format", "rf5", "rf5", NULL, TRUE, FALSE,
+               k12_dump_can_write_encap, k12_dump_open },
 
-        /* WTAP_FILE_PPPDUMP */
-        { "pppd log (pppdump format)", NULL,
-          NULL, NULL },
+       /* WTAP_FILE_TOSHIBA */
+       { "Toshiba Compact ISDN Router snoop", "toshiba", "txt", NULL, FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_FILE_VISUAL_NETWORKS */
+       { "Visual Networks traffic capture", "visual", NULL, NULL, TRUE, FALSE,
+         visual_dump_can_write_encap, visual_dump_open },
 
        /* WTAP_FILE_ETHERPEEK_V56 */
-       { "EtherPeek/TokenPeek trace (V5 & V6 file format)", NULL,
+       { "WildPackets Ether/TokenPeek (V5 & V6)", "peek56", "pkt", "tpc;apc;wpz", FALSE, FALSE,
          NULL, NULL },
 
        /* WTAP_FILE_ETHERPEEK_V7 */
-       { "EtherPeek/TokenPeek/AiroPeek trace (V7 file format)", NULL,
+       { "WildPackets Ether/Token/AiroPeek (V7)", "peek7", "pkt", "tpc;apc;wpz", FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_VMS */
-       { "TCPIPtrace (VMS)", NULL,
-         NULL, NULL},
+       /* WTAP_FILE_ETHERPEEK_V9 */
+       { "WildPackets Ether/AiroPeek (V9)", "peek9", "pkt", "tpc;apc;wpz", FALSE, FALSE,
+         NULL, NULL },
 
-       /* WTAP_FILE_DBS_ETHERWATCH */
-       { "DBS Etherwatch (VMS)", NULL,
-         NULL, NULL},
+       /* WTAP_FILE_MPEG */
+       { "MPEG", "mpeg", "mpeg", "mpg;mp3", FALSE, FALSE,
+         NULL, NULL },
 
-       /* WTAP_FILE_VISUAL_NETWORKS */
-       { "Visual Networks traffic capture", "visual",
-         visual_dump_can_write_encap, visual_dump_open },
+       /* WTAP_FILE_K12TEXT  */
+       { "K12 text file", "k12text", "txt", NULL, FALSE, FALSE,
+         k12text_dump_can_write_encap, k12text_dump_open },
 
-       /* WTAP_FILE_COSINE */
-       { "CoSine IPSX L2 capture", "cosine",
+       /* WTAP_FILE_NETSCREEN */
+       { "NetScreen snoop text file", "netscreen", "txt", NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_5VIEWS */
-       { "Accellent 5Views capture", "5views",
-         _5views_dump_can_write_encap, _5views_dump_open },
+       /* WTAP_FILE_COMMVIEW */
+       { "TamoSoft CommView", "commview", "ncf", NULL, FALSE, FALSE,
+         commview_dump_can_write_encap, commview_dump_open },
 
-       /* WTAP_FILE_ERF */
-       { "Endace DAG capture", "erf",
+       /* WTAP_FILE_BTSNOOP */
+       { "Symbian OS btsnoop", "btsnoop", "log", NULL, FALSE, FALSE,
+         btsnoop_dump_can_write_encap, btsnoop_dump_open_h4 },
+
+       /* WTAP_FILE_TNEF */
+       { "Transport-Neutral Encapsulation Format", "tnef", NULL, NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_HCIDUMP */
-       { "Bluetooth HCI dump", "hcidump",
+       /* WTAP_FILE_DCT3TRACE */
+       { "Gammu DCT3 trace", "dct3trace", "xml", NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_NETWORK_INSTRUMENTS_V9 */
-       { "Network Instruments Observer version 9", "niobserverv9",
-         network_instruments_dump_can_write_encap, network_instruments_dump_open },
+       /* WTAP_FILE_PACKETLOGGER */
+       { "PacketLogger", "pklg", "pklg", NULL, FALSE, FALSE,
+         NULL, NULL },
 
-       /* WTAP_FILE_AIROPEEK_V9 */
-       { "EtherPeek/AiroPeek trace (V9 file format)", NULL,
+       /* WTAP_FILE_DAINTREE_SNA */
+       { "Daintree SNA", "dsna", "dcf", NULL, FALSE, FALSE,
          NULL, NULL },
-    
-       /* WTAP_FILE_EYESDN */
-       { "EyeSDN USB S0/E1 ISDN trace format", NULL,
+
+       /* WTAP_FILE_NETSCALER_1_0 */
+       { "NetScaler Trace (Version 1.0)", "nstrace10", NULL, NULL, TRUE, FALSE,
+         nstrace_10_dump_can_write_encap, nstrace_dump_open },
+
+       /* WTAP_FILE_NETSCALER_2_0 */
+       { "NetScaler Trace (Version 2.0)", "nstrace20", "cap", NULL, TRUE, FALSE,
+         nstrace_20_dump_can_write_encap, nstrace_dump_open },
+
+       /* WTAP_FILE_JPEG_JFIF */
+       { "JPEG/JFIF", "jpeg", "jpg", "jpeg;jfif", FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_FILE_IPFIX */
+       { "IPFIX File Format", "ipfix", "pfx", "ipfix", FALSE, FALSE,
+         NULL, NULL },
+
+       /* WTAP_ENCAP_MIME */
+       { "MIME File Format", "mime", NULL, NULL, FALSE, FALSE,
+          NULL, NULL },
+
+       /* WTAP_FILE_AETHRA */
+       { "Aethra .aps file", "aethra", "aps", NULL, FALSE, FALSE,
          NULL, NULL },
 };
 
+gint wtap_num_file_types = sizeof(dump_open_table_base) / sizeof(struct file_type_info);
+
+static GArray*  dump_open_table_arr = NULL;
+static const struct file_type_info* dump_open_table = dump_open_table_base;
+
+/* initialize the open routines array if it has not being initialized yet */
+static void init_file_types(void) {
+
+       if (dump_open_table_arr) return;
+
+       dump_open_table_arr = g_array_new(FALSE,TRUE,sizeof(struct file_type_info));
+
+       g_array_append_vals(dump_open_table_arr,dump_open_table_base,wtap_num_file_types);
+
+       dump_open_table = (const struct file_type_info*)(void *)dump_open_table_arr->data;
+}
+
+int wtap_register_file_type(const struct file_type_info* fi) {
+       init_file_types();
+
+       g_array_append_val(dump_open_table_arr,*fi);
+
+       dump_open_table = (const struct file_type_info*)(void *)dump_open_table_arr->data;
+
+       return wtap_num_file_types++;
+}
+
+int wtap_get_num_file_types(void)
+{
+       return wtap_num_file_types;
+}
+
+/*
+ * Get a GArray of WTAP_FILE_ values for file types that can be used
+ * to save a file of a given type with a given WTAP_ENCAP_ type.
+ */
+static gboolean
+can_save_with_wiretap(int ft, int encap)
+{
+       /*
+        * To save a file in a given file format, we have to handle that
+        * format, and the code to handle that format must be able to
+        * write a file with that file's encapsulation type.
+        */
+       return wtap_dump_can_open(ft) &&
+           wtap_dump_can_write_encap(ft, encap);
+}
+
+GArray *
+wtap_get_savable_file_types(int file_type, int file_encap)
+{
+       GArray *savable_file_types;
+       int ft;
+       int default_file_type = -1;
+       int other_file_type = -1;
+
+       /* Can we save this file in its own file type? */
+       if (can_save_with_wiretap(file_type, file_encap)) {
+               /* Yes - make that the default file type. */
+               default_file_type = file_type;
+       } else {
+               /* No - can we save it as a pcap-NG file? */
+               if (can_save_with_wiretap(WTAP_FILE_PCAPNG, file_encap)) {
+                       /* Yes - default to pcap-NG, instead. */
+                       default_file_type = WTAP_FILE_PCAPNG;
+               } else {
+                       /* OK, find the first file type we *can* save it as. */
+                       default_file_type = -1;
+                       for (ft = 0; ft < WTAP_NUM_FILE_TYPES; ft++) {
+                               if (can_save_with_wiretap(ft, file_encap)) {
+                                       /* OK, got it. */
+                                       default_file_type = ft;
+                               }
+                       }
+               }
+       }
+
+       if (default_file_type == -1) {
+               /* We don't support writing this file as any file type. */
+               return NULL;
+       }
+
+       /* Allocate the array. */
+       savable_file_types = g_array_new(FALSE, FALSE, (guint)sizeof (int));
+
+       /* Put the default file format first in the list. */
+       g_array_append_val(savable_file_types, default_file_type);
+
+       /* If it's pcap, put pcap-NG right after it; otherwise, if it's
+          pcap-NG, put pcap right after it. */
+       if (default_file_type == WTAP_FILE_PCAP) {
+               if (can_save_with_wiretap(WTAP_FILE_PCAPNG, file_encap))
+                       other_file_type = WTAP_FILE_PCAPNG;
+       } else if (default_file_type == WTAP_FILE_PCAPNG) {
+               if (can_save_with_wiretap(WTAP_FILE_PCAP, file_encap))
+                       other_file_type = WTAP_FILE_PCAP;
+       }
+       if (other_file_type != -1)
+               g_array_append_val(savable_file_types, other_file_type);
+
+       /* Add all the other file types that work. */
+       for (ft = 0; ft < WTAP_NUM_FILE_TYPES; ft++) {
+               if (ft == WTAP_FILE_UNKNOWN)
+                       continue;       /* not a real file type */
+               if (ft == default_file_type || ft == other_file_type)
+                       continue;       /* we've already done this one */
+               if (can_save_with_wiretap(ft, file_encap)) {
+                       /* OK, we can write it out in this type. */
+                       g_array_append_val(savable_file_types, ft);
+               }
+       }
+
+       return savable_file_types;
+}
+
 /* Name that should be somewhat descriptive. */
 const char *wtap_file_type_string(int filetype)
 {
-       if (filetype < 0 || filetype >= WTAP_NUM_FILE_TYPES) {
+       if (filetype < 0 || filetype >= wtap_num_file_types) {
                g_error("Unknown capture file type %d", filetype);
-               return NULL;
+               /** g_error() does an abort() and thus never returns **/
+               return "";
        } else
                return dump_open_table[filetype].name;
 }
@@ -511,7 +780,7 @@ const char *wtap_file_type_string(int filetype)
 /* Name to use in, say, a command-line flag specifying the type. */
 const char *wtap_file_type_short_string(int filetype)
 {
-       if (filetype < 0 || filetype >= WTAP_NUM_FILE_TYPES)
+       if (filetype < 0 || filetype >= wtap_num_file_types)
                return NULL;
        else
                return dump_open_table[filetype].short_name;
@@ -522,7 +791,7 @@ int wtap_short_string_to_file_type(const char *short_name)
 {
        int filetype;
 
-       for (filetype = 0; filetype < WTAP_NUM_FILE_TYPES; filetype++) {
+       for (filetype = 0; filetype < wtap_num_file_types; filetype++) {
                if (dump_open_table[filetype].short_name != NULL &&
                    strcmp(short_name, dump_open_table[filetype].short_name) == 0)
                        return filetype;
@@ -530,9 +799,123 @@ int wtap_short_string_to_file_type(const char *short_name)
        return -1;      /* no such file type, or we can't write it */
 }
 
+static GSList *add_extensions(GSList *extensions, const gchar *extension,
+    GSList *compressed_file_extensions)
+{
+       GSList *compressed_file_extension;
+
+       /*
+        * Add the specified extension.
+        */
+       extensions = g_slist_append(extensions, g_strdup(extension));
+
+       /*
+        * Now add the extensions for compressed-file versions of
+        * that extension.
+        */
+       for (compressed_file_extension = compressed_file_extensions;
+           compressed_file_extension != NULL;
+           compressed_file_extension = g_slist_next(compressed_file_extension)) {
+               extensions = g_slist_append(extensions,
+                   g_strdup_printf("%s.%s", extension,
+                     (gchar *)compressed_file_extension->data));
+       }
+
+       return extensions;
+}
+
+/* Return a list of file extensions that are used by the specified file type.
+   This includes compressed extensions, e.g. not just "pcap" but also
+   "pcap.gz" if we can read gzipped files.
+
+   All strings in the list are allocated with g_malloc() and must be freed
+   with g_free(). */
+GSList *wtap_get_file_extensions_list(int filetype)
+{
+       gchar **extensions_set, **extensionp;
+       gchar *extension;
+       GSList *compressed_file_extensions;
+       GSList *extensions;
+
+       if (filetype < 0 || filetype >= wtap_num_file_types)
+               return NULL;    /* not a valid file type */
+
+       if (dump_open_table[filetype].default_file_extension == NULL)
+               return NULL;    /* valid, but no extensions known */
+
+       extensions = NULL;      /* empty list, to start with */
+
+       /*
+        * Get the list of compressed-file extensions.
+        */
+       compressed_file_extensions = wtap_get_compressed_file_extensions();
+
+       /*
+        * Add the default extension, and all compressed variants of
+        * it.
+        */
+       extensions = add_extensions(extensions,
+           dump_open_table[filetype].default_file_extension,
+           compressed_file_extensions);
+
+       if (dump_open_table[filetype].additional_file_extensions != NULL) {
+               /*
+                * We have additional extensions; add them.
+                *
+                * First, split the extension-list string into a set of
+                * extensions.
+                */
+               extensions_set = g_strsplit(dump_open_table[filetype].additional_file_extensions,
+                   ";", 0);
+
+               /*
+                * Add each of those extensions to the list.
+                */
+               for (extensionp = extensions_set; *extensionp != NULL;
+                   extensionp++) {
+                       extension = *extensionp;
+
+                       /*
+                        * Add the extension, and all compressed variants
+                        * of it.
+                        */
+                       extensions = add_extensions(extensions, extension,
+                           compressed_file_extensions);
+               }
+
+               g_strfreev(extensions_set);
+       }
+       g_slist_free(compressed_file_extensions);
+       return extensions;
+}
+
+/*
+ * Free a list returned by wtap_file_extensions_list().
+ */
+void wtap_free_file_extensions_list(GSList *extensions)
+{
+       GSList *extension;
+
+       for (extension = extensions; extension != NULL;
+           extension = g_slist_next(extension)) {
+               g_free(extension->data);
+       }
+       g_slist_free(extensions);
+}
+
+/* Return the default file extension to use with the specified file type;
+   that's just the extension, without any ".". */
+const char *wtap_default_file_extension(int filetype)
+{
+       if (filetype < 0 || filetype >= wtap_num_file_types)
+               return NULL;
+       else
+               return dump_open_table[filetype].default_file_extension;
+}
+
 gboolean wtap_dump_can_open(int filetype)
 {
-       if (filetype < 0 || filetype >= WTAP_NUM_FILE_TYPES
+       if (filetype < 0 || filetype >= wtap_num_file_types
            || dump_open_table[filetype].dump_open == NULL)
                return FALSE;
 
@@ -541,7 +924,7 @@ gboolean wtap_dump_can_open(int filetype)
 
 gboolean wtap_dump_can_write_encap(int filetype, int encap)
 {
-       if (filetype < 0 || filetype >= WTAP_NUM_FILE_TYPES
+       if (filetype < 0 || filetype >= wtap_num_file_types
            || dump_open_table[filetype].can_write_encap == NULL)
                return FALSE;
 
@@ -551,87 +934,183 @@ gboolean wtap_dump_can_write_encap(int filetype, int encap)
        return TRUE;
 }
 
-static gboolean wtap_dump_open_check(int filetype, int encap, int *err);
+#ifdef HAVE_LIBZ
+gboolean wtap_dump_can_compress(int filetype)
+{
+       /*
+        * If this is an unknown file type, or if we have to
+        * seek when writing out a file with this file type,
+        * return FALSE.
+        */
+       if (filetype < 0 || filetype >= wtap_num_file_types
+           || dump_open_table[filetype].writing_must_seek)
+               return FALSE;
+
+       return TRUE;
+}
+#else
+gboolean wtap_dump_can_compress(int filetype _U_)
+{
+       return FALSE;
+}
+#endif
+
+gboolean wtap_dump_has_name_resolution(int filetype)
+{
+       if (filetype < 0 || filetype >= wtap_num_file_types
+           || dump_open_table[filetype].has_name_resolution == FALSE)
+               return FALSE;
+
+       return TRUE;
+}
+
+static gboolean wtap_dump_open_check(int filetype, int encap, gboolean comressed, int *err);
 static wtap_dumper* wtap_dump_alloc_wdh(int filetype, int encap, int snaplen,
-    int *err);
-static gboolean wtap_dump_open_finish(wtap_dumper *wdh, int filetype, int *err);
+                                       gboolean compressed, int *err);
+static gboolean wtap_dump_open_finish(wtap_dumper *wdh, int filetype, gboolean compressed, int *err);
+
+static WFILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename);
+static WFILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd);
+static int wtap_dump_file_close(wtap_dumper *wdh);
 
 wtap_dumper* wtap_dump_open(const char *filename, int filetype, int encap,
-                               int snaplen, int *err)
+                               int snaplen, gboolean compressed, int *err)
+{
+       return wtap_dump_open_ng(filename, filetype, encap,snaplen, compressed, NULL, NULL, err);
+}
+
+wtap_dumper* wtap_dump_open_ng(const char *filename, int filetype, int encap,
+                               int snaplen, gboolean compressed, wtapng_section_t *shb_hdr, wtapng_iface_descriptions_t *idb_inf, int *err)
 {
        wtap_dumper *wdh;
-       FILE *fh;
+       WFILE_T fh;
 
        /* Check whether we can open a capture file with that file type
           and that encapsulation. */
-       if (!wtap_dump_open_check(filetype, encap, err))
+       if (!wtap_dump_open_check(filetype, encap, compressed, err))
                return NULL;
 
        /* Allocate a data structure for the output stream. */
-       wdh = wtap_dump_alloc_wdh(filetype, encap, snaplen, err);
+       wdh = wtap_dump_alloc_wdh(filetype, encap, snaplen, compressed, err);
        if (wdh == NULL)
                return NULL;    /* couldn't allocate it */
 
-       /* Empty filename means stdout */
-       if (*filename == '\0') {
+       /* Set Section Header Block data */
+       wdh->shb_hdr = shb_hdr;
+       /* Set Interface Description Block data */
+       if ((idb_inf != NULL) && (idb_inf->number_of_interfaces > 0)) {
+               wdh->number_of_interfaces = idb_inf->number_of_interfaces;
+               wdh->interface_data = idb_inf->interface_data;
+               g_free(idb_inf);
+       } else {
+               wtapng_if_descr_t descr;
+
+               descr.wtap_encap = encap;
+               descr.time_units_per_second = 0;
+               descr.link_type = wtap_wtap_encap_to_pcap_encap(encap);
+               descr.snap_len = snaplen;
+               descr.opt_comment = NULL;
+               descr.if_name = NULL;
+               descr.if_description = NULL;
+               descr.if_speed = 0;
+               descr.if_tsresol = 6;
+               descr.if_filter= NULL;
+               descr.if_os = NULL;
+               descr.if_fcslen = -1;
+               wdh->number_of_interfaces= 1;
+               wdh->interface_data= g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t));
+               g_array_append_val(wdh->interface_data, descr);
+       }
+
+       /* "-" means stdout */
+       if (strcmp(filename, "-") == 0) {
+               if (compressed) {
+                       *err = EINVAL;  /* XXX - return a Wiretap error code for this */
+                       g_free(wdh);
+                       return NULL;    /* compress won't work on stdout */
+               }
 #ifdef _WIN32
-               setmode(fileno(stdout), O_BINARY);
+               if (_setmode(fileno(stdout), O_BINARY) == -1) {
+                       /* "Should not happen" */
+                       *err = errno;
+                       g_free(wdh);
+                       return NULL;    /* couldn't put standard output in binary mode */
+               }
 #endif
                wdh->fh = stdout;
        } else {
                /* In case "fopen()" fails but doesn't set "errno", set "errno"
                   to a generic "the open failed" error. */
                errno = WTAP_ERR_CANT_OPEN;
-               fh = fopen(filename, "wb");
+               fh = wtap_dump_file_open(wdh, filename);
                if (fh == NULL) {
                        *err = errno;
+                       g_free(wdh);
                        return NULL;    /* can't create file */
                }
                wdh->fh = fh;
        }
 
-       if (!wtap_dump_open_finish(wdh, filetype, err)) {
+       if (!wtap_dump_open_finish(wdh, filetype, compressed, err)) {
                /* Get rid of the file we created; we couldn't finish
                   opening it. */
-               if (wdh->fh != stdout)
-                       unlink(filename);
+               if (wdh->fh != stdout) {
+                       wtap_dump_file_close(wdh);
+                       ws_unlink(filename);
+               }
+               g_free(wdh);
                return NULL;
        }
        return wdh;
 }
 
 wtap_dumper* wtap_dump_fdopen(int fd, int filetype, int encap, int snaplen,
-                               int *err)
+                               gboolean compressed, int *err)
 {
        wtap_dumper *wdh;
-       FILE *fh;
+       WFILE_T fh;
 
        /* Check whether we can open a capture file with that file type
           and that encapsulation. */
-       if (!wtap_dump_open_check(filetype, encap, err))
+       if (!wtap_dump_open_check(filetype, encap, compressed, err))
                return NULL;
 
        /* Allocate a data structure for the output stream. */
-       wdh = wtap_dump_alloc_wdh(filetype, encap, snaplen, err);
+       wdh = wtap_dump_alloc_wdh(filetype, encap, snaplen, compressed, err);
        if (wdh == NULL)
                return NULL;    /* couldn't allocate it */
 
+#ifdef _WIN32
+       if (fd == 1) {
+               if (_setmode(fileno(stdout), O_BINARY) == -1) {
+                       /* "Should not happen" */
+                       *err = errno;
+                       g_free(wdh);
+                       return NULL;    /* couldn't put standard output in binary mode */
+               }
+       }
+#endif
+
        /* In case "fopen()" fails but doesn't set "errno", set "errno"
           to a generic "the open failed" error. */
        errno = WTAP_ERR_CANT_OPEN;
-       fh = fdopen(fd, "wb");
+       fh = wtap_dump_file_fdopen(wdh, fd);
        if (fh == NULL) {
                *err = errno;
+               g_free(wdh);
                return NULL;    /* can't create standard I/O stream */
        }
        wdh->fh = fh;
 
-       if (!wtap_dump_open_finish(wdh, filetype, err))
+       if (!wtap_dump_open_finish(wdh, filetype, compressed, err)) {
+               wtap_dump_file_close(wdh);
+               g_free(wdh);
                return NULL;
+       }
        return wdh;
 }
 
-static gboolean wtap_dump_open_check(int filetype, int encap, int *err)
+static gboolean wtap_dump_open_check(int filetype, int encap, gboolean compressed, int *err)
 {
        if (!wtap_dump_can_open(filetype)) {
                /* Invalid type, or type we don't know how to write. */
@@ -645,72 +1124,88 @@ static gboolean wtap_dump_open_check(int filetype, int encap, int *err)
        if (*err != 0)
                return FALSE;
 
+       /* if compression is wanted, do we support this for this filetype? */
+       if(compressed && !wtap_dump_can_compress(filetype)) {
+               *err = WTAP_ERR_COMPRESSION_NOT_SUPPORTED;
+               return FALSE;
+       }
+
+       *err = (*dump_open_table[filetype].can_write_encap)(encap);
+       if (*err != 0)
+               return FALSE;
+
        /* All systems go! */
        return TRUE;
 }
 
 static wtap_dumper* wtap_dump_alloc_wdh(int filetype, int encap, int snaplen,
-                                       int *err)
+                                       gboolean compressed, int *err)
 {
        wtap_dumper *wdh;
 
-       wdh = g_malloc(sizeof (wtap_dumper));
+       wdh = (wtap_dumper *)g_malloc0(sizeof (wtap_dumper));
        if (wdh == NULL) {
                *err = errno;
                return NULL;
        }
-       wdh->fh = NULL;
+
        wdh->file_type = filetype;
        wdh->snaplen = snaplen;
        wdh->encap = encap;
-       wdh->bytes_dumped = 0;
-       wdh->dump.opaque = NULL;
-       wdh->subtype_write = NULL;
-       wdh->subtype_close = NULL;
+       wdh->compressed = compressed;
        return wdh;
 }
 
-static gboolean wtap_dump_open_finish(wtap_dumper *wdh, int filetype, int *err)
+static gboolean wtap_dump_open_finish(wtap_dumper *wdh, int filetype, gboolean compressed, int *err)
 {
        int fd;
        gboolean cant_seek;
 
        /* Can we do a seek on the file descriptor?
           If not, note that fact. */
-       fd = fileno(wdh->fh);
-       if (lseek(fd, 1, SEEK_CUR) == -1)
-         cant_seek = TRUE;
-       else {
-         /* Undo the seek. */
-         lseek(fd, 0, SEEK_SET);
-         cant_seek = FALSE;
+       if(compressed) {
+               cant_seek = TRUE;
+       } else {
+               fd = fileno((FILE *)wdh->fh);
+               if (lseek(fd, 1, SEEK_CUR) == -1)
+                       cant_seek = TRUE;
+               else {
+                       /* Undo the seek. */
+                       lseek(fd, 0, SEEK_SET);
+                       cant_seek = FALSE;
+               }
+       }
+
+       /* If this file type requires seeking, and we can't seek, fail. */
+       if (dump_open_table[filetype].writing_must_seek && cant_seek) {
+               *err = WTAP_ERR_CANT_WRITE_TO_PIPE;
+               return FALSE;
        }
 
        /* Now try to open the file for writing. */
-       if (!(*dump_open_table[filetype].dump_open)(wdh, cant_seek, err)) {
-               /* The attempt failed.  Close the stream for the file.
-                  NOTE: this means the FD handed to "wtap_dump_fdopen()"
-                  will be closed if the open fails. */
-               if (wdh->fh != stdout)
-                       fclose(wdh->fh);
-
-               /* Now free up the dumper handle. */
-               g_free(wdh);
+       if (!(*dump_open_table[filetype].dump_open)(wdh, err)) {
                return FALSE;
        }
 
        return TRUE;    /* success! */
 }
 
-FILE* wtap_dump_file(wtap_dumper *wdh)
+gboolean wtap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
+                  const union wtap_pseudo_header *pseudo_header, const guint8 *pd, int *err)
 {
-       return wdh->fh;
+       return (wdh->subtype_write)(wdh, phdr, pseudo_header, pd, err);
 }
 
-gboolean wtap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
-    const union wtap_pseudo_header *pseudo_header, const guchar *pd, int *err)
+void wtap_dump_flush(wtap_dumper *wdh)
 {
-       return (wdh->subtype_write)(wdh, phdr, pseudo_header, pd, err);
+#ifdef HAVE_LIBZ
+       if(wdh->compressed) {
+               gzwfile_flush((GZWFILE_T)wdh->fh);
+       } else
+#endif
+       {
+               fflush((FILE *)wdh->fh);
+       }
 }
 
 gboolean wtap_dump_close(wtap_dumper *wdh, int *err)
@@ -725,7 +1220,7 @@ gboolean wtap_dump_close(wtap_dumper *wdh, int *err)
        errno = WTAP_ERR_CANT_CLOSE;
        /* Don't close stdout */
        if (wdh->fh != stdout) {
-               if (fclose(wdh->fh) == EOF) {
+               if (wtap_dump_file_close(wdh) == EOF) {
                        if (ret) {
                                /* The per-format close function succeeded,
                                   but the fclose didn't.  Save the reason
@@ -735,20 +1230,113 @@ gboolean wtap_dump_close(wtap_dumper *wdh, int *err)
                        }
                        ret = FALSE;
                }
+       } else {
+               /* as we don't close stdout, at least try to flush it */
+               wtap_dump_flush(wdh);
        }
-       if (wdh->dump.opaque != NULL)
-               g_free(wdh->dump.opaque);
+       if (wdh->priv != NULL)
+               g_free(wdh->priv);
        g_free(wdh);
        return ret;
 }
 
-long wtap_get_bytes_dumped(wtap_dumper *wdh)
+gint64 wtap_get_bytes_dumped(wtap_dumper *wdh)
 {
        return wdh->bytes_dumped;
 }
 
-void wtap_set_bytes_dumped(wtap_dumper *wdh, long bytes_dumped)
+void wtap_set_bytes_dumped(wtap_dumper *wdh, gint64 bytes_dumped)
 {
        wdh->bytes_dumped = bytes_dumped;
 }
 
+gboolean wtap_dump_set_addrinfo_list(wtap_dumper *wdh, struct addrinfo *addrinfo_list)
+{
+       if (!wdh || wdh->file_type < 0 || wdh->file_type >= wtap_num_file_types
+               || dump_open_table[wdh->file_type].has_name_resolution == FALSE)
+                       return FALSE;
+       wdh->addrinfo_list = addrinfo_list;
+       return TRUE;
+}
+
+/* internally open a file for writing (compressed or not) */
+#ifdef HAVE_LIBZ
+static WFILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename)
+{
+       if(wdh->compressed) {
+               return gzwfile_open(filename);
+       } else {
+               return ws_fopen(filename, "wb");
+       }
+}
+#else
+static WFILE_T wtap_dump_file_open(wtap_dumper *wdh _U_, const char *filename)
+{
+       return ws_fopen(filename, "wb");
+}
+#endif
+
+/* internally open a file for writing (compressed or not) */
+#ifdef HAVE_LIBZ
+static WFILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd)
+{
+       if(wdh->compressed) {
+               return gzwfile_fdopen(fd);
+       } else {
+               return fdopen(fd, "wb");
+       }
+}
+#else
+static WFILE_T wtap_dump_file_fdopen(wtap_dumper *wdh _U_, int fd)
+{
+       return fdopen(fd, "wb");
+}
+#endif
+
+/* internally writing raw bytes (compressed or not) */
+gboolean wtap_dump_file_write(wtap_dumper *wdh, const void *buf, size_t bufsize,
+                    int *err)
+{
+       size_t nwritten;
+
+#ifdef HAVE_LIBZ
+       if (wdh->compressed) {
+               nwritten = gzwfile_write((GZWFILE_T)wdh->fh, buf, (unsigned) bufsize);
+               /*
+                * gzwfile_write() returns 0 on error.
+                */
+               if (nwritten == 0) {
+                       *err = gzwfile_geterr((GZWFILE_T)wdh->fh);
+                       return FALSE;
+               }
+       } else
+#endif
+       {
+               nwritten = fwrite(buf, 1, bufsize, (FILE *)wdh->fh);
+               /*
+                * At least according to the Mac OS X man page,
+                * this can return a short count on an error.
+                */
+               if (nwritten != bufsize) {
+                       if (ferror((FILE *)wdh->fh))
+                               *err = errno;
+                       else
+                               *err = WTAP_ERR_SHORT_WRITE;
+                       return FALSE;
+               }
+       }
+       return TRUE;
+}
+
+/* internally close a file for writing (compressed or not) */
+static int wtap_dump_file_close(wtap_dumper *wdh)
+{
+#ifdef HAVE_LIBZ
+       if(wdh->compressed) {
+               return gzwfile_close((GZWFILE_T)wdh->fh);
+       } else
+#endif
+       {
+               return fclose((FILE *)wdh->fh);
+       }
+}