comparison libpurple/protocols/msn/directconn.h @ 30779:23b7b1b817c8

merge of '5af6a35c4c39341b79cc8d61c700da2b874b9b6b' and 'b4a877b5d355860851acfe7ac186ba5d4f88d684'
author masca@cpw.pidgin.im
date Sun, 06 Jun 2010 21:27:12 +0000
parents 7f564cf26ea3 62538a3f90f0
children 4481d04cda70
comparison
equal deleted inserted replaced
30778:acc66653b4ff 30779:23b7b1b817c8
32 32
33 #include "msg.h" 33 #include "msg.h"
34 #include "slp.h" 34 #include "slp.h"
35 #include "slplink.h" 35 #include "slplink.h"
36 #include "slpmsg.h" 36 #include "slpmsg.h"
37 #include "p2p.h"
37 38
38 typedef enum 39 typedef enum
39 { 40 {
40 DC_STATE_CLOSED, /*< No socket opened yet */ 41 DC_STATE_CLOSED, /*< No socket opened yet */
41 DC_STATE_FOO, /*< Waiting for FOO message */ 42 DC_STATE_FOO, /*< Waiting for FOO message */
98 int in_size; /**< The receive buffer size */ 99 int in_size; /**< The receive buffer size */
99 int in_pos; /**< The first free position in receive buffer */ 100 int in_pos; /**< The first free position in receive buffer */
100 GQueue *out_queue; /**< The outgoing packet queue */ 101 GQueue *out_queue; /**< The outgoing packet queue */
101 int msg_pos; /**< The position of next byte to be sent in the actual packet */ 102 int msg_pos; /**< The position of next byte to be sent in the actual packet */
102 103
103 MsnSlpHeader header; /**< SLP header for parsing / serializing */ 104 MsnP2PHeader header; /**< SLP header for parsing / serializing */
104 105
105 /** The callback used for sending information to the peer about the opened socket */ 106 /** The callback used for sending information to the peer about the opened socket */
106 void (*send_connection_info_msg_cb)(MsnDirectConn *); 107 void (*send_connection_info_msg_cb)(MsnDirectConn *);
107 108
108 gchar *ext_ip; /**< Our external IP address */ 109 gchar *ext_ip; /**< Our external IP address */