X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=7bd64cc91bd7f5f63ddad91706ecd84ceb81423f;hp=f8d72298e28162d01ec4d7bc1095f30683ab6cc6;hb=ac73c72488dd8b33464fac1f392e89df48f7a23b;hpb=c5737583c8a5d099a71174e1eb997e0972ae03e9

diff --git a/src/protocol.c b/src/protocol.c
index f8d72298..7bd64cc9 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.18 2000/06/30 12:41:06 guus Exp $
+    $Id: protocol.c,v 1.28.4.22 2000/08/08 08:48:50 guus Exp $
 */
 
 #include "config.h"
@@ -34,6 +34,8 @@
 #include <utils.h>
 #include <xalloc.h>
 
+#include <netinet/in.h>
+
 #include "conf.h"
 #include "encr.h"
 #include "net.h"
@@ -120,6 +122,32 @@ cp
   return 0;
 }
 
+/* Evil hack - TCP tunneling is bad */
+int send_tcppacket(conn_list_t *cl, void *data, int len)
+{
+cp
+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"),
+	   cl->vpn_hostname, cl->real_hostname);
+
+  buflen = snprintf(buffer, MAXBUFSIZE, "%d %d\n", PACKET, len);
+
+  if((write(cl->meta_socket, buffer, buflen)) != buflen)
+    {
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      return -1;
+    }
+
+  if((write(cl->meta_socket, data, len)) != len)
+    {
+      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      return -1;
+    }
+  
+cp
+  return 0;
+}
+
 int send_ping(conn_list_t *cl)
 {
 cp
@@ -419,7 +447,7 @@ cp
          is not desirable.
        */
        
-      if(old=lookup_conn(cl->vpn_ip))
+      if((old=lookup_conn(cl->vpn_ip)))
         {
           if(debug_lvl>0)
             syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"),
@@ -505,9 +533,10 @@ cp
          old connection that has timed out but we don't know it yet.
        */
 
-      while(old = lookup_conn(cl->vpn_ip)) 
+      while((old = lookup_conn(cl->vpn_ip))) 
         {
-          syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
+          if(debug_lvl > 1)
+            syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
             cl->vpn_hostname, old->real_hostname, cl->real_hostname);
           old->status.active = 0;
           terminate_connection(old);
@@ -535,7 +564,8 @@ cp
   
   cl->status.active = 1;
 
-  syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
+  if(debug_lvl > 0)
+    syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
               cl->vpn_hostname, cl->real_hostname);
 
   notify_others(cl, NULL, send_add_host);
@@ -636,6 +666,85 @@ cp
   return 0;
 }
 
+int tcppacket_h(conn_list_t *cl)
+{
+  real_packet_t rp;
+  int len, count = 0, result;
+  conn_list_t *f;
+cp
+  if(!cl->status.active)
+    {
+      syslog(LOG_ERR, _("Got unauthorized PACKET from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+      return -1;
+    }
+
+  if(sscanf(cl->buffer, "%*d %d", &len) != 1)
+    {
+       syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+       return -1;
+    }  
+
+  if(len>1600)
+    {
+       syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);
+       return -1;
+    }  
+
+  /* Evil kludge comming up */
+  while(len)
+    {
+       syslog(LOG_DEBUG, _("Direct read count=%d len=%d rp=%p socket=%d"), count, len, ((char *)&rp)+count, cl->meta_socket);
+       result=read(cl->meta_socket,((char *)&rp)+count,len);
+       if(result<0)
+         {
+           syslog(LOG_ERR, _("Error while receiving PACKET data from %s (%s): %m"),
+              cl->vpn_hostname, cl->real_hostname);
+           return -1;
+         }
+       count+=result;
+       len-=result;
+    }
+
+  if(debug_lvl > 3)
+    syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
+              cl->vpn_hostname, cl->real_hostname);
+
+  total_socket_in += len;
+
+  rp.data.len = ntohs(rp.data.len);
+  rp.len = ntohs(rp.len);
+  rp.from = ntohl(rp.from);
+
+  if(rp.len >= 0)
+    {
+      f = lookup_conn(rp.from);
+      if(!f)
+	{
+	  syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
+		 cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp.from));
+	  return -1;
+	}
+
+      if(f->status.validkey)
+	xrecv(f, &rp);
+      else
+	{
+	  add_queue(&(f->rq), &rp, rp.len);
+	  if(!cl->status.waitingforkey)
+	    send_key_request(rp.from);
+	}
+
+      if(my_key_expiry <= time(NULL))
+	regenerate_keys();
+    }
+cp
+  return 0;
+}
+
+
 int ping_h(conn_list_t *cl)
 {
 cp
@@ -700,7 +809,7 @@ cp
        return -1;
     }  
 
-  if(old = lookup_conn(vpn_ip))
+  if((old = lookup_conn(vpn_ip)))
     {
       if((real_ip==old->real_ip) && (vpn_mask==old->vpn_mask) && (port==old->port))
         {
@@ -745,9 +854,9 @@ cp
     syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
            ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);
 
-skip_add_host:
-
   notify_others(ncn, cl, send_add_host);
+
+skip_add_host:
 cp
   return 0;
 }
@@ -961,13 +1070,19 @@ int (*request_handlers[256])(conn_list_t*) = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  tcppacket_h, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   req_key_h, ans_key_h, key_changed_h, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0
 };