X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=4db639ce80633c09f7d78d3704070a92663a5c64;hp=68080fdefd4701aec34a566483dbad061ebda97a;hb=fcf869cd4250a240ea8d443f70fa373e4fbacf07;hpb=4dee76522e177dcb4af5d6d844a5f3b74070e4b7

diff --git a/src/net.c b/src/net.c
index 68080fde..4db639ce 100644
--- a/src/net.c
+++ b/src/net.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: net.c,v 1.35.4.106 2001/05/25 08:36:11 guus Exp $
+    $Id: net.c,v 1.35.4.108 2001/05/25 11:54:28 guus Exp $
 */
 
 #include "config.h"
@@ -184,6 +184,17 @@ cp
 cp
 }
 
+void receive_tcppacket(connection_t *cl, char *buffer, int len)
+{
+  vpn_packet_t outpkt;
+cp
+  outpkt.len = len;
+  memcpy(outpkt.data, buffer, len);
+
+  receive_packet(cl, &outpkt);
+cp
+}
+
 void accept_packet(vpn_packet_t *packet)
 {
 cp
@@ -203,7 +214,7 @@ cp
       if(write(tap_fd, packet->data - 2, packet->len + 2) < 0)
         syslog(LOG_ERR, _("Can't write to ethertap device: %m"));
       else
-        total_tap_out += packet->len + 2;
+        total_tap_out += packet->len;
     }
 cp
 }
@@ -285,7 +296,7 @@ cp
    {
 #ifdef HAVE_LINUX
 # ifdef HAVE_TUNTAP
-      tapfname = "/dev/misc/net/tun";
+      tapfname = "/dev/net/tun";
 # else
       tapfname = "/dev/tap0";
 # endif
@@ -1151,7 +1162,7 @@ cp
       syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
     }
 
-  /* Inactivate */
+  /* Deactivate */
 
   cl->status.active = 0;
 cp
@@ -1290,7 +1301,7 @@ cp
       vp.len = lenin - 2;
     }
 
-  total_tap_in += lenin;
+  total_tap_in += vp.len;
 
   if(lenin < 32)
     {