diff options
Diffstat (limited to 'main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch')
| -rw-r--r-- | main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch b/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch new file mode 100644 index 0000000000..3120027400 --- /dev/null +++ b/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch @@ -0,0 +1,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 */ + |