X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=25a86abe4ec0d62bd6440468662a7faade82b619;hp=4dcdd927993de7c6b327be02916b1cbac5bd4bc2;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 4dcdd927..25a86abe 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -1,7 +1,7 @@
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions
-    Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,42 +17,33 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_misc.c,v 1.1.4.6 2002/09/09 21:25:02 guus Exp $
+    $Id: protocol_misc.c,v 1.1.4.12 2003/07/22 20:55:20 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
+#include "system.h"
 
 #include "conf.h"
+#include "connection.h"
+#include "logger.h"
+#include "meta.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
-#include "meta.h"
-#include "connection.h"
-
-#include "system.h"
+#include "utils.h"
 
 /* Status and error notification routines */
 
-int send_status(connection_t * c, int statusno, char *statusstring)
+bool send_status(connection_t *c, int statusno, char *statusstring)
 {
 	cp();
 
 	if(!statusstring)
-		statusstring = status_text[statusno];
+		statusstring = "Status";
 
 	return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
 }
 
-int status_h(connection_t * c)
+bool status_h(connection_t *c)
 {
 	int statusno;
 	char statusstring[MAX_STRING_SIZE];
@@ -60,30 +51,28 @@ int status_h(connection_t * c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
 			   c->name, c->hostname);
-		return -1;
+		return false;
 	}
 
-	if(debug_lvl >= DEBUG_STATUS) {
-		syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
-			   c->name, c->hostname, status_text[statusno], statusstring);
-	}
+	ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"),
+			   c->name, c->hostname, statusno, statusstring);
 
-	return 0;
+	return true;
 }
 
-int send_error(connection_t * c, int err, char *errstring)
+bool send_error(connection_t *c, int err, char *errstring)
 {
 	cp();
 
 	if(!errstring)
-		errstring = strerror(err);
+		errstring = "Error";
 
 	return send_request(c, "%d %d %s", ERROR, err, errstring);
 }
 
-int error_h(connection_t * c)
+bool error_h(connection_t *c)
 {
 	int err;
 	char errorstring[MAX_STRING_SIZE];
@@ -91,120 +80,102 @@ int error_h(connection_t * c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
 			   c->name, c->hostname);
-		return -1;
+		return false;
 	}
 
-	if(debug_lvl >= DEBUG_ERROR) {
-		syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
-			   c->name, c->hostname, strerror(err), errorstring);
-	}
+	ifdebug(ERROR) logger(LOG_NOTICE, _("Error message from %s (%s): %d: %s"),
+			   c->name, c->hostname, err, errorstring);
 
 	terminate_connection(c, c->status.active);
 
-	return 0;
+	return true;
 }
 
-int send_termreq(connection_t * c)
+bool send_termreq(connection_t *c)
 {
 	cp();
 
 	return send_request(c, "%d", TERMREQ);
 }
 
-int termreq_h(connection_t * c)
+bool termreq_h(connection_t *c)
 {
 	cp();
 
 	terminate_connection(c, c->status.active);
 
-	return 0;
+	return true;
 }
 
-int send_ping(connection_t * c)
+bool send_ping(connection_t *c)
 {
 	cp();
 
-	c->status.pinged = 1;
+	c->status.pinged = true;
 	c->last_ping_time = now;
 
 	return send_request(c, "%d", PING);
 }
 
-int ping_h(connection_t * c)
+bool ping_h(connection_t *c)
 {
 	cp();
 
 	return send_pong(c);
 }
 
-int send_pong(connection_t * c)
+bool send_pong(connection_t *c)
 {
 	cp();
 
 	return send_request(c, "%d", PONG);
 }
 
-int pong_h(connection_t * c)
+bool pong_h(connection_t *c)
 {
 	cp();
 
-	c->status.pinged = 0;
+	c->status.pinged = false;
 
 	/* Succesful connection, reset timeout if this is an outgoing connection. */
 
 	if(c->outgoing)
 		c->outgoing->timeout = 0;
 
-	return 0;
+	return true;
 }
 
 /* Sending and receiving packets via TCP */
 
-int send_tcppacket(connection_t * c, vpn_packet_t * packet)
+bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
 {
-	int x;
-
 	cp();
 
 	/* Evil hack. */
 
-	x = send_request(c, "%d %hd", PACKET, packet->len);
-
-	if(x)
-		return x;
+	if(!send_request(c, "%d %hd", PACKET, packet->len))
+		return false;
 
 	return send_meta(c, packet->data, packet->len);
 }
 
-int tcppacket_h(connection_t * c)
+bool tcppacket_h(connection_t *c)
 {
 	short int len;
 
 	cp();
 
 	if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
-		syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
+		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
 			   c->hostname);
-		return -1;
+		return false;
 	}
 
 	/* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
 
 	c->tcplen = len;
 
-	return 0;
+	return true;
 }
-
-/* Status strings */
-
-char (*status_text[]) = {
-	"Warning",
-};
-
-/* Error strings */
-
-char (*error_text[]) = {
-	"Error",
-};