pex: move rx header check to callback function

[project/unetd.git] / pex-msg.c

diff --git a/pex-msg.c b/pex-msg.c
index 4f0b19538ffd7c7e61837cbcf1aff16243669126..f6cbd71179e6e0a8b0c8155010c0e0e69e7927ff 100644 (file)
--- a/pex-msg.c
+++ b/pex-msg.c
@@ -137,7 +137,6 @@ pex_fd_cb(struct uloop_fd *fd, unsigned int events)
 {
        static struct sockaddr_in6 sin6;
        static char buf[PEX_RX_BUF_SIZE];
-       struct pex_hdr *hdr = (struct pex_hdr *)buf;
        ssize_t len;
 
        while (1) {
@@ -199,14 +198,7 @@ retry:
                        }
                }
 
-               if (len < sizeof(*hdr) + sizeof(struct pex_ext_hdr))
-                       continue;
-
-               hdr->len = ntohs(hdr->len);
-               if (len - sizeof(hdr) - sizeof(struct pex_ext_hdr) < hdr->len)
-                       continue;
-
-               pex_recv_cb(hdr, &sin6);
+               pex_recv_cb(buf, len, &sin6);
        }
 }
 
@@ -666,6 +658,28 @@ error:
        return NULL;
 }
 
+struct pex_hdr *pex_rx_accept(void *data, size_t len, bool ext)
+{
+       struct pex_hdr *hdr = data;
+       uint16_t hdr_len;
+       size_t min_size;
+
+       min_size = sizeof(*hdr);
+       if (ext)
+               min_size += sizeof(struct pex_ext_hdr);
+
+       if (len < min_size)
+               return NULL;
+
+       hdr_len = ntohs(hdr->len);
+       if (len < min_size + hdr_len)
+               return NULL;
+
+       hdr->len = hdr_len;
+
+       return hdr;
+}
+
 static void
 pex_gc_cb(struct uloop_timeout *t)
 {