summaryrefslogtreecommitdiff
path: root/src/lachttp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lachttp.c')
-rw-r--r--src/lachttp.c87
1 files changed, 43 insertions, 44 deletions
diff --git a/src/lachttp.c b/src/lachttp.c
index f9a7661..d44fe24 100644
--- a/src/lachttp.c
+++ b/src/lachttp.c
@@ -114,7 +114,7 @@ struct _LacHttpRequest {
GList * headers;
- LacByteQueue * content;
+ nul_buffer_t * content;
HttpHost * host;
gboolean canceled;
@@ -129,7 +129,7 @@ struct _LacHttpRequest {
HttpTransport * transport;
/* parsing */
- LacByteQueue * unparsed;
+ nul_buffer_t * unparsed;
gsize n_content_bytes;
gsize n_ignore_bytes;
RequestParseState parser_state;
@@ -155,7 +155,7 @@ static void request_destroy (LacHttpRequest *re
static gchar * request_serialize (LacHttpRequest *request,
const gchar *connection);
static gboolean request_parse_response (LacHttpRequest *request,
- LacByteQueue *bytes);
+ nul_buffer_t *bytes);
static void request_parse_end_of_file (LacHttpRequest *request);
static gboolean request_done_parsing (LacHttpRequest *request);
static gboolean request_done_parsing_headers (LacHttpRequest *request);
@@ -180,7 +180,7 @@ static void request_emit_begin_content (LacHttpRequest *re
gssize total);
static void request_emit_content (LacHttpRequest *request,
gsize n_bytes,
- LacByteQueue *queue);
+ nul_buffer_t *buffer);
static void request_emit_end_content (LacHttpRequest *request);
static void request_emit_no_content (LacHttpRequest *request);
static void request_emit_error (LacHttpRequest *request,
@@ -250,7 +250,7 @@ struct _HttpTransport {
gboolean pipelining;
gboolean broken_server;
guint successful_requests;
- LacByteQueue * write_buffer;
+ nul_buffer_t * write_buffer;
gint write_timeout;
gint answer_timeout;
gboolean did_pipeline; /* if TRUE, we did pipeline at some point,
@@ -279,7 +279,7 @@ static void http_transport_cancel_request (HttpTransport *connection,
static void
request_initialize_parser_state (LacHttpRequest *request)
{
- request->unparsed = lac_byte_queue_new ();
+ request->unparsed = nul_buffer_new ();
request->parser_state = INITIAL;
request->n_content_bytes = 0;
@@ -306,7 +306,7 @@ request_alloc (const LacUri *uri, LacHttpFunc func, gpointer data)
request->headers = NULL;
- request->content = lac_byte_queue_new ();
+ request->content = nul_buffer_new ();
request->host = NULL;
request->canceled = FALSE;
@@ -329,7 +329,7 @@ request_alloc (const LacUri *uri, LacHttpFunc func, gpointer data)
static void
request_restart_parsing (LacHttpRequest *request)
{
- lac_byte_queue_free (request->unparsed, TRUE);
+ nul_buffer_free (request->unparsed, TRUE);
request_initialize_parser_state (request);
}
@@ -352,7 +352,7 @@ http_event_free (LacHttpEvent *event)
break;
case LAC_HTTP_EVENT_CONTENT:
- lac_byte_queue_free (event->content.byte_queue, TRUE);
+ nul_buffer_free (event->content.buffer, TRUE);
break;
case LAC_HTTP_EVENT_ERROR:
@@ -383,8 +383,8 @@ request_destroy (LacHttpRequest *request)
}
g_list_free (request->headers);
- lac_byte_queue_free (request->content, TRUE);
- lac_byte_queue_free (request->unparsed, TRUE);
+ nul_buffer_free (request->content, TRUE);
+ nul_buffer_free (request->unparsed, TRUE);
while ((event = g_queue_pop_head (request->pending_events)))
http_event_free (event);
@@ -505,7 +505,7 @@ request_serialize (LacHttpRequest *request, const gchar *connection)
* and our caller calls strlen() on it. We need to return a GString
* or something.
*/
- content = lac_byte_queue_peek (request->content, &content_len);
+ content = nul_buffer_peek (request->content, &content_len);
g_string_append_len (result, content, content_len);
#endif
@@ -519,7 +519,7 @@ request_get_line (LacHttpRequest *request, gchar **result)
gchar *lf_pos;
gsize line_len;
gsize n_bytes;
- const gchar *unparsed = lac_byte_queue_peek (request->unparsed, &n_bytes);
+ const gchar *unparsed = nul_buffer_peek (request->unparsed, &n_bytes);
lf_pos = strchr (unparsed, LF);
@@ -543,7 +543,7 @@ request_get_line (LacHttpRequest *request, gchar **result)
*result = g_strstrip (g_strndup (unparsed, line_len));
/* delete up to and including the LF */
- lac_byte_queue_delete_head (request->unparsed, line_len + 1);
+ nul_buffer_delete_head (request->unparsed, line_len + 1);
return OK;
}
@@ -658,7 +658,7 @@ request_parse_status_line (LacHttpRequest *request)
gchar *status_line;
ParseResult result;
gsize n_bytes;
- const gchar *unparsed = lac_byte_queue_peek (request->unparsed, &n_bytes);
+ const gchar *unparsed = nul_buffer_peek (request->unparsed, &n_bytes);
if (n_bytes < 4)
return NEED_MORE_DATA;
@@ -882,7 +882,7 @@ static ParseResult
request_parse_chunk_data (LacHttpRequest *request)
{
gsize n_bytes;
- const gchar *unparsed = lac_byte_queue_peek (request->unparsed, &n_bytes);
+ const gchar *unparsed = nul_buffer_peek (request->unparsed, &n_bytes);
g_assert (request->current_chunk_size > 0);
@@ -901,7 +901,7 @@ request_parse_chunk_data (LacHttpRequest *request)
request, request->current_chunk_size, request->unparsed);
/* Delete the CRLF */
- lac_byte_queue_delete_head (request->unparsed, 2);
+ nul_buffer_delete_head (request->unparsed, 2);
request->parser_state = EXPECT_CHUNK_HEADER;
return OK;
@@ -956,7 +956,7 @@ static ParseResult
request_parse_length_delimited_body (LacHttpRequest *request)
{
gsize emit_size;
- gsize n_bytes = lac_byte_queue_get_length (request->unparsed);
+ gsize n_bytes = nul_buffer_get_length (request->unparsed);
g_assert (request->content_length > request->n_content_bytes);
@@ -988,7 +988,7 @@ static ParseResult
request_parse_close_delimited_body (LacHttpRequest *request)
{
request_emit_content (
- request, lac_byte_queue_get_length (request->unparsed),
+ request, nul_buffer_get_length (request->unparsed),
request->unparsed);
return NEED_MORE_DATA;
@@ -998,7 +998,7 @@ request_parse_close_delimited_body (LacHttpRequest *request)
*/
static gboolean
request_parse_response (LacHttpRequest *request,
- LacByteQueue *bytes)
+ nul_buffer_t *bytes)
{
ParseResult result;
@@ -1009,9 +1009,9 @@ request_parse_response (LacHttpRequest *request,
g_print ("received: %d\n", len);
#endif
- lac_byte_queue_transfer_data (request->unparsed, bytes, -1);
+ nul_buffer_transfer_data (request->unparsed, bytes, -1);
- while (lac_byte_queue_get_length (request->unparsed) > 0)
+ while (nul_buffer_get_length (request->unparsed) > 0)
{
result = ERROR;
@@ -1063,9 +1063,9 @@ request_parse_response (LacHttpRequest *request,
* then this will be detected by the same invocation.
*/
#if 0
- g_assert (lac_byte_queue_get_length (request->unparsed) < len);
+ g_assert (nul_buffer_get_length (request->unparsed) < len);
#endif
- lac_byte_queue_transfer_data (bytes, request->unparsed, -1);
+ nul_buffer_transfer_data (bytes, request->unparsed, -1);
return TRUE;
break;
@@ -1095,7 +1095,7 @@ request_parse_end_of_file (LacHttpRequest *request)
if (request->parser_state == EXPECT_CLOSE_DELIMITED_BODY)
{
- gsize n_bytes = lac_byte_queue_get_length (request->unparsed);
+ gsize n_bytes = nul_buffer_get_length (request->unparsed);
if (n_bytes > 0)
request_emit_content (request, n_bytes, request->unparsed);
@@ -1358,11 +1358,11 @@ request_emit_begin_content (LacHttpRequest *request,
static void
request_emit_content (LacHttpRequest *request,
gsize length,
- LacByteQueue *queue)
+ nul_buffer_t *buffer)
{
LacHttpEvent *event = g_new (LacHttpEvent, 1);
gssize bytes_to_ignore;
- LacByteQueue *copy;
+ nul_buffer_t *copy;
if (!request->sent_begin_content)
request_emit_begin_content (request, -1);
@@ -1375,19 +1375,19 @@ request_emit_content (LacHttpRequest *request,
if (bytes_to_ignore >= length)
bytes_to_ignore = length;
- lac_byte_queue_delete_head (queue, bytes_to_ignore);
+ nul_buffer_delete_head (buffer, bytes_to_ignore);
length -= bytes_to_ignore;
}
- copy = lac_byte_queue_new ();
- lac_byte_queue_transfer_data (copy, queue, length);
+ copy = nul_buffer_new ();
+ nul_buffer_transfer_data (copy, buffer, length);
if (length > 0)
{
event->type = LAC_HTTP_EVENT_CONTENT;
event->content.length = length;
- event->content.byte_queue = copy;
- event->content.data = lac_byte_queue_peek (copy, NULL);
+ event->content.buffer = copy;
+ event->content.data = nul_buffer_peek (copy, NULL);
event->content.so_far = request->n_content_bytes;
event->content.total = request->content_length;
@@ -1592,7 +1592,7 @@ lac_http_request_add_content (LacHttpRequest *request,
request->type == PUT_REQUEST);
g_return_if_fail (data != NULL);
- lac_byte_queue_append (request->content, data, len);
+ nul_buffer_append (request->content, data, len);
}
void
@@ -1890,11 +1890,11 @@ http_host_cancel_request (HttpHost *host, LacHttpRequest *request)
static void
http_transport_delete_write_buffer (HttpTransport *transport)
{
- gsize n_bytes = lac_byte_queue_get_length (transport->write_buffer);
+ gsize n_bytes = nul_buffer_get_length (transport->write_buffer);
if (n_bytes > 0)
{
- lac_byte_queue_delete_head (transport->write_buffer, n_bytes);
+ nul_buffer_delete_head (transport->write_buffer, n_bytes);
if (transport->write_timeout)
{
@@ -2035,14 +2035,14 @@ static void
http_transport_flush_write_buffer (HttpTransport *transport)
{
gsize n_bytes;
- const gchar *bytes = lac_byte_queue_peek (transport->write_buffer, &n_bytes);
+ const gchar *bytes = nul_buffer_peek (transport->write_buffer, &n_bytes);
if (n_bytes > 0)
{
/* FIXME: should we have a lac_connection_write_byte_queue()? */
lac_connection_write (transport->connection, bytes, n_bytes);
- lac_byte_queue_delete_head (transport->write_buffer, n_bytes);
+ nul_buffer_delete_head (transport->write_buffer, n_bytes);
}
}
@@ -2100,7 +2100,7 @@ http_transport_transmit_request (HttpTransport *transport,
transport->write_timeout = 0;
}
- lac_byte_queue_append (transport->write_buffer, serialized, strlen (serialized));
+ nul_buffer_append (transport->write_buffer, serialized, strlen (serialized));
g_free (serialized);
#if 0
@@ -2216,7 +2216,7 @@ http_transport_handle_read (HttpTransport *transport,
}
#endif
- while (lac_byte_queue_get_length (read_event->byte_queue) > 0)
+ while (nul_buffer_get_length (read_event->buffer) > 0)
{
if (!transport->current)
{
@@ -2235,8 +2235,7 @@ http_transport_handle_read (HttpTransport *transport,
g_assert (transport->current);
- if (!request_parse_response (transport->current,
- read_event->byte_queue))
+ if (!request_parse_response (transport->current, read_event->buffer))
{
GError *err = g_error_new (LAC_HTTP_ERROR,
LAC_HTTP_ERROR_MALFORMED_RESPONSE,
@@ -2471,7 +2470,7 @@ transport_dump_spam (HttpTransport *transport)
{
gsize n_bytes;
const gchar *unparsed =
- lac_byte_queue_peek (transport->current->unparsed, &n_bytes);
+ nul_buffer_peek (transport->current->unparsed, &n_bytes);
int i;
g_print ("**** transport info: \n");
g_print (" transport->current->unparsed: %d\n", n_bytes);
@@ -2553,7 +2552,7 @@ http_transport_new (HttpHost *host,
transport->pipelining = pipelining;
transport->broken_server = broken;
transport->successful_requests = 0;
- transport->write_buffer = lac_byte_queue_new ();
+ transport->write_buffer = nul_buffer_new ();
transport->write_timeout = 0;
transport->answer_timeout = 0;
@@ -2577,7 +2576,7 @@ http_transport_destroy (HttpTransport *transport)
g_assert (g_queue_is_empty (transport->in_progress));
g_queue_free (transport->in_progress);
- lac_byte_queue_free (transport->write_buffer, TRUE);
+ nul_buffer_free (transport->write_buffer, TRUE);
g_free (transport);
}