From 579463933b6328b8d54ea246c0d0c7745fb8542a Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Sun, 1 Mar 2015 00:57:21 +0800 Subject: A bit of a bodge to avoid memcpy if zlib is disabled --HG-- branch : nocircbuffer --- packet.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'packet.c') diff --git a/packet.c b/packet.c index b477a07..d38d8f4 100644 --- a/packet.c +++ b/packet.c @@ -314,18 +314,21 @@ void decrypt_packet() { if (is_compress_recv()) { /* decompress */ ses.payload = buf_decompress(ses.readbuf, len); + buf_setpos(ses.payload, 0); + ses.payload_beginning = 0; + buf_free(ses.readbuf); } else #endif { + ses.payload = ses.readbuf; + ses.payload_beginning = ses.payload->pos; + buf_setlen(ses.payload, ses.payload->pos + len); /* copy payload */ - ses.payload = buf_new(len); - memcpy(ses.payload->data, buf_getptr(ses.readbuf, len), len); - buf_incrlen(ses.payload, len); + //ses.payload = buf_new(len); + //memcpy(ses.payload->data, buf_getptr(ses.readbuf, len), len); + //buf_incrlen(ses.payload, len); } - - buf_free(ses.readbuf); ses.readbuf = NULL; - buf_setpos(ses.payload, 0); ses.recvseq++; -- cgit v1.2.3