Send RST packets when receiving data after we closed a UDP channel.

[meshlink] / src / utcp.c

diff --git a/src/utcp.c b/src/utcp.c
index ec74923dd128a85c4b730fefa015127e40a40c8a..c1add21808cd51031c07b5919b5aa90c4b1f84c7 100644 (file)
--- a/src/utcp.c
+++ b/src/utcp.c
@@ -17,16 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#define _GNU_SOURCE
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
+#include "system.h"
 #include <time.h>
 
 #include "utcp_priv.h"
@@ -659,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);
 }
 
@@ -1301,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;
                        }
@@ -1567,6 +1559,11 @@ synack:
        advanced = seqdiff(hdr.ack, c->snd.una);
 
        if(advanced) {
+               if(c->reapable && !is_reliable(c)) {
+                       // TODO: we should also send RST for reliable connections
+                       goto reset;
+               }
+
                // RTT measurement
                if(c->rtt_start.tv_sec) {
                        if(c->rtt_seq == hdr.ack) {
@@ -1727,6 +1724,7 @@ skip_ack:
                                c->snd.last++;
                                set_state(c, FIN_WAIT_1);
                        } else {
+                               c->do_poll = true;
                                set_state(c, ESTABLISHED);
                        }
 
@@ -2052,7 +2050,6 @@ void utcp_abort_all_connections(struct utcp *utcp) {
 
 int utcp_close(struct utcp_connection *c) {
        if(c->rcvbuf.used) {
-               fprintf(stderr, "UTCP channel closed with stuff in receive buffer\n");
                return reset_connection(c) ? 0 : -1;
        }
 
@@ -2166,7 +2163,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;
@@ -2192,7 +2189,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
@@ -2409,10 +2406,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;
        }
 }