X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=c6a3630ae2ea190fc27ee41dbe8b9206c85591b9;hp=727881bd1080476d2c5d9303b76d315f702cc2a0;hb=902446edf822a32383c4fa4b7c13b83a568095ad;hpb=b67296418c51784d39a24c3041e2cb199bee06f2

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 727881bd..c6a3630a 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];
 
@@ -48,6 +51,9 @@ bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 }
 
 bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	int err;
 	char errorstring[MAX_STRING_SIZE];
 
@@ -65,6 +71,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;
 }
 
@@ -72,35 +82,35 @@ bool send_ping(meshlink_handle_t *mesh, connection_t *c) {
 	c->status.pinged = true;
 	c->last_ping_time = mesh->loop.now.tv_sec;
 
-	return send_request(mesh, c, "%d", PING);
+	return send_request(mesh, c, NULL, "%d", PING);
 }
 
 bool ping_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	(void)request;
+
+	assert(request);
+	assert(*request);
+
 	return send_pong(mesh, c);
 }
 
 bool send_pong(meshlink_handle_t *mesh, connection_t *c) {
-	return send_request(mesh, c, "%d", PONG);
+	return send_request(mesh, c, NULL, "%d", PONG);
 }
 
 bool pong_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	(void)mesh;
 	(void)request;
-	c->status.pinged = false;
 
-	/* Succesful connection, reset timeout if this is an outgoing connection. */
+	assert(request);
+	assert(*request);
 
-	if(c->outgoing) {
-		c->outgoing->timeout = 0;
-		c->outgoing->cfg = NULL;
+	c->status.pinged = false;
 
-		if(c->outgoing->ai) {
-			freeaddrinfo(c->outgoing->ai);
-		}
+	/* Successful connection, reset timeout if this is an outgoing connection. */
 
-		c->outgoing->ai = NULL;
-		c->outgoing->aip = NULL;
+	if(c->outgoing) {
+		reset_outgoing(c->outgoing);
 	}
 
 	return true;
@@ -109,6 +119,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) {