X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_misc.c;fp=src%2Fprotocol_misc.c;h=8a536e37ea90898ecd07d20a3cd21c0f1acf7163;hp=5499b344f5106a9fbea8b352d2fb2b6bc8cb4c3a;hb=a227843b739d279b63adcf3736ebb03d856080c4;hpb=5dde6461a321ee47b06e33f8203f2acf00a31a51

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 5499b344..8a536e37 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -34,8 +34,6 @@ int maxoutbufsize = 0;
 /* Status and error notification routines */
 
 bool send_status(connection_t *c, int statusno, const char *statusstring) {
-	cp();
-
 	if(!statusstring)
 		statusstring = "Status";
 
@@ -46,8 +44,6 @@ bool status_h(connection_t *c) {
 	int statusno;
 	char statusstring[MAX_STRING_SIZE];
 
-	cp();
-
 	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
 			   c->name, c->hostname);
@@ -61,8 +57,6 @@ bool status_h(connection_t *c) {
 }
 
 bool send_error(connection_t *c, int err, const char *errstring) {
-	cp();
-
 	if(!errstring)
 		errstring = "Error";
 
@@ -73,8 +67,6 @@ bool error_h(connection_t *c) {
 	int err;
 	char errorstring[MAX_STRING_SIZE];
 
-	cp();
-
 	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
 			   c->name, c->hostname);
@@ -90,22 +82,16 @@ bool error_h(connection_t *c) {
 }
 
 bool send_termreq(connection_t *c) {
-	cp();
-
 	return send_request(c, "%d", TERMREQ);
 }
 
 bool termreq_h(connection_t *c) {
-	cp();
-
 	terminate_connection(c, c->status.active);
 
 	return true;
 }
 
 bool send_ping(connection_t *c) {
-	cp();
-
 	c->status.pinged = true;
 	c->last_ping_time = now;
 
@@ -113,20 +99,14 @@ bool send_ping(connection_t *c) {
 }
 
 bool ping_h(connection_t *c) {
-	cp();
-
 	return send_pong(c);
 }
 
 bool send_pong(connection_t *c) {
-	cp();
-
 	return send_request(c, "%d", PONG);
 }
 
 bool pong_h(connection_t *c) {
-	cp();
-
 	c->status.pinged = false;
 
 	/* Succesful connection, reset timeout if this is an outgoing connection. */
@@ -140,8 +120,6 @@ bool pong_h(connection_t *c) {
 /* Sending and receiving packets via TCP */
 
 bool send_tcppacket(connection_t *c, vpn_packet_t *packet) {
-	cp();
-
 	/* If there already is a lot of data in the outbuf buffer, discard this packet.
            We use a very simple Random Early Drop algorithm. */
 
@@ -157,8 +135,6 @@ bool send_tcppacket(connection_t *c, vpn_packet_t *packet) {
 bool tcppacket_h(connection_t *c) {
 	short int len;
 
-	cp();
-
 	if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
 			   c->hostname);