summaryrefslogtreecommitdiffstats
path: root/libssh/packet.c
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-03-28 21:43:53 +0000
committerAndreas Schneider <mail@cynapses.org>2009-03-28 21:43:53 +0000
commit33b948cab991cb9ef4834ea02b19cf38623bcc3f (patch)
treeabd6df3b0b1df55c6b96da3adf32161b4c26fa5e /libssh/packet.c
parentd3d7f08d6a7c9738856b6b3d55c8f255fe881463 (diff)
downloadlibssh-33b948cab991cb9ef4834ea02b19cf38623bcc3f.tar.gz
libssh-33b948cab991cb9ef4834ea02b19cf38623bcc3f.tar.xz
libssh-33b948cab991cb9ef4834ea02b19cf38623bcc3f.zip
Add an option WITH_LIBZ to compile with zlib support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@289 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/packet.c')
-rw-r--r--libssh/packet.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/libssh/packet.c b/libssh/packet.c
index aca1255..6c96a56 100644
--- a/libssh/packet.c
+++ b/libssh/packet.c
@@ -24,10 +24,12 @@ MA 02111-1307, USA. */
#include <stdio.h>
#include <unistd.h>
#include <string.h>
+#include <errno.h>
+
+#include "config.h"
#include "libssh/priv.h"
#include "libssh/ssh2.h"
#include "libssh/ssh1.h"
-#include <errno.h>
#include "libssh/crypto.h"
/* XXX include selected mac size */
@@ -139,7 +141,7 @@ static int packet_read2(SSH_SESSION *session){
ssh_log(session, SSH_LOG_RARE,
"After padding, %d bytes left in buffer",
buffer_get_rest_len(session->in_buffer));
-#ifdef HAVE_LIBZ
+#if defined(HAVE_LIBZ) && defined(WITH_LIBZ)
if(session->current_crypto && session->current_crypto->do_compress_in){
ssh_log(session, SSH_LOG_RARE, "Decompressing in_buffer ...");
decompress_buffer(session,session->in_buffer);
@@ -247,7 +249,7 @@ static int packet_read1(SSH_SESSION *session){
buffer_pass_bytes(session->in_buffer,padding); /*pass the padding*/
ssh_log(session,SSH_LOG_PACKET,"the packet is valid");
/* will do that later
-#ifdef HAVE_LIBZ
+#if defined(HAVE_LIBZ) && defined(WITH_LIBZ)
if(session->current_crypto && session->current_crypto->do_compress_in){
decompress_buffer(session,session->in_buffer);
}
@@ -326,7 +328,7 @@ static int packet_send2(SSH_SESSION *session){
enter_function();
ssh_log(session, SSH_LOG_RARE,
"Writing on the wire a packet having %u bytes before", currentlen);
-#ifdef HAVE_LIBZ
+#if defined(HAVE_LIBZ) && defined(WITH_LIBZ)
if(session->current_crypto && session->current_crypto->do_compress_out){
ssh_log(session, SSH_LOG_RARE, "Compressing in_buffer ...");
compress_buffer(session,session->out_buffer);
@@ -369,7 +371,7 @@ static int packet_send1(SSH_SESSION *session){
enter_function();
ssh_log(session,SSH_LOG_PACKET,"Sending a %d bytes long packet",currentlen);
/*
-#ifdef HAVE_LIBZ
+#if defined(HAVE_LIBZ) && defined(WITH_LIBZ)
if(session->current_crypto && session->current_crypto->do_compress_out){
compress_buffer(session,session->out_buffer);
currentlen=buffer_get_len(session->out_buffer);