aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-04-06 14:02:49 -0700
committerGuy Harris <guy@alum.mit.edu>2019-04-06 21:04:02 +0000
commit937ec02581ee3918e6caa6de75340c28593a22d5 (patch)
tree7b248de19e92997267b3b6292d216423b4e4f4eb /wiretap
parentf0a2b8303a9fcd18d09e27d79bd21ac19d9da7d0 (diff)
1514 is a better initial Buffer size than 1500.
Ethernet packets without the CRC are 1514 bytes long, not 1500 bytes long; using 1514 bytes will avoid a reallocation for a full-sized Ethernet packet. Change-Id: Ie8da3f13bf3df07e23e4478b7dcf84f06dec6a9d Reviewed-on: https://code.wireshark.org/review/32761 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c
index 2c3fdfcbf3..aba94dbc18 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -149,7 +149,7 @@ merge_open_in_files(guint in_file_count, const char *const *in_file_names,
return FALSE;
}
wtap_rec_init(&files[i].rec);
- ws_buffer_init(&files[i].frame_buffer, 1500);
+ ws_buffer_init(&files[i].frame_buffer, 1514);
files[i].size = size;
files[i].idb_index_map = g_array_new(FALSE, FALSE, sizeof(guint));
}