Changeset 5506

Timestamp:

05/08/08 13:49:31 (1 week ago)

Author:

morris

Message:

Reuse zlib streams

Files:

• libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (13 diffs)

libwired/trunk/libwired/p7/wi-p7-socket.c

@@ -148 +148 @@
-        
-        wi_boolean_t                                                    compression_enabled;
+        z_stream                                                                deflate_stream;
+        z_stream                                                                inflate_stream;
-        
-        wi_boolean_t                                                    checksum_enabled;
@@ -193 +195 @@
-static wi_p7_message_t *                                        _wi_p7_socket_read_xml_message(wi_p7_socket_t *, wi_time_interval_t, wi_string_t *);
-
+static wi_boolean_t                                                     _wi_p7_socket_configure_compression(wi_p7_socket_t *);
-static wi_integer_t                                                     _wi_p7_socket_deflate(wi_p7_socket_t *, const void *, uint32_t);
-static wi_integer_t                                                     _wi_p7_socket_inflate(wi_p7_socket_t *, const void *, uint32_t);
@@ -1101 +1104 @@
-        
-        if(p7_socket->compression_enabled) {
+                wi_log_info(WI_STR("compressing"));
+                
-                compressed_size = _wi_p7_socket_deflate(p7_socket, send_buffer, send_size);
-                
@@ -1111 +1116 @@
-        
-        if(p7_socket->encryption_enabled) {
+                wi_log_info(WI_STR("encrypting"));
+
-                encrypted_size = send_size + wi_cipher_block_size(p7_socket->cipher);
-                
@@ -1146 +1153 @@
-        if(p7_socket->checksum_enabled) {
-                _wi_p7_socket_checksum_binary_message(p7_socket, p7_message, checksum_buffer);
+                
+                wi_log_info(WI_STR("send message data %@"), wi_data_with_bytes(send_buffer, send_size));
+                wi_log_info(WI_STR("writing checksum %@"), wi_data_with_bytes(checksum_buffer, p7_socket->checksum_length));
-                
-                if(wi_socket_write_buffer(p7_socket->socket, timeout, checksum_buffer, p7_socket->checksum_length) < 0)
@@ -1307 +1317 @@
-#pragma mark -
-
+static wi_boolean_t _wi_p7_socket_configure_compression(wi_p7_socket_t *p7_socket) {
+        int             err;
+        
+        p7_socket->deflate_stream.data_type = Z_UNKNOWN;
+        
+        err = deflateInit(&p7_socket->deflate_stream, Z_DEFAULT_COMPRESSION);
+        
+        if(err != Z_OK) {
+                wi_error_set_zlib_error(err);
+                
+                return false;
+        }
+        
+        err = inflateInit(&p7_socket->inflate_stream);
+        
+        if(err != Z_OK) {
+                wi_error_set_zlib_error(err);
+                
+                return false;
+        }
+        
+        p7_socket->compression_enabled = true;
+        
+        return true;
+}
+
+
+
-static wi_integer_t _wi_p7_socket_deflate(wi_p7_socket_t *p7_socket, const void *in_buffer, uint32_t in_size) {
-z_stream               stream
+wi_integer_t   bytes
-        int                             err, enderr;
-        
@@ -1318 +1356 @@
-                p7_socket->compression_buffer = wi_realloc(p7_socket->compression_buffer, p7_socket->compression_buffer_length);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        
-        if(err != Z_STREAM_END) {
@@ -1353 +1380 @@
-        }
-        
-stream.total_out
+bytes
-}
-
@@ -1359 +1386 @@
-
-static wi_integer_t _wi_p7_socket_inflate(wi_p7_socket_t *p7_socket, const void *in_buffer, uint32_t in_size) {
-
-
+
-        int                             err, enderr;
-        
@@ -1371 +1397 @@
-                        p7_socket->compression_buffer = wi_realloc(p7_socket->compression_buffer, p7_socket->compression_buffer_length);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                
-                if(err == Z_STREAM_END) {
@@ -1397 +1414 @@
-                }
-        }
-
-stream.total_out
+
+bytes
-}
-
@@ -1440 +1457 @@
-                return false;
-        
+        if(WI_P7_COMPRESSION_ENABLED(p7_socket->options)) {
+                if(!_wi_p7_socket_configure_compression(p7_socket))
+                        return false;
+        }
+        
-        if(WI_P7_CHECKSUM_ENABLED(p7_socket->options))
-                _wi_p7_socket_configure_checksum(p7_socket);
@@ -1472 +1494 @@
-                return false;
-        
+        if(WI_P7_COMPRESSION_ENABLED(p7_socket->options)) {
+                if(!_wi_p7_socket_configure_compression(p7_socket))
+                        return false;
+        }
+
-        if(WI_P7_CHECKSUM_ENABLED(p7_socket->options))
-                _wi_p7_socket_configure_checksum(p7_socket);