Remove newlines from log messages.
[tinc] / src / protocol.c
index 9b2ec91..0d58d6a 100644 (file)
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
+                  2000,2001 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
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.128 2002/03/27 15:26:43 guus Exp $
+    $Id: protocol.c,v 1.28.4.146 2003/08/03 12:38:43 guus Exp $
 */
 
-#include "config.h"
+#include "system.h"
 
-#include <sys/types.h>
+#include "conf.h"
+#include "connection.h"
+#include "logger.h"
+#include "meta.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
+/* Jumptable for the request handlers */
 
-#include <utils.h>
-#include <xalloc.h>
+static bool (*request_handlers[])(connection_t *) = {
+               id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+               status_h, error_h, termreq_h,
+               ping_h, pong_h,
+               add_subnet_h, del_subnet_h,
+               add_edge_h, del_edge_h,
+               key_changed_h, req_key_h, ans_key_h, tcppacket_h,
+};
 
-#include "conf.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
+/* Request names */
 
-#include "system.h"
+static char (*request_name[]) = {
+               "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
+               "STATUS", "ERROR", "TERMREQ",
+               "PING", "PONG",
+               "ADD_SUBNET", "DEL_SUBNET",
+               "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
+};
 
-avl_tree_t *past_request_tree;
+static avl_tree_t *past_request_tree;
 
-int check_id(char *id)
+bool check_id(const char *id)
 {
-  int i;
+       for(; *id; id++)
+               if(!isalnum(*id) && *id != '_')
+                       return false;
 
-  for (i = 0; i < strlen(id); i++)
-    if(!isalnum(id[i]) && id[i] != '_')
-      return -1;
-  
-  return 0;
+       return true;
 }
 
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-int send_request(connection_t *c, const char *format, ...)
+bool send_request(connection_t *c, const char *format, ...)
+{
+       va_list args;
+       char buffer[MAXBUFSIZE];
+       int len, request;
+
+       cp();
+
+       /* Use vsnprintf instead of vasprintf: faster, no memory
+          fragmentation, cleanup is automatic, and there is a limit on the
+          input buffer anyway */
+
+       va_start(args, format);
+       len = vsnprintf(buffer, MAXBUFSIZE, format, args);
+       va_end(args);
+
+       if(len < 0 || len > MAXBUFSIZE - 1) {
+               logger(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"),
+                          c->name, c->hostname);
+               return false;
+       }
+
+       ifdebug(PROTOCOL) {
+               sscanf(buffer, "%d", &request);
+               ifdebug(META)
+                       logger(LOG_DEBUG, _("Sending %s to %s (%s): %s"),
+                                  request_name[request], c->name, c->hostname, buffer);
+               else
+                       logger(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request],
+                                  c->name, c->hostname);
+       }
+
+       buffer[len++] = '\n';
+
+       if(c == broadcast) {
+               broadcast_meta(NULL, buffer, len);
+               return true;
+       } else
+               return send_meta(c, buffer, len);
+}
+
+void forward_request(connection_t *from)
 {
-  va_list args;
-  char buffer[MAXBUFSIZE];
-  int len, request;
-
-cp
-  /* Use vsnprintf instead of vasprintf: faster, no memory
-     fragmentation, cleanup is automatic, and there is a limit on the
-     input buffer anyway */
-
-  va_start(args, format);
-  len = vsnprintf(buffer, MAXBUFSIZE, format, args);
-  va_end(args);
-
-  if(len < 0 || len > MAXBUFSIZE-1)
-    {
-      syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), c->name, c->hostname);
-      return -1;
-    }
-
-  if(debug_lvl >= DEBUG_PROTOCOL)
-    {
-      sscanf(buffer, "%d", &request);
-      if(debug_lvl >= DEBUG_META)
-        syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], c->name, c->hostname, buffer);
-      else
-        syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], c->name, c->hostname);
-    }
-
-  buffer[len++] = '\n';
-cp
-  return send_meta(c, buffer, len);
+       int request;
+
+       cp();
+
+       ifdebug(PROTOCOL) {
+               sscanf(from->buffer, "%d", &request);
+               ifdebug(META)
+                       logger(LOG_DEBUG, _("Forwarding %s from %s (%s): %s"),
+                                  request_name[request], from->name, from->hostname,
+                                  from->buffer);
+               else
+                       logger(LOG_DEBUG, _("Forwarding %s from %s (%s)"),
+                                  request_name[request], from->name, from->hostname);
+       }
+
+       from->buffer[from->reqlen - 1] = '\n';
+
+       broadcast_meta(from, from->buffer, from->reqlen);
 }
 
-int receive_request(connection_t *c)
+bool receive_request(connection_t *c)
 {
-  int request;
-cp
-  if(sscanf(c->buffer, "%d", &request) == 1)
-    {
-      if((request < 0) || (request >= LAST) || (request_handlers[request] == NULL))
-        {
-          if(debug_lvl >= DEBUG_META)
-            syslog(LOG_DEBUG, _("Unknown request from %s (%s): %s"),
-                  c->name, c->hostname, c->buffer);
-          else
-            syslog(LOG_ERR, _("Unknown request from %s (%s)"),
-                   c->name, c->hostname);
-                   
-          return -1;
-        }
-      else
-        {
-          if(debug_lvl >= DEBUG_PROTOCOL)
-            {
-              if(debug_lvl >= DEBUG_META)
-                syslog(LOG_DEBUG, _("Got %s from %s (%s): %s"),
-                      request_name[request], c->name, c->hostname, c->buffer);
-              else
-                syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
-                      request_name[request], c->name, c->hostname);
-            }
+       int request;
+
+       cp();
+
+       if(sscanf(c->buffer, "%d", &request) == 1) {
+               if((request < 0) || (request >= LAST) || !request_handlers[request]) {
+                       ifdebug(META)
+                               logger(LOG_DEBUG, _("Unknown request from %s (%s): %s"),
+                                          c->name, c->hostname, c->buffer);
+                       else
+                               logger(LOG_ERR, _("Unknown request from %s (%s)"),
+                                          c->name, c->hostname);
+
+                       return false;
+               } else {
+                       ifdebug(PROTOCOL) {
+                               ifdebug(META)
+                                       logger(LOG_DEBUG, _("Got %s from %s (%s): %s"),
+                                                  request_name[request], c->name, c->hostname,
+                                                  c->buffer);
+                               else
+                                       logger(LOG_DEBUG, _("Got %s from %s (%s)"),
+                                                  request_name[request], c->name, c->hostname);
+                       }
+               }
+
+               if((c->allow_request != ALL) && (c->allow_request != request)) {
+                       logger(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name,
+                                  c->hostname);
+                       return false;
+               }
+
+               if(!request_handlers[request](c)) {
+                       /* Something went wrong. Probably scriptkiddies. Terminate. */
+
+                       logger(LOG_ERR, _("Error while processing %s from %s (%s)"),
+                                  request_name[request], c->name, c->hostname);
+                       return false;
+               }
+       } else {
+               logger(LOG_ERR, _("Bogus data received from %s (%s)"),
+                          c->name, c->hostname);
+               return false;
        }
 
-      if((c->allow_request != ALL) && (c->allow_request != request))
-        {
-          syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name, c->hostname);
-          return -1;
-        }
-
-      if(request_handlers[request](c))
-       /* Something went wrong. Probably scriptkiddies. Terminate. */
-        {
-          syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
-                request_name[request], c->name, c->hostname);
-          return -1;
-        }
-    }
-  else
-    {
-      syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
-            c->name, c->hostname);
-      return -1;
-    }
-cp
-  return 0;
+       return true;
 }
 
-int past_request_compare(past_request_t *a, past_request_t *b)
+static int past_request_compare(const past_request_t *a, const past_request_t *b)
 {
-cp
-  return strcmp(a->request, b->request);
+       return strcmp(a->request, b->request);
 }
 
-void free_past_request(past_request_t *r)
+static void free_past_request(past_request_t *r)
 {
-cp
-  if(r->request)
-    free(r->request);
-  free(r);
-cp
+       cp();
+
+       if(r->request)
+               free(r->request);
+
+       free(r);
 }
 
 void init_requests(void)
 {
-cp
-  past_request_tree = avl_alloc_tree((avl_compare_t)past_request_compare, (avl_action_t)free_past_request);
-cp
+       cp();
+
+       past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
 }
 
 void exit_requests(void)
 {
-cp
-  avl_delete_tree(past_request_tree);
-cp
+       cp();
+
+       avl_delete_tree(past_request_tree);
 }
 
-int seen_request(char *request)
+bool seen_request(char *request)
 {
-  past_request_t p, *new;
-cp
-  p.request = request;
-
-  if(avl_search(past_request_tree, &p))
-    {
-      if(debug_lvl >= DEBUG_SCARY_THINGS)
-        syslog(LOG_DEBUG, _("Already seen request"));
-      return 1;
-    }
-  else
-    {
-      new = (past_request_t *)xmalloc(sizeof(*new));
-      new->request = xstrdup(request);
-      new->firstseen = now;
-      avl_insert(past_request_tree, new);
-      return 0;
-    }
-cp  
+       past_request_t *new, p = {0};
+
+       cp();
+
+       p.request = request;
+
+       if(avl_search(past_request_tree, &p)) {
+               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request"));
+               return true;
+       } else {
+               new = (past_request_t *) xmalloc(sizeof(*new));
+               new->request = xstrdup(request);
+               new->firstseen = now;
+               avl_insert(past_request_tree, new);
+               return false;
+       }
 }
 
 void age_past_requests(void)
 {
-  avl_node_t *node, *next;
-  past_request_t *p;
-  int left = 0, deleted = 0;
-cp 
-  for(node = past_request_tree->head; node; node = next)
-    {
-      next = node->next;
-      p = (past_request_t *)node->data;
-      if(p->firstseen + pingtimeout < now)
-        avl_delete_node(past_request_tree, node), deleted++;
-      else
-        left++;
-    }
-
-  if(debug_lvl >= DEBUG_SCARY_THINGS && left + deleted)
-    syslog(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"), deleted, left);
-cp
-}
+       avl_node_t *node, *next;
+       past_request_t *p;
+       int left = 0, deleted = 0;
 
-/* Jumptable for the request handlers */
+       cp();
 
-int (*request_handlers[])(connection_t*) = {
-  id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
-  status_h, error_h, termreq_h,
-  ping_h, pong_h,
-  add_subnet_h, del_subnet_h,
-  add_edge_h, del_edge_h,
-  key_changed_h, req_key_h, ans_key_h,
-  tcppacket_h,
-};
+       for(node = past_request_tree->head; node; node = next) {
+               next = node->next;
+               p = (past_request_t *) node->data;
 
-/* Request names */
+               if(p->firstseen + pingtimeout < now)
+                       avl_delete_node(past_request_tree, node), deleted++;
+               else
+                       left++;
+       }
 
-char (*request_name[]) = {
-  "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
-  "STATUS", "ERROR", "TERMREQ",
-  "PING", "PONG",
-  "ADD_SUBNET", "DEL_SUBNET",
-  "ADD_EDGE", "DEL_EDGE",
-  "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
-  "PACKET",
-};
+       if(left || deleted)
+               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d"),
+                          deleted, left);
+}