[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.2.8-zlib-1.2.5-capture.patch

[Peter Volkov (pva)]

pva         10/05/08 07:24:22

  Added:                wireshark-1.2.8-zlib-1.2.5-capture.patch
  Log:
  Fix failure to capture packets with newer zlib, bug #316835, thank Richard for report.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/wireshark/files/wireshark-1.2.8-zlib-1.2.5-capture.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.2.8-zlib-1.2.5-capture.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.2.8-zlib-1.2.5-capture.patch?rev=1.1&content-type=text/plain

Index: wireshark-1.2.8-zlib-1.2.5-capture.patch
===================================================================
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 */