X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=bd1e4e21d4a56cc1be817955bd653aa5330b355d;hb=698d6ddac6ab32d5a4b802941b02232793442684;hp=f0423c10f5d082282d03eaaffada550f5e58e901;hpb=97d492d9e23f43fe4c8a5ca8c95747088cf32f98;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index f0423c10..bd1e4e21 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1,7 +1,7 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
-    Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2002 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
@@ -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_packet.c,v 1.1.2.14 2002/04/18 20:09:05 zarq Exp $
+    $Id: net_packet.c,v 1.1.2.18 2002/09/03 20:43:25 guus Exp $
 */
 
 #include "config.h"
@@ -26,8 +26,13 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#ifdef HAVE_LINUX
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
  #include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
  #include <netinet/tcp.h>
 #endif
 #include <stdio.h>
@@ -65,7 +70,6 @@
 #include "process.h"
 #include "protocol.h"
 #include "subnet.h"
-#include "graph.h"
 #include "process.h"
 #include "route.h"
 #include "device.h"
@@ -327,7 +331,7 @@ cp
       return;
     }
 
-  via = (n->via == myself)?n->nexthop:n->via;
+  via = (n->options & OPTION_INDIRECT)?n->nexthop:n;
 
   if(via != n && debug_lvl >= DEBUG_TRAFFIC)
     syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"),