Changeset 1522faf for lib/ssl_gnutls.c

Timestamp:

2015-04-06T02:26:44Z (9 years ago)

Author:

dequis <dx@…>

Children:

d16e951

Parents:

71f87ba (diff), 69982f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

dequis <dx@…> (06-04-15 02:24:35)

git-committer:

dequis <dx@…> (06-04-15 02:26:44)

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc_im.c
protocols/jabber/conference.c

File:

• lib/ssl_gnutls.c (modified) (4 diffs)

lib/ssl_gnutls.c

@@ -124 +124 @@
 
         if (conn->fd < 0) {
+                g_free(conn->hostname);
                 g_free(conn);
                 return NULL;
@@ -314 +315 @@
         if (source == -1) {
                 conn->func(conn->data, 0, NULL, cond);
+                g_free(conn->hostname);
                 g_free(conn);
                 return FALSE;
@@ -355 +357 @@
                         conn->func(conn->data, 0, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 }
         } else {
@@ -364 +363 @@
                         conn->func(conn->data, stver, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 } else {
                         /* For now we can't handle non-blocking perfectly everywhere... */