- Solaris compile fixes

- Set mymac to broadcast MAC so that ifconfig hw ether <...> is really not
  needed anymore.
- Forwarding of indirect packets when in switch mode (because the kernel
  will not do it for us then).

diff --git a/src/net.c b/src/net.c
index 4f39990..9c1dd3b 100644 (file)
--- 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.
 
     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.114 2001/06/08 18:02:10 guus Exp $
+    $Id: net.c,v 1.35.4.115 2001/06/21 16:16:31 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -69,9 +69,12 @@
 # include <pem.h>
 #endif
 
 # include <pem.h>
 #endif
 

+#warning oi1

 #ifdef HAVE_TUNTAP
 #ifdef HAVE_TUNTAP

+#warning oi2

 #include LINUX_IF_TUN_H
 #endif
 #include LINUX_IF_TUN_H
 #endif

+#warning oi3

 
 #include <utils.h>
 #include <xalloc.h>
 
 #include <utils.h>
 #include <xalloc.h>


@@ -344,12 +347,12 @@ cp
   /* Set default MAC address for ethertap devices */
 
   mymac.type = SUBNET_MAC;
   /* Set default MAC address for ethertap devices */
 
   mymac.type = SUBNET_MAC;

-  mymac.net.mac.address.x[0] = 0xfe;
-  mymac.net.mac.address.x[1] = 0xfd;
-  mymac.net.mac.address.x[2] = 0x00;
-  mymac.net.mac.address.x[3] = 0x00;
-  mymac.net.mac.address.x[4] = 0x00;
-  mymac.net.mac.address.x[5] = 0x00;
+  mymac.net.mac.address.x[0] = 0xff;
+  mymac.net.mac.address.x[1] = 0xff;
+  mymac.net.mac.address.x[2] = 0xff;
+  mymac.net.mac.address.x[3] = 0xff;
+  mymac.net.mac.address.x[4] = 0xff;
+  mymac.net.mac.address.x[5] = 0xff;

 
 #ifdef HAVE_LINUX
  #ifdef HAVE_TUNTAP
 
 #ifdef HAVE_LINUX
  #ifdef HAVE_TUNTAP

diff --git a/src/route.c b/src/route.c
index fd18dfb..bd1c136 100644 (file)
--- 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.
 
     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.14 2001/06/21 16:16:32 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -27,7 +27,12 @@
 #endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
 #include <sys/socket.h>
 #include <netinet/in.h>

-#include <net/ethernet.h>
+#ifdef HAVE_SOLARIS
+ #include <netinet/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 <netinet/if_ether.h>
 #include <utils.h>
 #include <xalloc.h>


@@ -36,8 +41,6 @@
 #include <avl_tree.h>
 
 #include "net.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"
 #include "connection.h"
 #include "subnet.h"
 #include "route.h"


@@ -254,15 +257,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 */
     {
       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:
         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 */
         break;
       case RMODE_HUB:
         broadcast_packet(source,packet);                       /* Spread it on */

+        accept_packet(packet);

         break;
     }
         break;
     }

-  
-  accept_packet(packet);

 }
 }