#include "utcp_priv.h"
-static void set_state(struct utcp_connection *c, enum state state) {
- c->state = state;
- if(state == ESTABLISHED)
- timerclear(&c->conn_timeout);
- fprintf(stderr, "%p new state: %s\n", c->utcp, strstate[state]);
+#ifdef UTCP_DEBUG
+#include <stdarg.h>
+
+static void debug(const char *format, ...) {
+ va_list ap;
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
}
static void print_packet(struct utcp *utcp, const char *dir, const void *pkt, size_t len) {
struct hdr hdr;
if(len < sizeof hdr) {
- fprintf(stderr, "%p %s: short packet (%zu bytes)\n", utcp, dir, len);
+ debug("%p %s: short packet (%zu bytes)\n", utcp, dir, len);
return;
}
memcpy(&hdr, pkt, sizeof hdr);
fprintf (stderr, "%p %s: src=%u dst=%u seq=%u ack=%u wnd=%u ctl=", utcp, dir, hdr.src, hdr.dst, hdr.seq, hdr.ack, hdr.wnd);
if(hdr.ctl & SYN)
- fprintf(stderr, "SYN");
+ debug("SYN");
if(hdr.ctl & RST)
- fprintf(stderr, "RST");
+ debug("RST");
if(hdr.ctl & FIN)
- fprintf(stderr, "FIN");
+ debug("FIN");
if(hdr.ctl & ACK)
- fprintf(stderr, "ACK");
+ debug("ACK");
if(len > sizeof hdr) {
- fprintf(stderr, " data=");
+ debug(" data=");
for(int i = sizeof hdr; i < len; i++) {
const char *data = pkt;
- fprintf(stderr, "%c", data[i] >= 32 ? data[i] : '.');
+ debug("%c", data[i] >= 32 ? data[i] : '.');
}
}
- fprintf(stderr, "\n");
+ debug("\n");
+}
+#else
+#define debug(...)
+#define print_packet(...)
+#endif
+
+static void set_state(struct utcp_connection *c, enum state state) {
+ c->state = state;
+ if(state == ESTABLISHED)
+ timerclear(&c->conn_timeout);
+ debug("%p new state: %s\n", c->utcp, strstate[state]);
}
static inline void list_connections(struct utcp *utcp) {
- fprintf(stderr, "%p has %d connections:\n", utcp, utcp->nconnections);
+ debug("%p has %d connections:\n", utcp, utcp->nconnections);
for(int i = 0; i < utcp->nconnections; i++)
- fprintf(stderr, " %u -> %u state %s\n", utcp->connections[i]->src, utcp->connections[i]->dst, strstate[utcp->connections[i]->state]);
+ debug(" %u -> %u state %s\n", utcp->connections[i]->src, utcp->connections[i]->dst, strstate[utcp->connections[i]->state]);
+}
+
+static int32_t seqdiff(uint32_t a, uint32_t b) {
+ return a - b;
}
// Connections are stored in a sorted list.
else
utcp->nallocated *= 2;
struct utcp_connection **new_array = realloc(utcp->connections, utcp->nallocated * sizeof *utcp->connections);
- if(!new_array) {
- errno = ENOMEM;
+ if(!new_array)
return NULL;
- }
utcp->connections = new_array;
}
struct utcp_connection *c = calloc(1, sizeof *c);
- if(!c) {
- errno = ENOMEM;
+ if(!c)
+ return NULL;
+
+ c->sndbufsize = DEFAULT_SNDBUFSIZE;
+ c->maxsndbufsize = DEFAULT_MAXSNDBUFSIZE;
+ c->sndbuf = malloc(c->sndbufsize);
+ if(!c->sndbuf) {
+ free(c);
return NULL;
}
c->snd.nxt = c->snd.iss + 1;
c->rcv.wnd = utcp->mtu;
c->utcp = utcp;
- c->sndbufsize = 65536;
- c->sndbuf = malloc(c->sndbufsize);
- if(!c->sndbuf)
- c->sndbufsize = 0;
// Add it to the sorted list of connections
void utcp_accept(struct utcp_connection *c, utcp_recv_t recv, void *priv) {
if(c->reapable || c->state != SYN_RECEIVED) {
- fprintf(stderr, "Error: accept() called on invalid connection %p in state %s\n", c, strstate[c->state]);
+ debug("Error: accept() called on invalid connection %p in state %s\n", c, strstate[c->state]);
return;
}
- fprintf(stderr, "%p accepted, %p %p\n", c, recv, priv);
+ debug("%p accepted, %p %p\n", c, recv, priv);
c->recv = recv;
c->priv = priv;
set_state(c, ESTABLISHED);
ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
if(c->reapable) {
- fprintf(stderr, "Error: send() called on closed connection %p\n", c);
+ debug("Error: send() called on closed connection %p\n", c);
errno = EBADF;
return -1;
}
case LISTEN:
case SYN_SENT:
case SYN_RECEIVED:
- fprintf(stderr, "Error: send() called on unconnected connection %p\n", c);
+ debug("Error: send() called on unconnected connection %p\n", c);
errno = ENOTCONN;
return -1;
case ESTABLISHED:
case CLOSING:
case LAST_ACK:
case TIME_WAIT:
- fprintf(stderr, "Error: send() called on closing connection %p\n", c);
+ debug("Error: send() called on closing connection %p\n", c);
errno = EPIPE;
return -1;
}
return -1;
}
- uint32_t bufused = c->snd.nxt - c->snd.una;
+ uint32_t bufused = seqdiff(c->snd.nxt, c->snd.una);
/* Check our send buffer.
* - If it's big enough, just put the data in there.
- * - If not, decide whether to enlarge. (TODO, now we just always enlarge)
+ * - If not, decide whether to enlarge if possible.
* - Cap len so it doesn't overflow our buffer.
*/
- if(len > c->sndbufsize - bufused) {
- c->sndbufsize *= 2;
+ if(len > c->sndbufsize - bufused && c->sndbufsize < c->maxsndbufsize) {
+ if(c->sndbufsize > c->maxsndbufsize / 2)
+ c->sndbufsize = c->maxsndbufsize;
+ else
+ c->sndbufsize *= 2;
c->sndbuf = realloc(c->sndbuf, c->sndbufsize);
}
hdr->dst = tmp;
}
-static int32_t seqdiff(uint32_t a, uint32_t b) {
- return a - b;
-}
-
int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
if(!utcp) {
errno = EFAULT;
return 0;
}
- fprintf(stderr, "%p state %s\n", c->utcp, strstate[c->state]);
+ debug("%p state %s\n", c->utcp, strstate[c->state]);
// In case this is for a CLOSED connection, ignore the packet.
// TODO: make it so incoming packets can never match a CLOSED connection.
#endif
if(!acceptable) {
- fprintf(stderr, "Packet not acceptable, %u <= %u + %zu < %u\n", c->rcv.nxt, hdr.seq, len, c->rcv.nxt + c->rcv.wnd);
+ debug("Packet not acceptable, %u <= %u + %zu < %u\n", c->rcv.nxt, hdr.seq, len, c->rcv.nxt + c->rcv.wnd);
// Ignore unacceptable RST packets.
if(hdr.ctl & RST)
return 0;
// ackno should not roll back, and it should also not be bigger than snd.nxt.
if(hdr.ctl & ACK && (seqdiff(hdr.ack, c->snd.nxt) > 0 || seqdiff(hdr.ack, c->snd.una) < 0)) {
- fprintf(stderr, "Packet ack seqno out of range, %u %u %u\n", hdr.ack, c->snd.una, c->snd.nxt);
+ debug("Packet ack seqno out of range, %u %u %u\n", hdr.ack, c->snd.una, c->snd.nxt);
// Ignore unacceptable RST packets.
if(hdr.ctl & RST)
return 0;
c->snd.una = hdr.ack;
if(advanced) {
- fprintf(stderr, "%p advanced %u\n", utcp, advanced);
+ debug("%p advanced %u\n", utcp, advanced);
// Make room in the send buffer.
// TODO: try to avoid memmoving too much. Circular buffer?
uint32_t left = seqdiff(c->snd.nxt, hdr.ack);
}
int utcp_shutdown(struct utcp_connection *c, int dir) {
- fprintf(stderr, "%p shutdown %d\n", c->utcp, dir);
+ debug("%p shutdown %d\n", c->utcp, dir);
if(!c) {
errno = EFAULT;
return -1;
}
if(c->reapable) {
- fprintf(stderr, "Error: shutdown() called on closed connection %p\n", c);
+ debug("Error: shutdown() called on closed connection %p\n", c);
errno = EBADF;
return -1;
}
}
if(c->reapable) {
- fprintf(stderr, "Error: abort() called on closed connection %p\n", c);
+ debug("Error: abort() called on closed connection %p\n", c);
errno = EBADF;
return -1;
}
if(c->state == CLOSED) {
if(c->reapable) {
- fprintf(stderr, "Reaping %p\n", c);
+ debug("Reaping %p\n", c);
free_connection(c);
i--;
}
free(utcp);
}
+uint16_t utcp_get_mtu(struct utcp *utcp) {
+ return utcp->mtu;
+}
+
void utcp_set_mtu(struct utcp *utcp, uint16_t mtu) {
// TODO: handle overhead of the header
utcp->mtu = mtu;
}
-int utcp_set_connection_timeout(struct utcp *u, int timeout) {
- int prev = u->timeout;
+int utcp_get_user_timeout(struct utcp *u) {
+ return u->timeout;
+}
+
+void utcp_set_user_timeout(struct utcp *u, int timeout) {
u->timeout = timeout;
- return prev;
+}
+
+size_t utcp_get_sndbuf(struct utcp_connection *c) {
+ return c->maxsndbufsize;
+}
+
+void utcp_set_sndbuf(struct utcp_connection *c, size_t size) {
+ c->maxsndbufsize = size;
+ if(c->maxsndbufsize != size)
+ c->maxsndbufsize = -1;
+}
+
+bool utcp_get_nodelay(struct utcp_connection *c) {
+ return c->nodelay;
+}
+
+void utcp_set_nodelay(struct utcp_connection *c, bool nodelay) {
+ c->nodelay = nodelay;
+}
+
+bool utcp_get_keepalive(struct utcp_connection *c) {
+ return c->keepalive;
+}
+
+void utcp_set_keepalive(struct utcp_connection *c, bool keepalive) {
+ c->keepalive = keepalive;
+}
+
+size_t utcp_get_outq(struct utcp_connection *c) {
+ return seqdiff(c->snd.nxt, c->snd.una);
}