Changeset 767b2d1 for protocols/msn/ns.c

Timestamp:

2015-05-31T02:40:04Z (9 years ago)

Author:

dequis <dx@…>

Children:

074c9b6

Parents:

2ca933c

git-author:

dequis <dx@…> (07-04-15 12:59:51)

git-committer:

dequis <dx@…> (31-05-15 02:40:04)

Message:

msn: Start of SSL over TCP code (required for MSNP24)

File:

• protocols/msn/ns.c (modified) (8 diffs)

protocols/msn/ns.c

@@ -32 +32 @@
 #include "soap.h"
 #include "xmltree.h"
-
-static gboolean msn_ns_connected(gpointer data, gint source, b_input_condition cond);
+#include "ssl_client.h"
+
+static gboolean msn_ns_connected(gpointer data, int source, void *scd, b_input_condition cond);
 static gboolean msn_ns_callback(gpointer data, gint source, b_input_condition cond);
 
@@ -68 +69 @@
                 msn_gw_write(md->gw, out, len);
         } else {
-                st = write(fd, out, len);
+                st = ssl_write(md->ssl, out, len);
         }
 
@@ -92 +93 @@
                 md->gw = msn_gw_new(ic);
                 md->gw->callback = msn_ns_callback;
-                msn_ns_connected(md, -1, B_EV_IO_READ);
+                msn_ns_connected(md, 0, NULL, B_EV_IO_READ);
         } else {
-                md->fd = proxy_connect(host, port, msn_ns_connected, md);
+                md->ssl = ssl_connect((char *) host, port, TRUE, msn_ns_connected, md);
+                md->fd = md->ssl ? ssl_getfd(md->ssl) : -1;
                 if (md->fd < 0) {
                         imcb_error(ic, "Could not connect to server");
@@ -105 +107 @@
 }
 
-static gboolean msn_ns_connected(gpointer data, gint source, b_input_condition cond)
+static gboolean msn_ns_connected(gpointer data, int source, void *scd, b_input_condition cond)
 {
         struct msn_data *md = data;
         struct im_connection *ic = md->ic;
 
-        if (source == -1 && !md->is_http) {
+        if (!scd && !md->is_http) {
+                md->ssl = NULL;
                 imcb_error(ic, "Could not connect to server");
                 imc_logout(ic, TRUE);
@@ -135 +138 @@
         }
 
-        if (msn_ns_write(ic, source, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER)) {
+        if (msn_ns_write(ic, -1, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER)) {
                 if (!md->is_http) {
                         md->inpa = b_input_add(md->fd, B_EV_IO_READ, msn_ns_callback, md);
@@ -150 +153 @@
                 msn_gw_free(md->gw);
         }
-        if (md->fd >= 0) {
-                closesocket(md->fd);
+
+        if (md->ssl) {
+                ssl_disconnect(md->ssl);
                 b_event_remove(md->inpa);
         }
 
+        md->ssl = NULL;
         md->fd = md->inpa = -1;
+
         g_free(md->rxq);
         g_free(md->cmd_text);
@@ -175 +181 @@
         } else {
                 bytes = g_malloc(1024);
-                st = read(md->fd, bytes, 1024);
-        }
-
-        if (st <= 0) {
+                st = ssl_read(md->ssl, bytes, 1024);
+        }
+
+        if (st == 0 || (st < 0 && (md->is_http || !ssl_sockerr_again(md->ssl)))) {
                 imcb_error(ic, "Error while reading from server");
                 imc_logout(ic, TRUE);
@@ -188 +194 @@
 
         g_free(bytes);
+
+        if (!md->is_http && ssl_pending(md->ssl)) {
+                return msn_ns_callback(data, source, cond);
+        }
 
         return msn_handler(md);