X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=af3caddf8957f38006a540ddc331cfe0823efcdd;hb=HEAD;hp=8855d20e22a6ada4967c6bd8df759103173ccf2e;hpb=ec02aca3d7888f072c5c0d52ba6b5c37ed42b69e;p=meshlink

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 8855d20e..65895437 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -34,6 +34,9 @@ int maxoutbufsize = 0;
 /* Status and error notification routines */
 
 bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	int statusno;
 	char statusstring[MAX_STRING_SIZE];
 
@@ -47,7 +50,16 @@ bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	return true;
 }
 
+bool send_error(meshlink_handle_t *mesh, connection_t *c, request_error_t err, const char *message) {
+	send_request(mesh, c, NULL, "%d %d %s", ERROR, err, message);
+	flush_meta(mesh, c);
+	return false;
+}
+
 bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	int err;
 	char errorstring[MAX_STRING_SIZE];
 
@@ -58,6 +70,13 @@ bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	logger(mesh, MESHLINK_INFO, "Error message from %s: %d: %s", c->name, err, errorstring);
 
+	switch(err) {
+	case BLACKLISTED:
+		if(mesh->blacklisted_cb) {
+			mesh->blacklisted_cb(mesh, (meshlink_node_t *)lookup_node(mesh, c->name));
+		}
+	}
+
 	return false;
 }
 
@@ -65,6 +84,10 @@ bool termreq_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	(void)mesh;
 	(void)c;
 	(void)request;
+
+	assert(request);
+	assert(*request);
+
 	return false;
 }
 
@@ -77,6 +100,10 @@ bool send_ping(meshlink_handle_t *mesh, connection_t *c) {
 
 bool ping_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	(void)request;
+
+	assert(request);
+	assert(*request);
+
 	return send_pong(mesh, c);
 }
 
@@ -87,20 +114,16 @@ bool send_pong(meshlink_handle_t *mesh, connection_t *c) {
 bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	(void)mesh;
 	(void)request;
+
+	assert(request);
+	assert(*request);
+
 	c->status.pinged = false;
 
 	/* Successful connection, reset timeout if this is an outgoing connection. */
 
 	if(c->outgoing) {
-		c->outgoing->timeout = 0;
-		c->outgoing->cfg = NULL;
-
-		if(c->outgoing->ai) {
-			freeaddrinfo(c->outgoing->ai);
-		}
-
-		c->outgoing->ai = NULL;
-		c->outgoing->aip = NULL;
+		reset_outgoing(c->outgoing);
 	}
 
 	return true;
@@ -109,6 +132,9 @@ bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 /* Sending and receiving packets via TCP */
 
 bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	short int len;
 
 	if(sscanf(request, "%*d %hd", &len) != 1) {
@@ -119,3 +145,16 @@ bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request)
 	// This should never happen with MeshLink.
 	return false;
 }
+
+bool send_raw_packet(meshlink_handle_t *mesh, connection_t *c, const vpn_packet_t *packet) {
+	size_t hdrsize = sizeof(meshlink_packethdr_t);
+	assert(packet->len >= hdrsize);
+	return send_request(mesh, c, NULL, "%d", PACKET) && send_meta(mesh, c, (const char *)packet->data + hdrsize, packet->len - hdrsize);
+}
+
+bool raw_packet_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	(void)mesh;
+	(void)request;
+	c->status.raw_packet = true;
+	return true;
+}