annotate src/protocols/oscar/odc.c @ 13608:6c34fbb75bbd

[gaim-migrate @ 15994] Disconnect the account with a decent error message when there are problems with an oscar FLAP connection. This needed to be added after I removed it when rewriting things for non-blocking I/O. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 10 Apr 2006 03:37:37 +0000
parents e1c81d199ee0
children 8a8b4f7f7d99
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
1 /*
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
2 * Gaim's oscar protocol plugin
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
3 * This file is the legal property of its developers.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
4 * Please see the AUTHORS file distributed alongside this file.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
5 *
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
6 * This library is free software; you can redistribute it and/or
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
9 * version 2 of the License, or (at your option) any later version.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
10 *
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
11 * This library is distributed in the hope that it will be useful,
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
14 * Lesser General Public License for more details.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
15 *
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
17 * License along with this library; if not, write to the Free Software
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
19 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
20
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
21 /* From the oscar PRPL */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
22 #include "oscar.h"
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
23 #include "peer.h"
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
24
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
25 /* From Gaim */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
26 #include "conversation.h"
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
27 #include "imgstore.h"
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
28 #include "util.h"
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
29
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
30 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
31 * Free any ODC related data and print a message to the conversation
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
32 * window based on conn->disconnect_reason.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
33 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
34 void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
35 peer_odc_close(PeerConnection *conn)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
36 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
37 const gchar *tmp;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
38
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
39 if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
40 {
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
41 tmp = _("The remote user has closed the connection.");
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
42 }
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
43 else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_REFUSED)
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
44 {
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
45 tmp = _("The remote user has declined your request.");
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
46 }
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
47 else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
48 {
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
49 tmp = _("Lost connection with the remote user for an unknown reason.");
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
50 }
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
51 else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA)
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
52 {
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
53 tmp = _("Received invalid data on connection with remote user.");
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
54 }
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
55 else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT)
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
56 {
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
57 tmp = _("Could not establish a connection with the remote user.");
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
58 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
59 else
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
60 /*
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
61 * We shouldn't print a message for some disconnect_reasons.
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
62 * Like OSCAR_DISCONNECT_LOCAL_CLOSED.
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
63 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
64 tmp = NULL;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
65
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
66 if (tmp != NULL)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
67 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
68 GaimAccount *account;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
69 GaimConversation *conv;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
70
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
71 account = gaim_connection_get_account(conn->od->gc);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
72 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, conn->sn);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
73 gaim_conversation_write(conv, NULL, tmp, GAIM_MESSAGE_SYSTEM, time(NULL));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
74 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
75
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
76 if (conn->frame != NULL)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
77 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
78 OdcFrame *frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
79 frame = conn->frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
80 g_free(frame->payload.data);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
81 g_free(frame);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
82 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
83 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
84
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
85 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
86 * Write the given OdcFrame to a ByteStream and send it out
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
87 * on the established PeerConnection.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
88 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
89 static void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
90 peer_odc_send(PeerConnection *conn, OdcFrame *frame)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
91 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
92 GaimAccount *account;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
93 const char *username;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
94 size_t length;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
95 ByteStream bs;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
96
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
97 gaim_debug_info("oscar", "Outgoing ODC frame to %s with "
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
98 "type=0x%04x, flags=0x%04x, payload length=%u\n",
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
99 conn->sn, frame->type, frame->flags, frame->payload.len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
100
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
101 account = gaim_connection_get_account(conn->od->gc);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
102 username = gaim_account_get_username(account);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
103 memcpy(frame->sn, username, strlen(username));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
104 memcpy(frame->cookie, conn->cookie, 8);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
105
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
106 length = 76;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
107 byte_stream_init(&bs, malloc(length + frame->payload.len),
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
108 length + frame->payload.len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
109 byte_stream_putraw(&bs, conn->magic, 4);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
110 byte_stream_put16(&bs, length);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
111 byte_stream_put16(&bs, frame->type);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
112 byte_stream_put16(&bs, frame->subtype);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
113 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
114 byte_stream_putraw(&bs, frame->cookie, 8);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
115 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
116 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
117 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
118 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
119 byte_stream_put32(&bs, frame->payload.len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
120 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
121 byte_stream_put16(&bs, frame->encoding);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
122 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
123 byte_stream_put16(&bs, frame->flags);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
124 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
125 byte_stream_put16(&bs, 0x0000);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
126 byte_stream_putraw(&bs, frame->sn, 32);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
127 byte_stream_putraw(&bs, frame->payload.data, frame->payload.len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
128
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
129 peer_connection_send(conn, &bs);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
130
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
131 free(bs.data);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
132 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
133
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
134 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
135 * Send a very basic ODC frame (which contains the cookie) so that the
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
136 * remote user can verify that we are the person they were expecting.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
137 * If we made an outgoing connection to then remote user, then we send
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
138 * this immediately. If the remote user connected to us, then we wait
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
139 * for the other person to send this to us, then we send one to them.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
140 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
141 void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
142 peer_odc_send_cookie(PeerConnection *conn)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
143 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
144 OdcFrame frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
145
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
146 memset(&frame, 0, sizeof(OdcFrame));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
147 frame.type = 0x0001;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
148 frame.subtype = 0x0006;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
149 frame.flags = 0x0060; /* Maybe this means "we're sending the cookie"? */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
150
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
151 peer_odc_send(conn, &frame);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
152 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
153
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
154 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
155 * Send client-to-client typing notification over an established direct connection.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
156 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
157 void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
158 peer_odc_send_typing(PeerConnection *conn, GaimTypingState typing)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
159 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
160 OdcFrame frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
161
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
162 memset(&frame, 0, sizeof(OdcFrame));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
163 frame.type = 0x0001;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
164 frame.subtype = 0x0006;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
165 if (typing == GAIM_TYPING)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
166 frame.flags = 0x0002 | 0x0008;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
167 else if (typing == GAIM_TYPED)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
168 frame.flags = 0x0002 | 0x0004;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
169 else
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
170 frame.flags = 0x0002;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
171
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
172 peer_odc_send(conn, &frame);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
173 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
174
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
175 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
176 * Send client-to-client IM over an established direct connection.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
177 * To send a direct IM, call this just like you would aim_send_im.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
178 *
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
179 * @param conn The already-connected ODC connection.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
180 * @param msg Null-terminated string to send.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
181 * @param len The length of the message to send, including binary data.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
182 * @param encoding See the AIM_CHARSET_* defines in oscar.h
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
183 * @param autoreply TRUE if this is any auto-reply.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
184 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
185 void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
186 peer_odc_send_im(PeerConnection *conn, const char *msg, int len, int encoding, gboolean autoreply)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
187 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
188 OdcFrame frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
189
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
190 g_return_if_fail(msg != NULL);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
191 g_return_if_fail(len > 0);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
192
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
193 memset(&frame, 0, sizeof(OdcFrame));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
194 frame.type = 0x0001;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
195 frame.subtype = 0x0006;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
196 frame.payload.len = len;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
197 frame.encoding = encoding;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
198 frame.flags = autoreply;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
199 byte_stream_init(&frame.payload, malloc(len), len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
200 byte_stream_putraw(&frame.payload, (guint8 *)msg, len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
201
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
202 peer_odc_send(conn, &frame);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
203
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
204 g_free(frame.payload.data);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
205 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
206
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
207 struct embedded_data
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
208 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
209 size_t size;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
210 const guint8 *data;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
211 };
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
212
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
213 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
214 * This is called after a direct IM has been received in its entirety. This
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
215 * function is passed a long chunk of data which contains the IM with any
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
216 * data chunks (images) appended to it.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
217 *
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
218 * This function rips out all the data chunks and creates an imgstore for
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
219 * each one. In order to do this, it first goes through the IM and takes
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
220 * out all the IMG tags. When doing so, it rewrites the original IMG tag
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
221 * with one compatible with the imgstore Gaim core code. For each one, we
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
222 * then read in chunks of data from the end of the message and actually
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
223 * create the img store using the given data.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
224 *
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
225 * For somewhat easy reference, here's a sample message
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
226 * (with added whitespace):
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
227 *
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
228 * <HTML><BODY BGCOLOR="#ffffff">
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
229 * <FONT LANG="0">
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
230 * This is a really stupid picture:<BR>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
231 * <IMG SRC="Sample.jpg" ID="1" WIDTH="283" HEIGHT="212" DATASIZE="9894"><BR>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
232 * Yeah it is<BR>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
233 * Here is another one:<BR>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
234 * <IMG SRC="Soap Bubbles.bmp" ID="2" WIDTH="256" HEIGHT="256" DATASIZE="65978">
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
235 * </FONT>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
236 * </BODY></HTML>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
237 * <BINARY>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
238 * <DATA ID="1" SIZE="9894">datadatadatadata</DATA>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
239 * <DATA ID="2" SIZE="65978">datadatadatadata</DATA>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
240 * </BINARY>
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
241 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
242 static void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
243 peer_odc_handle_payload(PeerConnection *conn, const char *msg, size_t len, int encoding, gboolean autoreply)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
244 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
245 GaimConnection *gc;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
246 GaimAccount *account;
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
247 const char *msgend, *binary_start, *dataend;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
248 const char *tmp, *start, *end, *idstr, *src, *sizestr;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
249 GData *attributes;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
250 GHashTable *embedded_datas;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
251 struct embedded_data *embedded_data;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
252 GSList *images;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
253 gchar *utf8;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
254 GString *newmsg;
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
255 GaimMessageFlags imflags;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
256
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
257 gc = conn->od->gc;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
258 account = gaim_connection_get_account(gc);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
259
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
260 dataend = msg + len;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
261
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
262 /*
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
263 * Create a hash table containing references to each embedded
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
264 * data chunk. The key is the "ID" and the value is an
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
265 * embedded_data struct.
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
266 */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
267 embedded_datas = g_hash_table_new_full(g_direct_hash,
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
268 g_direct_equal, NULL, g_free);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
269
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
270 /*
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
271 * Create an index of any binary chunks. If we run into any
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
272 * problems while parsing the binary data section then we stop
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
273 * parsing it, and the local user will see broken image icons.
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
274 */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
275 /* TODO: Use a length argument when looking for the <binary> tag! */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
276 binary_start = gaim_strcasestr(msg, "<binary>");
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
277 if (binary_start == NULL)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
278 msgend = dataend;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
279 else
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
280 {
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
281 msgend = binary_start;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
282
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
283 /* Move our pointer to immediately after the <binary> tag */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
284 tmp = binary_start + 8;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
285
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
286 /* The embedded binary markup has a mimimum length of 29 bytes */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
287 /* TODO: Use a length argument when looking for the <data> tag! */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
288 while ((tmp + 29 <= dataend) &&
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
289 gaim_markup_find_tag("data", tmp, &start, &tmp, &attributes))
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
290 {
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
291 unsigned int id;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
292 size_t size;
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
293
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
294 /* Move the binary pointer from ">" to the start of the data */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
295 tmp++;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
296
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
297 /* Get the ID */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
298 idstr = g_datalist_get_data(&attributes, "id");
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
299 if (idstr == NULL)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
300 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
301 g_datalist_clear(&attributes);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
302 break;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
303 }
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
304 id = atoi(idstr);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
305
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
306 /* Get the size */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
307 sizestr = g_datalist_get_data(&attributes, "size");
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
308 if (sizestr == NULL)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
309 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
310 g_datalist_clear(&attributes);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
311 break;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
312 }
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
313 size = atol(sizestr);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
314
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
315 g_datalist_clear(&attributes);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
316
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
317 if ((size > 0) && (tmp + size > dataend))
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
318 break;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
319
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
320 embedded_data = g_new(struct embedded_data, 1);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
321 embedded_data->size = size;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
322 embedded_data->data = (const guint8 *)tmp;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
323 tmp += size;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
324
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
325 /* Skip past the closing </data> tag */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
326 if (strncasecmp(tmp, "</data>", 7))
13599
9f633bd09463 [gaim-migrate @ 15985]
Mark Doliner <mark@kingant.net>
parents: 13592
diff changeset
327 {
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
328 g_free(embedded_data);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
329 break;
13599
9f633bd09463 [gaim-migrate @ 15985]
Mark Doliner <mark@kingant.net>
parents: 13592
diff changeset
330 }
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
331 tmp += 7;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
332
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
333 g_hash_table_insert(embedded_datas,
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
334 GINT_TO_POINTER(id), embedded_data);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
335 }
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
336 }
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
337
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
338 /*
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
339 * Loop through the message, replacing OSCAR img tags with the
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
340 * equivalent Gaim img tag.
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
341 */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
342 images = NULL;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
343 newmsg = g_string_new("");
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
344 tmp = msg;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
345 while (gaim_markup_find_tag("img", tmp, &start, &end, &attributes))
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
346 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
347 int imgid = 0;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
348
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
349 idstr = g_datalist_get_data(&attributes, "id");
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
350 src = g_datalist_get_data(&attributes, "src");
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
351 sizestr = g_datalist_get_data(&attributes, "datasize");
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
352
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
353 if ((idstr != NULL) && (src != NULL) && (sizestr!= NULL))
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
354 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
355 unsigned int id;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
356 size_t size;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
357
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
358 id = atoi(idstr);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
359 size = atol(sizestr);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
360 embedded_data = g_hash_table_lookup(embedded_datas,
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
361 GINT_TO_POINTER(id));
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
362
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
363 if ((embedded_data != NULL) && (embedded_data->size == size))
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
364 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
365 imgid = gaim_imgstore_add(embedded_data->data, size, src);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
366
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
367 /* Record the image number */
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
368 images = g_slist_append(images, GINT_TO_POINTER(imgid));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
369 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
370 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
371
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
372 /* Delete the attribute list */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
373 g_datalist_clear(&attributes);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
374
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
375 /* Append the message up to the tag */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
376 utf8 = gaim_plugin_oscar_decode_im_part(account, conn->sn,
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
377 encoding, 0x0000, tmp, start - tmp);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
378 if (utf8 != NULL) {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
379 g_string_append(newmsg, utf8);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
380 g_free(utf8);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
381 }
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
382
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
383 if (imgid != 0)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
384 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
385 /* Write the new image tag */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
386 g_string_append_printf(newmsg, "<IMG ID=\"%d\">", imgid);
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
387 }
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
388
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
389 /* Continue from the end of the tag */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
390 tmp = end + 1;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
391 }
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
392
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
393 /* Append any remaining message data */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
394 if (tmp <= msgend)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
395 {
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
396 utf8 = gaim_plugin_oscar_decode_im_part(account, conn->sn,
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
397 encoding, 0x0000, tmp, msgend - tmp);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
398 if (utf8 != NULL) {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
399 g_string_append(newmsg, utf8);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
400 g_free(utf8);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
401 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
402 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
403
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
404 /* Send the message */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
405 imflags = 0;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
406 if (images != NULL)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
407 imflags |= GAIM_MESSAGE_IMAGES;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
408 if (autoreply)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
409 imflags |= GAIM_MESSAGE_AUTO_RESP;
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
410 serv_got_im(gc, conn->sn, newmsg->str, imflags, time(NULL));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
411 g_string_free(newmsg, TRUE);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
412
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
413 /* unref any images we allocated */
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
414 if (images)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
415 {
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
416 GSList *l;
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
417 for (l = images; l != NULL; l = l->next)
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
418 gaim_imgstore_unref(GPOINTER_TO_INT(l->data));
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
419 g_slist_free(images);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
420 }
13600
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
421
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
422 /* Delete our list of pointers to embedded images */
e1c81d199ee0 [gaim-migrate @ 15986]
Mark Doliner <mark@kingant.net>
parents: 13599
diff changeset
423 g_hash_table_destroy(embedded_datas);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
424 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
425
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
426 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
427 * This is a gaim_input_add() watcher callback function for reading
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
428 * direct IM payload data. "Payload data" is always an IM and
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
429 * maybe some embedded images or files or something. The actual
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
430 * ODC frame is read using peer_connection_recv_cb(). We temporarily
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
431 * switch to this watcher callback ONLY to read the payload, and we
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
432 * switch back once we're done.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
433 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
434 static void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
435 peer_odc_recv_cb(gpointer data, gint source, GaimInputCondition cond)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
436 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
437 PeerConnection *conn;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
438 OdcFrame *frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
439 ByteStream *bs;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
440 ssize_t read;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
441
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
442 conn = data;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
443 frame = conn->frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
444 bs = &frame->payload;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
445
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
446 /* Read data into the temporary buffer until it is complete */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
447 read = recv(conn->fd,
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
448 &bs->data[bs->offset],
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
449 bs->len - bs->offset,
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
450 0);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
451
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
452 /* Check if the remote user closed the connection */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
453 if (read == 0)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
454 {
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
455 peer_connection_destroy(conn, OSCAR_DISCONNECT_REMOTE_CLOSED);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
456 return;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
457 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
458
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
459 if (read == -1)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
460 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
461 if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
462 /* No worries */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
463 return;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
464
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
465 peer_connection_destroy(conn, OSCAR_DISCONNECT_LOST_CONNECTION);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
466 return;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
467 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
468
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
469 bs->offset += read;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
470 if (bs->offset < bs->len)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
471 /* Waiting for more data to arrive */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
472 return;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
473
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
474 /* We have a complete ODC/OFT frame! Handle it and continue reading */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
475 byte_stream_rewind(bs);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
476 peer_odc_handle_payload(conn, (const char *)bs->data,
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
477 bs->len, frame->encoding, frame->flags & 0x0001);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
478 g_free(bs->data);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
479 bs->data = NULL;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
480 g_free(frame);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
481 conn->frame = NULL;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
482
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
483 gaim_input_remove(conn->watcher_incoming);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
484 conn->watcher_incoming = gaim_input_add(conn->fd,
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
485 GAIM_INPUT_READ, peer_connection_recv_cb, conn);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
486 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
487
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
488 /**
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
489 * Handle an incoming OdcFrame. If there is a payload associated
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
490 * with this frame, then we remove the old watcher and add the
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
491 * ODC watcher to read in the payload.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
492 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
493 void
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
494 peer_odc_recv_frame(PeerConnection *conn, ByteStream *bs)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
495 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
496 GaimConnection *gc;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
497 OdcFrame *frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
498
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
499 gc = conn->od->gc;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
500
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
501 frame = g_new0(OdcFrame, 1);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
502 frame->type = byte_stream_get16(bs);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
503 frame->subtype = byte_stream_get16(bs);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
504 byte_stream_advance(bs, 2);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
505 byte_stream_getrawbuf(bs, frame->cookie, 8);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
506 byte_stream_advance(bs, 8);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
507 frame->payload.len = byte_stream_get32(bs);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
508 frame->encoding = byte_stream_get16(bs);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
509 byte_stream_advance(bs, 4);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
510 frame->flags = byte_stream_get16(bs);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
511 byte_stream_advance(bs, 4);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
512 byte_stream_getrawbuf(bs, frame->sn, 32);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
513
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
514 gaim_debug_info("oscar", "Incoming ODC frame from %s with "
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
515 "type=0x%04x, flags=0x%04x, payload length=%u\n",
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
516 frame->sn, frame->type, frame->flags, frame->payload.len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
517
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
518 if (!conn->ready)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
519 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
520 /*
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
521 * We need to verify the cookie so that we know we are
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
522 * connected to our friend and not a malicious middle man.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
523 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
524
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
525 GaimAccount *account;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
526 GaimConversation *conv;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
527
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
528 if (conn->flags & PEER_CONNECTION_FLAG_IS_INCOMING)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
529 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
530 if (memcmp(conn->cookie, frame->cookie, 8))
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
531 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
532 /*
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
533 * Oh no! The user that connected to us did not send
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
534 * the correct cookie! They are not our friend. Go try
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
535 * to accept another connection?
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
536 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
537 gaim_debug_info("oscar", "Received an incorrect cookie. "
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
538 "Closing connection.\n");
13608
6c34fbb75bbd [gaim-migrate @ 15994]
Mark Doliner <mark@kingant.net>
parents: 13600
diff changeset
539 peer_connection_destroy(conn, OSCAR_DISCONNECT_INVALID_DATA);
13592
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
540 g_free(frame);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
541 return;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
542 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
543
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
544 /*
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
545 * Ok, we know they are legit. Now be courteous and
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
546 * send them our cookie. Note: This doesn't seem
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
547 * to be necessary, but it also doesn't seem to hurt.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
548 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
549 peer_odc_send_cookie(conn);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
550 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
551
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
552 conn->ready = TRUE;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
553
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
554 /*
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
555 * If they connected to us then close the listener socket
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
556 * and send them our cookie.
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
557 */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
558 if (conn->listenerfd != -1)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
559 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
560 close(conn->listenerfd);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
561 conn->listenerfd = -1;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
562 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
563
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
564 /* Tell the local user that we are connected */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
565 account = gaim_connection_get_account(gc);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
566 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, conn->sn);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
567 gaim_conversation_write(conv, NULL, _("Direct IM established"),
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
568 GAIM_MESSAGE_SYSTEM, time(NULL));
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
569 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
570
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
571 if ((frame->type != 0x0001) && (frame->subtype != 0x0006))
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
572 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
573 gaim_debug_info("oscar", "Unknown ODC frame type 0x%04hx, "
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
574 "subtype 0x%04hx.\n", frame->type, frame->subtype);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
575 return;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
576 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
577
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
578 if (frame->flags & 0x0008)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
579 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
580 /* I had to leave this. It's just too funny. It reminds me of my sister. */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
581 gaim_debug_info("oscar", "ohmigod! %s has started typing "
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
582 "(DirectIM). He's going to send you a message! "
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
583 "*squeal*\n", conn->sn);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
584 serv_got_typing(gc, conn->sn, 0, GAIM_TYPING);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
585 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
586 else if (frame->flags & 0x0004)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
587 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
588 serv_got_typing(gc, conn->sn, 0, GAIM_TYPED);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
589 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
590 else
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
591 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
592 serv_got_typing_stopped(gc, conn->sn);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
593 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
594
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
595 if (frame->payload.len > 0)
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
596 {
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
597 /* We have payload data! Switch to the ODC watcher to read it. */
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
598 frame->payload.data = g_new(guint8, frame->payload.len);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
599 frame->payload.offset = 0;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
600 conn->frame = frame;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
601 gaim_input_remove(conn->watcher_incoming);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
602 conn->watcher_incoming = gaim_input_add(conn->fd,
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
603 GAIM_INPUT_READ, peer_odc_recv_cb, conn);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
604 return;
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
605 }
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
606
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
607 g_free(frame);
6519aeb66b31 [gaim-migrate @ 15978]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
608 }