X-Git-Url: http://git.thejh.net/?p=libjh.git;a=blobdiff_plain;f=netconn.c;fp=netconn.c;h=0000000000000000000000000000000000000000;hp=3ecb5cb02894624a6143deac0598e9915700fb59;hb=e42f5dfa29fbf2bcfec7d3169c76dc7046c602b2;hpb=b736f0f2440aa010f396f682964cb2e35ab934cf

diff --git a/netconn.c b/netconn.c
deleted file mode 100644
index 3ecb5cb..0000000
--- a/netconn.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <sys/types.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdbool.h>
-
-static void connection_waiting_cb(struct ev_loop *loop, ev_io *w, int revents) {
-  bufio_connection *con = (bufio_connection *)w->data;
-  if (revents & EV_READ) {
-    assert(con->inbuf_used != con->inbuf_size);
-    int res = read(w->fd, con->inbuf+con->inbuf_used, con->inbuf_size-con->inbuf_used);
-    if (res == -1) {
-      if (errno != EAGAIN && errno != EWOULDBLOCK) {
-        con->err_cb(con);
-      }
-      return;
-    }
-    if (res == 0) {
-      con->err_cb(con);
-      return;
-    }
-    con->inbuf_used += res;
-    if (con->inbuf_size == con->inbuf_used) {
-      // The buffer is filled, so stop reading data until we have a new one.
-      ev_io_stop(loop, w);
-
-      // Call the callback AFTERWARDS (after it has finished executing, we might
-      // already have a new read buffer).
-      con->data_cb(con);
-    }
-  }
-
-  if (revents & EV_WRITE) {
-    if (bufio_chain_flush(&con->outbuf, w->fd) == 0) {
-      ev_io_stop(loop, w);
-    }
-  }
-}
-
-bufio_connection *bufio_connection_create(struct ev_loop *loop, int fd) {
-  bufio_connection *con = calloc(1, sizeof(*con));
-  if (con == NULL) return NULL;
-  con->loop = loop;
-  ev_io_init(&con->rw, connection_waiting_cb, fd, EV_READ);
-  ev_io_init(&con->ww, connection_waiting_cb, fd, EV_WRITE);
-  con->rw.data = con;
-  con->ww.data = con;
-  return con;
-}
-
-void bufio_connection_set_read_buffer(bufio_connection *con, void *buf, size_t size) {
-  assert(size > 0);
-  con->inbuf = buf;
-  con->inbuf_size = size;
-  con->inbuf_used = 0;
-
-  ev_io_start(con->loop, &con->rw);
-}
-
-void bufio_connection_destroy(bufio_connection *con) {
-  bufio_chain_clear(&con->outbuf);
-  ev_io_stop(con->loop, &con->rw);
-  ev_io_stop(con->loop, &con->ww);
-  free(con);
-}
-
-int bufio_connection_write(bufio_connection *con, void *buf, size_t len) {
-  int res;
-  bool chain_was_empty = (con->outbuf.head == NULL);
-  res = bufio_chain_append(&con->outbuf, buf, len);
-  if (res == -1) return -1;
-  if (chain_was_empty) {
-    if (bufio_chain_flush(&con->outbuf, con->ww.fd)) {
-      ev_io_start(con->loop, &con->ww);
-    }
-  }
-  return 0;
-}