Never automatically try to bind to ports >= 32768.

[meshlink] / src / route.c

diff --git a/src/route.c b/src/route.c
index ee36a9bfe4b17c8289d85053312a7d44ed2692c3..c63c03732f4e39c8b93cff6233b105e3257ebefc 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -57,9 +57,16 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
                return;
        }
 
+       size_t len = packet->len - sizeof(*hdr);
+
+       // Channel traffic accounting
+       if(source == mesh->self) {
+               dest->out_data += len + SPTPS_OVERHEAD;
+       }
+
        if(dest == mesh->self) {
+               source->in_data += len + SPTPS_OVERHEAD;
                const void *payload = packet->data + sizeof(*hdr);
-               size_t len = packet->len - sizeof(*hdr);
 
                char hex[len * 2 + 1];
 
@@ -69,7 +76,9 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
 
                logger(mesh, MESHLINK_DEBUG, "I received a packet for me with payload: %s\n", hex);
 
-               if(mesh->receive_cb) {
+               if(source->utcp) {
+                       channel_receive(mesh, (meshlink_node_t *)source, payload, len);
+               } else if(mesh->receive_cb) {
                        mesh->receive_cb(mesh, (meshlink_node_t *)source, payload, len);
                }