Allow bigger snapshot lengths for D-Bus captures.

[metze/wireshark/wip.git] / wiretap / merge.c

diff --git a/wiretap/merge.c b/wiretap/merge.c
index 0ba1b81a664a557408d3b2586d707b104f596d11..0f3c8017405372a3c48e9ac21a8ca7a855cb457b 100644 (file)
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -959,7 +959,7 @@ merge_files(const gchar* out_filename, const int file_type,
 
     if (snaplen == 0) {
         /* Snapshot length not specified - default to the maximum. */
-        snaplen = WTAP_MAX_PACKET_SIZE;
+        snaplen = WTAP_MAX_PACKET_SIZE_STANDARD;
     }
 
     /*
@@ -1062,7 +1062,7 @@ merge_files_to_tempfile(gchar **out_filenamep, const char *pfx,
 
     if (snaplen == 0) {
         /* Snapshot length not specified - default to the maximum. */
-        snaplen = WTAP_MAX_PACKET_SIZE;
+        snaplen = WTAP_MAX_PACKET_SIZE_STANDARD;
     }
 
     /*
@@ -1161,7 +1161,7 @@ merge_files_to_stdout(const int file_type, const char *const *in_filenames,
 
     if (snaplen == 0) {
         /* Snapshot length not specified - default to the maximum. */
-        snaplen = WTAP_MAX_PACKET_SIZE;
+        snaplen = WTAP_MAX_PACKET_SIZE_STANDARD;
     }
 
     /*