- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / compress.c

diff --git a/compress.c b/compress.c
index cc974ce4433f7aa7ba646fa12f354371cc75f33a..c058d222412fba86df23cf7e679bf15533988cf7 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -1,27 +1,34 @@
+/* $OpenBSD: compress.c,v 1.25 2006/08/06 01:13:32 stevesk Exp $ */
 /*
- *
- * compress.c
- *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- *
- * Created: Wed Oct 25 22:12:46 1995 ylo
- *
  * Interface to packet compression for ssh.
  *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$Id$");
 
-#include "ssh.h"
+#include <sys/types.h>
+
+#include <stdarg.h>
+#include <zlib.h>
+
+#include "log.h"
 #include "buffer.h"
-#include "zlib.h"
+#include "compress.h"
 
-static z_stream incoming_stream;
-static z_stream outgoing_stream;
+z_stream incoming_stream;
+z_stream outgoing_stream;
+static int compress_init_send_called = 0;
+static int compress_init_recv_called = 0;
+static int inflate_failed = 0;
+static int deflate_failed = 0;
 
 /*
  * Initializes compression; level is compression level from 1 to 9
@@ -29,30 +36,44 @@ static z_stream outgoing_stream;
  */
 
 void
-buffer_compress_init(int level)
+buffer_compress_init_send(int level)
 {
+       if (compress_init_send_called == 1)
+               deflateEnd(&outgoing_stream);
+       compress_init_send_called = 1;
        debug("Enabling compression at level %d.", level);
        if (level < 1 || level > 9)
                fatal("Bad compression level %d.", level);
-       inflateInit(&incoming_stream);
        deflateInit(&outgoing_stream, level);
 }
+void
+buffer_compress_init_recv(void)
+{
+       if (compress_init_recv_called == 1)
+               inflateEnd(&incoming_stream);
+       compress_init_recv_called = 1;
+       inflateInit(&incoming_stream);
+}
 
 /* Frees any data structures allocated for compression. */
 
 void
-buffer_compress_uninit()
+buffer_compress_uninit(void)
 {
-       debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
-             outgoing_stream.total_in, outgoing_stream.total_out,
-             outgoing_stream.total_in == 0 ? 0.0 :
-             (double) outgoing_stream.total_out / outgoing_stream.total_in);
-       debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
-             incoming_stream.total_out, incoming_stream.total_in,
-             incoming_stream.total_out == 0 ? 0.0 :
-             (double) incoming_stream.total_in / incoming_stream.total_out);
-       inflateEnd(&incoming_stream);
-       deflateEnd(&outgoing_stream);
+       debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f",
+           (unsigned long long)outgoing_stream.total_in,
+           (unsigned long long)outgoing_stream.total_out,
+           outgoing_stream.total_in == 0 ? 0.0 :
+           (double) outgoing_stream.total_out / outgoing_stream.total_in);
+       debug("compress incoming: raw data %llu, compressed %llu, factor %.2f",
+           (unsigned long long)incoming_stream.total_out,
+           (unsigned long long)incoming_stream.total_in,
+           incoming_stream.total_out == 0 ? 0.0 :
+           (double) incoming_stream.total_in / incoming_stream.total_out);
+       if (compress_init_recv_called == 1 && inflate_failed == 0)
+               inflateEnd(&incoming_stream);
+       if (compress_init_send_called == 1 && deflate_failed == 0)
+               deflateEnd(&outgoing_stream);
 }
 
 /*
@@ -67,7 +88,7 @@ buffer_compress_uninit()
 void
 buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
 {
-       char buf[4096];
+       u_char buf[4096];
        int status;
 
        /* This case is not handled below. */
@@ -75,13 +96,13 @@ buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
                return;
 
        /* Input is the contents of the input buffer. */
-       outgoing_stream.next_in = (unsigned char *) buffer_ptr(input_buffer);
+       outgoing_stream.next_in = buffer_ptr(input_buffer);
        outgoing_stream.avail_in = buffer_len(input_buffer);
 
        /* Loop compressing until deflate() returns with avail_out != 0. */
        do {
                /* Set up fixed-size output buffer. */
-               outgoing_stream.next_out = (unsigned char *)buf;
+               outgoing_stream.next_out = buf;
                outgoing_stream.avail_out = sizeof(buf);
 
                /* Compress as much data into the buffer as possible. */
@@ -93,6 +114,7 @@ buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
                            sizeof(buf) - outgoing_stream.avail_out);
                        break;
                default:
+                       deflate_failed = 1;
                        fatal("buffer_compress: deflate returned %d", status);
                        /* NOTREACHED */
                }
@@ -111,15 +133,15 @@ buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
 void
 buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
 {
-       char buf[4096];
+       u_char buf[4096];
        int status;
 
-       incoming_stream.next_in = (unsigned char *) buffer_ptr(input_buffer);
+       incoming_stream.next_in = buffer_ptr(input_buffer);
        incoming_stream.avail_in = buffer_len(input_buffer);
 
        for (;;) {
                /* Set up fixed-size output buffer. */
-               incoming_stream.next_out = (unsigned char *) buf;
+               incoming_stream.next_out = buf;
                incoming_stream.avail_out = sizeof(buf);
 
                status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
@@ -136,6 +158,7 @@ buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
                         */
                        return;
                default:
+                       inflate_failed = 1;
                        fatal("buffer_uncompress: inflate returned %d", status);
                        /* NOTREACHED */
                }