-/* Combine two dump files, either by appending or by merging by timestamp
+/* Combine dump files, either by appending or by merging by timestamp
*
- * $Id$
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
*
- * Written by Scott Renfro <scott@renfro.org> based on
+ * 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.
+ *
+ * Mergecap written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
*
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#ifdef HAVE_LIBZ
+#include <zlib.h> /* to get the libz version number */
+#endif
+
#include <string.h>
#include "wtap.h"
-#ifdef NEED_GETOPT_H
-#include "getopt.h"
+#ifndef HAVE_GETOPT
+#include <wsutil/wsgetopt.h>
#endif
-#include "svnversion.h"
-#include "merge.h"
+#include <wsutil/clopts_common.h>
+#include <wsutil/strnatcmp.h>
+#include <wsutil/file_util.h>
+#include <wsutil/cmdarg_err.h>
+#include <wsutil/crash_info.h>
+#include <wsutil/copyright_info.h>
+#include <wsutil/os_version_info.h>
+#include <wsutil/ws_version_info.h>
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
+#include <wiretap/merge.h>
+
+#include "version_info.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
-/* Win32 needs the O_BINARY flag for open() */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
+#ifdef _WIN32
+#include <wsutil/unicode-utils.h>
+#endif /* _WIN32 */
-static int
-get_natural_int(const char *string, const char *name)
+static void
+show_version(GString *comp_info_str, GString *runtime_info_str)
{
- long number;
- char *p;
+ printf("Mergecap (Wireshark) %s\n"
+ "\n"
+ "%s"
+ "\n"
+ "%s"
+ "\n"
+ "%s",
+ get_ws_vcs_version_info(), get_copyright_info(),
+ comp_info_str->str, runtime_info_str->str);
+}
- number = strtol(string, &p, 10);
- if (p == string || *p != '\0') {
- fprintf(stderr, "mergecap: The specified %s \"%s\" is not a decimal number\n",
- name, string);
- exit(1);
- }
- if (number < 0) {
- fprintf(stderr, "mergecap: The specified %s is a negative number\n",
- name);
- exit(1);
- }
- if (number > INT_MAX) {
- fprintf(stderr, "mergecap: The specified %s is too large (greater than %d)\n",
- name, INT_MAX);
- exit(1);
- }
- return number;
+/*
+ * Show the usage
+ */
+static void
+print_usage(FILE *output)
+{
+ fprintf(output, "\n");
+ fprintf(output, "Usage: mergecap [options] -w <outfile>|- <infile> [<infile> ...]\n");
+ fprintf(output, "\n");
+ fprintf(output, "Output:\n");
+ fprintf(output, " -a concatenate rather than merge files.\n");
+ fprintf(output, " default is to merge based on frame timestamps.\n");
+ fprintf(output, " -s <snaplen> truncate packets to <snaplen> bytes of data.\n");
+ fprintf(output, " -w <outfile>|- set the output filename to <outfile> or '-' for stdout.\n");
+ fprintf(output, " -F <capture type> set the output file type; default is pcapng.\n");
+ fprintf(output, " an empty \"-F\" option will list the file types.\n");
+ fprintf(output, " -T <encap type> set the output file encapsulation type;\n");
+ fprintf(output, " default is the same as the first input file.\n");
+ fprintf(output, " an empty \"-T\" option will list the encapsulation types.\n");
+ fprintf(output, "\n");
+ fprintf(output, "Miscellaneous:\n");
+ fprintf(output, " -h display this help and exit.\n");
+ fprintf(output, " -v verbose output.\n");
+}
+
+/*
+ * Report an error in command-line arguments.
+ */
+static void
+mergecap_cmdarg_err(const char *fmt, va_list ap)
+{
+ fprintf(stderr, "mergecap: ");
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
}
-static int
-get_positive_int(const char *string, const char *name)
+/*
+ * Report additional information for an error in command-line arguments.
+ */
+static void
+mergecap_cmdarg_err_cont(const char *fmt, va_list ap)
{
- long number;
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+}
- number = get_natural_int(string, name);
+struct string_elem {
+ const char *sstr; /* The short string */
+ const char *lstr; /* The long string */
+};
- if (number == 0) {
- fprintf(stderr, "mergecap: The specified %s is zero\n",
- name);
- exit(1);
- }
+static gint
+string_compare(gconstpointer a, gconstpointer b)
+{
+ return strcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
+}
- return number;
+static gint
+string_nat_compare(gconstpointer a, gconstpointer b)
+{
+ return ws_ascii_strnatcmp(((const struct string_elem *)a)->sstr,
+ ((const struct string_elem *)b)->sstr);
}
-/*
- * Show the usage
- */
static void
-usage(void)
+string_elem_print(gpointer data, gpointer not_used _U_)
{
+ fprintf(stderr, " %s - %s\n", ((struct string_elem *)data)->sstr,
+ ((struct string_elem *)data)->lstr);
+}
+
+static void
+list_capture_types(void) {
int i;
- const char *string;
-
- printf("Usage: mergecap [-hva] [-s <snaplen>] [-T <encap type>]\n");
- printf(" [-F <capture type>] -w <outfile> <infile> [...]\n\n");
- printf(" where\t-h produces this help listing.\n");
- printf(" \t-v verbose operation, default is silent\n");
- printf(" \t-a files should be concatenated, not merged\n");
- printf(" \t Default merges based on frame timestamps\n");
- printf(" \t-s <snaplen>: truncate packets to <snaplen> bytes of data\n");
- printf(" \t-w <outfile>: sets output filename to <outfile>\n");
- printf(" \t-T <encap type> encapsulation type to use:\n");
- for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
- string = wtap_encap_short_string(i);
- if (string != NULL)
- printf(" \t %s - %s\n",
- string, wtap_encap_string(i));
+ struct string_elem *captypes;
+ GSList *list = NULL;
+
+ captypes = g_new(struct string_elem,WTAP_NUM_FILE_TYPES_SUBTYPES);
+
+ fprintf(stderr, "mergecap: The available capture file types for the \"-F\" flag are:\n");
+ for (i = 0; i < WTAP_NUM_FILE_TYPES_SUBTYPES; i++) {
+ if (wtap_dump_can_open(i)) {
+ captypes[i].sstr = wtap_file_type_subtype_short_string(i);
+ captypes[i].lstr = wtap_file_type_subtype_string(i);
+ list = g_slist_insert_sorted(list, &captypes[i], string_compare);
+ }
}
- printf(" \t default is the same as the first input file\n");
- printf(" \t-F <capture type> capture file type to write:\n");
- for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) {
- if (wtap_dump_can_open(i))
- printf(" \t %s - %s\n",
- wtap_file_type_short_string(i), wtap_file_type_string(i));
+ g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_free(list);
+ g_free(captypes);
+}
+
+static void
+list_encap_types(void) {
+ int i;
+ struct string_elem *encaps;
+ GSList *list = NULL;
+
+ encaps = g_new(struct string_elem,WTAP_NUM_ENCAP_TYPES);
+ fprintf(stderr, "mergecap: The available encapsulation types for the \"-T\" flag are:\n");
+ for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
+ encaps[i].sstr = wtap_encap_short_string(i);
+ if (encaps[i].sstr != NULL) {
+ encaps[i].lstr = wtap_encap_string(i);
+ list = g_slist_insert_sorted(list, &encaps[i], string_nat_compare);
+ }
}
- printf(" \t default is libpcap\n");
+ g_slist_foreach(list, string_elem_print, NULL);
+ g_slist_free(list);
+ g_free(encaps);
+}
+
+static void
+get_mergecap_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_mergecap_runtime_info(GString *str)
+{
+ /* zlib */
+#if defined(HAVE_LIBZ) && !defined(_WIN32)
+ g_string_append_printf(str, ", with libz %s", zlibVersion());
+#endif
}
int
main(int argc, char *argv[])
{
- extern char *optarg;
- extern int optind;
- int opt;
- gboolean do_append = FALSE;
- gboolean verbose = FALSE;
- int in_file_count = 0;
- int snaplen = 0;
- int file_type = WTAP_FILE_PCAP; /* default to libpcap format */
- int frame_type = -2;
- int out_fd;
- merge_in_file_t *in_files = NULL;
- int i;
- merge_out_file_t out_file;
- int err, close_err;
- gchar *err_info;
- int err_fileno;
- char *out_filename = NULL;
- merge_status_e status;
+ GString *comp_info_str;
+ GString *runtime_info_str;
+ int opt;
+ static const struct option long_options[] = {
+ {(char *)"help", no_argument, NULL, 'h'},
+ {(char *)"version", no_argument, NULL, 'V'},
+ {0, 0, 0, 0 }
+ };
+ gboolean do_append = FALSE;
+ gboolean verbose = FALSE;
+ int in_file_count = 0;
+ guint snaplen = 0;
+#ifdef PCAP_NG_DEFAULT
+ int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcap format */
+#else
+ int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAP; /* default to pcapng format */
+#endif
+ int frame_type = -2;
+ int out_fd;
+ merge_in_file_t *in_files = NULL, *in_file;
+ int i;
+ struct wtap_pkthdr *phdr, snap_phdr;
+ wtap_dumper *pdh;
+ int open_err, read_err = 0, write_err, close_err;
+ gchar *err_info, *write_err_info = NULL;
+ int err_fileno;
+ char *out_filename = NULL;
+ gboolean got_read_error = FALSE, got_write_error = FALSE;
+ int count;
+
+ cmdarg_err_init(mergecap_cmdarg_err, mergecap_cmdarg_err_cont);
+
+#ifdef _WIN32
+ arg_list_utf_16to8(argc, argv);
+ create_app_running_mutex();
+#endif /* _WIN32 */
+
+ /* Assemble the compile-time version information string */
+ comp_info_str = g_string_new("Compiled ");
+ get_compiled_version_info(comp_info_str, NULL, get_mergecap_compiled_info);
+
+ /* Assemble the run-time version information string */
+ runtime_info_str = g_string_new("Running ");
+ get_runtime_version_info(runtime_info_str, get_mergecap_runtime_info);
+
+ /* Add it to the information to be reported on a crash. */
+ ws_add_crash_info("Mergecap (Wireshark) %s\n"
+ "\n"
+ "%s"
+ "\n"
+ "%s",
+ get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
/* Process the options first */
- while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
+ while ((opt = getopt_long(argc, argv, "aF:hs:T:vVw:", long_options, NULL)) != -1) {
switch (opt) {
- case 'w':
- out_filename = optarg;
- break;
-
case 'a':
do_append = !do_append;
break;
- case 'T':
- frame_type = wtap_short_string_to_encap(optarg);
- if (frame_type < 0) {
- fprintf(stderr, "mergecap: \"%s\" is not a valid encapsulation type\n",
- optarg);
- exit(1);
- }
- break;
-
case 'F':
- file_type = wtap_short_string_to_file_type(optarg);
+ file_type = wtap_short_string_to_file_type_subtype(optarg);
if (file_type < 0) {
- fprintf(stderr, "mergecap: \"%s\" is not a valid capture file type\n",
- optarg);
- exit(1);
+ fprintf(stderr, "mergecap: \"%s\" isn't a valid capture file type\n",
+ optarg);
+ list_capture_types();
+ exit(1);
}
break;
- case 'v':
- verbose = TRUE;
+ case 'h':
+ printf("Mergecap (Wireshark) %s\n"
+ "Merge two or more capture files into one.\n"
+ "See http://www.wireshark.org for more information.\n",
+ get_ws_vcs_version_info());
+ print_usage(stdout);
+ exit(0);
break;
case 's':
snaplen = get_positive_int(optarg, "snapshot length");
break;
- case 'h':
- printf("mergecap version %s"
-#ifdef SVNVERSION
- " (" SVNVERSION ")"
-#endif
- "\n", VERSION);
- usage();
+ case 'T':
+ frame_type = wtap_short_string_to_encap(optarg);
+ if (frame_type < 0) {
+ fprintf(stderr, "mergecap: \"%s\" isn't a valid encapsulation type\n",
+ optarg);
+ list_encap_types();
+ exit(1);
+ }
+ break;
+
+ case 'v':
+ verbose = TRUE;
+ break;
+
+ case 'V':
+ show_version(comp_info_str, runtime_info_str);
+ g_string_free(comp_info_str, TRUE);
+ g_string_free(runtime_info_str, TRUE);
exit(0);
break;
- case '?': /* Bad options if GNU getopt */
- usage();
- return 1;
+ case 'w':
+ out_filename = optarg;
break;
+ case '?': /* Bad options if GNU getopt */
+ switch(optopt) {
+ case'F':
+ list_capture_types();
+ break;
+ case'T':
+ list_encap_types();
+ break;
+ default:
+ print_usage(stderr);
+ }
+ exit(1);
+ break;
}
-
}
/* check for proper args; at a minimum, must have an output
/* open the input files */
if (!merge_open_in_files(in_file_count, &argv[optind], &in_files,
- &err, &err_info, &err_fileno)) {
+ &open_err, &err_info, &err_fileno)) {
fprintf(stderr, "mergecap: Can't open %s: %s\n", argv[optind + err_fileno],
- wtap_strerror(err));
- switch (err) {
-
- case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNSUPPORTED_ENCAP:
- case WTAP_ERR_BAD_RECORD:
+ wtap_strerror(open_err));
+ if (err_info != NULL) {
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
- break;
}
return 2;
}
if (verbose) {
for (i = 0; i < in_file_count; i++)
fprintf(stderr, "mergecap: %s is type %s.\n", argv[optind + i],
- wtap_file_type_string(wtap_file_type(in_files[i].wth)));
+ wtap_file_type_subtype_string(wtap_file_type_subtype(in_files[i].wth)));
}
if (snaplen == 0) {
}
/* open the outfile */
- if (strncmp(out_filename, "-", 2) == 0) {
+ if (strncmp(out_filename, "-", 2) == 0) {
/* use stdout as the outfile */
out_fd = 1 /*stdout*/;
} else {
/* open the outfile */
- out_fd = open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
+ out_fd = ws_open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
if (out_fd == -1) {
fprintf(stderr, "mergecap: Couldn't open output file %s: %s\n",
- out_filename, strerror(errno));
+ out_filename, g_strerror(errno));
exit(1);
}
- }
-
+ }
+
/* prepare the outfile */
- if (!merge_open_outfile(&out_file, out_fd, file_type, frame_type, snaplen,
- &err)) {
+ if(file_type == WTAP_FILE_TYPE_SUBTYPE_PCAPNG ){
+ wtapng_section_t *shb_hdr;
+ GString *comment_gstr;
+
+ shb_hdr = g_new(wtapng_section_t,1);
+ comment_gstr = g_string_new("File created by merging: \n");
+
+ for (i = 0; i < in_file_count; i++) {
+ g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[i].filename);
+ }
+ shb_hdr->section_length = -1;
+ /* options */
+ shb_hdr->opt_comment = comment_gstr->str; /* NULL if not available */
+ shb_hdr->shb_hardware = NULL; /* NULL if not available, UTF-8 string containing the description of the hardware used to create this section. */
+ shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */
+ shb_hdr->shb_user_appl = g_strdup("mergecap"); /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
+
+ pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen,
+ FALSE /* compressed */, shb_hdr, NULL /* wtapng_iface_descriptions_t *idb_inf */, &open_err);
+ g_string_free(comment_gstr, TRUE);
+ } else {
+ pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, &open_err);
+ }
+ if (pdh == NULL) {
merge_close_in_files(in_file_count, in_files);
- free(in_files);
+ g_free(in_files);
fprintf(stderr, "mergecap: Can't open or create %s: %s\n", out_filename,
- wtap_strerror(err));
+ wtap_strerror(open_err));
exit(1);
}
/* do the merge (or append) */
- if (do_append)
- status = merge_append_files(in_file_count, in_files, &out_file, &err);
- else
- status = merge_files(in_file_count, in_files, &out_file, &err);
+ count = 1;
+ for (;;) {
+ if (do_append)
+ in_file = merge_append_read_packet(in_file_count, in_files, &read_err,
+ &err_info);
+ else
+ in_file = merge_read_packet(in_file_count, in_files, &read_err,
+ &err_info);
+ if (in_file == NULL) {
+ /* EOF */
+ break;
+ }
- merge_close_in_files(in_file_count, in_files);
- if (status == MERGE_SUCCESS) {
- if (!merge_close_outfile(&out_file, &err))
- status = MERGE_WRITE_ERROR;
- } else
- merge_close_outfile(&out_file, &close_err);
- switch (status) {
+ if (read_err != 0) {
+ /* I/O error reading from in_file */
+ got_read_error = TRUE;
+ break;
+ }
+
+ if (verbose)
+ fprintf(stderr, "Record: %u\n", count++);
+
+ /* We simply write it, perhaps after truncating it; we could do other
+ * things, like modify it. */
+ phdr = wtap_phdr(in_file->wth);
+ if (snaplen != 0 && phdr->caplen > snaplen) {
+ snap_phdr = *phdr;
+ snap_phdr.caplen = snaplen;
+ phdr = &snap_phdr;
+ }
+
+ if (!wtap_dump(pdh, phdr, wtap_buf_ptr(in_file->wth), &write_err, &write_err_info)) {
+ got_write_error = TRUE;
+ break;
+ }
+ }
- case MERGE_SUCCESS:
- break;
+ merge_close_in_files(in_file_count, in_files);
+ if (!got_write_error) {
+ if (!wtap_dump_close(pdh, &write_err))
+ got_write_error = TRUE;
+ } else {
+ /*
+ * We already got a write error; no need to report another
+ * write error on close.
+ *
+ * Don't overwrite the earlier write error.
+ */
+ (void)wtap_dump_close(pdh, &close_err);
+ }
- case MERGE_READ_ERROR:
+ if (got_read_error) {
/*
* Find the file on which we got the error, and report the error.
*/
for (i = 0; i < in_file_count; i++) {
- if (!in_files[i].ok) {
+ if (in_files[i].state == GOT_ERROR) {
fprintf(stderr, "mergecap: Error reading %s: %s\n",
- in_files[i].filename, wtap_strerror(in_files[i].err));
- switch (err) {
-
- case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNSUPPORTED_ENCAP:
- case WTAP_ERR_BAD_RECORD:
- fprintf(stderr, "(%s)\n", in_files[i].err_info);
- g_free(in_files[i].err_info);
- break;
+ in_files[i].filename, wtap_strerror(read_err));
+ if (err_info != NULL) {
+ fprintf(stderr, "(%s)\n", err_info);
+ g_free(err_info);
}
}
}
- break;
+ }
+
+ if (got_write_error) {
+ switch (write_err) {
+
+ case WTAP_ERR_UNWRITABLE_ENCAP:
+ /*
+ * This is a problem with the particular frame we're writing and
+ * the file type and subtype we're wwriting; note that, and
+ * report the frame number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.\n",
+ in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
+ wtap_file_type_subtype_string(file_type));
+ break;
+
+ case WTAP_ERR_PACKET_TOO_LARGE:
+ /*
+ * This is a problem with the particular frame we're writing and
+ * the file type and subtype we're wwriting; note that, and
+ * report the frame number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Frame %u of \"%s\" is too large for a \"%s\" file.\n",
+ in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
+ wtap_file_type_subtype_string(file_type));
+ break;
+
+ case WTAP_ERR_UNWRITABLE_REC_TYPE:
+ /*
+ * This is a problem with the particular record we're writing and
+ * the file type and subtype we're wwriting; note that, and
+ * report the record number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Record %u of \"%s\" has a record type that can't be saved in a \"%s\" file.\n",
+ in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
+ wtap_file_type_subtype_string(file_type));
+ break;
+
+ case WTAP_ERR_UNWRITABLE_REC_DATA:
+ /*
+ * This is a problem with the particular record we're writing and
+ * the file type and subtype we're wwriting; note that, and
+ * report the record number and file type/subtype.
+ */
+ fprintf(stderr, "mergecap: Record %u of \"%s\" has data that can't be saved in a \"%s\" file.\n(%s)\n",
+ in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
+ wtap_file_type_subtype_string(file_type),
+ write_err_info != NULL ? write_err_info : "no information supplied");
+ g_free(write_err_info);
+ break;
- case MERGE_WRITE_ERROR:
- fprintf(stderr, "mergecap: Error writing to outfile: %s\n",
- wtap_strerror(err));
- break;
+ default:
+ fprintf(stderr, "mergecap: Error writing to outfile: %s\n",
+ wtap_strerror(write_err));
+ break;
+ }
}
- free(in_files);
+ g_free(in_files);
- return (status == MERGE_SUCCESS) ? 0 : 2;
+ return (!got_read_error && !got_write_error) ? 0 : 2;
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
+
git.samba.org / metze / wireshark / wip.git / blobdiff