Changeset 0db6618

Timestamp:

2015-10-26T08:28:10Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

345577b

Parents:

4e365ce

git-author:

dequis <dx@…> (26-10-15 08:18:51)

git-committer:

dequis <dx@…> (26-10-15 08:28:10)

Message:

Use proxy_disconnect() in http, ssl, jabber, oscar

Twitter and MSN are all HTTP/SSL, so they don't need it either.

The out of tree facebook and steam plugins are also covered by the
HTTP/SSL changes.

Yahoo is written in a weird way and doesn't seem to need it (it seems it
doesn't immediately stop connections when you tell it to logout)

Files:

• lib/http_client.c (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (1 diff)
• lib/ssl_nss.c (modified) (2 diffs)
• lib/ssl_openssl.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/oscar/conn.c (modified) (1 diff)

lib/http_client.c

@@ -700 +700 @@
                 ssl_disconnect(req->ssl);
         } else {
-                closesocket(req->fd);
+                proxy_disconnect(req->fd);
         }
 

lib/ssl_gnutls.c

@@ -455 +455 @@
         }
 
-        closesocket(conn->fd);
+        proxy_disconnect(conn->fd);
 
         if (conn->session) {

lib/ssl_nss.c

@@ -226 +226 @@
         if (conn->prfd) {
                 PR_Close(conn->prfd);
-        }
-        if (source >= 0) {
+        } else if (source >= 0) {
+                /* proxy_disconnect() would be redundant here */
                 closesocket(source);
         }
@@ -305 +305 @@
         if (conn->prfd) {
                 PR_Close(conn->prfd);
+        } else if (conn->fd) {
+                proxy_disconnect(conn->fd);
         }
 

lib/ssl_openssl.c

@@ -131 +131 @@
                 conn->func(conn->data, 1, NULL, cond);
                 if (source >= 0) {
-                        closesocket(source);
+                        proxy_disconnect(source);
                 }
                 ssl_conn_free(conn);
@@ -276 +276 @@
         }
 
-        closesocket(conn->fd);
+        proxy_disconnect(conn->fd);
 
         ssl_conn_free(conn);

protocols/jabber/jabber.c

@@ -345 +345 @@
         }
         if (jd->fd >= 0) {
-                closesocket(jd->fd);
+                proxy_disconnect(jd->fd);
         }
 

protocols/oscar/conn.c

@@ -317 +317 @@
 
         if (deadconn->fd >= 3) {
-                closesocket(deadconn->fd);
+                proxy_disconnect(deadconn->fd);
         }
         deadconn->fd = -1;