Commit: 9a05ad81f81bdbb8e40a3f4e19934efd48b98fa0 - phabrics (git)

Commit MetaInfo

• Révision: 9a05ad81f81bdbb8e40a3f4e19934efd48b98fa0 (tree)
• l'heure: 2015-12-04 12:30:03
• Auteur: Ruben Agin <phabrics@phab...>
• Commiter: Ruben Agin

Message de Log

Fix for TAP windows ethernet. Updated docs for OpenVPN. New version.

Change Summary

• modified: contrib/tme-0.8/configure.ac
• modified: contrib/tme-0.8/host/eth/eth-impl.c
• modified: contrib/tme-0.8/host/posix/posix-disk.c
• modified: contrib/tme-0.8/libtme/host/recode-mmap.c
• modified: contrib/tme-0.8/machine/sun2/SUN2-MULTIBUS
• modified: contrib/tme-0.8/machine/sun3/SUN3-CARRERA
• modified: contrib/tme-0.8/machine/sun4/SUN4-75
• modified: contrib/tme-0.8/machine/sun4u/SUN-ULTRA-1
• modified: contrib/tme-0.8/tme/tme.texi

Modification

--- a/contrib/tme-0.8/configure.ac
+++ b/contrib/tme-0.8/configure.ac
@@ -34,7 +34,7 @@ dnl POSSIBILITY OF SUCH DAMAGE.
 dnl Checks that we are given a good source directory.
 AC_PREREQ([2.68])
 m4_include(version.m4)
-AC_INIT([tme], [0.12beta12])
+AC_INIT([tme], [0.12beta14])
 AC_CONFIG_SRCDIR([ic/m68k/m68k-impl.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET

--- a/contrib/tme-0.8/host/eth/eth-impl.c
+++ b/contrib/tme-0.8/host/eth/eth-impl.c
@@ -286,6 +286,8 @@ _tme_eth_th_reader(struct tme_ethernet *eth)
     }
     
 #elif defined(OPENVPN_ETH)
+    event_reset(eth->tme_eth_event_set);
+    
     flags = EVENT_READ;
     
     can_write = eth->tme_eth_can_write;
@@ -321,20 +323,27 @@ _tme_eth_th_reader(struct tme_ethernet *eth)
 			    eth->tme_eth_buffer,
 			    eth->tme_eth_buffer_size);
 #endif
+    tme_mutex_lock(&eth->tme_eth_mutex);
+
+#ifdef OPENVPN_ETH
+    if(can_write && !eth->tme_eth_can_write) {
+      /* signal transition that we can write */
+      eth->tme_eth_can_write = TRUE;	 
+      //_tme_eth_callout(eth, TME_ETH_CALLOUT_CTRL);
+    }
+#endif
+
     /* if the read failed: */
-    if (buffer_end <= 0
+    if(buffer_end <= 0) {
 #ifdef OPENVPN_ETH
-	&& !can_write
+      if(!can_write)
 #endif
-	) {
-      tme_log(&eth->tme_eth_element->tme_element_log_handle, 1, errno,
-	      (&eth->tme_eth_element->tme_element_log_handle,
-	       _("failed to read/write packets")));
-      tme_mutex_lock(&eth->tme_eth_mutex);
+	tme_log(&eth->tme_eth_element->tme_element_log_handle, 1, errno,
+		(&eth->tme_eth_element->tme_element_log_handle,
+		 _("failed to read/write packets")));
       continue;
     }
 
-
     /* Filter out multicast packets we sent or unicast packets not destined for us. 
        This should remove all duplicate packets on, i.e., tap interfaces...
      */
@@ -352,19 +361,9 @@ _tme_eth_th_reader(struct tme_ethernet *eth)
       tme_log(&eth->tme_eth_element->tme_element_log_handle, 1, TME_OK,
 	      (&eth->tme_eth_element->tme_element_log_handle,
 	       _("read %ld bytes of packets"), (long) buffer_end));
-      tme_mutex_lock(&eth->tme_eth_mutex);
       eth->tme_eth_buffer_offset = 0;
       eth->tme_eth_buffer_end = buffer_end;
       _tme_eth_callout(eth, TME_ETH_CALLOUT_CTRL);
-    } else {
-      tme_mutex_lock(&eth->tme_eth_mutex);
-#ifdef OPENVPN_ETH
-      if(can_write && !eth->tme_eth_can_write) {
-	/* signal transition that we can write */
-	eth->tme_eth_can_write = TRUE;	 
-	//_tme_eth_callout(eth, TME_ETH_CALLOUT_CTRL);
-      }
-#endif
     }
   }
   /* NOTREACHED */

--- a/contrib/tme-0.8/host/posix/posix-disk.c
+++ b/contrib/tme-0.8/host/posix/posix-disk.c
@@ -59,6 +59,9 @@ _TME_RCSID("$Id: posix-disk.c,v 1.6 2010/06/05 14:28:57 fredette Exp $");
 #else
 #include "mman.h"
 #endif
+#ifdef WIN32
+#include <windows.h>
+#endif
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #else  /* HAVE_STDARG_H */
@@ -716,6 +719,10 @@ _tme_posix_disk_open(struct tme_posix_disk *posix_disk,
   page_size = sysconf(_SC_PAGESIZE);
 #elif defined(_SC_PAGE_SIZE)
   page_size = sysconf(_SC_PAGE_SIZE);
+#elif defined(WIN32)
+  SYSTEM_INFO si;
+  GetSystemInfo(&si);
+  page_size = si.dwPageSize;  
 #else
   page_size = 4096;
 #endif

--- a/contrib/tme-0.8/libtme/host/recode-mmap.c
+++ b/contrib/tme-0.8/libtme/host/recode-mmap.c
@@ -49,6 +49,9 @@ _TME_RCSID("$Id: recode-mmap.c,v 1.2 2008/07/01 02:00:53 fredette Exp $");
 #else
 #include "mman.h"
 #endif
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 /* this host function allocates memory for building and running thunks: */
 void
@@ -64,6 +67,10 @@ tme_recode_host_thunks_alloc(struct tme_recode_ic *ic,
   size_page = sysconf(_SC_PAGESIZE);
 #elif defined(_SC_PAGE_SIZE)
   size_page = sysconf(_SC_PAGE_SIZE);
+#elif defined(WIN32)
+  SYSTEM_INFO si;
+  GetSystemInfo(&si);
+  size_page = si.dwPageSize;  
 #else
   size_page = 4096;
 #endif

--- a/contrib/tme-0.8/machine/sun2/SUN2-MULTIBUS
+++ b/contrib/tme-0.8/machine/sun2/SUN2-MULTIBUS
@@ -54,9 +54,22 @@ scsibus0 at sc0: tme/scsi/bus
 #mie0 memory 0xa0000 at mbmem0 addr 0xa0000
 #ie0 at mie0: tme/ic/i82586
 #bpf1 at ie0: tme/host/bsd/bpf delay 10000
+
 # OR enable tap ethernet device, an alternative method for network access
-# if you have read/write permission on tap device or have cap_net_admin+ep capability (on Linux)
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
 #tap1 at ie0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap1 at ie0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# You can enable "networking" multiple machines using the following line,
+# while removing the " at ie0" from the one of the previous 2 lines that is used
+# to set up the tap device.
+#tap1 at tap1
+
+# This creates a master configuration that can be used with different slave
+# configurations that only need the second line below to connect to the tap network
+# via bpf.  Note that the master requires this line, too...
+#bpf1 at ie0: tme/host/bsd/bpf interface tap0
 
 ## the Sun bwtwo Multibus board, Sun type-2 keyboard and mouse, and
 ## the GTK-based display to drive them all:

--- a/contrib/tme-0.8/machine/sun3/SUN3-CARRERA
+++ b/contrib/tme-0.8/machine/sun3/SUN3-CARRERA
@@ -33,8 +33,20 @@ mainbus0 intreg	at obio0 addr 0x0A0000
 #ie0 at obie0: tme/ic/i82586
 #bpf1 at ie0: tme/host/bsd/bpf
 # OR enable tap ethernet device, an alternative method for network access
-# if you have read/write permission on tap device or have cap_net_admin+ep capability (on Linux)
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
 #tap1 at ie0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap1 at ie0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# You can enable "networking" multiple machines using the following line,
+# while removing the " at ie0" from the one of the previous 2 lines that is used
+# to set up the tap device.
+#tap1 at tap1
+
+# This creates a master configuration that can be used with different slave
+# configurations that only need the second line below to connect to the tap network
+# via bpf.  Note that the master requires this line, too...
+#bpf1 at ie0: tme/host/bsd/bpf interface tap0
 
 ## the Sun type-3 keyboard and mouse:
 ##

--- a/contrib/tme-0.8/machine/sun4/SUN4-75
+++ b/contrib/tme-0.8/machine/sun4/SUN4-75
@@ -74,8 +74,20 @@ scsibus0 at ncr0: tme/scsi/bus
 le0 at sbus0 slot 0 offset 0xc00000 ipl 5 dma-offset 0xff000000: tme/ic/am7990
 #bpf0 at le0: tme/host/bsd/bpf
 # OR enable tap ethernet device, an alternative method for network access
-# if you have read/write permission on tap device or have cap_net_admin+ep capability (on Linux)
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
 #tap0 at le0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# You can enable "networking" multiple machines using the following line,
+# while removing the " at le0" from the one of the previous 2 lines that is used
+# to set up the tap device.
+#tap0 at tap0
+
+# This creates a master configuration that can be used with different slave
+# configurations that only need the second line below to connect to the tap network
+# via bpf.  Note that the master requires this line, too...
+#bpf0 at le0: tme/host/bsd/bpf interface tap0
 
 ## an SBus cgthree:
 ##

--- a/contrib/tme-0.8/machine/sun4u/SUN-ULTRA-1
+++ b/contrib/tme-0.8/machine/sun4u/SUN-ULTRA-1
@@ -77,8 +77,20 @@ ledma0 at sbus0 slot 14 offset 0x8c00000
 le0 at ledma0 master: tme/ic/am7990
 #bpf0 at le0: tme/host/bsd/bpf
 # OR enable tap ethernet device, an alternative method for network access
-# if you have read/write permission on tap device or have cap_net_admin+ep capability (on Linux)
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
 #tap0 at le0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# You can enable "networking" multiple machines using the following line,
+# while removing the " at le0" from the one of the previous 2 lines that is used
+# to set up the tap device.
+#tap0 at tap0
+
+# This creates a master configuration that can be used with different slave
+# configurations that only need the second line below to connect to the tap network
+# via bpf.  Note that the master requires this line, too...
+#bpf0 at le0: tme/host/bsd/bpf interface tap0
 
 ## the SBus parallel port:
 ##

--- a/contrib/tme-0.8/tme/tme.texi
+++ b/contrib/tme-0.8/tme/tme.texi
@@ -97,6 +97,7 @@ Networking
 * PPP::
 * IPv4 Network Address Translation::
 * Proxy ARP/NDP::
+* OpenVPN::
 * Network Descriptions::
 * Network Services::
 
@@ -233,8 +234,8 @@ Windows - Preliminary support for building/running on Windows
 platforms is provided through Cygwin. It should work out of the
 box. See below for details. It should also build (natively or cross)
 on MinGW, and run under the Wine emulator (use --without-x
---enable-threads=glib configure options). No Ethernet support is
-available for Windows, yet.
+--enable-threads=glib configure options). Preliminary Ethernet support is
+available for Windows, using OpenVPN.
 
 @item
 Other - It should work on any POSIX platforms, sans whatever features
@@ -519,6 +520,7 @@ is the topic of the next section.
 * PPP::
 * IPv4 Network Address Translation::
 * Proxy ARP/NDP::
+* OpenVPN::
 * Network Descriptions::
 * Network Services::
 @end menu
@@ -880,6 +882,24 @@ apply, with commands used for IPv6 instead (ip -6). If your router
 doesn't have a route to your host, this may be needed to use IPv6
 networking.
 
+@node OpenVPN
+@subsection OpenVPN
+
+Preliminary support for OpenVPN is now provided for the purposes of
+creating and using TAP devices on multiple platforms.  OpenVPN is
+compiled in as another host module, with a special tap leaf interface,
+that uses the same options as OpenVPN itself.  See the OpenVPN docs
+for further information.
+
+In particular, it can be used to configure tap interfaces with IP
+or IPv6 addresses.  Here is a sample line that can be used to accomplish
+this:
+
+@code{tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2" --tun-ipv6}
+
+Note that this is currently the only way to get networking support
+under Windows.  
+
 @node Network Descriptions
 @subsection Network Descriptions