X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=97cbed2a316959e6b3e697320be3ebcea62a37ad;hb=89d675c474a6717d9daa8b5d9ff2c0f2c03666f9;hp=42e947101657871df945eded603c039f2b3d29af;hpb=682042b856da86ef01fd93483d0871f7e312d87b;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index 42e94710..97cbed2a 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -28,27 +28,28 @@
 #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!");
+		logger(mesh, MESHLINK_ERROR, "send_meta_sptps() called with NULL pointer!");
 		abort();
 	}
 
-	buffer_add(&c->outbuf, buffer, length);
+	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!");
+		logger(mesh, MESHLINK_ERROR, "send_meta() called with NULL pointer!");
 		abort();
 	}
 
-	logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
+	logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
 			   c->name, c->hostname);
 
 	if(c->allow_request == ID) {
@@ -60,28 +61,30 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 	return sptps_send_record(&c->sptps, 0, buffer, length);
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length) {
+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!");
+		logger(mesh, MESHLINK_ERROR, "receive_meta_sptps() called with NULL pointer!");
 		abort();
 	}
 
 	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? */
@@ -89,22 +92,22 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 	if(c->tcplen) {
 		if(length != c->tcplen)
 			return false;
-		receive_tcppacket(mesh, 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;
@@ -121,7 +124,7 @@ bool receive_meta(connection_t *c) {
 	buffer_compact(&c->inbuf, MAXBUFSIZE);
 
 	if(sizeof inbuf <= c->inbuf.len) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Input buffer full for %s (%s)", c->name, c->hostname);
 		return false;
 	}
 
@@ -129,12 +132,12 @@ bool receive_meta(connection_t *c) {
 
 	if(inlen <= 0) {
 		if(!inlen || !errno) {
-			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)",
+			logger(mesh, MESHLINK_INFO, "Connection closed by %s (%s)",
 					   c->name, c->hostname);
 		} else if(sockwouldblock(sockerrno))
 			return true;
 		else
-			logger(DEBUG_ALWAYS, LOG_ERR, "Metadata socket read error for %s (%s): %s",
+			logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s (%s): %s",
 				   c->name, c->hostname, sockstrerror(sockerrno));
 		return false;
 	}
@@ -154,7 +157,7 @@ bool receive_meta(connection_t *c) {
 		while(c->inbuf.len) {
 			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;