Changeset 19ac9c5

Timestamp:

2006-05-13T19:44:59Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0356ae3

Parents:

782d988

Message:

Timeouts are now persistent.

Location:

protocols

Files:

• events_libevent.c (modified) (3 diffs)
• proxy.c (modified) (1 diff)
• ssl_openssl.c (modified) (1 diff)

protocols/events_libevent.c

@@ -50 +50 @@
         guint id;
         struct event evinfo;
+        gint timeout;
         b_event_handler function;
         void *data;
@@ -101 +102 @@
                 event_debug( "Handler returned FALSE: " );
                 b_event_remove( id );
+        }
+        else if( fd == -1 )
+        {
+                struct timeval tv;
+                
+                tv.tv_sec = b_ev->timeout / 1000;
+                tv.tv_usec = ( b_ev->timeout % 1000 ) * 1000;
+                
+                evtimer_add( &b_ev->evinfo, &tv );
         }
 }
@@ -159 +169 @@
         
         b_ev->id = id_next++;
+        b_ev->timeout = timeout;
         b_ev->function = function;
         b_ev->data = data;

protocols/proxy.c

@@ -126 +126 @@
 
         sock_make_nonblocking(fd);
-
+        
+        event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);
+        
         if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
                 if (sockerr_again()) {

protocols/ssl_openssl.c

@@ -115 +115 @@
         int st;
         
-        if( 0 && conn->inpa != -1 )
-        {
-                b_event_remove( conn->inpa );
-                conn->inpa = -1;
-        }
-        
         if( ( st = SSL_connect( conn->ssl ) ) < 0 )
         {