← Back to branch summary

~ubuntu-branches/ubuntu/trusty/serf/trusty-security

« back to all changes in this revision

Viewing changes to serf_private.h

  • Committer: Bazaar Package Importer
  • Author(s): Peter Samuelson
  • Date: 2011-06-27 18:09:28 UTC
  • mfrom: (1.2.5 upstream)
  • mto: (3.3.1 sid)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: james.westby@ubuntu.com-20110627180928-ybwzd3hmx82nu3ir
Tags: 1.0.0~0+svn1514-1
* New upstream snapshot.
  - patches/abi-0.x: Remove as obsolete.
  - patches/kqueue: Forward-port.
  - Bump ABI: libserf0.7{,-dbg} -> libserf1{,-dbg}
  - patches/ip6-localhost: New patch: temporary (I hope) workaround for
    IPv4 / IPv6 confusion in testsuite.
* Implement Multi-Arch: same.
* libserf-dev Conflicts: libserf-0-0-dev, not Breaks.  Thanks, lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serf_private.h
65
65
    serf_bucket_t *resp_bkt;
66
66
 
67
67
    int written;
 
68
    int priority;
68
69
 
69
70
    struct serf_request_t *next;
70
71
};
123
124
    apr_pool_t *pool;
124
125
    apr_pollfd_t desc;
125
126
    void *accept_baton;
126
 
    serf_accept_client_t accept;
 
127
    serf_accept_client_t accept_func;
127
128
};
128
129
 
129
130
struct serf_incoming_t {
135
136
    apr_pollfd_t desc;
136
137
};
137
138
 
 
139
/* States for the different stages in the lifecyle of a connection. */
 
140
typedef enum {
 
141
    SERF_CONN_INIT,             /* no socket created yet */
 
142
    SERF_CONN_SETUP_SSLTUNNEL,  /* ssl tunnel being setup, no requests sent */
 
143
    SERF_CONN_CONNECTED,        /* conn is ready to send requests */
 
144
    SERF_CONN_CLOSING,          /* conn is closing, no more requests,
 
145
                                   start a new socket */
 
146
} serf__connection_state_t;
 
147
 
138
148
struct serf_connection_t {
139
149
    serf_context_t *ctx;
140
150
 
167
177
    /* keepalive */
168
178
    unsigned int probable_keepalive_limit;
169
179
 
170
 
    /* someone has told us that the connection is closing
171
 
     * so, let's start a new socket.
172
 
     */
173
 
    int closing;
 
180
    /* Current state of the connection (whether or not it is connected). */
 
181
    serf__connection_state_t state;
174
182
 
175
183
    /* This connection may have responses without a request! */
176
184
    int async_responses;
188
196
    serf_bucket_t *ostream_head;
189
197
    serf_bucket_t *ostream_tail;
190
198
 
 
199
    /* Aggregate bucket used to send the CONNECT request. */
 
200
    serf_bucket_t *ssltunnel_ostream;
 
201
 
191
202
    /* The list of active requests. */
192
203
    serf_request_t *requests;
193
204
    serf_request_t *requests_tail;
336
347
                                       apr_int16_t events);
337
348
apr_status_t serf__conn_update_pollset(serf_connection_t *conn);
338
349
 
 
350
/* from ssltunnel.c */
 
351
apr_status_t serf__ssltunnel_connect(serf_connection_t *conn);
 
352
 
339
353
#endif