Changeset 767b2d1 for protocols/msn/msn.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/msn.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -43 +43 @@
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
 
-        s = set_add(&acc->set, "port", MSN_NS_PORT, set_eval_int, acc);
+        s = set_add(&acc->set, "port", NULL, set_eval_int, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
@@ -60 +60 @@
         struct im_connection *ic = imcb_new(acc);
         struct msn_data *md = g_new0(struct msn_data, 1);
-        char *server = set_getstr(&ic->acc->set, "server");
+        char *server = set_getstr(&ic->acc->set, "server") ? : MSN_SSL_HOST;
+        int port = set_getint(&ic->acc->set, "port") ? : MSN_SSL_PORT;
 
         ic->proto_data = md;
         ic->flags |= OPT_PONGS | OPT_PONGED;
-
-        if (!server) {
-                server = "geo.gateway.messenger.live.com";
-        }
 
         if (strchr(acc->user, '@') == NULL) {
@@ -84 +81 @@
 
         imcb_log(ic, "Connecting");
-        msn_ns_connect(ic, server,
-                       set_getint(&ic->acc->set, "port"));
+
+        msn_ns_connect(ic, server, port);
 
         if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "mail_notifications_handle")) {