X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Futcp.c;h=65e6be7a2de4e19ac42401ef2696a1590561435d;hb=e40d5bf3a0e030105334046319f377efbf3f06c4;hp=acd8188bc3dca4e605465648ae108e70ee7b7b2a;hpb=6ba5501ace0b03e1573e4ec2a3fee1491f64bfe2;p=meshlink

diff --git a/src/utcp.c b/src/utcp.c
index acd8188b..65e6be7a 100644
--- a/src/utcp.c
+++ b/src/utcp.c
@@ -650,6 +650,7 @@ void utcp_accept(struct utcp_connection *c, utcp_recv_t recv, void *priv) {
 	debug(c, "accepted %p %p\n", c, recv, priv);
 	c->recv = recv;
 	c->priv = priv;
+	c->do_poll = true;
 	set_state(c, ESTABLISHED);
 }
 
@@ -1292,7 +1293,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 
 		if(hdr.ctl & SYN && !(hdr.ctl & ACK) && utcp->accept) {
 			// If we don't want to accept it, send a RST back
-			if((utcp->pre_accept && !utcp->pre_accept(utcp, hdr.dst))) {
+			if((utcp->listen && !utcp->listen(utcp, hdr.dst))) {
 				len = 1;
 				goto reset;
 			}
@@ -1718,6 +1719,7 @@ skip_ack:
 				c->snd.last++;
 				set_state(c, FIN_WAIT_1);
 			} else {
+				c->do_poll = true;
 				set_state(c, ESTABLISHED);
 			}
 
@@ -2156,7 +2158,7 @@ bool utcp_is_active(struct utcp *utcp) {
 	return false;
 }
 
-struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_send_t send, void *priv) {
+struct utcp *utcp_init(utcp_accept_t accept, utcp_listen_t listen, utcp_send_t send, void *priv) {
 	if(!send) {
 		errno = EFAULT;
 		return NULL;
@@ -2182,7 +2184,7 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
 	}
 
 	utcp->accept = accept;
-	utcp->pre_accept = pre_accept;
+	utcp->listen = listen;
 	utcp->send = send;
 	utcp->priv = priv;
 	utcp->timeout = DEFAULT_USER_TIMEOUT; // sec
@@ -2399,10 +2401,10 @@ void utcp_set_poll_cb(struct utcp_connection *c, utcp_poll_t poll) {
 	}
 }
 
-void utcp_set_accept_cb(struct utcp *utcp, utcp_accept_t accept, utcp_pre_accept_t pre_accept) {
+void utcp_set_accept_cb(struct utcp *utcp, utcp_accept_t accept, utcp_listen_t listen) {
 	if(utcp) {
 		utcp->accept = accept;
-		utcp->pre_accept = pre_accept;
+		utcp->listen = listen;
 	}
 }