Never automatically try to bind to ports >= 32768.

[meshlink] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index af3caddf8957f38006a540ddc331cfe0823efcdd..6589543778697ce13c0e731c2e74c047396af2a0 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -50,6 +50,12 @@ bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        return true;
 }
 
+bool send_error(meshlink_handle_t *mesh, connection_t *c, request_error_t err, const char *message) {
+       send_request(mesh, c, NULL, "%d %d %s", ERROR, err, message);
+       flush_meta(mesh, c);
+       return false;
+}
+
 bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        assert(request);
        assert(*request);
@@ -64,6 +70,13 @@ bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
        logger(mesh, MESHLINK_INFO, "Error message from %s: %d: %s", c->name, err, errorstring);
 
+       switch(err) {
+       case BLACKLISTED:
+               if(mesh->blacklisted_cb) {
+                       mesh->blacklisted_cb(mesh, (meshlink_node_t *)lookup_node(mesh, c->name));
+               }
+       }
+
        return false;
 }
 
@@ -109,17 +122,8 @@ bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
        /* Successful connection, reset timeout if this is an outgoing connection. */
 
-       // TODO: completely remove this outgoing, let the autoconnect algorithm handle it
        if(c->outgoing) {
-               c->outgoing->timeout = 0;
-               c->outgoing->state = OUTGOING_START;
-
-               if(c->outgoing->ai) {
-                       freeaddrinfo(c->outgoing->ai);
-               }
-
-               c->outgoing->ai = NULL;
-               c->outgoing->aip = NULL;
+               reset_outgoing(c->outgoing);
        }
 
        return true;
@@ -141,3 +145,16 @@ bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request)
        // This should never happen with MeshLink.
        return false;
 }
+
+bool send_raw_packet(meshlink_handle_t *mesh, connection_t *c, const vpn_packet_t *packet) {
+       size_t hdrsize = sizeof(meshlink_packethdr_t);
+       assert(packet->len >= hdrsize);
+       return send_request(mesh, c, NULL, "%d", PACKET) && send_meta(mesh, c, (const char *)packet->data + hdrsize, packet->len - hdrsize);
+}
+
+bool raw_packet_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+       (void)mesh;
+       (void)request;
+       c->status.raw_packet = true;
+       return true;
+}