comparison src/protocols/msn/notification.c @ 7288:ff9127038a5a

[gaim-migrate @ 7869] It doesn't completely work yet, but this is the beginnings of the MSN HTTP port 80 connect method. I don't have it set so it can be enabled, so it's harmless to commit this now, but I want a second set of eyes, and I also want to do other MSN work without dealing with hand-merging patches. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Fri, 17 Oct 2003 14:57:59 +0000
parents 448e39ace278
children ab2085024a29
comparison
equal deleted inserted replaced
7287:3a41c3f80228 7288:ff9127038a5a
1861 port = atoi(c + 1); 1861 port = atoi(c + 1);
1862 } 1862 }
1863 else 1863 else
1864 port = 1863; 1864 port = 1863;
1865 1865
1866 if (session->http_method)
1867 port = 80;
1868
1866 swboard = msn_switchboard_new(session); 1869 swboard = msn_switchboard_new(session);
1867 1870
1868 user = msn_user_new(session, params[4], NULL); 1871 user = msn_user_new(session, params[4], NULL);
1869 1872
1870 msn_switchboard_set_invited(swboard, TRUE); 1873 msn_switchboard_set_invited(swboard, TRUE);
1922 "switchboards!\n"); 1925 "switchboards!\n");
1923 return FALSE; 1926 return FALSE;
1924 } 1927 }
1925 1928
1926 msn_switchboard_set_auth_key(swboard, params[4]); 1929 msn_switchboard_set_auth_key(swboard, params[4]);
1930
1931 if (session->http_method)
1932 port = 80;
1927 1933
1928 if (!msn_switchboard_connect(swboard, host, port)) { 1934 if (!msn_switchboard_connect(swboard, host, port)) {
1929 gaim_debug(GAIM_DEBUG_ERROR, "msn", 1935 gaim_debug(GAIM_DEBUG_ERROR, "msn",
1930 "Unable to connect to switchboard on %s, port %d\n", 1936 "Unable to connect to switchboard on %s, port %d\n",
1931 host, port); 1937 host, port);
2180 notification = msn_servconn_new(session); 2186 notification = msn_servconn_new(session);
2181 2187
2182 msn_servconn_set_server(notification, server, port); 2188 msn_servconn_set_server(notification, server, port);
2183 msn_servconn_set_connect_cb(notification, connect_cb); 2189 msn_servconn_set_connect_cb(notification, connect_cb);
2184 msn_servconn_set_failed_read_cb(notification, failed_read_cb); 2190 msn_servconn_set_failed_read_cb(notification, failed_read_cb);
2191
2192 if (session->http_method)
2193 notification->http_data->server_type = "NS";
2185 2194
2186 if (notification_commands == NULL) { 2195 if (notification_commands == NULL) {
2187 /* Register the command callbacks. */ 2196 /* Register the command callbacks. */
2188 msn_servconn_register_command(notification, "ADD", add_cmd); 2197 msn_servconn_register_command(notification, "ADD", add_cmd);
2189 msn_servconn_register_command(notification, "ADG", adg_cmd); 2198 msn_servconn_register_command(notification, "ADG", adg_cmd);