#include "utcp.h"
+#define DIR_READ 1
+#define DIR_WRITE 2
+
struct utcp_connection *c;
-int dir = 3;
+int dir = DIR_READ | DIR_WRITE;
bool running = true;
double dropin;
double dropout;
-int do_recv(struct utcp_connection *c, const void *data, size_t len) {
+ssize_t do_recv(struct utcp_connection *c, const void *data, size_t len) {
if(!data || !len) {
if(errno) {
fprintf(stderr, "Error: %s\n", strerror(errno));
dir = 0;
} else {
- dir &= ~2;
+ dir &= ~DIR_WRITE;
fprintf(stderr, "Connection closed by peer\n");
}
- return 0;
+ return -1;
}
return write(1, data, len);
}
void do_accept(struct utcp_connection *nc, uint16_t port) {
utcp_accept(nc, do_recv, NULL);
c = nc;
+ utcp_set_accept_cb(c->utcp, NULL, NULL);
}
-int do_send(struct utcp *utcp, const void *data, size_t len) {
+ssize_t do_send(struct utcp *utcp, const void *data, size_t len) {
int s = *(int *)utcp->priv;
- if(drand48() >= dropout)
- return send(s, data, len, MSG_DONTWAIT);
- else
- return 0;
+ if(drand48() < dropout)
+ return len;
+
+ ssize_t result = send(s, data, len, MSG_DONTWAIT);
+ if(result <= 0)
+ fprintf(stderr, "Error sending UDP packet: %s\n", strerror(errno));
+ return result;
}
int main(int argc, char *argv[]) {
return 1;
int s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if(s < 0)
+ if(s == -1)
return 1;
if(server) {
if(!u)
return 1;
+ utcp_set_mtu(u, 1300);
utcp_set_user_timeout(u, 10);
if(!server)
{.fd = s, .events = POLLIN | POLLERR | POLLHUP},
};
- char buf[1024];
- int timeout = utcp_timeout(u);
+ char buf[102400];
+ struct timeval timeout = utcp_timeout(u);
while(dir) {
- poll(fds, 2, timeout);
+ size_t max = c ? utcp_get_sndbuf_free(c) : 0;
+ if(max > sizeof buf)
+ max = sizeof buf;
+
+ if((dir & DIR_READ) && max)
+ poll(fds, 2, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
+ else
+ poll(fds + 1, 1, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
if(fds[0].revents) {
- int len = read(0, buf, sizeof buf);
+ fds[0].revents = 0;
+ fprintf(stderr, "0");
+ ssize_t len = read(0, buf, max);
if(len <= 0) {
fds[0].fd = -1;
- dir &= ~1;
+ dir &= ~DIR_READ;
if(c)
utcp_shutdown(c, SHUT_WR);
- if(len < 0)
+ if(len == -1)
break;
else
continue;
}
- if(c)
- utcp_send(c, buf, len);
+ if(c) {
+ ssize_t sent = utcp_send(c, buf, len);
+ if(sent != len)
+ fprintf(stderr, "PANIEK: %zd != %zd\n", sent, len);
+ }
}
if(fds[1].revents) {
+ fds[1].revents = 0;
+ fprintf(stderr, "1");
struct sockaddr_storage ss;
socklen_t sl = sizeof ss;
int len = recvfrom(s, buf, sizeof buf, MSG_DONTWAIT, (struct sockaddr *)&ss, &sl);
- if(len <= 0)
+ if(len <= 0) {
+ fprintf(stderr, "Error receiving UDP packet: %s\n", strerror(errno));
break;
+ }
if(!connected)
if(!connect(s, (struct sockaddr *)&ss, sl))
connected = true;