X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=25ed4d019ad347eee1a2cf05890d6f6dc4a0c94e;hb=f18e30dab3c208fd353af11e365791035534f444;hp=78ab00d79a36cdb25da34255f338bd29574cb56a;hpb=5afc1e98f436c4a2ed5da4b64293275b09632c79;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 78ab00d7..25ed4d01 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     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.34 2000/09/22 15:06:28 guus Exp $
+    $Id: protocol.c,v 1.28.4.38 2000/10/11 22:01:00 guus Exp $
 */
 
 #include "config.h"
@@ -43,6 +43,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
+#include "meta.h"
 
 #include "system.h"
 
@@ -61,7 +62,7 @@ int check_id(char *id)
   return 1;
 }
 
-/* Generic outgoing request routine - takes care of logging and error detection as well */
+/* Generic request routines - takes care of logging and error detection as well */
 
 int send_request(conn_list_t *cl, const char *format, int request, /*args*/ ...)
 {
@@ -83,24 +84,44 @@ cp
       return -1;
     }
 
-  if(debug_lvl >= DEBUG_META)
-    syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request],
-           cl->name, cl->hostname, buffer);
-  else if(debug_lvl >= DEBUG_PROTOCOL)
+  if(debug_lvl >= DEBUG_PROTOCOL)
     syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
+cp
+  return send_meta(cl, buffer, len);
+}
 
-
-  if(cl->status.encryptin)
+int receive_request(conn_list_t *cl)
+{
+  int request;
+cp  
+  if(sscanf(cl->buffer, "%d", &request) == 1)
     {
-      /* FIXME: Do encryption */
+      if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+        {
+          syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+		 cl->name, cl->hostname);
+          return -1;
+        }
+      else
+        {
+          if(debug_lvl > DEBUG_PROTOCOL)
+            syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
+		   request_name[request], cl->name, cl->hostname);
+	}
+      if(request_handlers[request](cl))
+	/* Something went wrong. Probably scriptkiddies. Terminate. */
+        {
+          syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
+		 request_name[request], cl->name, cl->hostname);
+          return -1;
+        }
     }
-
-  if((write(cl->meta_socket, buffer, len)) < 0)
+  else
     {
-      syslog(LOG_ERR, _("Sending meta data failed:  %m"));
+      syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+	     cl->name, cl->hostname);
       return -1;
     }
-cp
 }
 
 /* Connection protocol:
@@ -133,21 +154,15 @@ cp
 
 int send_id(conn_list_t *cl)
 {
-  int x;
-  char *optstr;
 cp
-  x = send_request(cl, "%d %s %d %s", ID, myself->name, myself->protocol_version, optstr=opt2str(myself->options));
-  free(optstr);
-cp
-  return x;
+  return send_request(cl, "%d %s %d %lx", ID, myself->name, myself->protocol_version, myself->options);
 }
 
 int id_h(conn_list_t *cl)
 {
   conn_list_t *old;
-  char *optstr;
 cp
-  if(sscanf(cl->buffer, "%*d %as %d %as", &cl->name, &cl->protocol_version, &optstr) != 3)
+  if(sscanf(cl->buffer, "%*d %as %d %lx", &cl->name, &cl->protocol_version, &cl->options) != 3)
     {
        syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
        return -1;
@@ -162,17 +177,6 @@ cp
       return -1;
     }
 
-  /* Check if option string is valid */
-
-  if((cl->options = str2opt(optstr)) == -1)
-    {
-      syslog(LOG_ERR, _("Peer %s uses invalid option string"), cl->hostname);
-      free(optstr);
-      return -1;
-    }
-
-  free(optstr);
-
   /* Check if identity is a valid name */
 
   if(!check_id(cl->name))
@@ -183,7 +187,7 @@ cp
 
   /* Load information about peer */
 
-  if(!read_id(cl))
+  if(!read_host_config(cl))
     {
       syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
       return -1;
@@ -231,7 +235,7 @@ cp
   /* Convert the random data to a hexadecimal formatted string */
 
   bin2hex(cl->hischallenge,buffer,CHAL_LENGTH);
-  buffer[keylength*2] = '\0';
+  buffer[CHAL_LENGTH*2] = '\0';
 
   /* Send the challenge */
 
@@ -312,6 +316,7 @@ cp
   if(sscanf(cl->buffer, "%*d %as", &hishash) != 2)
     {
        syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
+       free(hishash);
        return -1;
     }
 
@@ -320,6 +325,7 @@ cp
   if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
     {
       syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->name, cl->hostname);
+      free(hishash);
       return -1;
     }
 
@@ -444,7 +450,7 @@ cp
 
   /* Check if subnet string is valid */
 
-  if((subnet = str2net(subnetstr)) == -1)
+  if(!(subnet = str2net(subnetstr)))
     {
       syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
       free(name); free(subnetstr);
@@ -466,7 +472,7 @@ cp
 
   /* Check if the owner of the new subnet is in the connection list */
 
-  if(!(owner = lookup_id(name))
+  if(!(owner = lookup_id(name)))
     {
       syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
              name, cl->name, cl->hostname);
@@ -475,8 +481,10 @@ cp
     }
 
   /* If everything is correct, add the subnet to the list of the owner */
+
+  subnet_add(owner, subnet);
 cp
-  return subnet_add(owner, subnet);
+  return 0;
 }
 
 int send_del_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet)
@@ -510,7 +518,7 @@ cp
 
   /* Check if subnet string is valid */
 
-  if((subnet = str2net(subnetstr)) == -1)
+  if(!(subnet = str2net(subnetstr)))
     {
       syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
       free(name); free(subnetstr);
@@ -532,7 +540,7 @@ cp
 
   /* Check if the owner of the new subnet is in the connection list */
 
-  if(!(owner = lookup_id(name))
+  if(!(owner = lookup_id(name)))
     {
       syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
              name, cl->name, cl->hostname);
@@ -540,50 +548,35 @@ cp
       return -1;
     }
 
-  /* If everything is correct, add the subnet to the list of the owner */
+  /* If everything is correct, delete the subnet from the list of the owner */
+
+  subnet_del(subnet);
 cp
-  return subnet_del(owner, subnet);
+  return 0;
 }
 
 /* New and closed connections notification */
 
 int send_add_host(conn_list_t *cl, conn_list_t *other)
 {
-  char *optstr;
-  int x;
-cp
-  x = send_request(cl, "%d %s %s %lx:%d %s", ADD_HOST,
-                      myself->name, other->name, other->real_ip, other->port, optstr = opt2str(other->options));
-  free(optstr);
 cp
-  return x;
+  return send_request(cl, "%d %s %s %lx:%d %lx", ADD_HOST,
+                      myself->name, other->name, other->address, other->port, other->options);
 }
 
 int add_host_h(conn_list_t *cl)
 {
-  char *optstr;
   char *sender;
   conn_list_t *old, *new, *hisuplink;
 cp
   new = new_conn_list();
 
-  if(sscanf(cl->buffer, "%*d %as %as %lx:%d %as", &sender, &new->name, &new->address, &new->port, &optstr) != 5)
+  if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &new->name, &new->address, &new->port, &new->options) != 5)
     {
        syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
        return -1;
     }
 
-  /* Check if option string is valid */
-
-  if((new->options = str2opt(optstr)) == -1)
-    {
-      syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid option string"), cl->name, cl->hostname);
-      free(optstr); free(sender);
-      return -1;
-    }
-
-  free(optstr);
-
   /* Check if identity is a valid name */
 
   if(!check_id(new->name) || !check_id(sender))
@@ -615,7 +608,7 @@ cp
 
   /* Lookup his uplink */
 
-  if(!(new->hisuplink = lookup_id(sender))
+  if(!(new->hisuplink = lookup_id(sender)))
     {
       syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"),
              sender, cl->name, cl->hostname);
@@ -627,13 +620,13 @@ cp
 
   /* Fill in more of the new conn_list structure */
 
-  new->hostname = hostlookup(htonl(new->real_ip));
+  new->hostname = hostlookup(htonl(new->address));
 
   /* Check if the new host already exists in the connnection list */
 
   if((old = lookup_id(new->name)))
     {
-      if((new->real_ip == old->real_ip) && (new->port == old->port))
+      if((new->address == old->address) && (new->port == old->port))
         {
           if(debug_lvl > DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
@@ -669,45 +662,28 @@ cp
 
 int send_del_host(conn_list_t *cl, conn_list_t *other)
 {
-  char *optstr;
-  int x;
-cp
-  x = send_request(cl, "%d %s %s %lx:%d %s", DEL_HOST,
-                      myself->name, other->name, other->real_ip, other->port, optstr = opt2str(other->options));
-  free(optstr);
 cp
-  return x;
+  return send_request(cl, "%d %s %s %lx:%d %lx", DEL_HOST,
+                      myself->name, other->name, other->address, other->port, other->options);
 }
 
 int del_host_h(conn_list_t *cl)
 {
   char *name;
   char *sender;
-  char *opstr;
   ip_t address;
   port_t port;
   int options;
   conn_list_t *old, *hisuplink;
 
 cp
-  if(sscanf(cl->buffer, "%*d %as %as %lx:%d %as", &sender, &name, &address, &port, &optstr) != 5)
+  if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &name, &address, &port, &options) != 5)
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
              cl->name, cl->hostname);
       return -1;
     }
 
-  /* Check if option string is valid */
-
-  if((options = str2opt(optstr)) == -1)
-    {
-      syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid option string"), cl->name, cl->hostname);
-      free(optstr); free(sender); free(name);
-      return -1;
-    }
-
-  free(optstr);
-      
   /* Check if identity is a valid name */
 
   if(!check_id(name) || !check_id(sender))
@@ -740,7 +716,7 @@ cp
 
   /* Lookup his uplink */
 
-  if(!(hisuplink = lookup_id(sender))
+  if(!(hisuplink = lookup_id(sender)))
     {
       syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"),
              cl->name, cl->hostname, sender);
@@ -1049,43 +1025,7 @@ cp
   return 0;
 }
 
-/* Old routines */
-
-/*
-  Notify all my direct connections of a new host
-  that was added to the vpn, with the exception
-  of the source of the announcement.
-*/
-
-int notify_others(conn_list_t *new, conn_list_t *source,
-                  int (*function)(conn_list_t*, conn_list_t*))
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p != new && p != source && p->status.meta && p->status.active)
-      function(p, new);
-cp
-  return 0;
-}
-
-/*
-  Notify one connection of everything
-  I have connected
-*/
-
-int notify_one(conn_list_t *new)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p != new && p->status.active)
-      send_add_host(new, p);
-cp
-  return 0;
-}
-
-/* "Complete overhaul". */
+/* Jumptable for the request handlers */
 
 int (*request_handlers[])(conn_list_t*) = {
   id_h, challenge_h, chal_reply_h, ack_h,
@@ -1096,6 +1036,8 @@ int (*request_handlers[])(conn_list_t*) = {
   key_changed_h, req_key_h, ans_key_h,
 };
 
+/* Request names */
+
 char (*request_name[]) = {
   "ID", "CHALLENGE", "CHAL_REPLY", "ACK",
   "STATUS", "ERROR", "TERMREQ",