- More fixing. Tinc daemons can now even create activated connections.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 42b41eb..20f6644 100644 (file)
--- 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.39 2000/10/14 17:04:15 guus Exp $
+    $Id: protocol.c,v 1.28.4.42 2000/10/16 19:04:47 guus Exp $
 */
 
 #include "config.h"
@@ -52,40 +52,40 @@ int check_id(char *id)
   int i;
 
   for (i = 0; i < strlen(id); i++)
-    {
-      if(!isalpha(id[i]) && id[i] != '_')
-        {
-          return 0;
-        }
-    }
-
-  return 1;
+    if(!isalnum(id[i]) && id[i] != '_')
+      return -1;
+          
+  return 0;
 }
 
 /* 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*/ ...)
+int send_request(conn_list_t *cl, const char *format, ...)
 {
   va_list args;
-  char buffer[MAXBUFSIZE+1];
-  int len;
+  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, request);
-  len = vsnprintf(buffer, MAXBUFSIZE+1, format, args);
+  va_start(args, format);
+  len = vsnprintf(buffer, MAXBUFSIZE, format, args);
+  request = va_arg(args, int);
   va_end(args);
 
-  if(len < 0 || len > MAXBUFSIZE)
+  if(len < 0 || len > MAXBUFSIZE-1)
     {
       syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
       return -1;
     }
 
+  len++;
+
   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);
 }
@@ -155,14 +155,16 @@ cp
 int send_id(conn_list_t *cl)
 {
 cp
-  return send_request(cl, "%d %s %d %lx", ID, myself->name, myself->protocol_version, myself->options);
+  cl->allow_request = CHALLENGE;
+cp
+  return send_request(cl, "%d %s %d %lx %hd", ID, myself->name, myself->protocol_version, myself->options, myself->port);
 }
 
 int id_h(conn_list_t *cl)
 {
   conn_list_t *old;
 cp
-  if(sscanf(cl->buffer, "%*d %as %d %lx", &cl->name, &cl->protocol_version, &cl->options) != 3)
+  if(sscanf(cl->buffer, "%*d %as %d %lx %hd", &cl->name, &cl->protocol_version, &cl->options, &cl->port) != 4)
     {
        syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
        return -1;
@@ -179,7 +181,7 @@ cp
 
   /* Check if identity is a valid name */
 
-  if(!check_id(cl->name))
+  if(check_id(cl->name))
     {
       syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
       return -1;
@@ -187,7 +189,7 @@ cp
 
   /* Load information about peer */
 
-  if(!read_host_config(cl))
+  if(read_host_config(cl))
     {
       syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
       return -1;
@@ -211,10 +213,6 @@ cp
           return 0;
         }
     }
-
-  /* Send a challenge to verify the identity */
-
-  cl->allow_request = CHAL_REPLY;
 cp
   return send_challenge(cl);
 }
@@ -227,14 +225,14 @@ cp
 
   if(!cl->hischallenge)
     cl->hischallenge = xmalloc(CHAL_LENGTH);
-
+cp
   /* Copy random data to the buffer */
 
   RAND_bytes(cl->hischallenge, CHAL_LENGTH);
-
+cp
   /* Convert the random data to a hexadecimal formatted string */
 
-  bin2hex(cl->hischallenge,buffer,CHAL_LENGTH);
+  bin2hex(cl->hischallenge, buffer, CHAL_LENGTH);
   buffer[CHAL_LENGTH*2] = '\0';
 
   /* Send the challenge */
@@ -313,7 +311,7 @@ int chal_reply_h(conn_list_t *cl)
   char *hishash;
   char myhash[SHA_DIGEST_LENGTH];
 cp
-  if(sscanf(cl->buffer, "%*d %as", &hishash) != 2)
+  if(sscanf(cl->buffer, "%*d %as", &hishash) != 1)
     {
        syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
        free(hishash);
@@ -339,7 +337,7 @@ cp
 
   /* Verify the incoming hash with the calculated hash */
 
-  if(!memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
+  if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
     {
       syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname);
       free(hishash);
@@ -354,19 +352,15 @@ cp
    */
 cp
   if(cl->status.outgoing)
-    {
-      cl->allow_request = ACK;
       return send_ack(cl);
-    }
   else
-    {
-      cl->allow_request = CHALLENGE;
       return send_id(cl);
-    }
 }
 
 int send_ack(conn_list_t *cl)
 {
+cp
+  cl->allow_request = ACK;
 cp
   return send_request(cl, "%d", ACK);
 }
@@ -442,7 +436,7 @@ cp
 
   /* Check if owner name is a valid */
 
-  if(!check_id(name))
+  if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
       free(name); free(subnetstr);
@@ -510,7 +504,7 @@ cp
 
   /* Check if owner name is a valid */
 
-  if(!check_id(name))
+  if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
       free(name); free(subnetstr);
@@ -580,7 +574,7 @@ cp
 
   /* Check if identity is a valid name */
 
-  if(!check_id(new->name) || !check_id(sender))
+  if(check_id(new->name) || check_id(sender))
     {
       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
       free(sender);
@@ -687,7 +681,7 @@ cp
 
   /* Check if identity is a valid name */
 
-  if(!check_id(name) || !check_id(sender))
+  if(check_id(name) || check_id(sender))
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
       free(name); free(sender);
@@ -804,12 +798,12 @@ int error_h(conn_list_t *cl)
 cp
   if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2)
     {
-       syslog(LOG_ERR, _("Got bad error from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
               cl->name, cl->hostname);
        return -1;
     }
 
-  if(debug_lvl > DEBUG_error)
+  if(debug_lvl > DEBUG_ERROR)
     {
       syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
              cl->name, cl->hostname, strerror(errno), errorstring);
@@ -1051,11 +1045,11 @@ char (*request_name[]) = {
 /* Status strings */
 
 char (*status_text[]) = {
-  "FIXME: status text",
+  "Warning",
 };
 
 /* Error strings */
 
 char (*error_text[]) = {
-  "FIXME: error text",
+  "Error",
 };