comparison libgaim/protocols/oscar/peer.h @ 15195:4934e7a03a98

[gaim-migrate @ 17983] Move away from using MSG_PEEK when recv'ing data over oscar sockets. It's possible this was causing problems with a small number of Windows users? People seem to frown pretty heavily upon MSG_PEEK in general, for some reason. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 13 Dec 2006 10:11:31 +0000
parents cde909b9eb4b
children 5176a9f30ba3
comparison
equal deleted inserted replaced
15194:8d2e6e9118e2 15195:4934e7a03a98
156 /** 156 /**
157 * This is only used when the peer connection is being established. 157 * This is only used when the peer connection is being established.
158 */ 158 */
159 GaimProxyConnectData *client_connect_data; 159 GaimProxyConnectData *client_connect_data;
160 GaimProxyConnectData *verified_connect_data; 160 GaimProxyConnectData *verified_connect_data;
161 161
162 /** 162 /**
163 * This is only used when the peer connection is being established. 163 * This is only used when the peer connection is being established.
164 */ 164 */
165 GaimNetworkListenData *listen_data; 165 GaimNetworkListenData *listen_data;
166 166
175 * connect to us. 175 * connect to us.
176 */ 176 */
177 int listenerfd; 177 int listenerfd;
178 178
179 int fd; 179 int fd;
180 180 guint8 header[6];
181 ssize_t header_received;
182 guint8 proxy_header[12];
183 ssize_t proxy_header_received;
184 ByteStream buffer_incoming;
185 GaimCircBuffer *buffer_outgoing;
181 guint watcher_incoming; 186 guint watcher_incoming;
182 guint watcher_outgoing; 187 guint watcher_outgoing;
183
184 ByteStream buffer_incoming;
185 GaimCircBuffer *buffer_outgoing;
186 188
187 /** 189 /**
188 * IP address of the proxy server, if applicable. 190 * IP address of the proxy server, if applicable.
189 */ 191 */
190 gchar *proxyip; 192 gchar *proxyip;