aboutsummaryrefslogtreecommitdiffstats
path: root/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch
blob: 3120027400d4b7dc56f78ca1f699fad748193b1e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
http://anonsvn.wireshark.org/viewvc?view=rev&revision=32715

--- trunk/wiretap/wtap.c	2010/05/07 19:24:32	32714
+++ trunk/wiretap/wtap.c	2010/05/07 19:45:47	32715
@@ -35,6 +35,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+
 #include "wtap-int.h"
 #include "wtap.h"
 
@@ -646,6 +650,14 @@
 	 */
 	wth->phdr.pkt_encap = wth->file_encap;
 
+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM == 0x1250
+	/* Reset EOF */
+	/* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof before seek: %d", gzeof(wth->fh)); */
+	if (gzeof(wth->fh))
+		gzseek(wth->fh, 0, SEEK_CUR);
+	/* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof after seek: %d", gzeof(wth->fh)); */
+#endif
+
 	if (!wth->subtype_read(wth, err, err_info, data_offset))
 		return FALSE;	/* failure */