Remove some GTK+-only code.
[metze/wireshark/wip.git] / randpkt.c
index d19545987f8af3cbfcad4d3509d2ae69bf09e863..fe3cc9d43f3a111d22d64c7a7872401d9ab7ba20 100644 (file)
--- a/randpkt.c
+++ b/randpkt.c
  *
  * Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include <glib.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <wsutil/clopts_common.h>
+#include <wsutil/cmdarg_err.h>
+#include <wsutil/unicode-utils.h>
+#include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
+#include <wsutil/privileges.h>
+
+#ifdef HAVE_PLUGINS
+#include <wsutil/plugins.h>
 #endif
 
-#ifndef HAVE_GETOPT
-#include "wsutil/wsgetopt.h"
+#include <wsutil/report_message.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
 #endif
 
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+#ifndef HAVE_GETOPT_LONG
+#include "wsutil/wsgetopt.h"
 #endif
 
-#include <time.h>
-#include <errno.h>
+#include "randpkt_core/randpkt_core.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include "wiretap/wtap.h"
-#include "wsutil/file_util.h"
+#define INVALID_OPTION 1
+#define INVALID_TYPE 2
+#define CLOSE_ERROR 2
 
-#ifdef _WIN32
-#include <wsutil/unicode-utils.h>
-#endif /* _WIN32 */
+/*
+ * General errors and warnings are reported with an console message
+ * in randpkt.
+ */
+static void
+failure_warning_message(const char *msg_format, va_list ap)
+{
+       fprintf(stderr, "randpkt: ");
+       vfprintf(stderr, msg_format, ap);
+       fprintf(stderr, "\n");
+}
 
-#define array_length(x)        (sizeof x / sizeof x[0])
-
-/* Types of produceable packets */
-enum {
-       PKT_ARP,
-       PKT_BGP,
-       PKT_BVLC,
-       PKT_DNS,
-       PKT_ETHERNET,
-       PKT_FDDI,
-       PKT_GIOP,
-       PKT_ICMP,
-       PKT_IP,
-       PKT_LLC,
-       PKT_M2M,
-       PKT_MEGACO,
-       PKT_NBNS,
-       PKT_NCP2222,
-       PKT_SCTP,
-       PKT_SYSLOG,
-       PKT_TCP,
-       PKT_TDS,
-       PKT_TR,
-       PKT_UDP,
-       PKT_USB,
-       PKT_USB_LINUX
-};
-
-typedef struct {
-       const char      *abbrev;
-       const char      *longname;
-       int             produceable_type;
-       int             sample_wtap_encap;
-       guint8          *sample_buffer;
-       int             sample_length;
-       guint8          *pseudo_buffer;
-       int             pseudo_length;
-} pkt_example;
-
-/* Ethernet, indicating ARP */
-guint8 pkt_arp[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x00, 0x00,
-       0x32, 0x25, 0x0f, 0xff,
-       0x08, 0x06
-};
-
-/* Ethernet+IP+UDP, indicating DNS */
-guint8 pkt_dns[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x3c,
-       0xc5, 0x9e, 0x40, 0x00,
-       0xff, 0x11, 0xd7, 0xe0,
-       0xd0, 0x15, 0x02, 0xb8,
-       0x0a, 0x01, 0x01, 0x63,
-
-       0x05, 0xe8, 0x00, 0x35,
-       0xff, 0xff, 0x2a, 0xb9,
-       0x30
-};
-
-/* Ethernet+IP, indicating ICMP */
-guint8 pkt_icmp[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x54,
-       0x8f, 0xb3, 0x40, 0x00,
-       0xfd, 0x01, 0x8a, 0x99,
-       0xcc, 0xfc, 0x66, 0x0b,
-       0xce, 0x41, 0x62, 0x12
-};
-
-/* Ethernet, indicating IP */
-guint8 pkt_ip[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00
-};
-
-/* TR, indicating LLC */
-guint8 pkt_llc[] = {
-       0x10, 0x40, 0x68, 0x00,
-       0x19, 0x69, 0x95, 0x8b,
-       0x00, 0x01, 0xfa, 0x68,
-       0xc4, 0x67
-};
-
-/* Ethernet, indicating WiMAX M2M */
-guint8 pkt_m2m[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x00, 0x00,
-       0x32, 0x25, 0x0f, 0xff,
-       0x08, 0xf0
-};
-
-/* Ethernet+IP+UDP, indicating NBNS */
-guint8 pkt_nbns[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x3c,
-       0xc5, 0x9e, 0x40, 0x00,
-       0xff, 0x11, 0xd7, 0xe0,
-       0xd0, 0x15, 0x02, 0xb8,
-       0x0a, 0x01, 0x01, 0x63,
-
-       0x00, 0x89, 0x00, 0x89,
-       0x00, 0x00, 0x2a, 0xb9,
-       0x30
-};
-
-/* Ethernet+IP+UDP, indicating syslog */
-guint8 pkt_syslog[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x64,
-       0x20, 0x48, 0x00, 0x00,
-       0xfc, 0x11, 0xf8, 0x03,
-       0xd0, 0x15, 0x02, 0xb8,
-       0x0a, 0x01, 0x01, 0x63,
-
-       0x05, 0xe8, 0x02, 0x02,
-       0x00, 0x50, 0x51, 0xe1,
-       0x3c
-};
-
-/* TR+LLC+IP, indicating TCP */
-guint8 pkt_tcp[] = {
-       0x10, 0x40, 0x68, 0x00,
-       0x19, 0x69, 0x95, 0x8b,
-       0x00, 0x01, 0xfa, 0x68,
-       0xc4, 0x67,
-
-       0xaa, 0xaa, 0x03, 0x00,
-       0x00, 0x00, 0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x28,
-       0x0b, 0x0b, 0x40, 0x00,
-       0x20, 0x06, 0x85, 0x37,
-       0xc0, 0xa8, 0x27, 0x01,
-       0xc0, 0xa8, 0x22, 0x3c
-};
-
-/* Ethernet+IP, indicating UDP */
-guint8 pkt_udp[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x3c,
-       0xc5, 0x9e, 0x40, 0x00,
-       0xff, 0x11, 0xd7, 0xe0,
-       0xd0, 0x15, 0x02, 0xb8,
-       0x0a, 0x01, 0x01, 0x63
-};
-
-/* Ethernet+IP+UDP, indicating BVLC */
-guint8 pkt_bvlc[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x3c,
-       0xc5, 0x9e, 0x40, 0x00,
-       0xff, 0x11, 0x01, 0xaa,
-       0xc1, 0xff, 0x19, 0x1e,
-       0xc1, 0xff, 0x19, 0xff,
-       0xba, 0xc0, 0xba, 0xc0,
-       0x00, 0xff, 0x2d, 0x5e,
-       0x81
-};
-
-/* TR+LLC+IPX, indicating NCP, with NCP Type == 0x2222 */
-guint8 pkt_ncp2222[] = {
-       0x10, 0x40, 0x00, 0x00,
-       0xf6, 0x7c, 0x9b, 0x70,
-       0x68, 0x00, 0x19, 0x69,
-       0x95, 0x8b, 0xe0, 0xe0,
-       0x03, 0xff, 0xff, 0x00,
-       0x25, 0x02, 0x11, 0x00,
-       0x00, 0x74, 0x14, 0x00,
-       0x00, 0x00, 0x00, 0x00,
-       0x01, 0x04, 0x51, 0x00,
-       0x00, 0x00, 0x04, 0x00,
-       0x02, 0x16, 0x19, 0x7a,
-       0x84, 0x40, 0x01, 0x22,
-       0x22
-};
-
-/* Ethernet+IP+TCP, indicating GIOP */
-guint8 pkt_giop[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0xa6,
-       0x00, 0x2f, 0x40, 0x00,
-       0x40, 0x06, 0x3c, 0x21,
-       0x7f, 0x00, 0x00, 0x01,
-       0x7f, 0x00, 0x00, 0x01,
-
-       0x30, 0x39, 0x04, 0x05,
-       0xac, 0x02, 0x1e, 0x69,
-       0xab, 0x74, 0xab, 0x64,
-       0x80, 0x18, 0x79, 0x60,
-       0xc4, 0xb8, 0x00, 0x00,
-       0x01, 0x01, 0x08, 0x0a,
-       0x00, 0x00, 0x48, 0xf5,
-       0x00, 0x00, 0x48, 0xf5,
-
-       0x47, 0x49, 0x4f, 0x50,
-       0x01, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x30,
-       0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x01,
-       0x01
-};
-
-/* Ethernet+IP+TCP, indicating BGP */
-guint8 pkt_bgp[] = {
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x01,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0xa6,
-       0x00, 0x2f, 0x40, 0x00,
-       0x40, 0x06, 0x3c, 0x21,
-       0x7f, 0x00, 0x00, 0x01,
-       0x7f, 0x00, 0x00, 0x01,
-
-       0x30, 0x39, 0x00, 0xb3,
-       0xac, 0x02, 0x1e, 0x69,
-       0xab, 0x74, 0xab, 0x64,
-       0x80, 0x18, 0x79, 0x60,
-       0xc4, 0xb8, 0x00, 0x00,
-       0x01, 0x01, 0x08, 0x0a,
-       0x00, 0x00, 0x48, 0xf5,
-       0x00, 0x00, 0x48, 0xf5,
-
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff,
-};
-
-/* Ethernet+IP+TCP, indicating TDS NetLib */
-guint8 pkt_tds[] = {
-       0x00, 0x50, 0x8b, 0x0d,
-       0x7a, 0xed, 0x00, 0x08,
-       0xa3, 0x98, 0x39, 0x81,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x03, 0x8d,
-       0x90, 0xd4, 0x40, 0x00,
-       0x7c, 0x06, 0xc3, 0x1b,
-       0xac, 0x14, 0x02, 0x22,
-       0x0a, 0xc2, 0xee, 0x82,
-
-       0x05, 0x99, 0x08, 0xf8,
-       0xff, 0x4e, 0x85, 0x46,
-       0xa2, 0xb4, 0x42, 0xaa,
-       0x50, 0x18, 0x3c, 0x28,
-       0x0f, 0xda, 0x00, 0x00,
-};
-
-/* Ethernet+IP, indicating SCTP */
-guint8 pkt_sctp[] = {
-       0x00, 0xa0, 0x80, 0x00,
-       0x5e, 0x46, 0x08, 0x00,
-       0x03, 0x4a, 0x00, 0x35,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x7c,
-       0x14, 0x1c, 0x00, 0x00,
-       0x3b, 0x84, 0x4a, 0x54,
-       0x0a, 0x1c, 0x06, 0x2b,
-       0x0a, 0x1c, 0x06, 0x2c,
-};
-
-
-/* Ethernet+IP+SCTP, indicating MEGACO */
-guint8 pkt_megaco[] = {
-       0x00, 0xa0, 0x80, 0x00,
-       0x5e, 0x46, 0x08, 0x00,
-       0x03, 0x4a, 0x00, 0x35,
-       0x08, 0x00,
-
-       0x45, 0x00, 0x00, 0x7c,
-       0x14, 0x1c, 0x00, 0x00,
-       0x3b, 0x84, 0x4a, 0x54,
-       0x0a, 0x1c, 0x06, 0x2b,
-       0x0a, 0x1c, 0x06, 0x2c,
-
-       0x40, 0x00, 0x0b, 0x80,
-       0x00, 0x01, 0x6f, 0x0a,
-       0x6d, 0xb0, 0x18, 0x82,
-       0x00, 0x03, 0x00, 0x5b,
-       0x28, 0x02, 0x43, 0x45,
-       0x00, 0x00, 0xa0, 0xbd,
-       0x00, 0x00, 0x00, 0x07,
-};
-
-/* This little data table drives the whole program */
-pkt_example examples[] = {
-       { "arp", "Address Resolution Protocol",
-               PKT_ARP,        WTAP_ENCAP_ETHERNET,
-               pkt_arp,        array_length(pkt_arp),
-               NULL,           0 },
-
-       { "bgp", "Border Gateway Protocol",
-               PKT_BGP,        WTAP_ENCAP_ETHERNET,
-               pkt_bgp,        array_length(pkt_bgp),
-               NULL,           0 },
-
-       { "bvlc", "BACnet Virtual Link Control",
-               PKT_BVLC,       WTAP_ENCAP_ETHERNET,
-               pkt_bvlc,       array_length(pkt_bvlc),
-               NULL,           0 },
-
-       { "dns", "Domain Name Service",
-               PKT_DNS,        WTAP_ENCAP_ETHERNET,
-               pkt_dns,        array_length(pkt_dns),
-               NULL,           0 },
-
-       { "eth", "Ethernet",
-               PKT_ETHERNET,   WTAP_ENCAP_ETHERNET,
-               NULL,           0,
-               NULL,           0 },
-
-       { "fddi", "Fiber Distributed Data Interface",
-               PKT_FDDI,       WTAP_ENCAP_FDDI,
-               NULL,           0,
-               NULL,           0 },
-
-       { "giop", "General Inter-ORB Protocol",
-               PKT_GIOP,       WTAP_ENCAP_ETHERNET,
-               pkt_giop,       array_length(pkt_giop),
-               NULL,           0 },
-
-       { "icmp", "Internet Control Message Protocol",
-               PKT_ICMP,       WTAP_ENCAP_ETHERNET,
-               pkt_icmp,       array_length(pkt_icmp),
-               NULL,           0 },
-
-       { "ip", "Internet Protocol",
-               PKT_IP,         WTAP_ENCAP_ETHERNET,
-               pkt_ip,         array_length(pkt_ip),
-               NULL,           0 },
-
-       { "llc", "Logical Link Control",
-               PKT_LLC,        WTAP_ENCAP_TOKEN_RING,
-               pkt_llc,        array_length(pkt_llc),
-               NULL,           0 },
-
-       { "m2m", "WiMAX M2M Encapsulation Protocol",
-               PKT_M2M,        WTAP_ENCAP_ETHERNET,
-               pkt_m2m,        array_length(pkt_m2m),
-               NULL,           0 },
-
-       { "megaco", "MEGACO",
-               PKT_MEGACO,     WTAP_ENCAP_ETHERNET,
-               pkt_megaco,     array_length(pkt_megaco),
-               NULL,           0 },
-
-       { "nbns", "NetBIOS-over-TCP Name Service",
-               PKT_NBNS,       WTAP_ENCAP_ETHERNET,
-               pkt_nbns,       array_length(pkt_nbns),
-               NULL,           0 },
-
-       { "ncp2222", "NetWare Core Protocol",
-               PKT_NCP2222,    WTAP_ENCAP_TOKEN_RING,
-               pkt_ncp2222,    array_length(pkt_ncp2222),
-               NULL,           0 },
-
-       { "sctp", "Stream Control Transmission Protocol",
-               PKT_SCTP,       WTAP_ENCAP_ETHERNET,
-               pkt_sctp,       array_length(pkt_sctp),
-               NULL,           0 },
-
-       { "syslog", "Syslog message",
-               PKT_SYSLOG,     WTAP_ENCAP_ETHERNET,
-               pkt_syslog,     array_length(pkt_syslog),
-               NULL,           0 },
-
-       { "tds", "TDS NetLib",
-               PKT_TDS,        WTAP_ENCAP_ETHERNET,
-               pkt_tds,        array_length(pkt_tds),
-               NULL,           0 },
-
-       { "tcp", "Transmission Control Protocol",
-               PKT_TCP,        WTAP_ENCAP_TOKEN_RING,
-               pkt_tcp,        array_length(pkt_tcp),
-               NULL,           0 },
-
-       { "tr",  "Token-Ring",
-               PKT_TR,         WTAP_ENCAP_TOKEN_RING,
-               NULL,           0,
-               NULL,           0 },
-
-       { "udp", "User Datagram Protocol",
-               PKT_UDP,        WTAP_ENCAP_ETHERNET,
-               pkt_udp,        array_length(pkt_udp),
-               NULL,           0 },
-
-       { "usb", "Universal Serial Bus",
-               PKT_USB,        WTAP_ENCAP_USB,
-               NULL,           0,
-               NULL,           0 },
-
-       { "usb-linux", "Universal Serial Bus with Linux specific header",
-               PKT_USB_LINUX,  WTAP_ENCAP_USB_LINUX,
-               NULL,           0,
-               NULL,           0 },
-
-};
-
-
-
-static int parse_type(char *string);
-static void usage(gboolean is_error);
-static void seed(void);
-
-static pkt_example* find_example(int type);
+/*
+ * Report additional information for an error in command-line arguments.
+ */
+static void
+failure_message_cont(const char *msg_format, va_list ap)
+{
+       vfprintf(stderr, msg_format, ap);
+       fprintf(stderr, "\n");
+}
 
-int
-main(int argc, char **argv)
+/* Print usage statement and exit program */
+static void
+usage(gboolean is_error)
 {
+       FILE *output;
+       char** abbrev_list;
+       char** longname_list;
+       unsigned i = 0;
+
+       if (!is_error) {
+               output = stdout;
+       }
+       else {
+               output = stderr;
+       }
 
-       wtap_dumper             *dump;
-       struct wtap_pkthdr      pkthdr;
-       union wtap_pseudo_header *ps_header = &pkthdr.pseudo_header;
-       int                     i, j, len_this_pkt, len_random, err;
-       gchar                   *err_info;
-       guint8                  buffer[65536];
+       fprintf(output, "Usage: randpkt [-b maxbytes] [-c count] [-t type] [-r] filename\n");
+       fprintf(output, "Default max bytes (per packet) is 5000\n");
+       fprintf(output, "Default count is 1000.\n");
+       fprintf(output, "-r: random packet type selection\n");
+       fprintf(output, "\n");
+       fprintf(output, "Types:\n");
 
-       int                     opt;
+       /* Get the examples list */
+       randpkt_example_list(&abbrev_list, &longname_list);
+       while (abbrev_list[i] && longname_list[i]) {
+               fprintf(output, "\t%-16s%s\n", abbrev_list[i], longname_list[i]);
+               i++;
+       }
+
+       g_strfreev(abbrev_list);
+       g_strfreev(longname_list);
+
+       fprintf(output, "\nIf type is not specified, a random packet will be chosen\n\n");
+}
 
-       int                     produce_count = 1000; /* number of pkts to produce */
-       int                     produce_type = PKT_ETHERNET;
+int
+main(int argc, char **argv)
+{
+       char                   *init_progfile_dir_error;
+       int                     opt;
+       int                     produce_type = -1;
        char                    *produce_filename = NULL;
        int                     produce_max_bytes = 5000;
-       pkt_example             *example;
+       int                     produce_count = 1000;
+       randpkt_example         *example;
+       guint8*                 type = NULL;
+       int                     allrandom = FALSE;
+       wtap_dumper             *savedump;
+       int                      ret = EXIT_SUCCESS;
+       static const struct option long_options[] = {
+               {"help", no_argument, NULL, 'h'},
+               {0, 0, 0, 0 }
+       };
+
+       /*
+        * Get credential information for later use.
+        */
+       init_process_policies();
+
+       /*
+        * Attempt to get the pathname of the directory containing the
+        * executable file.
+        */
+       init_progfile_dir_error = init_progfile_dir(argv[0], main);
+       if (init_progfile_dir_error != NULL) {
+               fprintf(stderr,
+                   "capinfos: Can't get pathname of directory containing the capinfos program: %s.\n",
+                   init_progfile_dir_error);
+               g_free(init_progfile_dir_error);
+       }
+
+       init_report_message(failure_warning_message, failure_warning_message,
+                               NULL, NULL, NULL);
+
+       wtap_init(TRUE);
+
+       cmdarg_err_init(failure_warning_message, failure_message_cont);
 
 #ifdef _WIN32
        arg_list_utf_16to8(argc, argv);
        create_app_running_mutex();
 #endif /* _WIN32 */
 
-       while ((opt = getopt(argc, argv, "b:c:ht:")) != -1) {
+       while ((opt = getopt_long(argc, argv, "b:c:ht:r", long_options, NULL)) != -1) {
                switch (opt) {
                        case 'b':       /* max bytes */
-                               produce_max_bytes = atoi(optarg);
+                               produce_max_bytes = get_positive_int(optarg, "max bytes");
                                if (produce_max_bytes > 65536) {
-                                       fprintf(stderr,
-                                           "randpkt: Max bytes is 65536\n");
-                                       exit(1);
+                                       cmdarg_err("max bytes is > 65536");
+                                       ret = INVALID_OPTION;
+                                       goto clean_exit;
                                }
                                break;
 
                        case 'c':       /* count */
-                               produce_count = atoi(optarg);
+                               produce_count = get_positive_int(optarg, "count");
                                break;
 
                        case 't':       /* type of packet to produce */
-                               produce_type = parse_type(optarg);
+                               type = g_strdup(optarg);
                                break;
 
                        case 'h':
                                usage(FALSE);
+                               goto clean_exit;
+                               break;
+
+                       case 'r':
+                               allrandom = TRUE;
                                break;
+
                        default:
                                usage(TRUE);
+                               ret = INVALID_OPTION;
+                               goto clean_exit;
                                break;
                }
        }
@@ -548,209 +189,62 @@ main(int argc, char **argv)
        }
        else {
                usage(TRUE);
+               ret = INVALID_OPTION;
+               goto clean_exit;
        }
 
-       example = find_example(produce_type);
-
-
-       dump = wtap_dump_open(produce_filename, WTAP_FILE_TYPE_SUBTYPE_PCAP,
-               example->sample_wtap_encap, produce_max_bytes, FALSE /* compressed */, &err);
-       if (!dump) {
-               fprintf(stderr,
-                   "randpkt: Error writing to %s\n", produce_filename);
-               exit(2);
-       }
-
-       seed();
-
-       /* reduce max_bytes by # of bytes already in sample */
-       if (produce_max_bytes <= example->sample_length) {
-               fprintf(stderr,
-                   "randpkt: Sample packet length is %d, which is greater than or equal to\n",
-                   example->sample_length);
-               fprintf(stderr, "your requested max_bytes value of %d\n",
-                   produce_max_bytes);
-               exit(1);
-       }
-       else {
-               produce_max_bytes -= example->sample_length;
-       }
-
-       memset(&pkthdr, 0, sizeof(pkthdr));
-       memset(buffer, 0, sizeof(buffer));
-
-       pkthdr.rec_type = REC_TYPE_PACKET;
-       pkthdr.presence_flags = WTAP_HAS_TS;
-       pkthdr.pkt_encap = example->sample_wtap_encap;
-
-       /* Load the sample pseudoheader into our pseudoheader buffer */
-       if (example->pseudo_buffer)
-               memcpy(ps_header, example->pseudo_buffer, example->pseudo_length);
-
-       /* Load the sample into our buffer */
-       if (example->sample_buffer)
-               memcpy(&buffer[0], example->sample_buffer, example->sample_length);
-
-       /* Produce random packets */
-       for (i = 0; i < produce_count; i++) {
-               if (produce_max_bytes > 0) {
-                       len_random = (rand() % produce_max_bytes + 1);
-               }
-               else {
-                       len_random = 0;
-               }
-
-               len_this_pkt = example->sample_length + len_random;
-
-               pkthdr.caplen = len_this_pkt;
-               pkthdr.len = len_this_pkt;
-               pkthdr.ts.secs = i; /* just for variety */
-
-               for (j = example->pseudo_length; j < (int) sizeof(*ps_header); j++) {
-                       ((guint8*)ps_header)[j] = (rand() % 0x100);
-               }
+       if (!allrandom) {
+               produce_type = randpkt_parse_type(type);
+               g_free(type);
 
-               for (j = example->sample_length; j < len_this_pkt; j++) {
-                       /* Add format strings here and there */
-                       if ((int) (100.0*rand()/(RAND_MAX+1.0)) < 3 && j < (len_random - 3)) {
-                               memcpy(&buffer[j], "%s", 3);
-                               j += 2;
-                       } else {
-                               buffer[j] = (rand() % 0x100);
-                       }
+               example = randpkt_find_example(produce_type);
+               if (!example) {
+                       ret = INVALID_OPTION;
+                       goto clean_exit;
                }
 
-               /* XXX - report errors! */
-               if (!wtap_dump(dump, &pkthdr, &buffer[0], &err, &err_info)) {
-                       if (err_info != NULL)
-                               g_free(err_info);
-               }
-       }
-
-       wtap_dump_close(dump, &err);
-
-       return 0;
-
-}
-
-/* Print usage statement and exit program */
-static void
-usage(gboolean is_error)
-{
-       FILE    *output;
-       int      num_entries = array_length(examples);
-       int      i;
-
-       if (!is_error) {
-               output = stdout;
-       }
-       else {
-               output = stderr;
-       }
-
-       fprintf(output, "Usage: randpkt [-b maxbytes] [-c count] [-t type] filename\n");
-       fprintf(output, "Default max bytes (per packet) is 5000\n");
-       fprintf(output, "Default count is 1000.\n");
-       fprintf(output, "Types:\n");
-
-       for (i = 0; i < num_entries; i++) {
-               fprintf(output, "\t%-16s%s\n", examples[i].abbrev, examples[i].longname);
-       }
-
-       fprintf(output, "\n");
-
-       exit(is_error ? 1 : 0);
-}
-
-/* Parse command-line option "type" and return enum type */
-static
-int parse_type(char *string)
-{
-       int     num_entries = array_length(examples);
-       int     i;
-
-       for (i = 0; i < num_entries; i++) {
-               if (strcmp(examples[i].abbrev, string) == 0) {
-                       return examples[i].produceable_type;
+               ret = randpkt_example_init(example, produce_filename, produce_max_bytes);
+               if (ret != EXIT_SUCCESS)
+                       goto clean_exit;
+               randpkt_loop(example, produce_count);
+       } else {
+               if (type) {
+                       fprintf(stderr, "Can't set type in random mode\n");
+                       ret = INVALID_TYPE;
+                       goto clean_exit;
                }
-       }
 
-       /* Complain */
-       fprintf(stderr, "randpkt: Type %s not known.\n", string);
-       exit(1);
-}
-
-/* Find pkt_example record and return pointer to it */
-static
-pkt_example* find_example(int type)
-{
-       int     num_entries = array_length(examples);
-       int     i;
-
-       for (i = 0; i < num_entries; i++) {
-               if (examples[i].produceable_type == type) {
-                       return &examples[i];
+               produce_type = randpkt_parse_type(NULL);
+               example = randpkt_find_example(produce_type);
+               if (!example) {
+                       ret = INVALID_OPTION;
+                       goto clean_exit;
                }
-       }
+               ret = randpkt_example_init(example, produce_filename, produce_max_bytes);
+               if (ret != EXIT_SUCCESS)
+                       goto clean_exit;
 
-       fprintf(stderr,
-           "randpkt: Internal error. Type %d has no entry in examples table.\n",
-           type);
-       exit(1);
-}
-
-/* Seed the random-number generator */
-void
-seed(void)
-{
-       unsigned int    randomness;
-       time_t          now;
-#ifndef _WIN32
-       int             fd;
-       ssize_t         ret;
+               while (produce_count-- > 0) {
+                       randpkt_loop(example, 1);
+                       produce_type = randpkt_parse_type(NULL);
 
-#define RANDOM_DEV "/dev/urandom"
+                       savedump = example->dump;
 
-       /*
-        * Assume it's at least worth trying /dev/urandom on UN*X.
-        * If it doesn't exist, fall back on time().
-        *
-        * XXX - Use CryptGenRandom on Windows?
-        */
-       fd = ws_open(RANDOM_DEV, O_RDONLY);
-       if (fd == -1) {
-               if (errno != ENOENT) {
-                       fprintf(stderr,
-                           "randpkt: Could not open " RANDOM_DEV " for reading: %s\n",
-                           g_strerror(errno));
-                       exit(2);
+                       example = randpkt_find_example(produce_type);
+                       if (!example) {
+                               ret = INVALID_OPTION;
+                               goto clean_exit;
+                       }
+                       example->dump = savedump;
                }
-               goto fallback;
-       }
-
-       ret = ws_read(fd, &randomness, sizeof randomness);
-       if (ret == -1) {
-               fprintf(stderr,
-                   "randpkt: Could not read from " RANDOM_DEV ": %s\n",
-                   g_strerror(errno));
-               exit(2);
        }
-       if ((size_t)ret != sizeof randomness) {
-               fprintf(stderr,
-                   "randpkt: Tried to read %lu bytes from " RANDOM_DEV ", got %ld\n",
-                   (unsigned long)sizeof randomness, (long)ret);
-               exit(2);
+       if (!randpkt_example_close(example)) {
+               ret = CLOSE_ERROR;
        }
-       srand(randomness);
-       ws_close(fd);
-       return;
-
-fallback:
-#endif
-       now = time(NULL);
-       randomness = (unsigned int) now;
 
-       srand(randomness);
+clean_exit:
+       wtap_cleanup();
+       return ret;
 }
 
 /*