Also renew SPTPS keys for meta-connections.

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 416066ff0ed0a6eb6654bab6a0e70bc2b709e8e6..c17d9e8214b9b196c30b4725c2a456e204142a1e 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -43,113 +43,7 @@
 
 extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
 
-static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
-       switch(mesh->proxytype) {
-       case PROXY_HTTP: {
-               char *host;
-               char *port;
-
-               sockaddr2str(&c->address, &host, &port);
-               send_request(mesh, c, NULL, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
-               free(host);
-               free(port);
-               return true;
-       }
-
-       case PROXY_SOCKS4: {
-               if(c->address.sa.sa_family != AF_INET) {
-                       logger(mesh, MESHLINK_ERROR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
-                       return false;
-               }
-
-               char s4req[9 + (mesh->proxyuser ? strlen(mesh->proxyuser) : 0)];
-               s4req[0] = 4;
-               s4req[1] = 1;
-               memcpy(s4req + 2, &c->address.in.sin_port, 2);
-               memcpy(s4req + 4, &c->address.in.sin_addr, 4);
-
-               if(mesh->proxyuser) {
-                       memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser));
-               }
-
-               s4req[sizeof(s4req) - 1] = 0;
-               c->tcplen = 8;
-               return send_meta(mesh, c, s4req, sizeof(s4req));
-       }
-
-       case PROXY_SOCKS5: {
-               int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
-               c->tcplen = 2;
-
-               if(mesh->proxypass) {
-                       len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass);
-               }
-
-               char s5req[len];
-               int i = 0;
-               s5req[i++] = 5;
-               s5req[i++] = 1;
-
-               if(mesh->proxypass) {
-                       s5req[i++] = 2;
-                       s5req[i++] = 1;
-                       s5req[i++] = strlen(mesh->proxyuser);
-                       memcpy(s5req + i, mesh->proxyuser, strlen(mesh->proxyuser));
-                       i += strlen(mesh->proxyuser);
-                       s5req[i++] = strlen(mesh->proxypass);
-                       memcpy(s5req + i, mesh->proxypass, strlen(mesh->proxypass));
-                       i += strlen(mesh->proxypass);
-                       c->tcplen += 2;
-               } else {
-                       s5req[i++] = 0;
-               }
-
-               s5req[i++] = 5;
-               s5req[i++] = 1;
-               s5req[i++] = 0;
-
-               if(c->address.sa.sa_family == AF_INET) {
-                       s5req[i++] = 1;
-                       memcpy(s5req + i, &c->address.in.sin_addr, 4);
-                       i += 4;
-                       memcpy(s5req + i, &c->address.in.sin_port, 2);
-                       i += 2;
-                       c->tcplen += 10;
-               } else if(c->address.sa.sa_family == AF_INET6) {
-                       s5req[i++] = 3;
-                       memcpy(s5req + i, &c->address.in6.sin6_addr, 16);
-                       i += 16;
-                       memcpy(s5req + i, &c->address.in6.sin6_port, 2);
-                       i += 2;
-                       c->tcplen += 22;
-               } else {
-                       logger(mesh, MESHLINK_ERROR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
-                       return false;
-               }
-
-               if(i > len) {
-                       abort();
-               }
-
-               return send_meta(mesh, c, s5req, sizeof(s5req));
-       }
-
-       case PROXY_SOCKS4A:
-               logger(mesh, MESHLINK_ERROR, "Proxy type not implemented yet");
-               return false;
-
-       default:
-               logger(mesh, MESHLINK_ERROR, "Unknown proxy type");
-               return false;
-       }
-}
-
 bool send_id(meshlink_handle_t *mesh, connection_t *c) {
-       if(mesh->proxytype && c->outgoing)
-               if(!send_proxyrequest(mesh, c)) {
-                       return false;
-               }
-
        return send_request(mesh, c, NULL, "%d %s %d.%d %s", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname);
 }
 
@@ -471,6 +365,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        /* Activate this connection */
 
        c->allow_request = ALL;
+       c->last_key_renewal = mesh->loop.now.tv_sec;
        c->status.active = true;
 
        logger(mesh, MESHLINK_INFO, "Connection with %s activated", c->name);