Changeset 356

Timestamp:

30/08/07 22:04:56 (15 months ago)

Author:

smoku

Message:

Implemented XEP-0138 Stream Compression support

Files:

• trunk/sx/ssl.c (modified) (5 diffs)

trunk/sx/ssl.c

@@ -104 +104 @@
             }
 
+            /* can't go on if we're on compressed stream */
+            if(s->compressed > 0) {
+                _sx_debug(ZONE, "starttls requested on already compressed channel, dropping packet");
+                return 0;
+            }
+
             _sx_debug(ZONE, "starttls requested, setting up");
 
@@ -175 +181 @@
     int ns;
 
-    /* if the session is already encrypted, or the app told us not to, then we don't offer anything */
-    if(s->state > state_STREAM || s->ssf > 0 || !(s->flags & SX_SSL_STARTTLS_OFFER))
+    /* if the session is already encrypted, or the app told us not to,
+     * or session is compressed then we don't offer anything */
+    if(s->state > state_STREAM || s->ssf > 0 || !(s->flags & SX_SSL_STARTTLS_OFFER) || s->compressed)
         return;
 
@@ -629 +636 @@
 }
 
-/** args: pemfile */
+int sx_openssl_initialized = 0;
+
+/** args: pemfile, cachain, mode */
 int sx_ssl_init(sx_env_t env, sx_plugin_t p, va_list args) {
     char *pemfile, *cachain;
@@ -653 +662 @@
     SSL_library_init();
     SSL_load_error_strings();
+
+    sx_openssl_initialized = 1;
 
     /* create the context */
@@ -726 +737 @@
     }
 
-    /* check if we're already encrypted */
-    if(s->ssf > 0) {
+    /* check if we're already encrypted or compressed */
+    if(s->ssf > 0 || s->compressed) {
         _sx_debug(ZONE, "encrypted channel already established");
         return 1;