#include "system.h"
-#include "cipher.h"
#include "connection.h"
#include "logger.h"
+#include "meshlink_internal.h"
#include "meta.h"
#include "net.h"
#include "protocol.h"
#include "utils.h"
#include "xalloc.h"
-bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t length) {
+bool send_meta_sptps(void *handle, uint8_t type, const void *buffer, size_t length) {
connection_t *c = handle;
+ meshlink_handle_t *mesh = c->mesh;
if(!c) {
logger(DEBUG_ALWAYS, LOG_ERR, "send_meta_sptps() called with NULL pointer!");
abort();
}
- buffer_add(&c->outbuf, buffer, length);
- io_set(&c->io, IO_READ | IO_WRITE);
+ buffer_add(&c->outbuf, (const char *)buffer, length);
+ io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
return true;
}
-bool send_meta(connection_t *c, const char *buffer, int length) {
+bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int length) {
if(!c) {
logger(DEBUG_ALWAYS, LOG_ERR, "send_meta() called with NULL pointer!");
abort();
logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
c->name, c->hostname);
- if(c->protocol_minor >= 2)
- return sptps_send_record(&c->sptps, 0, buffer, length);
-
- /* Add our data to buffer */
- if(c->status.encryptout) {
- size_t outlen = length;
-
- if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
- c->name, c->hostname);
- return false;
- }
- } else {
+ if(c->allow_request == ID) {
buffer_add(&c->outbuf, buffer, length);
+ io_set(&mesh->loop, &c->io, IO_READ | IO_WRITE);
+ return true;
}
- io_set(&c->io, IO_READ | IO_WRITE);
-
- return true;
+ return sptps_send_record(&c->sptps, 0, buffer, length);
}
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
- for list_each(connection_t, c, connection_list)
+void broadcast_meta(meshlink_handle_t *mesh, connection_t *from, const char *buffer, int length) {
+ for list_each(connection_t, c, mesh->connections)
if(c != from && c->status.active)
- send_meta(c, buffer, length);
+ send_meta(mesh, c, buffer, length);
}
-bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
+bool receive_meta_sptps(void *handle, uint8_t type, const void *data, uint16_t length) {
connection_t *c = handle;
+ meshlink_handle_t *mesh = c->mesh;
+ char *request = (char *)data;
if(!c) {
logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
if(type == SPTPS_HANDSHAKE) {
if(c->allow_request == ACK)
- return send_ack(c);
+ return send_ack(mesh, c);
else
return true;
}
- if(!data)
+ if(!request)
return true;
/* Are we receiving a TCPpacket? */
if(c->tcplen) {
if(length != c->tcplen)
return false;
- receive_tcppacket(c, data, length);
+ receive_tcppacket(mesh, c, request, length);
c->tcplen = 0;
return true;
}
/* Change newline to null byte, just like non-SPTPS requests */
- if(data[length - 1] == '\n')
- ((char *)data)[length - 1] = 0;
+ if(request[length - 1] == '\n')
+ request[length - 1] = 0;
/* Otherwise we are waiting for a request */
- return receive_request(c, data);
+ return receive_request(mesh, c, request);
}
-bool receive_meta(connection_t *c) {
+bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
int inlen;
char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp;
return false;
}
- do {
- if(c->protocol_minor >= 2)
- return sptps_receive_data(&c->sptps, bufp, inlen);
-
- if(!c->status.decryptin) {
- endp = memchr(bufp, '\n', inlen);
- if(endp)
- endp++;
- else
- endp = bufp + inlen;
+ if(c->allow_request == ID) {
+ endp = memchr(bufp, '\n', inlen);
+ if(endp)
+ endp++;
+ else
+ endp = bufp + inlen;
- buffer_add(&c->inbuf, bufp, endp - bufp);
+ buffer_add(&c->inbuf, bufp, endp - bufp);
- inlen -= endp - bufp;
- bufp = endp;
- } else {
- size_t outlen = inlen;
-
- if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
- c->name, c->hostname);
- return false;
- }
-
- inlen = 0;
- }
+ inlen -= endp - bufp;
+ bufp = endp;
while(c->inbuf.len) {
- /* Are we receiving a TCPpacket? */
-
- if(c->tcplen) {
- char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
- if(!tcpbuffer)
- break;
-
- if(!c->node) {
- if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
- if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) {
- logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
- } else {
- logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
- return false;
- }
- } else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
- if(tcpbuffer[0] != 5) {
- logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
- return false;
- }
- if(tcpbuffer[1] == (char)0xff) {
- logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method");
- return false;
- }
- if(tcpbuffer[2] != 5) {
- logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
- return false;
- }
- if(tcpbuffer[3] == 0) {
- logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
- } else {
- logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request rejected");
- return false;
- }
- } else {
- logger(DEBUG_CONNECTIONS, LOG_ERR, "c->tcplen set but c->node is NULL!");
- abort();
- }
- } else {
- if(c->allow_request == ALL) {
- receive_tcppacket(c, tcpbuffer, c->tcplen);
- } else {
- logger(DEBUG_CONNECTIONS, LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname);
- return false;
- }
- }
-
- c->tcplen = 0;
- }
-
- /* Otherwise we are waiting for a request */
-
char *request = buffer_readline(&c->inbuf);
if(request) {
- bool result = receive_request(c, request);
+ bool result = receive_request(mesh, c, request);
if(!result)
return false;
continue;
break;
}
}
- } while(inlen);
- return true;
+ return true;
+ }
+
+ return sptps_receive_data(&c->sptps, bufp, inlen);
}
projects / meshlink / blobdiff