X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=dc91940ac8d3c47ec1188d6deb431cc9d9774207;hp=fd18dfb823f431173fecaba018dd143ccae44df4;hb=fcbe215d64d7e2f3b159fff6422d750417877ac4;hpb=96ef7becdd71fc63c3489e3696117c1f137eade5

diff --git a/src/route.c b/src/route.c
index fd18dfb8..dc91940a 100644
--- a/src/route.c
+++ b/src/route.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: route.c,v 1.1.2.13 2001/06/06 19:12:38 guus Exp $
+    $Id: route.c,v 1.1.2.18 2001/07/21 20:21:25 guus Exp $
 */
 
 #include "config.h"
@@ -27,17 +27,21 @@
 #endif
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <net/ethernet.h>
+#ifdef HAVE_SOLARIS
+ #include <net/if.h>
+ #define ETHER_ADDR_LEN 6
+#else
+ #include <net/ethernet.h>
+#endif
 #include <netinet/if_ether.h>
 #include <utils.h>
 #include <xalloc.h>
 #include <syslog.h>
+#include <string.h>
 
 #include <avl_tree.h>
 
 #include "net.h"
-#include "net/ethernet.h"
-#include "netinet/if_ether.h"
 #include "connection.h"
 #include "subnet.h"
 #include "route.h"
@@ -74,7 +78,7 @@ cp
       for(node = connection_tree->head; node; node = node->next)
         {
           p = (connection_t *)node->data;
-          if(p->status.meta && p->status.active && p!= myself)
+          if(p->status.active)
             send_add_subnet(p, subnet);
         }
     }
@@ -103,10 +107,15 @@ connection_t *route_ipv4(vpn_packet_t *packet)
   ipv4_t dest;
   subnet_t *subnet;
 cp
+#ifdef HAVE_SOLARIS
+  /* The other form gives bus errors on a SparcStation 20. */
+  dest = ((packet->data[30] * 0x100 + packet->data[31]) * 0x100 + packet->data[32]) * 0x100 + packet->data[33];
+#else
   dest = ntohl(*((unsigned long*)(&packet->data[30])));
-  
+#endif
+cp  
   subnet = lookup_subnet_ipv4(&dest);
-
+cp
   if(!subnet)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
@@ -254,15 +263,31 @@ void route_incoming(connection_t *source, vpn_packet_t *packet)
     {
       case RMODE_ROUTER:
         memcpy(packet->data, mymac.net.mac.address.x, 6);	/* Override destination address to make the kernel accept it */
+        accept_packet(packet);
         break;
       case RMODE_SWITCH:
-        if(packet->data[0] & 0x01)				/* Broadcast? */
-          broadcast_packet(source, packet);			/* If yes, spread it on */
+        {
+          subnet_t *subnet;
+
+          subnet = lookup_subnet_mac((mac_t *)(&packet->data[0]));
+
+          if(subnet)
+            {
+              if(subnet->owner == myself)
+                accept_packet(packet);
+              else
+                send_packet(subnet->owner, packet);
+            }
+          else
+            {
+              broadcast_packet(source, packet);
+              accept_packet(packet);
+            }
+          }
         break;
       case RMODE_HUB:
         broadcast_packet(source,packet);			/* Spread it on */
+        accept_packet(packet);
         break;
     }
-  
-  accept_packet(packet);
 }