Changeset 657

Timestamp:

09/08/08 22:01:49 (5 months ago)

Author:

smoku

Message:

Writing stream error to the wire before closing stream

Location:

trunk/sx

Files:

• error.c (modified) (1 diff)
• io.c (modified) (1 diff)
• ssl.c (modified) (6 diffs)

trunk/sx/error.c

@@ -84 +84 @@
     /* stuff to write */
     s->want_write = 1;
+
+        _sx_event(s, event_WANT_WRITE, NULL);
 }
 

trunk/sx/io.c

@@ -468 +468 @@
     /* close the stream if necessary */
     if(s->state >= state_STREAM_SENT) {
+        _sx_debug(ZONE, "sending closing </stream:stream>");
         jqueue_push(s->wbufq, _sx_buffer_new("</stream:stream>", 16, NULL, NULL), 0);
         s->want_write = 1;
-    }
-
-    _sx_state(s, state_CLOSING);
+        _sx_state(s, state_CLOSING);
+        _sx_event(s, event_WANT_WRITE, NULL);
+    } else
+        _sx_state(s, state_CLOSING);
 }
 

trunk/sx/ssl.c

@@ -103 +103 @@
         if(NAD_ENAME_L(nad, 0) == 8 && strncmp(NAD_ENAME(nad, 0), "starttls", 8) == 0) {
             nad_free(nad);
-    
+
             /* can't go on if we've been here before */
             if(s->ssf > 0) {
@@ -255 +255 @@
                 _sx_close(s);
 
-                /* !!! drop queue */
-
                 return -1;
             }
@@ -272 +270 @@
     sx_error_t sxe;
 
-    /* sanity */
+    /* do not encrypt when error */
     if(sc->last_state == SX_SSL_STATE_ERROR)
-        return -2;
+        return 1;
 
     _sx_debug(ZONE, "in _sx_ssl_wio");
@@ -485 +483 @@
     if(sc->last_state == SX_SSL_STATE_WANT_READ || sc->last_state == SX_SSL_STATE_NONE)
         s->want_read = 1;
-    
+
     if(buf->len == 0)
         return 0;
@@ -655 +653 @@
 
     free(sc);
-    
+
     s->plugin_data[p->index] = NULL;
 }
@@ -748 +746 @@
         return 1;
     }
-    
+
     /* Load the CA chain, if configured */
     if (cachain != NULL) {