Simplify logging, update copyrights and some minor cleanups.

[tinc] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 5863f9e..d5c9aeb 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -1,7 +1,7 @@
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions

-    Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    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
 
     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,14 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     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.1 2002/02/11 10:05:58 guus Exp $
+    $Id: protocol_misc.c,v 1.1.4.10 2003/07/12 17:41:47 guus Exp $

 */
 
 #include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 */
 
 #include "config.h"
 
 #include <stdlib.h>
 #include <string.h>

-#include <syslog.h>

 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>


@@ -37,6 +36,7 @@
 #include "protocol.h"
 #include "meta.h"
 #include "connection.h"
 #include "protocol.h"
 #include "meta.h"
 #include "connection.h"

+#include "logger.h"

 
 #include "system.h"
 
 
 #include "system.h"
 


@@ -44,150 +44,151 @@
 
 int send_status(connection_t *c, int statusno, char *statusstring)
 {
 
 int send_status(connection_t *c, int statusno, char *statusstring)
 {

-cp
-  if(!statusstring)
-    statusstring = status_text[statusno];
-cp
-  return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
+       cp();
+
+       if(!statusstring)
+               statusstring = "Status";
+
+       return send_request(c, "%d %d %s", STATUS, statusno, statusstring);

 }
 
 int status_h(connection_t *c)
 {
 }
 
 int status_h(connection_t *c)
 {

-  int statusno;
-  char statusstring[MAX_STRING_SIZE];
-cp
-  if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
-    {
-       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
-              c->name, c->hostname);
-       return -1;
-    }
-
-  if(debug_lvl >= DEBUG_STATUS)
-    {
-      syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
-             c->name, c->hostname, status_text[statusno], statusstring);
-    }
-
-cp
-  return 0;
+       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);
+               return -1;
+       }
+
+       ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"),
+                          c->name, c->hostname, statusno, statusstring);
+
+       return 0;

 }
 
 int send_error(connection_t *c, int err, char *errstring)
 {
 }
 
 int send_error(connection_t *c, int err, char *errstring)
 {

-cp
-  if(!errstring)
-    errstring = strerror(err);
-  return send_request(c, "%d %d %s", ERROR, err, errstring);
+       cp();
+
+       if(!errstring)
+               errstring = "Error";
+
+       return send_request(c, "%d %d %s", ERROR, err, errstring);

 }
 
 int error_h(connection_t *c)
 {
 }
 
 int error_h(connection_t *c)
 {

-  int err;
-  char errorstring[MAX_STRING_SIZE];
-cp
-  if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
-    {
-       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
-              c->name, c->hostname);
-       return -1;
-    }
-
-  if(debug_lvl >= DEBUG_ERROR)
-    {
-      syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
-             c->name, c->hostname, strerror(err), errorstring);
-    }
-
-  terminate_connection(c, c->status.active);
-cp
-  return 0;
+       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);
+               return -1;
+       }
+
+       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;

 }
 
 int send_termreq(connection_t *c)
 {
 }
 
 int send_termreq(connection_t *c)
 {

-cp
-  return send_request(c, "%d", TERMREQ);
+       cp();
+
+       return send_request(c, "%d", TERMREQ);

 }
 
 int termreq_h(connection_t *c)
 {
 }
 
 int termreq_h(connection_t *c)
 {

-cp
-  terminate_connection(c, c->status.active);
-cp
-  return 0;
+       cp();
+
+       terminate_connection(c, c->status.active);
+
+       return 0;

 }
 
 int send_ping(connection_t *c)
 {
 }
 
 int send_ping(connection_t *c)
 {

-cp
-  c->status.pinged = 1;
-  c->last_ping_time = time(NULL);
-cp
-  return send_request(c, "%d", PING);
+       cp();
+
+       c->status.pinged = 1;
+       c->last_ping_time = now;
+
+       return send_request(c, "%d", PING);

 }
 
 int ping_h(connection_t *c)
 {
 }
 
 int ping_h(connection_t *c)
 {

-cp
-  return send_pong(c);
+       cp();
+
+       return send_pong(c);

 }
 
 int send_pong(connection_t *c)
 {
 }
 
 int send_pong(connection_t *c)
 {

-cp
-  return send_request(c, "%d", PONG);
+       cp();
+
+       return send_request(c, "%d", PONG);

 }
 
 int pong_h(connection_t *c)
 {
 }
 
 int pong_h(connection_t *c)
 {

-cp
-  c->status.pinged = 0;
-cp
-  return 0;
+       cp();
+
+       c->status.pinged = 0;
+
+       /* Succesful connection, reset timeout if this is an outgoing connection. */
+
+       if(c->outgoing)
+               c->outgoing->timeout = 0;
+
+       return 0;

 }
 
 /* Sending and receiving packets via TCP */
 
 int send_tcppacket(connection_t *c, vpn_packet_t *packet)
 {
 }
 
 /* Sending and receiving packets via TCP */
 
 int send_tcppacket(connection_t *c, vpn_packet_t *packet)
 {

-  int x;
-cp  
-  /* Evil hack. */
+       int x;
+
+       cp();
+
+       /* Evil hack. */
+
+       x = send_request(c, "%d %hd", PACKET, packet->len);

 
 

-  x = send_request(c, "%d %hd", PACKET, packet->len);
+       if(x)
+               return x;

 
 

-  if(x)
-    return x;
-cp
-  return send_meta(c, packet->data, packet->len);
+       return send_meta(c, packet->data, packet->len);

 }
 
 int tcppacket_h(connection_t *c)
 {
 }
 
 int 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, c->hostname);
-      return -1;
-    }
-
-  /* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
-
-  c->tcplen = len;
-cp
-  return 0;
-}
+       short int len;
+
+       cp();

 
 

-/* Status strings */
+       if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
+               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
+                          c->hostname);
+               return -1;
+       }

 
 

-char (*status_text[]) = {
-  "Warning",
-};
+       /* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */

 
 

-/* Error strings */
+       c->tcplen = len;

 
 

-char (*error_text[]) = {
-  "Error",
-};
+       return 0;
+}