d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recent zlib does not like Z_FLUSH at the end of inflate().

Browse Source 
Reported by:	quak@mydiax.ch
Obtained from:	KAME
MFC after:	2 days
		and approved by re
This commit is contained in:
Hajimu UMEMOTO 2002-05-12 14:12:30 +00:00
parent 357228d788
commit 88a89f8617
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet6/ipcomp_core.c
View File

@ -252,14 +252,17 @@ do { \
MOREBLOCK();
}
zerror = mode ? inflate(&zs, Z_FINISH)
zerror = mode ? inflate(&zs, Z_SYNC_FLUSH)
: deflate(&zs, Z_FINISH);
if (zerror == Z_STREAM_END)
break;
else if (zerror == Z_OK)
; /* once more. */
else {
else if (zerror == Z_OK) {
if (mode && zs.avail_out != 0)
goto terminate;
else
; /* once more. */
} else {
if (zs.msg) {
ipseclog((LOG_ERR, "ipcomp_%scompress: "
"%sflate(Z_FINISH): %s\n",