X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_misc.c;h=934a1820866f9cb710a4354795430473c66d37d2;hp=18155e94200606053c02edaa9b5d6a0f7734e039;hb=e449d94caef963809d417f16497f6f978e10d731;hpb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 18155e94..934a1820 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,40 +17,19 @@
     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.9 2003/07/06 23:16:29 guus Exp $
+    $Id: protocol_misc.c,v 1.1.4.11 2003/07/17 15:06:26 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.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 "logger.h"
-
-#include "system.h"
-
-/* Status strings */
-
-static char (*status_text[]) = {
-	"Warning",
-};
-
-/* Error strings */
-
-static char (*error_text[]) = {
-	"Error",
-};
+#include "utils.h"
 
 /* Status and error notification routines */
 
@@ -59,7 +38,7 @@ int 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);
 }
@@ -72,13 +51,13 @@ int status_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-		logger(DEBUG_ALWAYS, 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;
 	}
 
-	logger(DEBUG_STATUS, 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;
 }
@@ -88,7 +67,7 @@ int 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);
 }
@@ -101,13 +80,13 @@ int error_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-		logger(DEBUG_ALWAYS, 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;
 	}
 
-	logger(DEBUG_ERROR, 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);
 
@@ -193,7 +172,7 @@ int tcppacket_h(connection_t *c)
 	cp();
 
 	if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
-		logger(DEBUG_ALWAYS, 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;
 	}