Wed, 26 May 2010 20:01:05 +0000
propagate from branch 'im.pidgin.cpw.qulogic.msnp16' (head 6b703b827c8c834fa6b785d9e2d2fa2b34849c09)
to branch 'im.pidgin.soc.2010.msn-tlc' (head f3f4e9b1b6ccbd6ab82dfbd0a4a7d1dec8c5bd9c)
| 5309 | 1 | /** |
| 2 | * @file servconn.c Server connection functions | |
| 3 | * | |
| 15884 | 4 | * purple |
| 5309 | 5 | * |
| 15884 | 6 | * Purple is the legal property of its developers, whose names are too numerous |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
7 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
8 | * source distribution. |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6122
diff
changeset
|
9 | * |
| 5309 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License as published by | |
| 12 | * the Free Software Foundation; either version 2 of the License, or | |
| 13 | * (at your option) any later version. | |
| 14 | * | |
| 15 | * This program is distributed in the hope that it will be useful, | |
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 | * GNU General Public License for more details. | |
| 19 | * | |
| 20 | * You should have received a copy of the GNU General Public License | |
| 21 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19578
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 5309 | 23 | */ |
| 24 | #include "msn.h" | |
| 25 | #include "servconn.h" | |
| 8569 | 26 | #include "error.h" |
| 5309 | 27 | |
| 15884 | 28 | static void read_cb(gpointer data, gint source, PurpleInputCondition cond); |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
29 | static void servconn_timeout_renew(MsnServConn *servconn); |
|
8583
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
30 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
31 | /************************************************************************** |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
32 | * Main |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
33 | **************************************************************************/ |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
34 | |
| 5309 | 35 | MsnServConn * |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
36 | msn_servconn_new(MsnSession *session, MsnServConnType type) |
| 5309 | 37 | { |
| 38 | MsnServConn *servconn; | |
| 39 | ||
| 40 | g_return_val_if_fail(session != NULL, NULL); | |
| 41 | ||
| 42 | servconn = g_new0(MsnServConn, 1); | |
| 43 | ||
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
44 | servconn->type = type; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
45 | |
| 5309 | 46 | servconn->session = session; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
47 | servconn->cmdproc = msn_cmdproc_new(session); |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
48 | servconn->cmdproc->servconn = servconn; |
| 5309 | 49 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
50 | servconn->httpconn = msn_httpconn_new(servconn); |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
51 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
52 | servconn->num = session->servconns_count++; |
|
5898
77c591517706
[gaim-migrate @ 6330]
Christian Hammond <chipx86@chipx86.com>
parents:
5897
diff
changeset
|
53 | |
| 15884 | 54 | servconn->tx_buf = purple_circ_buffer_new(MSN_BUF_LEN); |
|
19578
1b959e85174c
Input handlers are unsigned integers. So set them to 0 instead of -1 after
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
17724
diff
changeset
|
55 | servconn->tx_handler = 0; |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
56 | servconn->timeout_sec = 0; |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
57 | servconn->timeout_handle = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
58 | |
|
20664
5c766e725d54
Obligatory typo.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20663
diff
changeset
|
59 | servconn->fd = -1; |
|
20663
277ab3707384
Initialize file descriptors to -1 here too. These haven't caused any
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20602
diff
changeset
|
60 | |
| 5309 | 61 | return servconn; |
| 62 | } | |
| 63 | ||
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
64 | void |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
65 | msn_servconn_destroy(MsnServConn *servconn) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
66 | { |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
67 | g_return_if_fail(servconn != NULL); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
68 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
69 | if (servconn->processing) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
70 | { |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
71 | servconn->wasted = TRUE; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
72 | return; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
73 | } |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
74 | |
|
24708
a5f6cef9797e
This should fix another crash I've seen. We weren't correctly
Mark Doliner <markdoliner@pidgin.im>
parents:
24668
diff
changeset
|
75 | msn_servconn_disconnect(servconn); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
76 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
77 | if (servconn->destroy_cb) |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
78 | servconn->destroy_cb(servconn); |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
79 | |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
80 | if (servconn->httpconn != NULL) |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
81 | msn_httpconn_destroy(servconn->httpconn); |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
82 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
83 | g_free(servconn->host); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
84 | |
| 15884 | 85 | purple_circ_buffer_destroy(servconn->tx_buf); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
86 | if (servconn->tx_handler > 0) |
| 15884 | 87 | purple_input_remove(servconn->tx_handler); |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
88 | if (servconn->timeout_handle > 0) |
|
28644
7e62a6f19d38
Fix a leak, and a series of typos.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
28641
diff
changeset
|
89 | purple_timeout_remove(servconn->timeout_handle); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
90 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
91 | msn_cmdproc_destroy(servconn->cmdproc); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
92 | g_free(servconn); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
93 | } |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
94 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
95 | void |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
96 | msn_servconn_set_connect_cb(MsnServConn *servconn, |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
97 | void (*connect_cb)(MsnServConn *)) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
98 | { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
99 | g_return_if_fail(servconn != NULL); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
100 | servconn->connect_cb = connect_cb; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
101 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
102 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
103 | void |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
104 | msn_servconn_set_disconnect_cb(MsnServConn *servconn, |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
105 | void (*disconnect_cb)(MsnServConn *)) |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
106 | { |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
107 | g_return_if_fail(servconn != NULL); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
108 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
109 | servconn->disconnect_cb = disconnect_cb; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
110 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
111 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
112 | void |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
113 | msn_servconn_set_destroy_cb(MsnServConn *servconn, |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
114 | void (*destroy_cb)(MsnServConn *)) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
115 | { |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
116 | g_return_if_fail(servconn != NULL); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
117 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
118 | servconn->destroy_cb = destroy_cb; |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
119 | } |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
120 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
121 | /************************************************************************** |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
122 | * Utility |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
123 | **************************************************************************/ |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
124 | |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
125 | void |
|
27905
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
126 | msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error, |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
127 | const char *reason) |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
128 | { |
|
27903
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
129 | MsnSession *session = servconn->session; |
|
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
130 | MsnServConnType type = servconn->type; |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
131 | |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
132 | const char *names[] = { "Notification", "Switchboard" }; |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
133 | const char *name; |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
134 | |
|
27903
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
135 | name = names[type]; |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
136 | |
|
27905
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
137 | if (reason == NULL) { |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
138 | switch (error) |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
139 | { |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
140 | case MSN_SERVCONN_ERROR_CONNECT: |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
141 | reason = _("Unable to connect"); break; |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
142 | case MSN_SERVCONN_ERROR_WRITE: |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
143 | reason = _("Writing error"); break; |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
144 | case MSN_SERVCONN_ERROR_READ: |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
145 | reason = _("Reading error"); break; |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
146 | default: |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
147 | reason = _("Unknown error"); break; |
|
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
148 | } |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
149 | } |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
150 | |
| 15884 | 151 | purple_debug_error("msn", "Connection error from %s server (%s): %s\n", |
|
11897
10853b830964
[gaim-migrate @ 14188]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10773
diff
changeset
|
152 | name, servconn->host, reason); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
153 | |
|
27903
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
154 | if (type == MSN_SERVCONN_SB) |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
155 | { |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
156 | MsnSwitchBoard *swboard; |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
157 | swboard = servconn->cmdproc->data; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
158 | if (swboard != NULL) |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
159 | swboard->error = MSN_SB_ERROR_CONNECTION; |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
160 | } |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
161 | |
|
27903
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
162 | /* servconn->disconnect_cb may destroy servconn, so don't use it again */ |
|
14084
6dd13f1ca6e6
[gaim-migrate @ 16619]
Mark Doliner <markdoliner@pidgin.im>
parents:
14040
diff
changeset
|
163 | msn_servconn_disconnect(servconn); |
|
6dd13f1ca6e6
[gaim-migrate @ 16619]
Mark Doliner <markdoliner@pidgin.im>
parents:
14040
diff
changeset
|
164 | |
|
27903
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
165 | if (type == MSN_SERVCONN_NS) |
|
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
166 | { |
|
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
167 | char *tmp = g_strdup_printf(_("Connection error from %s server:\n%s"), |
|
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
168 | name, reason); |
|
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
169 | msn_session_set_error(session, MSN_ERROR_SERVCONN, tmp); |
|
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
170 | g_free(tmp); |
|
602a8a17b76a
Set the session error after disconnecting the servconn instead of before.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27887
diff
changeset
|
171 | } |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
172 | } |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
173 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
174 | /************************************************************************** |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
175 | * Connect |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
176 | **************************************************************************/ |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
177 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
178 | static void |
| 20538 | 179 | connect_cb(gpointer data, gint source, const char *error_message) |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
180 | { |
|
14174
1615a99529dc
[gaim-migrate @ 16746]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
181 | MsnServConn *servconn; |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
182 | |
|
14174
1615a99529dc
[gaim-migrate @ 16746]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
183 | servconn = data; |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
184 | servconn->connect_data = NULL; |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
185 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
186 | servconn->fd = source; |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
187 | |
|
14343
0620a31943fe
[gaim-migrate @ 16966]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
188 | if (source >= 0) |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
189 | { |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
190 | servconn->connected = TRUE; |
|
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
191 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
192 | /* Someone wants to know we connected. */ |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
193 | servconn->connect_cb(servconn); |
| 15884 | 194 | servconn->inpa = purple_input_add(servconn->fd, PURPLE_INPUT_READ, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
195 | read_cb, data); |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
196 | servconn_timeout_renew(servconn); |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
197 | } |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
198 | else |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
199 | { |
|
17644
b335f081a036
We should surface this error to the user when calling
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
200 | purple_debug_error("msn", "Connection error: %s\n", error_message); |
|
27905
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
201 | msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_CONNECT, error_message); |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
202 | } |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
203 | } |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10225
diff
changeset
|
204 | |
| 5309 | 205 | gboolean |
|
23816
fd601d075bd0
Allow forcing an MSN HTTP connection to connect to a new server. This
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
206 | msn_servconn_connect(MsnServConn *servconn, const char *host, int port, gboolean force) |
| 5309 | 207 | { |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
208 | MsnSession *session; |
| 5309 | 209 | |
|
8583
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
210 | g_return_val_if_fail(servconn != NULL, FALSE); |
|
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
211 | g_return_val_if_fail(host != NULL, FALSE); |
|
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
212 | g_return_val_if_fail(port > 0, FALSE); |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
213 | |
|
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
214 | session = servconn->session; |
| 5309 | 215 | |
|
8583
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
216 | if (servconn->connected) |
|
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
217 | msn_servconn_disconnect(servconn); |
|
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
218 | |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14343
diff
changeset
|
219 | g_free(servconn->host); |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
220 | servconn->host = g_strdup(host); |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
221 | |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
222 | if (session->http_method) |
|
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
223 | { |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
224 | /* HTTP Connection. */ |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
225 | |
|
23816
fd601d075bd0
Allow forcing an MSN HTTP connection to connect to a new server. This
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
226 | if (!servconn->httpconn->connected || force) |
|
10568
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
227 | if (!msn_httpconn_connect(servconn->httpconn, host, port)) |
|
19989
1f1bb361a75a
A fix from Laszlo Pandy to make the MSN HTTP Method work again. Fixes #2638 and should make a number of people happy. This introduces a new string that isn't marked as translatable for 2.2.0 because it is so late in the game.
Daniel Atallah <datallah@pidgin.im>
parents:
19859
diff
changeset
|
228 | return FALSE; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
229 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
230 | servconn->connected = TRUE; |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
231 | servconn->httpconn->virgin = TRUE; |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
232 | servconn_timeout_renew(servconn); |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
233 | |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
234 | /* Someone wants to know we connected. */ |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
235 | servconn->connect_cb(servconn); |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
236 | |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
237 | return TRUE; |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
238 | } |
|
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
239 | |
| 15884 | 240 | servconn->connect_data = purple_proxy_connect(NULL, session->account, |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14343
diff
changeset
|
241 | host, port, connect_cb, servconn); |
| 5309 | 242 | |
|
24606
c6eabc2d155f
The "processing" flag basically says "this connection is busy, don't
Mark Doliner <markdoliner@pidgin.im>
parents:
24421
diff
changeset
|
243 | return (servconn->connect_data != NULL); |
| 5309 | 244 | } |
| 245 | ||
| 246 | void | |
| 247 | msn_servconn_disconnect(MsnServConn *servconn) | |
| 248 | { | |
| 249 | g_return_if_fail(servconn != NULL); | |
|
10434
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
250 | |
|
23838
4e6e74a4683b
On MSN, cancel the connection process to a server before checking
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23829
diff
changeset
|
251 | if (servconn->connect_data != NULL) |
|
4e6e74a4683b
On MSN, cancel the connection process to a server before checking
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23829
diff
changeset
|
252 | { |
|
4e6e74a4683b
On MSN, cancel the connection process to a server before checking
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23829
diff
changeset
|
253 | purple_proxy_connect_cancel(servconn->connect_data); |
|
4e6e74a4683b
On MSN, cancel the connection process to a server before checking
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23829
diff
changeset
|
254 | servconn->connect_data = NULL; |
|
4e6e74a4683b
On MSN, cancel the connection process to a server before checking
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23829
diff
changeset
|
255 | } |
|
4e6e74a4683b
On MSN, cancel the connection process to a server before checking
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23829
diff
changeset
|
256 | |
|
10434
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
257 | if (!servconn->connected) |
|
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
258 | { |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
259 | /* We could not connect. */ |
|
10434
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
260 | if (servconn->disconnect_cb != NULL) |
|
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
261 | servconn->disconnect_cb(servconn); |
|
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
262 | |
|
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
263 | return; |
|
17665eed4948
[gaim-migrate @ 11691]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10403
diff
changeset
|
264 | } |
| 5309 | 265 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
266 | if (servconn->session->http_method) |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
267 | { |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
268 | /* Fake disconnection. */ |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
269 | if (servconn->disconnect_cb != NULL) |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
270 | servconn->disconnect_cb(servconn); |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
271 | |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
272 | return; |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
273 | } |
|
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
274 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
275 | if (servconn->inpa > 0) |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
276 | { |
| 15884 | 277 | purple_input_remove(servconn->inpa); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
278 | servconn->inpa = 0; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
279 | } |
| 5309 | 280 | |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
281 | if (servconn->timeout_handle > 0) |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
282 | { |
|
28644
7e62a6f19d38
Fix a leak, and a series of typos.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
28641
diff
changeset
|
283 | purple_timeout_remove(servconn->timeout_handle); |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
284 | servconn->timeout_handle = 0; |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
285 | } |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
286 | |
|
5744
138b30636f76
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
287 | close(servconn->fd); |
|
138b30636f76
[gaim-migrate @ 6168]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
288 | |
|
10403
4647a87ef73b
[gaim-migrate @ 11648]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
289 | servconn->rx_buf = NULL; |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
290 | servconn->rx_len = 0; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
291 | servconn->payload_len = 0; |
| 5309 | 292 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
293 | servconn->connected = FALSE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
294 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
295 | if (servconn->disconnect_cb != NULL) |
|
8583
56f69df8f12f
[gaim-migrate @ 9333]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8569
diff
changeset
|
296 | servconn->disconnect_cb(servconn); |
| 5309 | 297 | } |
| 298 | ||
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
299 | static gboolean |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
300 | servconn_idle_timeout_cb(MsnServConn *servconn) |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
301 | { |
|
28658
107811b9dda7
Swap two lines to fix a crash.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
28644
diff
changeset
|
302 | servconn->timeout_handle = 0; |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
303 | msn_servconn_disconnect(servconn); |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
304 | return FALSE; |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
305 | } |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
306 | |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
307 | static void |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
308 | servconn_timeout_renew(MsnServConn *servconn) |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
309 | { |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
310 | if (servconn->timeout_handle) { |
|
28644
7e62a6f19d38
Fix a leak, and a series of typos.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
28641
diff
changeset
|
311 | purple_timeout_remove(servconn->timeout_handle); |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
312 | servconn->timeout_handle = 0; |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
313 | } |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
314 | |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
315 | if (servconn->connected && servconn->timeout_sec) { |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
316 | servconn->timeout_handle = purple_timeout_add_seconds( |
|
27904
c1e552435b02
Fix a small warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27903
diff
changeset
|
317 | servconn->timeout_sec, (GSourceFunc)servconn_idle_timeout_cb, servconn); |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
318 | } |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
319 | } |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
320 | |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
321 | void |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
322 | msn_servconn_set_idle_timeout(MsnServConn *servconn, guint seconds) |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
323 | { |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
324 | servconn->timeout_sec = seconds; |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
325 | if (servconn->connected) |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
326 | servconn_timeout_renew(servconn); |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
327 | } |
|
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
328 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
329 | static void |
| 15884 | 330 | servconn_write_cb(gpointer data, gint source, PurpleInputCondition cond) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
331 | { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
332 | MsnServConn *servconn = data; |
|
24031
f9c3efb8afa6
Fix up some types.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23939
diff
changeset
|
333 | gssize ret; |
|
f9c3efb8afa6
Fix up some types.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23939
diff
changeset
|
334 | int writelen; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
335 | |
| 15884 | 336 | writelen = purple_circ_buffer_get_max_read(servconn->tx_buf); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
337 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
338 | if (writelen == 0) { |
| 15884 | 339 | purple_input_remove(servconn->tx_handler); |
|
19578
1b959e85174c
Input handlers are unsigned integers. So set them to 0 instead of -1 after
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
17724
diff
changeset
|
340 | servconn->tx_handler = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
341 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
342 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
343 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
344 | ret = write(servconn->fd, servconn->tx_buf->outptr, writelen); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
345 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
346 | if (ret < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
347 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
348 | else if (ret <= 0) { |
|
27905
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
349 | msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE, NULL); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
350 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
351 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
352 | |
| 15884 | 353 | purple_circ_buffer_mark_read(servconn->tx_buf, ret); |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
354 | servconn_timeout_renew(servconn); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
355 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
356 | |
| 23078 | 357 | gssize |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9093
diff
changeset
|
358 | msn_servconn_write(MsnServConn *servconn, const char *buf, size_t len) |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
359 | { |
| 23078 | 360 | gssize ret = 0; |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
361 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
362 | g_return_val_if_fail(servconn != NULL, 0); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
363 | |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
364 | if (!servconn->session->http_method) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
365 | { |
|
19578
1b959e85174c
Input handlers are unsigned integers. So set them to 0 instead of -1 after
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
17724
diff
changeset
|
366 | if (servconn->tx_handler == 0) { |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
367 | switch (servconn->type) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
368 | { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
369 | case MSN_SERVCONN_NS: |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
370 | case MSN_SERVCONN_SB: |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
371 | ret = write(servconn->fd, buf, len); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
372 | break; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
373 | #if 0 |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
374 | case MSN_SERVCONN_DC: |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
375 | ret = write(servconn->fd, &buf, sizeof(len)); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
376 | ret = write(servconn->fd, buf, len); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
377 | break; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
378 | #endif |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
379 | default: |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
380 | ret = write(servconn->fd, buf, len); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
381 | break; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
382 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
383 | } else { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
384 | ret = -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
385 | errno = EAGAIN; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
386 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
387 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
388 | if (ret < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
389 | ret = 0; |
|
17724
86e7e4aaec9e
Avoid accessing an invalid pointer when ret == -1
Daniel Atallah <datallah@pidgin.im>
parents:
17644
diff
changeset
|
390 | if (ret >= 0 && ret < len) { |
|
19578
1b959e85174c
Input handlers are unsigned integers. So set them to 0 instead of -1 after
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
17724
diff
changeset
|
391 | if (servconn->tx_handler == 0) |
| 15884 | 392 | servconn->tx_handler = purple_input_add( |
| 393 | servconn->fd, PURPLE_INPUT_WRITE, | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
394 | servconn_write_cb, servconn); |
| 15884 | 395 | purple_circ_buffer_append(servconn->tx_buf, buf + ret, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
12213
diff
changeset
|
396 | len - ret); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
397 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
398 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
399 | else |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
400 | { |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10434
diff
changeset
|
401 | ret = msn_httpconn_write(servconn->httpconn, buf, len); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
402 | } |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
403 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
404 | if (ret == -1) |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
405 | { |
|
27905
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
406 | msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE, NULL); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
407 | } |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
408 | |
|
27885
71d85d19eded
Timeout switchboard connections at 60 seconds, should Fixes #3330 for most
Ka-Hing Cheung <khc@pidgin.im>
parents:
24708
diff
changeset
|
409 | servconn_timeout_renew(servconn); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
410 | return ret; |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
411 | } |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
412 | |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
413 | static void |
| 15884 | 414 | read_cb(gpointer data, gint source, PurpleInputCondition cond) |
| 5309 | 415 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
416 | MsnServConn *servconn; |
| 5309 | 417 | char buf[MSN_BUF_LEN]; |
|
24031
f9c3efb8afa6
Fix up some types.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23939
diff
changeset
|
418 | gssize len; |
| 5309 | 419 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
420 | servconn = data; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
421 | |
|
23939
90cd53dcef0f
Update MSN's last_received time when we receive something on the NS
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23838
diff
changeset
|
422 | if (servconn->type == MSN_SERVCONN_NS) |
|
24668
853a6d533d60
Separate the parsing of data into a separate function from the reading of
Mark Doliner <markdoliner@pidgin.im>
parents:
24667
diff
changeset
|
423 | servconn->session->account->gc->last_received = time(NULL); |
| 5309 | 424 | |
|
24667
ea4a31429bbd
Make the two "read_cb()" functions more similar, and fix a rare
Mark Doliner <markdoliner@pidgin.im>
parents:
24663
diff
changeset
|
425 | len = read(servconn->fd, buf, sizeof(buf) - 1); |
|
ea4a31429bbd
Make the two "read_cb()" functions more similar, and fix a rare
Mark Doliner <markdoliner@pidgin.im>
parents:
24663
diff
changeset
|
426 | if (len < 0 && errno == EAGAIN) |
|
23829
b6b23770413e
In MSN servconn, make handling of EAGAIN similar to that in httpconn.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23816
diff
changeset
|
427 | return; |
|
24667
ea4a31429bbd
Make the two "read_cb()" functions more similar, and fix a rare
Mark Doliner <markdoliner@pidgin.im>
parents:
24663
diff
changeset
|
428 | if (len <= 0) { |
|
ea4a31429bbd
Make the two "read_cb()" functions more similar, and fix a rare
Mark Doliner <markdoliner@pidgin.im>
parents:
24663
diff
changeset
|
429 | purple_debug_error("msn", "servconn %03d read error, " |
|
24421
7e436b064a17
print out the servconn number when it's disconnected
Ka-Hing Cheung <khc@pidgin.im>
parents:
24044
diff
changeset
|
430 | "len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n", |
|
7e436b064a17
print out the servconn number when it's disconnected
Ka-Hing Cheung <khc@pidgin.im>
parents:
24044
diff
changeset
|
431 | servconn->num, len, errno, g_strerror(errno)); |
|
27905
a50992124f03
Propagate connect errors from the MSN proxy callback to the servconn error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27904
diff
changeset
|
432 | msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL); |
|
23829
b6b23770413e
In MSN servconn, make handling of EAGAIN similar to that in httpconn.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23816
diff
changeset
|
433 | |
|
b6b23770413e
In MSN servconn, make handling of EAGAIN similar to that in httpconn.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23816
diff
changeset
|
434 | return; |
| 5309 | 435 | } |
| 436 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
437 | buf[len] = '\0'; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
438 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
439 | servconn->rx_buf = g_realloc(servconn->rx_buf, len + servconn->rx_len + 1); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
440 | memcpy(servconn->rx_buf + servconn->rx_len, buf, len + 1); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
441 | servconn->rx_len += len; |
| 5309 | 442 | |
|
28641
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
443 | servconn = msn_servconn_process_data(servconn); |
|
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
444 | if (servconn) |
|
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
445 | servconn_timeout_renew(servconn); |
|
24668
853a6d533d60
Separate the parsing of data into a separate function from the reading of
Mark Doliner <markdoliner@pidgin.im>
parents:
24667
diff
changeset
|
446 | } |
|
853a6d533d60
Separate the parsing of data into a separate function from the reading of
Mark Doliner <markdoliner@pidgin.im>
parents:
24667
diff
changeset
|
447 | |
|
28641
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
448 | MsnServConn *msn_servconn_process_data(MsnServConn *servconn) |
|
24668
853a6d533d60
Separate the parsing of data into a separate function from the reading of
Mark Doliner <markdoliner@pidgin.im>
parents:
24667
diff
changeset
|
449 | { |
|
853a6d533d60
Separate the parsing of data into a separate function from the reading of
Mark Doliner <markdoliner@pidgin.im>
parents:
24667
diff
changeset
|
450 | char *cur, *end, *old_rx_buf; |
|
853a6d533d60
Separate the parsing of data into a separate function from the reading of
Mark Doliner <markdoliner@pidgin.im>
parents:
24667
diff
changeset
|
451 | int cur_len; |
|
853a6d533d60
Separate the parsing of data into a separate function from the reading of
Mark Doliner <markdoliner@pidgin.im>
parents:
24667
diff
changeset
|
452 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
453 | end = old_rx_buf = servconn->rx_buf; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
454 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
455 | servconn->processing = TRUE; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
456 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
457 | do |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
458 | { |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
459 | cur = end; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
460 | |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
461 | if (servconn->payload_len) |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
462 | { |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
463 | if (servconn->payload_len > servconn->rx_len) |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
464 | /* The payload is still not complete. */ |
| 5309 | 465 | break; |
| 466 | ||
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
467 | cur_len = servconn->payload_len; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
468 | end += cur_len; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
469 | } |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
470 | else |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
471 | { |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
472 | end = strstr(cur, "\r\n"); |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
473 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
474 | if (end == NULL) |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
475 | /* The command is still not complete. */ |
| 5309 | 476 | break; |
| 477 | ||
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
478 | *end = '\0'; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
479 | end += 2; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
480 | cur_len = end - cur; |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
481 | } |
| 5309 | 482 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
483 | servconn->rx_len -= cur_len; |
|
5899
cc081a4924f6
[gaim-migrate @ 6331]
Christian Hammond <chipx86@chipx86.com>
parents:
5898
diff
changeset
|
484 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
485 | if (servconn->payload_len) |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
486 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
487 | msn_cmdproc_process_payload(servconn->cmdproc, cur, cur_len); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
488 | servconn->payload_len = 0; |
| 5309 | 489 | } |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
490 | else |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
491 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
492 | msn_cmdproc_process_cmd_text(servconn->cmdproc, cur); |
|
20473
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
493 | servconn->payload_len = servconn->cmdproc->last_cmd->payload_len; |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
494 | } |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10568
diff
changeset
|
495 | } while (servconn->connected && !servconn->wasted && servconn->rx_len > 0); |
| 5309 | 496 | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10568
diff
changeset
|
497 | if (servconn->connected && !servconn->wasted) |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
498 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
499 | if (servconn->rx_len > 0) |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
500 | servconn->rx_buf = g_memdup(cur, servconn->rx_len); |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
501 | else |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
502 | servconn->rx_buf = NULL; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
503 | } |
| 5309 | 504 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
505 | servconn->processing = FALSE; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8662
diff
changeset
|
506 | |
|
28641
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
507 | if (servconn->wasted) { |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
508 | msn_servconn_destroy(servconn); |
|
28641
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
509 | servconn = NULL; |
|
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
510 | } |
| 5309 | 511 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8583
diff
changeset
|
512 | g_free(old_rx_buf); |
|
28641
6c744490832a
Donot use a servconn if it's freed. Mark a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27905
diff
changeset
|
513 | return servconn; |
| 5309 | 514 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
515 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
516 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
517 | static int |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
518 | create_listener(int port) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
519 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
520 | int fd; |
|
20997
7e27312a7d07
Fix all our calls to fcntl(listenfd, F_SETFL, O_NONBLOCK);
Mark Doliner <markdoliner@pidgin.im>
parents:
20747
diff
changeset
|
521 | int flags; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
522 | const int on = 1; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
523 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
524 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
525 | struct addrinfo hints; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
526 | struct addrinfo *c, *res; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
527 | char port_str[5]; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
528 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
529 | snprintf(port_str, sizeof(port_str), "%d", port); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
530 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
531 | memset(&hints, 0, sizeof(hints)); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
532 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
533 | hints.ai_flags = AI_PASSIVE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
534 | hints.ai_family = AF_UNSPEC; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
535 | hints.ai_socktype = SOCK_STREAM; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
536 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
537 | if (getaddrinfo(NULL, port_str, &hints, &res) != 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
538 | { |
| 15884 | 539 | purple_debug_error("msn", "Could not get address info: %s.\n", |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
540 | port_str); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
541 | return -1; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
542 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
543 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
544 | for (c = res; c != NULL; c = c->ai_next) |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
545 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
546 | fd = socket(c->ai_family, c->ai_socktype, c->ai_protocol); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
547 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
548 | if (fd < 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
549 | continue; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
550 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
551 | setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
552 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
553 | if (bind(fd, c->ai_addr, c->ai_addrlen) == 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
554 | break; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
555 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
556 | close(fd); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
557 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
558 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
559 | if (c == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
560 | { |
| 15884 | 561 | purple_debug_error("msn", "Could not find socket: %s.\n", port_str); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
562 | return -1; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
563 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
564 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
565 | freeaddrinfo(res); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
566 | #else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
567 | struct sockaddr_in sockin; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
568 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
569 | fd = socket(AF_INET, SOCK_STREAM, 0); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
570 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
571 | if (fd < 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
572 | return -1; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
573 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
574 | if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) != 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
575 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
576 | close(fd); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
577 | return -1; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
578 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
579 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
580 | memset(&sockin, 0, sizeof(struct sockaddr_in)); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
581 | sockin.sin_family = AF_INET; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
582 | sockin.sin_port = htons(port); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
583 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
584 | if (bind(fd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
585 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
586 | close(fd); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
587 | return -1; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
588 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
589 | #endif |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
590 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
591 | if (listen (fd, 4) != 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
592 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
593 | close (fd); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
594 | return -1; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
595 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
596 | |
|
20997
7e27312a7d07
Fix all our calls to fcntl(listenfd, F_SETFL, O_NONBLOCK);
Mark Doliner <markdoliner@pidgin.im>
parents:
20747
diff
changeset
|
597 | flags = fcntl(fd, F_GETFL); |
|
7e27312a7d07
Fix all our calls to fcntl(listenfd, F_SETFL, O_NONBLOCK);
Mark Doliner <markdoliner@pidgin.im>
parents:
20747
diff
changeset
|
598 | fcntl(fd, F_SETFL, flags | O_NONBLOCK); |
|
24044
3fd74bed3968
More leaks of fds to client processes.
Daniel Atallah <datallah@pidgin.im>
parents:
24031
diff
changeset
|
599 | #ifndef _WIN32 |
|
3fd74bed3968
More leaks of fds to client processes.
Daniel Atallah <datallah@pidgin.im>
parents:
24031
diff
changeset
|
600 | fcntl(fd, F_SETFD, FD_CLOEXEC); |
|
3fd74bed3968
More leaks of fds to client processes.
Daniel Atallah <datallah@pidgin.im>
parents:
24031
diff
changeset
|
601 | #endif |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
602 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
603 | return fd; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
604 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9165
diff
changeset
|
605 | #endif |