[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.9.2.7 and 1.10

version 1.9.2.7, 2002/03/08 17:04:42 version 1.10, 2000/12/19 23:17:56
Line 14 
Line 14 
 #include "includes.h"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
 #include "log.h"  #include "ssh.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;
 static int compress_init_send_called = 0;  
 static int compress_init_recv_called = 0;  
   
 /*  /*
  * Initializes compression; level is compression level from 1 to 9   * Initializes compression; level is compression level from 1 to 9
Line 30 
Line 27 
  */   */
   
 void  void
 buffer_compress_init_send(int level)  buffer_compress_init(int level)
 {  {
         if (compress_init_send_called == 1)  
                 deflateEnd(&outgoing_stream);  
         compress_init_send_called = 1;  
         debug("Enabling compression at level %d.", level);          debug("Enabling compression at level %d.", level);
         if (level < 1 || level > 9)          if (level < 1 || level > 9)
                 fatal("Bad compression level %d.", level);                  fatal("Bad compression level %d.", level);
           inflateInit(&incoming_stream);
         deflateInit(&outgoing_stream, level);          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. */  /* Frees any data structures allocated for compression. */
   
 void  void
 buffer_compress_uninit(void)  buffer_compress_uninit()
 {  {
         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,
             outgoing_stream.total_in == 0 ? 0.0 :                outgoing_stream.total_in == 0 ? 0.0 :
             (double) outgoing_stream.total_out / outgoing_stream.total_in);                (double) outgoing_stream.total_out / outgoing_stream.total_in);
         debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",          debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
             incoming_stream.total_out, incoming_stream.total_in,                incoming_stream.total_out, incoming_stream.total_in,
             incoming_stream.total_out == 0 ? 0.0 :                incoming_stream.total_out == 0 ? 0.0 :
             (double) incoming_stream.total_in / incoming_stream.total_out);                (double) incoming_stream.total_in / incoming_stream.total_out);
         if (compress_init_recv_called == 1)          inflateEnd(&incoming_stream);
                 inflateEnd(&incoming_stream);          deflateEnd(&outgoing_stream);
         if (compress_init_send_called == 1)  
                 deflateEnd(&outgoing_stream);  
 }  }
   
 /*  /*
Line 80 
Line 65 
 void  void
 buffer_compress(Buffer * input_buffer, Buffer * output_buffer)  buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
 {  {
         u_char buf[4096];          char buf[4096];
         int status;          int status;
   
         /* This case is not handled below. */          /* This case is not handled below. */
Line 88 
Line 73 
                 return;                  return;
   
         /* Input is the contents of the input buffer. */          /* Input is the contents of the input buffer. */
         outgoing_stream.next_in = 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 = 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 124 
Line 109 
 void  void
 buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)  buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
 {  {
         u_char buf[4096];          char buf[4096];
         int status;          int status;
   
         incoming_stream.next_in = 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 = 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.9.2.7  
changed lines
  Added in v.1.10