#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);
+ 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();
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!");
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(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;
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;