X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=e31c171cc7987f34c3f387bd13ab7974fe6398cb;hb=ea6d38aa8cbb366831153575c725022db7f84a82;hp=645954965550c601e098f18185c191617aaef540;hpb=5bd8b9914b56dafafe5e6a68a3a197f59c56ba19;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index 64595496..e31c171c 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -19,9 +19,9 @@
 
 #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"
@@ -30,6 +30,7 @@
 
 bool send_meta_sptps(void *handle, uint8_t type, const char *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!");
@@ -37,12 +38,12 @@ bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t leng
 	}
 
 	buffer_add(&c->outbuf, buffer, length);
-	io_set(&c->io, IO_READ | IO_WRITE);
+	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();
@@ -53,21 +54,22 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
 
 	if(c->allow_request == ID) {
 		buffer_add(&c->outbuf, buffer, length);
-		io_set(&c->io, IO_READ | IO_WRITE);
+		io_set(&mesh->loop, &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) {
 	connection_t *c = handle;
+	meshlink_handle_t *mesh = c->mesh;
 
 	if(!c) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
@@ -76,7 +78,7 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 
 	if(type == SPTPS_HANDSHAKE) {
 		if(c->allow_request == ACK)
-			return send_ack(c);
+			return send_ack(mesh, c);
 		else
 			return true;
 	}
@@ -89,7 +91,7 @@ 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(c, data, length);
+		receive_tcppacket(mesh, c, data, length);
 		c->tcplen = 0;
 		return true;
 	}
@@ -101,10 +103,10 @@ bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
 
 	/* Otherwise we are waiting for a request */
 
-	return receive_request(c, data);
+	return receive_request(mesh, c, data);
 }
 
-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;
@@ -154,7 +156,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;