diff options
Diffstat (limited to 'src/lactcpconnection.c')
| -rw-r--r-- | src/lactcpconnection.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lactcpconnection.c b/src/lactcpconnection.c index d72fbd3..05f7a7b 100644 --- a/src/lactcpconnection.c +++ b/src/lactcpconnection.c @@ -41,7 +41,7 @@ struct _LacTcpConnection { GQueue * pending_events; ConnectionState state; - LacByteQueue * unwritten; + nul_buffer_t * unwritten; gboolean has_fd; gboolean in_emit_events; @@ -55,9 +55,9 @@ event_free (LacConnectionEvent *event) if (event->type == LAC_CONNECTION_EVENT_READ) { /* FIXME: at some point we should support pushing - * data back into the queue, ie., it must be kept alive + * data back into the buffer, ie., it must be kept alive */ - lac_byte_queue_free (event->read.byte_queue, TRUE); + nul_buffer_free (event->read.buffer, TRUE); } else if (event->type == LAC_CONNECTION_EVENT_ERROR) g_error_free ((GError *)event->error.err); @@ -76,13 +76,13 @@ queue_connect (LacTcpConnection *connection) } static void -queue_read (LacTcpConnection *connection, LacByteQueue *queue) +queue_read (LacTcpConnection *connection, nul_buffer_t *buffer) { LacConnectionEvent *event = g_new (LacConnectionEvent, 1); event->type = LAC_CONNECTION_EVENT_READ; - event->read.byte_queue = queue; - event->read.data = lac_byte_queue_peek (queue, &(event->read.len)); + event->read.buffer = buffer; + event->read.data = nul_buffer_peek (buffer, &(event->read.len)); g_queue_push_tail (connection->pending_events, event); } @@ -181,20 +181,20 @@ lac_tcp_connection_do_reads (gpointer data) do { GError *err = NULL; - LacByteQueue *queue = lac_byte_queue_new (); - gchar *buf = lac_byte_queue_alloc_tail (queue, BUF_SIZE); + nul_buffer_t *buffer = nul_buffer_new (); + gchar *buf = nul_buffer_alloc_tail (buffer, BUF_SIZE); len = lac_recv (connection->fd, buf, BUF_SIZE, &err); if (len > 0) { - lac_byte_queue_delete_tail (queue, BUF_SIZE - len); + nul_buffer_delete_tail (buffer, BUF_SIZE - len); - queue_read (connection, queue); + queue_read (connection, buffer); } else { - lac_byte_queue_free (queue, TRUE); + nul_buffer_free (buffer, TRUE); if (len == 0) { @@ -230,13 +230,13 @@ lac_tcp_connection_do_writes (LacTcpConnection *connection) return; } - while (lac_byte_queue_get_length (connection->unwritten) > 0) + while (nul_buffer_get_length (connection->unwritten) > 0) { GError *err = NULL; const gchar *unwritten; gsize len, sent; - unwritten = lac_byte_queue_peek (connection->unwritten, &len); + unwritten = nul_buffer_peek (connection->unwritten, &len); sent = lac_send (connection->fd, unwritten, len, &err); @@ -257,7 +257,7 @@ lac_tcp_connection_do_writes (LacTcpConnection *connection) return; } - lac_byte_queue_delete_head (connection->unwritten, sent); + nul_buffer_delete_head (connection->unwritten, sent); /* FIXME check that we haven't used too much time? */ } @@ -370,7 +370,7 @@ lac_tcp_connection_new (const LacAddress *address, connection->state = UNDEFINED; connection->has_fd = FALSE; - connection->unwritten = lac_byte_queue_new (); + connection->unwritten = nul_buffer_new (); connection->in_emit_events = FALSE; connection->need_flush = FALSE; @@ -425,9 +425,9 @@ lac_tcp_connection_write (LacTcpConnection *connection, if (len == 0) return; - do_writes = (lac_byte_queue_get_length (connection->unwritten) == 0); + do_writes = (nul_buffer_get_length (connection->unwritten) == 0); - lac_byte_queue_append (connection->unwritten, data, len); + nul_buffer_append (connection->unwritten, data, len); if (do_writes) { @@ -463,7 +463,7 @@ lac_tcp_connection_unref (LacTcpConnection *connection) lac_tcp_connection_discard_pending_events (connection); g_queue_free (connection->pending_events); - lac_byte_queue_free (connection->unwritten, TRUE); + nul_buffer_free (connection->unwritten, TRUE); if (connection->has_fd) { @@ -486,6 +486,6 @@ lac_tcp_connection_flush (LacTcpConnection *connection) { connection->need_flush = TRUE; - if (lac_byte_queue_get_length (connection->unwritten) == 0) + if (nul_buffer_get_length (connection->unwritten) == 0) lac_tcp_connection_do_writes (connection); } |