[BACK]Return to compress.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/compress.c between version 1.7 and 1.7.2.4

version 1.7, 2000/04/14 10:30:31 version 1.7.2.4, 2001/03/21 18:52:43
Line 1 
Line 1 
 /*  /*
  *  
  * compress.c  
  *  
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  *  
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved   *                    All rights reserved
  *  
  * Created: Wed Oct 25 22:12:46 1995 ylo  
  *  
  * Interface to packet compression for ssh.   * 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"  #include "includes.h"
 RCSID("$Id$");  RCSID("$OpenBSD$");
   
 #include "ssh.h"  #include "log.h"
 #include "buffer.h"  #include "buffer.h"
 #include "zlib.h"  #include "zlib.h"
   #include "compress.h"
   
 static z_stream incoming_stream;  static z_stream incoming_stream;
 static z_stream outgoing_stream;  static z_stream outgoing_stream;
Line 41 
Line 40 
 /* Frees any data structures allocated for compression. */  /* Frees any data structures allocated for compression. */
   
 void  void
 buffer_compress_uninit()  buffer_compress_uninit(void)
 {  {
         debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",          debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
               outgoing_stream.total_in, outgoing_stream.total_out,                outgoing_stream.total_in, outgoing_stream.total_out,
Line 75 
Line 74 
                 return;                  return;
   
         /* Input is the contents of the input buffer. */          /* Input is the contents of the input buffer. */
         outgoing_stream.next_in = (unsigned char *) buffer_ptr(input_buffer);          outgoing_stream.next_in = (u_char *) buffer_ptr(input_buffer);
         outgoing_stream.avail_in = buffer_len(input_buffer);          outgoing_stream.avail_in = buffer_len(input_buffer);
   
         /* Loop compressing until deflate() returns with avail_out != 0. */          /* Loop compressing until deflate() returns with avail_out != 0. */
         do {          do {
                 /* Set up fixed-size output buffer. */                  /* Set up fixed-size output buffer. */
                 outgoing_stream.next_out = (unsigned char *)buf;                  outgoing_stream.next_out = (u_char *)buf;
                 outgoing_stream.avail_out = sizeof(buf);                  outgoing_stream.avail_out = sizeof(buf);
   
                 /* Compress as much data into the buffer as possible. */                  /* Compress as much data into the buffer as possible. */
Line 114 
Line 113 
         char buf[4096];          char buf[4096];
         int status;          int status;
   
         incoming_stream.next_in = (unsigned char *) buffer_ptr(input_buffer);          incoming_stream.next_in = (u_char *) buffer_ptr(input_buffer);
         incoming_stream.avail_in = buffer_len(input_buffer);          incoming_stream.avail_in = buffer_len(input_buffer);
   
         for (;;) {          for (;;) {
                 /* Set up fixed-size output buffer. */                  /* Set up fixed-size output buffer. */
                 incoming_stream.next_out = (unsigned char *) buf;                  incoming_stream.next_out = (u_char *) buf;
                 incoming_stream.avail_out = sizeof(buf);                  incoming_stream.avail_out = sizeof(buf);
   
                 status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);                  status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.7.2.4