diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/afl_network_proxy/afl-network-client.c | 28 | ||||
| -rw-r--r-- | examples/afl_network_proxy/afl-network-server.c | 6 |
2 files changed, 18 insertions, 16 deletions
diff --git a/examples/afl_network_proxy/afl-network-client.c b/examples/afl_network_proxy/afl-network-client.c index 94f6bb42..781ea328 100644 --- a/examples/afl_network_proxy/afl-network-client.c +++ b/examples/afl_network_proxy/afl-network-client.c @@ -302,7 +302,7 @@ int main(int argc, char *argv[]) { compressor = libdeflate_alloc_compressor(1); struct libdeflate_decompressor *decompressor; decompressor = libdeflate_alloc_decompressor(); - fprintf(stderr, "Compile with compression support\n"); + fprintf(stderr, "Compiled with compression support\n"); #endif if (s == -1) @@ -321,6 +321,7 @@ int main(int argc, char *argv[]) { // fprintf(stderr, "Sending testcase with len %u\n", *lenptr); #ifdef USE_DEFLATE + #ifdef COMPRESS_TESTCASES // we only compress the testcase if it does not fit in the TCP packet if (*lenptr > 1500 - 20 - 32 - 4) { @@ -330,24 +331,25 @@ int main(int argc, char *argv[]) { buf2 + 8, buf2_len); if (send(s, buf2, *lenptr2 + 8, 0) != *lenptr2 + 8) PFATAL("sending test data failed"); - fprintf(stderr, "COMPRESS (%u->%u):\n", *lenptr, *lenptr2); - for (u32 i = 0; i < *lenptr; i++) - fprintf(stderr, "%02x", buf[i + 4]); - fprintf(stderr, "\n"); - for (u32 i = 0; i < *lenptr2; i++) - fprintf(stderr, "%02x", buf2[i + 8]); - fprintf(stderr, "\n"); + //fprintf(stderr, "COMPRESS (%u->%u):\n", *lenptr, *lenptr2); + //for (u32 i = 0; i < *lenptr; i++) + // fprintf(stderr, "%02x", buf[i + 4]); + //fprintf(stderr, "\n"); + //for (u32 i = 0; i < *lenptr2; i++) + // fprintf(stderr, "%02x", buf2[i + 8]); + //fprintf(stderr, "\n"); } else { - + #endif #endif if (send(s, buf, *lenptr + 4, 0) != *lenptr + 4) PFATAL("sending test data failed"); #ifdef USE_DEFLATE + #ifdef COMPRESS_TESTCASES // fprintf(stderr, "unCOMPRESS (%u)\n", *lenptr); } - + #endif #endif received = 0; @@ -379,9 +381,9 @@ int main(int argc, char *argv[]) { &decompress_len) != LIBDEFLATE_SUCCESS || decompress_len != __afl_map_size) FATAL("decompression failed"); -// fprintf(stderr, "DECOMPRESS (%u->%u): ", compress_len, decompress_len); -// for (u32 i = 0; i < __afl_map_size; i++) fprintf(stderr, "%02x", -// __afl_area_ptr[i]); fprintf(stderr, "\n"); + // fprintf(stderr, "DECOMPRESS (%u->%u): ", compress_len, decompress_len); + // for (u32 i = 0; i < __afl_map_size; i++) fprintf(stderr, "%02x", + // __afl_area_ptr[i]); fprintf(stderr, "\n"); #else while (received < __afl_map_size && (ret = recv(s, __afl_area_ptr + received, __afl_map_size - received, diff --git a/examples/afl_network_proxy/afl-network-server.c b/examples/afl_network_proxy/afl-network-server.c index ffe37447..01501cc9 100644 --- a/examples/afl_network_proxy/afl-network-server.c +++ b/examples/afl_network_proxy/afl-network-server.c @@ -354,7 +354,7 @@ int recv_testcase(int s, void **buf, size_t *max_len) { if (size == 0) FATAL("did not receive valid size information"); // fprintf(stderr, "received size information of %d\n", size); - if ((size && 0xff000000) != 0xff000000) { + if ((size & 0xff000000) != 0xff000000) { *buf = maybe_grow(buf, max_len, size); received = 0; @@ -367,13 +367,13 @@ int recv_testcase(int s, void **buf, size_t *max_len) { #ifdef USE_DEFLATE u32 clen; - size = (size & 0x00ffffff); + size -= 0xff000000; *buf = maybe_grow(buf, max_len, size); received = 0; while (received < 4 && (ret = recv(s, &clen + received, 4 - received, 0)) > 0) received += ret; - if (received != 4) FATAL("did not receive size information"); + if (received != 4) FATAL("did not receive clen1 information"); // fprintf(stderr, "received clen information of %d\n", clen); if (clen < 1) FATAL("did not receive valid compressed len information: %u", clen); |