Commit: 066158ba81701c0ff591246de25e2717ad7d8f27 - phabrics (git)

Commit MetaInfo

• Révision: 066158ba81701c0ff591246de25e2717ad7d8f27 (tree)
• l'heure: 2015-11-03 14:37:54
• Auteur: phabrics <phabrics@phab...>
• Commiter: phabrics

Message de Log

Changed openvpn host to use openvpn ethernet access methods.

Change Summary

• modified: contrib/tme-0.8/host/bsd/bsd-bpf.c
• modified: contrib/tme-0.8/host/eth/eth-if.h
• modified: contrib/tme-0.8/host/eth/eth-impl.c
• modified: contrib/tme-0.8/host/openvpn/Makefile.am
• modified: contrib/tme-0.8/host/openvpn/tap.c
• modified: contrib/tme-0.8/host/tun/tun-tap.c

Modification

--- a/contrib/tme-0.8/host/bsd/bsd-bpf.c
+++ b/contrib/tme-0.8/host/bsd/bsd-bpf.c
@@ -275,9 +275,9 @@ _tme_bsd_bpf_config(struct tme_ethernet_connection *conn_eth,
   TME_BSD_BPF_LEN(program) = bpf_filter_size - first_pc;
   TME_BSD_BPF_INSNS(program) = bpf_filter + first_pc;
 #ifdef HAVE_LSF
-  if (setsockopt(bpf->tme_eth_fd, SOL_SOCKET, SO_ATTACH_FILTER, &program, sizeof(program)) == -1) {
+  if (setsockopt(bpf->tme_eth_handle, SOL_SOCKET, SO_ATTACH_FILTER, &program, sizeof(program)) == -1) {
 #else
-  if (ioctl(bpf->tme_eth_fd, BIOCSETF, &program) < 0) {
+  if (ioctl(bpf->tme_eth_handle, BIOCSETF, &program) < 0) {
 #endif
     tme_log(&bpf->tme_eth_element->tme_element_log_handle, 0, errno,
 	    (&bpf->tme_eth_element->tme_element_log_handle,

--- a/contrib/tme-0.8/host/eth/eth-if.h
+++ b/contrib/tme-0.8/host/eth/eth-if.h
@@ -122,6 +122,16 @@ _TME_RCSID("$Id: eth-impl.h,v 1.1 2003/05/18 00:02:23 fredette Exp $");
 #ifdef HAVE_IFADDRS_H
 #include <ifaddrs.h>
 #endif
+#ifdef OPENVPN_HOST
+#include "syshead.h"
+#include "tun.h"
+#define _tme_eth_static static
+#ifndef TME_THREADS_SJLJ
+#define OPENVPN_ETH
+#endif
+#else
+#define _tme_eth_static
+#endif
 
 /* structures: */
 
@@ -147,8 +157,12 @@ struct tme_ethernet {
   struct tme_ethernet_connection *tme_eth_eth_connection;
 
   /* the Ethernet file descriptor: */
-  int tme_eth_fd;
-
+#ifdef OPENVPN_ETH
+  struct tuntap *tme_eth_handle;
+#else
+  int tme_eth_handle;
+#endif
+  
   /* the size of the packet buffer for the interface: */
   size_t tme_eth_buffer_size;
 
@@ -177,6 +191,7 @@ struct tme_ethernet {
 };
 
 /* prototypes: */
+#ifndef OPENVPN_HOST
 #if 0
 int tme_eth_if_find _TME_P((_tme_const char *, 
 			    struct ifreq **, 
@@ -199,11 +214,15 @@ int tme_eth_connections_new _TME_P((struct tme_element *element,
 				    const char * const *args, 
 				    struct tme_connection **_conns));
 
-int tme_eth_init _TME_P((struct tme_element *element, 
-			 int fd, 
+int tme_eth_init _TME_P((struct tme_element *element,
+#ifdef OPENVPN_ETH
+			 struct tuntap *tt,
+#else
+			 int fd,
+#endif
 			 unsigned int sz, 
 			 void *data,
 			 unsigned char *addr,
 			 typeof(tme_eth_connections_new) eth_connections_new));
-
+#endif // !_tme_eth_static
 #endif /* !_HOST_ETH_IMPL_H */

--- a/contrib/tme-0.8/host/eth/eth-impl.c
+++ b/contrib/tme-0.8/host/eth/eth-impl.c
@@ -99,7 +99,7 @@ _tme_eth_callout(struct tme_ethernet *eth, int new_callouts)
   if (eth->tme_eth_callout_flags & TME_ETH_CALLOUT_RUNNING) {
     return;
   }
-
+  
   /* callouts are now running: */
   eth->tme_eth_callout_flags |= TME_ETH_CALLOUT_RUNNING;
 
@@ -177,8 +177,11 @@ _tme_eth_callout(struct tme_ethernet *eth, int new_callouts)
 	assert(rc <= sizeof(frame));
 
 	/* do the write: */
-	status = tme_thread_write(eth->tme_eth_fd, frame, rc);
-
+#ifdef OPENVPN_ETH
+	status = write_tun(eth->tme_eth_handle, frame, rc);
+#else
+	status = tme_thread_write(eth->tme_eth_handle, frame, rc);
+#endif
 	/* writes must succeed: */
 	assert (status == rc);
 
@@ -259,7 +262,7 @@ _tme_eth_th_reader(struct tme_ethernet *eth)
 	    (&eth->tme_eth_element->tme_element_log_handle,
 	     _("calling read")));
 #if 0
-    rc = tme_thread_select_yield(eth->tme_eth_fd + 1,
+    rc = tme_thread_select_yield(eth->tme_eth_handle + 1,
 				 &fdset_read_in,
 				 NULL,
 				 NULL,
@@ -268,9 +271,14 @@ _tme_eth_th_reader(struct tme_ethernet *eth)
 
     }
     
+#elif defined(OPENVPN_ETH)
+    buffer_end = 
+      read_tun(eth->tme_eth_handle,
+	       eth->tme_eth_buffer,
+	       eth->tme_eth_buffer_size);
 #else
     buffer_end = 
-      tme_thread_read_yield(eth->tme_eth_fd,
+      tme_thread_read_yield(eth->tme_eth_handle,
 			    eth->tme_eth_buffer,
 			    eth->tme_eth_buffer_size);
 #endif
@@ -477,7 +485,7 @@ _tme_eth_read(struct tme_ethernet_connection *conn_eth,
 
 #if 0
 /* this finds a network interface via traditional ioctls: */
-int
+_tme_eth_static int
 tme_eth_if_find(const char *ifr_name_user, struct ifreq **_ifreq, tme_uint8_t **_if_addr, unsigned int *_if_addr_size)
 {
   int saved_errno;
@@ -647,7 +655,7 @@ tme_eth_if_find(const char *ifr_name_user, struct ifreq **_ifreq, tme_uint8_t **
 
 #ifdef HAVE_IFADDRS_H
 /* this finds a network interface via the ifaddrs api: */
-int
+_tme_eth_static int
 tme_eth_ifaddrs_find(const char *ifa_name_user, int family, struct ifaddrs **_ifaddr, tme_uint8_t **_if_addr, unsigned int *_if_addr_size)
 {
   struct ifaddrs *ifaddr, *ifa;
@@ -793,7 +801,7 @@ tme_eth_ifaddrs_find(const char *ifa_name_user, int family, struct ifaddrs **_if
 #endif // HAVE_IFADDRS_H
 
 /* Allocate an ethernet device */
-int tme_eth_alloc(char *dev_filename, char **_output)
+_tme_eth_static int tme_eth_alloc(char *dev_filename, char **_output)
 {
   int fd, minor;
   char dev_minor[4];
@@ -829,7 +837,7 @@ int tme_eth_alloc(char *dev_filename, char **_output)
 }
 
 /* this makes a new connection side for a ETH: */
-int
+_tme_eth_static int
 tme_eth_connections_new(struct tme_element *element, 
 			const char * const *args, 
 			struct tme_connection **_conns)
@@ -869,8 +877,12 @@ tme_eth_connections_new(struct tme_element *element,
   return (TME_OK);
 }
 
-int tme_eth_init(struct tme_element *element, 
-		 int fd, 
+_tme_eth_static int tme_eth_init(struct tme_element *element, 
+#ifdef OPENVPN_ETH
+		 struct tuntap *handle,
+#else
+		 int handle,
+#endif
 		 unsigned int sz, 
 		 void *data,
 		 unsigned char *addr,
@@ -881,7 +893,7 @@ int tme_eth_init(struct tme_element *element,
   /* start our data structure: */
   eth = tme_new0(struct tme_ethernet, 1);
   eth->tme_eth_element = element;
-  eth->tme_eth_fd = fd;
+  eth->tme_eth_handle = handle;
   eth->tme_eth_buffer_size = sz;
   eth->tme_eth_buffer = tme_new(tme_uint8_t, sz);
   eth->tme_eth_data = data;

--- a/contrib/tme-0.8/host/openvpn/Makefile.am
+++ b/contrib/tme-0.8/host/openvpn/Makefile.am
@@ -88,8 +88,9 @@ tme_host_openvpn_la_SOURCES = \
 	tap.c \
 	win32.h win32.c \
 	cryptoapi.h cryptoapi.c
+
 tme_host_openvpn_la_LIBADD = \
-	../eth/libeth.la \
+	$(top_builddir)/generic/libtme-generic.la \
 	$(SOCKETS_LIBS) \
 	$(OPTIONAL_LZO_LIBS) \
 	$(OPTIONAL_PKCS11_HELPER_LIBS) \
@@ -97,6 +98,7 @@ tme_host_openvpn_la_LIBADD = \
 	$(OPTIONAL_SELINUX_LIBS) \
 	$(OPTIONAL_SYSTEMD_LIBS) \
 	$(OPTIONAL_DL_LIBS)
+
 if WIN32
 tme_host_openvpn_la_SOURCES += openvpn_win32_resources.rc
 tme_host_openvpn_la_LIBADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm
@@ -106,7 +108,4 @@ tme_host_openvpn_la_LDFLAGS = -module -version-info 0:0:0
 
 include $(top_srcdir)/modules
 
-$(pkglib_LTLIBRARIES): ../eth/libeth.la
-../eth/libeth.la: force
-	cd `dirname $@` && $(MAKE) `basename $@`
-force: ;
+tap.lo: ../eth/eth-impl.c

--- a/contrib/tme-0.8/host/openvpn/tap.c
+++ b/contrib/tme-0.8/host/openvpn/tap.c
@@ -34,9 +34,8 @@
 #include <tme/common.h>
 
 /* includes: */
-#include "eth-if.h"
-#include "syshead.h"
-#include "tun.h"
+#define OPENVPN_HOST
+#include "eth-impl.c"
 
 /* the new TAP function: */
 TME_ELEMENT_SUB_NEW_DECL(tme_host_openvpn,tap) {
@@ -181,9 +180,10 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_openvpn,tap) {
     do_ifconfig(tt, guess, TME_ETHERNET_FRAME_MAX, NULL);
   }
 
+#ifndef OPENVPN_ETH
   /* temporarily turn off ipv6 to disable protocol info being prepended to packets on Linux */
   tt->ipv6 = FALSE;
-  
+#endif
   /* open the tun device */
   open_tun(dev,
 	   dev_type,
@@ -220,6 +220,12 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_openvpn,tap) {
 	     hwaddr[5]));
   }
 #endif
-  return tme_eth_init(element, tt->fd, 4096, NULL, hwaddr, NULL);
+  return tme_eth_init(element,
+#ifdef OPENVPN_ETH
+		      tt,
+#else
+		      tt->fd,
+#endif
+		      4096, NULL, hwaddr, NULL);
   
 }

--- a/contrib/tme-0.8/host/tun/tun-tap.c
+++ b/contrib/tme-0.8/host/tun/tun-tap.c
@@ -248,7 +248,7 @@ _tme_tun_tap_config(struct tme_ethernet_connection *conn_eth,
 
   /* set the filter on the TAP device: */
   TME_TUN_TAP_LEN((TME_TUN_TAP_PROG *)tap_filter) = tap_filter_size;
-  if (ioctl(tap->tme_eth_fd, TUNSETTXFILTER, tap_filter) < 0) {
+  if (ioctl(tap->tme_eth_handle, TUNSETTXFILTER, tap_filter) < 0) {
     tme_log(&tap->tme_eth_element->tme_element_log_handle, 0, errno,
 	    (&tap->tme_eth_element->tme_element_log_handle,
 	     _("failed to set the filter")));