Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libgaim/protocols/oscar/peer.h Wed Dec 13 08:45:57 2006 +0000 +++ b/libgaim/protocols/oscar/peer.h Wed Dec 13 10:11:31 2006 +0000 @@ -158,7 +158,7 @@ */ GaimProxyConnectData *client_connect_data; GaimProxyConnectData *verified_connect_data; - + /** * This is only used when the peer connection is being established. */ @@ -177,13 +177,15 @@ int listenerfd; int fd; - + guint8 header[6]; + ssize_t header_received; + guint8 proxy_header[12]; + ssize_t proxy_header_received; + ByteStream buffer_incoming; + GaimCircBuffer *buffer_outgoing; guint watcher_incoming; guint watcher_outgoing; - ByteStream buffer_incoming; - GaimCircBuffer *buffer_outgoing; - /** * IP address of the proxy server, if applicable. */