andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added complete GZIP wrapper support to JZlib

Browse Source
This commit is contained in:
Trustin Lee 2009-10-21 10:06:33 +00:00
parent a5ae29df26
commit 8e6e996392
4 changed files with 167 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java
View File

@ -16,8 +16,48 @@
package org.jboss.netty.util.internal.jzlib;
final class CRC32 {
static long crc32(long crc32, byte[] buf, int index, int len) {
// TODO implement me
private static final int[] TABLE = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
};
static int crc32(int crc32, byte[] buf, int index, int len) {
final int endIndex = index + len;
crc32 ^= 0xffffffff;
for (int i = index; i < endIndex; i ++) {
crc32 = crc32 >>> 8 ^ TABLE[(crc32 ^ buf[i]) & 0xff];
}
crc32 ^= 0xffffffff;
return crc32;
}
}

114
src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
View File

@ -246,6 +246,7 @@ final class Deflate {
// Number of valid bits in bi_buf. All bits above the last valid bit
// are always zero.
int bi_valid;
private int gzipUncompressedBytes;
Deflate() {
dyn_ltree = new short[JZlib.HEAP_SIZE * 2];
@ -1378,7 +1379,8 @@ final class Deflate {
wroteTrailer = false;
status = wrapperType == WrapperType.NONE? BUSY_STATE : INIT_STATE;
strm.adler = Adler32.adler32(0, null, 0, 0);
strm.crc32 = CRC32.crc32(0, null, 0, 0);
strm.crc32 = 0;
gzipUncompressedBytes = 0;
last_flush = JZlib.Z_NO_FLUSH;
@ -1542,7 +1544,7 @@ final class Deflate {
// OS
put_byte((byte) 255);
strm.crc32 = CRC32.crc32(0, null, 0, 0);
strm.crc32 = 0;
break;
}
@ -1579,58 +1581,63 @@ final class Deflate {
}
// Start a new block or continue the current one.
if (strm.avail_in != 0 || lookahead != 0 || flush != JZlib.Z_NO_FLUSH &&
status != FINISH_STATE) {
int bstate = -1;
switch (config_table[level].func) {
case STORED:
bstate = deflate_stored(flush);
break;
case FAST:
bstate = deflate_fast(flush);
break;
case SLOW:
bstate = deflate_slow(flush);
break;
default:
}
if (bstate == FinishStarted || bstate == FinishDone) {
status = FINISH_STATE;
}
if (bstate == NeedMore || bstate == FinishStarted) {
if (strm.avail_out == 0) {
last_flush = -1; // avoid BUF_ERROR next call, see above
int old_next_in_index = strm.next_in_index;
try {
if (strm.avail_in != 0 || lookahead != 0 || flush != JZlib.Z_NO_FLUSH &&
status != FINISH_STATE) {
int bstate = -1;
switch (config_table[level].func) {
case STORED:
bstate = deflate_stored(flush);
break;
case FAST:
bstate = deflate_fast(flush);
break;
case SLOW:
bstate = deflate_slow(flush);
break;
default:
}
return JZlib.Z_OK;
// If flush != Z_NO_FLUSH && avail_out == 0, the next call
// of deflate should use the same flush parameter to make sure
// that the flush is complete. So we don't have to output an
// empty block here, this will be done at next call. This also
// ensures that for a very small output buffer, we emit at most
// one empty block.
}
if (bstate == BlockDone) {
if (flush == JZlib.Z_PARTIAL_FLUSH) {
_tr_align();
} else { // FULL_FLUSH or SYNC_FLUSH
_tr_stored_block(0, 0, false);
// For a full flush, this empty block will be recognized
// as a special marker by inflate_sync().
if (flush == JZlib.Z_FULL_FLUSH) {
//state.head[s.hash_size-1]=0;
for (int i = 0; i < hash_size/*-1*/; i ++) {
head[i] = 0;
if (bstate == FinishStarted || bstate == FinishDone) {
status = FINISH_STATE;
}
if (bstate == NeedMore || bstate == FinishStarted) {
if (strm.avail_out == 0) {
last_flush = -1; // avoid BUF_ERROR next call, see above
}
return JZlib.Z_OK;
// If flush != Z_NO_FLUSH && avail_out == 0, the next call
// of deflate should use the same flush parameter to make sure
// that the flush is complete. So we don't have to output an
// empty block here, this will be done at next call. This also
// ensures that for a very small output buffer, we emit at most
// one empty block.
}
if (bstate == BlockDone) {
if (flush == JZlib.Z_PARTIAL_FLUSH) {
_tr_align();
} else { // FULL_FLUSH or SYNC_FLUSH
_tr_stored_block(0, 0, false);
// For a full flush, this empty block will be recognized
// as a special marker by inflate_sync().
if (flush == JZlib.Z_FULL_FLUSH) {
//state.head[s.hash_size-1]=0;
for (int i = 0; i < hash_size/*-1*/; i ++) {
head[i] = 0;
}
}
}
}
strm.flush_pending();
if (strm.avail_out == 0) {
last_flush = -1; // avoid BUF_ERROR at next call, see above
return JZlib.Z_OK;
strm.flush_pending();
if (strm.avail_out == 0) {
last_flush = -1; // avoid BUF_ERROR at next call, see above
return JZlib.Z_OK;
}
}
}
} finally {
gzipUncompressedBytes += strm.next_in_index - old_next_in_index;
}
if (flush != JZlib.Z_FINISH) {
@ -1648,12 +1655,11 @@ final class Deflate {
putShortMSB((int) (strm.adler & 0xffff));
break;
case GZIP:
// Write the gzip trailer (crc32)
putShortMSB((int) (strm.crc32 >>> 16));
putShortMSB((int) (strm.crc32 & 0xffff));
// FIXME implement me
putShortMSB(0); // ISIZE 1
putShortMSB(0); // ISIZE 2
// Write the gzip trailer (CRC32 & ISIZE)
putShortMSB(strm.crc32 >>> 16);
putShortMSB(strm.crc32 & 0xFFFF);
putShortMSB(gzipUncompressedBytes >>> 16); // ISIZE 1
putShortMSB(gzipUncompressedBytes & 0xFFFF); // ISIZE 2
break;
}

157
src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
View File

@ -77,14 +77,8 @@ final class Inflate {
private static final int GZIP_FNAME = 21;
private static final int GZIP_FCOMMENT = 22;
private static final int GZIP_FHCRC = 23;
private static final int GZIP_CHECK8 = 24;
private static final int GZIP_CHECK7 = 25;
private static final int GZIP_CHECK6 = 26;
private static final int GZIP_CHECK5 = 27;
private static final int GZIP_CHECK4 = 28;
private static final int GZIP_CHECK3 = 29;
private static final int GZIP_CHECK2 = 30;
private static final int GZIP_CHECK1 = 31;
private static final int GZIP_CRC32= 24;
private static final int GZIP_ISIZE = 25;
private int mode; // current inflate mode
// mode dependent information
@ -101,6 +95,9 @@ final class Inflate {
private int gzipFlag;
private int gzipBytesToRead;
private int gzipXLen;
private int gzipUncompressedBytes;
private int gzipCRC32;
private int gzipISize;
private int inflateReset(ZStream z) {
if (z == null || z.istate == null) {
@ -121,6 +118,7 @@ final class Inflate {
break;
}
z.istate.blocks.reset(z, null);
gzipUncompressedBytes = 0;
return JZlib.Z_OK;
}
@ -268,32 +266,40 @@ final class Inflate {
z.istate.marker = 0; // can try inflateSync
return JZlib.Z_STREAM_ERROR;
case BLOCKS:
r = z.istate.blocks.proc(z, r);
if (r == JZlib.Z_DATA_ERROR) {
z.istate.mode = BAD;
z.istate.marker = 0; // can try inflateSync
break;
}
if (r == JZlib.Z_OK) {
int old_next_out_index = z.next_out_index;
try {
r = z.istate.blocks.proc(z, r);
if (r == JZlib.Z_DATA_ERROR) {
z.istate.mode = BAD;
z.istate.marker = 0; // can try inflateSync
break;
}
if (r == JZlib.Z_OK) {
r = f;
}
if (r != JZlib.Z_STREAM_END) {
return r;
}
r = f;
z.istate.blocks.reset(z, z.istate.was);
} finally {
int decompressedBytes = z.next_out_index - old_next_out_index;
gzipUncompressedBytes += decompressedBytes;
z.crc32 = CRC32.crc32(z.crc32, z.next_out, old_next_out_index, decompressedBytes);
}
if (r != JZlib.Z_STREAM_END) {
return r;
}
r = f;
z.istate.blocks.reset(z, z.istate.was);
if (z.istate.wrapperType == WrapperType.NONE) {
z.istate.mode = DONE;
break;
} else if (z.istate.wrapperType == WrapperType.ZLIB) {
z.istate.mode = CHECK4;
} else {
z.istate.mode = GZIP_CHECK8;
gzipCRC32 = 0;
gzipISize = 0;
gzipBytesToRead = 4;
z.istate.mode = GZIP_CRC32;
break;
}
case CHECK4:
if (z.avail_in == 0) {
return r;
}
@ -304,7 +310,6 @@ final class Inflate {
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = CHECK3;
case CHECK3:
if (z.avail_in == 0) {
return r;
}
@ -315,7 +320,6 @@ final class Inflate {
z.istate.need += (z.next_in[z.next_in_index ++] & 0xff) << 16 & 0xff0000L;
z.istate.mode = CHECK2;
case CHECK2:
if (z.avail_in == 0) {
return r;
}
@ -326,7 +330,6 @@ final class Inflate {
z.istate.need += (z.next_in[z.next_in_index ++] & 0xff) << 8 & 0xff00L;
z.istate.mode = CHECK1;
case CHECK1:
if (z.avail_in == 0) {
return r;
}
@ -487,77 +490,45 @@ final class Inflate {
}
z.istate.mode = BLOCKS;
break;
case GZIP_CHECK8:
if (z.avail_in == 0) {
return r;
case GZIP_CRC32:
while (gzipBytesToRead > 0) {
if (z.avail_in == 0) {
return r;
}
r = f;
z.avail_in --;
z.total_in ++;
gzipBytesToRead --;
z.istate.gzipCRC32 = z.istate.gzipCRC32 << 8 | z.next_in[z.next_in_index ++] & 0xff;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = GZIP_CHECK7;
case GZIP_CHECK7:
if (z.avail_in == 0) {
return r;
if (z.crc32 != z.istate.gzipCRC32) {
z.istate.mode = BAD;
z.msg = "incorrect CRC32 checksum";
z.istate.marker = 5; // can't try inflateSync
break;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = GZIP_CHECK6;
case GZIP_CHECK6:
if (z.avail_in == 0) {
return r;
gzipBytesToRead = 4;
z.istate.mode = GZIP_ISIZE;
case GZIP_ISIZE:
while (gzipBytesToRead > 0) {
if (z.avail_in == 0) {
return r;
}
r = f;
z.avail_in --;
z.total_in ++;
gzipBytesToRead --;
z.istate.gzipISize = z.istate.gzipISize << 8 | z.next_in[z.next_in_index ++] & 0xff;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = GZIP_CHECK5;
case GZIP_CHECK5:
if (z.avail_in == 0) {
return r;
if (gzipUncompressedBytes != z.istate.gzipISize) {
z.istate.mode = BAD;
z.msg = "incorrect ISIZE checksum";
z.istate.marker = 5; // can't try inflateSync
break;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = GZIP_CHECK4;
case GZIP_CHECK4:
if (z.avail_in == 0) {
return r;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = GZIP_CHECK3;
case GZIP_CHECK3:
if (z.avail_in == 0) {
return r;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = GZIP_CHECK2;
case GZIP_CHECK2:
if (z.avail_in == 0) {
return r;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = GZIP_CHECK1;
case GZIP_CHECK1:
if (z.avail_in == 0) {
return r;
}
r = f;
z.avail_in --;
z.total_in ++;
z.istate.need = (z.next_in[z.next_in_index ++] & 0xff) << 24 & 0xff000000L;
z.istate.mode = DONE;
break;
default:

2
src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
View File

@ -65,7 +65,7 @@ public final class ZStream {
Inflate istate;
int data_type; // best guess about the data type: ascii or binary
long adler;
long crc32;
int crc32;
public int inflateInit() {
return inflateInit(JZlib.DEF_WBITS);