Commit: 87979cc6cd8c8b28d938de3333cf1e324b361ff3 - phabrics (git)

Commit MetaInfo

• Révision: 87979cc6cd8c8b28d938de3333cf1e324b361ff3 (tree)
• l'heure: 2015-10-14 19:37:40
• Auteur: phabrics <phabrics@phab...>
• Commiter: phabrics

Message de Log

Added openvpn functionality to get hardware address and set ipv6 address. Moved setuid to end at GTK init so that all init code that needed it could run before getting there in the main thread.

Change Summary

• modified: contrib/tme-0.8/configure.ac
• 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/gtk/gtk-display.c
• modified: contrib/tme-0.8/host/openvpn/tap.c
• modified: contrib/tme-0.8/host/tun/tun-tap.c
• modified: contrib/tme-0.8/tmesh/tmesh-threads.c
• modified: contrib/tme-0.8/tmesh/tmesh.c

Modification

--- a/contrib/tme-0.8/configure.ac
+++ b/contrib/tme-0.8/configure.ac
@@ -635,9 +635,10 @@ linux*)
    AC_DEFINE_UNQUOTED([TARGET_PREFIX], ["L"], [Target prefix])
    CPPFLAGS="${CPPFLAGS-}"
    DEV_TAP_FILENAME='"\"/dev/net/tun\""'
-   SETCAP="setcap cap_sys_nice,cap_net_admin,cap_net_raw+ep"
+   SETCAP="chmod u+s"
+#   SETCAP="setcap cap_sys_nice,cap_net_admin,cap_net_raw+ep"
    ;;
-mingw*)
+mingw*|cygwin*)
    AC_DEFINE([TARGET_WIN32], [1], [Are we running WIN32?])
    AC_DEFINE_UNQUOTED([TARGET_PREFIX], ["W"], [Target prefix])
    CPPFLAGS="${CPPFLAGS} -DWIN32_LEAN_AND_MEAN"
@@ -983,7 +984,7 @@ fi
 
 for tme_thread_type in ${tme_thread_types}; do
 case "x${tme_thread_type}" in
-xpthreads | xposix)  CPPFLAGS="${CPPFLAGS-} -DTME_THREADS_POSIX -D_GNU_SOURCE" 
+xpthreads | xposix)  CPPFLAGS="${CPPFLAGS-} -DTME_THREADS_POSIX"
 #	  	     CFLAGS="${CFLAGS-} -pthread"
 		     ;;
 xglib)   CPPFLAGS="${CPPFLAGS-} -DTME_THREADS_GLIB ${GLIB_CFLAGS}"

--- a/contrib/tme-0.8/host/bsd/bsd-bpf.c
+++ b/contrib/tme-0.8/host/bsd/bsd-bpf.c
@@ -604,7 +604,7 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_bsd,bpf) {
   rc = _tme_bsd_bpf_args(args, &ifr, &packet_buffer_size, delay_time, _output);
 
   /* find the interface we will use: */
-  rc = tme_eth_ifaddrs_find(ifr.ifr_name, &ifa, NULL, NULL);
+  rc = tme_eth_ifaddrs_find(ifr.ifr_name, AF_UNSPEC, &ifa, NULL, NULL);
 
   if (rc != TME_OK) {
     tme_output_append_error(_output, _("couldn't find an interface %s"), ifr.ifr_name);
@@ -752,7 +752,6 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_bsd,bpf) {
     return (errno);
   }
   
-  setuid(getuid());
 #endif
   
   return tme_eth_init(element, bpf_fd, packet_buffer_size, delay_time, NULL, _tme_bsd_bpf_connections_new);

--- a/contrib/tme-0.8/host/eth/eth-if.h
+++ b/contrib/tme-0.8/host/eth/eth-if.h
@@ -185,7 +185,8 @@ int tme_eth_if_find _TME_P((_tme_const char *,
 
 #endif
 #ifdef HAVE_IFADDRS_H
-int tme_eth_ifaddrs_find _TME_P((_tme_const char *, 
+int tme_eth_ifaddrs_find _TME_P((_tme_const char *,
+				 int family,
 				 struct ifaddrs **, 
 				 tme_uint8_t **, 
 				 unsigned int *));

--- a/contrib/tme-0.8/host/eth/eth-impl.c
+++ b/contrib/tme-0.8/host/eth/eth-impl.c
@@ -364,7 +364,7 @@ static int
 _tme_eth_config(struct tme_ethernet_connection *conn_eth, 
 		    struct tme_ethernet_config *config)
 {
-  abort();
+  assert(0);
 }
 
 /* this is called when control lines change: */
@@ -651,10 +651,11 @@ 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_ifaddrs_find(const char *ifa_name_user, struct ifaddrs **_ifaddr, tme_uint8_t **_if_addr, unsigned int *_if_addr_size)
+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;
   struct ifaddrs *ifa_user = NULL;
+  char ifa_name[INET6_ADDRSTRLEN];
 #if defined(HAVE_AF_LINK) || defined(HAVE_AF_PACKET)
   struct ifaddrs *link_ifaddrs[20];	/* FIXME - magic constant. */
   size_t link_ifaddrs_count;
@@ -695,43 +696,53 @@ tme_eth_ifaddrs_find(const char *ifa_name_user, struct ifaddrs **_ifaddr, tme_ui
     }
 #endif 
 
-    /* ignore this interface if it doesn't do IP: */
-    /* XXX is this actually important? */
-    if (ifa->ifa_addr->sa_family != AF_INET) {
-      continue;
-    }
-
     /* ignore this interface if it isn't up and running: */
     if ((ifa->ifa_flags & (IFF_UP | IFF_RUNNING))
 	!= (IFF_UP | IFF_RUNNING)) {
       continue;
     }
 
+    switch(family) {
+    case AF_UNSPEC:
+      strncpy(ifa_name, ifa->ifa_name, IFNAMSIZ);
+      break;
+    case AF_INET:
+      if(ifa->ifa_addr->sa_family != AF_INET) continue;
+      inet_ntop(family, &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr, ifa_name, INET_ADDRSTRLEN);
+      break;
+    case AF_INET6:
+      if(ifa->ifa_addr->sa_family != AF_INET6) continue;
+      inet_ntop(family, &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr, ifa_name, INET6_ADDRSTRLEN);
+      break;
+    default:
+      return EAFNOSUPPORT;
+    }
+    
     /* if we don't have an interface yet, take this one depending on
        whether the user asked for an interface by name or not.  if he
        did, and this is it, take this one.  if he didn't, and this
        isn't a loopback interface, take this one: */
-    if (ifa_user == NULL
-	&& ((ifa_name_user != NULL && strlen(ifa_name_user))
-	    ? !strncmp(ifa->ifa_name, ifa_name_user, strlen(ifa->ifa_name))
-	    : !(ifa->ifa_flags & IFF_LOOPBACK))) {
+    if ((ifa_name_user != NULL && strlen(ifa_name_user))
+	? !strncmp(ifa_name, ifa_name_user, strlen(ifa_name))
+	: !(ifa->ifa_flags & IFF_LOOPBACK)) {
       ifa_user = ifa;
       break;
     }
-
+    
   }
-
+  
   /* if we don't have an interface to return: */
   if (ifa_user == NULL) {
     return ENOENT;
   }
-
+  
   /* return this interface: */
-  *_ifaddr = (struct ifaddrs *) tme_memdup(ifa_user, sizeof(struct ifaddrs));
-
+  if (_ifaddr != NULL)
+    *_ifaddr = (struct ifaddrs *) tme_memdup(ifa_user, sizeof(struct ifaddrs));
+    
   /* assume that we can't find this interface's hardware address: */
   if (_if_addr != NULL) {
-    *_if_addr = NULL;
+      *_if_addr = NULL;
   }
   if (_if_addr_size != NULL) {    
     *_if_addr_size = 0;
@@ -848,7 +859,7 @@ tme_eth_connections_new(struct tme_element *element,
   conn->tme_connection_score = tme_ethernet_connection_score;
   conn->tme_connection_make = _tme_eth_connection_make;
   conn->tme_connection_break = _tme_eth_connection_break;
-
+  
   /* fill in the Ethernet connection: */
   conn_eth->tme_ethernet_connection_config = _tme_eth_config;
   conn_eth->tme_ethernet_connection_ctrl = _tme_eth_ctrl;

--- a/contrib/tme-0.8/host/gtk/gtk-display.c
+++ b/contrib/tme-0.8/host/gtk/gtk-display.c
@@ -285,7 +285,7 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
   }
 
   /* call gtk_init if we haven't already: */
-  //  tme_threads_gtk_init();
+  tme_threads_gtk_init();
 
   /* start our data structure: */
   display = tme_new0(struct tme_gtk_display, 1);

--- a/contrib/tme-0.8/host/openvpn/tap.c
+++ b/contrib/tme-0.8/host/openvpn/tap.c
@@ -38,70 +38,71 @@
 #include "syshead.h"
 #include "tun.h"
 
-/* macros: */
-/* device names: */
-#define TME_DEV (0)
-#define TME_DEV_TYPE (1)
-#define TME_DEV_NODE (2)
-#define TME_DEV_ADDR (3)
-#define TME_DEV_TOTAL (4)
-
-/* interface addresses: */
-#define TME_IP_ADDRS_INET (0)
-#define TME_IP_ADDRS_NETMASK (1)
-#define TME_IP_ADDRS_TOTAL (2)
-
-/* retrieve ethernet arguments */
-int _tme_openvpn_tap_args(const char * const args[], 
-			  char *devs[],
-			  struct in_addr *ip_addrs,
-			  char **_output)
-{
+/* the new TAP function: */
+TME_ELEMENT_SUB_NEW_DECL(tme_host_openvpn,tap) {
+  int rc;
+  struct gc_arena gc = gc_new ();
+  const char *dev, *dev_type, *dev_node, *dev_addr;
+  const char *inet, *netmask, *inet6, *remote6, *netbits;
+  unsigned char *hwaddr;
+  unsigned int hwaddr_len;
+  struct tuntap *tt;
   int arg_i;
   int usage;
   
   /* check our arguments: */
   usage = 0;
 
-  memset(ip_addrs, 0, TME_IP_ADDRS_TOTAL * sizeof(struct in_addr));
-
+  dev = dev_type = dev_node = dev_addr =
+    inet = netmask = inet6 = remote6 = netbits = NULL;
+  
   arg_i = 1;
 
   for (;;) {
     /* the interface we're supposed to use: */
     if (TME_ARG_IS(args[arg_i + 0], "dev")
 	&& args[arg_i + 1] != NULL) {
-      devs[TME_DEV] = args[arg_i + 1];
+      dev = args[arg_i + 1];
     }
 
     else if (TME_ARG_IS(args[arg_i + 0], "dev-type")
 	&& args[arg_i + 1] != NULL) {
-      devs[TME_DEV_TYPE] = args[arg_i + 1];
+      dev_type = args[arg_i + 1];
     }
 
     else if (TME_ARG_IS(args[arg_i + 0], "dev-node")
 	&& args[arg_i + 1] != NULL) {
-      devs[TME_DEV_NODE] = args[arg_i + 1];
+      dev_node = args[arg_i + 1];
     }
 
     else if (TME_ARG_IS(args[arg_i + 0], "dev-addr")
 	&& args[arg_i + 1] != NULL) {
-      devs[TME_DEV_ADDR] = args[arg_i + 1];
+      dev_addr = args[arg_i + 1];
     }
 
     else if(TME_ARG_IS(args[arg_i + 0], "inet") 
 	 && args[arg_i + 1] != NULL) {
-      inet_pton(AF_INET, args[arg_i + 1], ip_addrs + TME_IP_ADDRS_INET);      
+      inet = args[arg_i + 1];
     }
-    /*
+
+    else if (TME_ARG_IS(args[arg_i + 0], "netmask")
+	&& args[arg_i + 1] != NULL) {
+      netmask =  args[arg_i + 1];
+    }
+
     else if(TME_ARG_IS(args[arg_i + 0], "inet6") 
 	 && args[arg_i + 1] != NULL) {
-      inet_pton(AF_INET6, args[arg_i + 1], ip_addrs + TME_IP_ADDRS_INET6);      
+      inet6 = args[arg_i + 1];
     }
-    */
-    else if (TME_ARG_IS(args[arg_i + 0], "netmask")
+
+    else if(TME_ARG_IS(args[arg_i + 0], "remote6") 
+	 && args[arg_i + 1] != NULL) {
+      remote6 = args[arg_i + 1];
+    }
+
+    else if (TME_ARG_IS(args[arg_i + 0], "netbits")
 	&& args[arg_i + 1] != NULL) {
-      inet_pton(AF_INET, args[arg_i + 1], ip_addrs + TME_IP_ADDRS_NETMASK);
+      netbits =  args[arg_i + 1];
     }
 
     /* if we ran out of arguments: */
@@ -123,7 +124,7 @@ int _tme_openvpn_tap_args(const char * const args[],
 
   if (usage) {
     tme_output_append_error(_output,
-			    "%s %s [ dev %s ] [ dev-type %s ] [ dev-node %s ] [ dev-addr %s ] [ inet %s ] [ netmask %s ]",
+			    "%s %s [ dev %s ] [ dev-type %s ] [ dev-node %s ] [ dev-addr %s ] [ inet %s ] [ netmask %s ] [ inet6 %s] [remote6 %s]",
 			    _("usage:"),
 			    args[0],
 			    _("NAME"),
@@ -131,77 +132,72 @@ int _tme_openvpn_tap_args(const char * const args[],
 			    _("NODE"),
 			    _("LLADDR"),
 			    _("IPADDRESS"),
-			    _("IPADDRESS"));
+			    _("IPADDRESS"),
+			    _("IP6ADDRESS"),
+			    _("IP6ADDRESS"));
     return (EINVAL);
   }
-  return (TME_OK);
-}
-
-/* the new TAP function: */
-TME_ELEMENT_SUB_NEW_DECL(tme_host_openvpn,tap) {
-  int i;
-  struct gc_arena gc = gc_new ();
-  char *devs[TME_DEV_TOTAL];
-  char tap_hosts[TME_IP_ADDRS_TOTAL][NI_MAXHOST];
-  struct in_addr tap_addrs[TME_IP_ADDRS_TOTAL];
-  unsigned char *hwaddr;
-  unsigned int hwaddr_len;
-  struct tuntap *tt;
   
-  for(i=0;i<TME_DEV_TOTAL;i++) {
-    devs[i]=NULL;
-  }
-  /* get the arguments: */
-  _tme_openvpn_tap_args(args, devs, tap_addrs, _output);
-
-  if(!devs[TME_DEV]) devs[TME_DEV] = "tap";
+  if(!dev) dev = "tap";
   
-  for(i=0;i<TME_IP_ADDRS_TOTAL;i++) {
-    inet_ntop(AF_INET, &tap_addrs[i], tap_hosts[i], NI_MAXHOST);
-  }
   tme_log(&element->tme_element_log_handle, 0, TME_OK, 
 	  (&element->tme_element_log_handle, 
-	   "trying tap device (%s, %s, %s) with link-layer address %s, ip address %s, netmask %s",
-	   ((devs[TME_DEV]) ? (devs[TME_DEV]) : ""),
-	   ((devs[TME_DEV_TYPE]) ? (devs[TME_DEV_TYPE]) : ""),
-	   ((devs[TME_DEV_NODE]) ? (devs[TME_DEV_TYPE]) : ""),
-	   ((devs[TME_DEV_ADDR]) ? (devs[TME_DEV_ADDR]) : ""),
-	   tap_hosts[TME_IP_ADDRS_INET],
-	   tap_hosts[TME_IP_ADDRS_NETMASK]));
-
+	   "trying tap device (%s, type %s, node %s) with addresses: link %s, ip %s/%s, ip6 %s/%s prefixlen %s",
+	   dev,
+	   (dev_type) ? (dev_type) : "",
+	   (dev_node) ? (dev_node) : "",
+	   (dev_addr) ? (dev_addr) : "",
+	   (inet) ? (inet) : "",
+	   (netmask) ? (netmask) : "",
+	   (inet6) ? (inet6) : "",
+	   (remote6) ? (remote6) : "",
+	   (netbits) ? (netbits) : ""));
+	  
   error_reset();
-  tt = init_tun(devs[TME_DEV],
-		devs[TME_DEV_TYPE],
+  tt = init_tun(dev,
+		dev_type,
 		TOP_SUBNET,
-		tap_hosts[TME_IP_ADDRS_INET],
-		tap_hosts[TME_IP_ADDRS_NETMASK],		
-		NULL, 0, NULL, 0, 0, 0, NULL);
+		inet,
+		netmask,		
+		inet6,
+		(netbits) ? (atoi(netbits)) : (0),
+		remote6,
+		0,
+		0,
+		0,
+		NULL);
 
   if(ifconfig_order() == IFCONFIG_BEFORE_TUN_OPEN) {
     /* guess actual tun/tap unit number that will be returned
        by open_tun */
-    const char *guess = guess_tuntap_dev(devs[TME_DEV],
-					 devs[TME_DEV_TYPE],
-					 devs[TME_DEV_NODE],
+    const char *guess = guess_tuntap_dev(dev,
+					 dev_type,
+					 dev_node,
 					 &gc);
     do_ifconfig(tt, guess, TME_ETHERNET_FRAME_MAX, NULL);
   }
   
   /* open the tun device */
-  open_tun(devs[TME_DEV],
-	   devs[TME_DEV_TYPE],
-	   devs[TME_DEV_NODE],
+  open_tun(dev,
+	   dev_type,
+	   dev_node,
 	   tt);
 
   /* set the hardware address */
-  if(devs[TME_DEV_ADDR])
-    set_lladdr(tt->actual_name, devs[TME_DEV_ADDR], NULL);
-
+  if(dev_addr)
+    set_lladdr(tt->actual_name, dev_addr, NULL);
+  
   /* do ifconfig */
   if(ifconfig_order() == IFCONFIG_AFTER_TUN_OPEN) {
     do_ifconfig(tt, tt->actual_name, TME_ETHERNET_FRAME_MAX, NULL);
   }
-
+  
+  /* find the interface we will use: */
+  if(inet || inet6)
+    rc = tme_eth_ifaddrs_find((inet) ? (inet) : (inet6),
+			      (inet) ? (AF_INET) : (AF_INET6),
+			      NULL, &hwaddr, &hwaddr_len);
+    
   return tme_eth_init(element, tt->fd, 4096, NULL, hwaddr, NULL);
-
+  
 }

--- a/contrib/tme-0.8/host/tun/tun-tap.c
+++ b/contrib/tme-0.8/host/tun/tun-tap.c
@@ -858,7 +858,7 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_tun,tap) {
   close(dummy_fd);
 
   /* find the interface we will use: */
-  rc = tme_eth_ifaddrs_find(TAPIF, &ifa, &hwaddr, &hwaddr_len);
+  rc = tme_eth_ifaddrs_find(TAPIF, AF_UNSPEC, &ifa, &hwaddr, &hwaddr_len);
   
   for(i=0;i<TME_IP_ADDRS_TOTAL;i++) {
     if((rc = getnameinfo(*(struct sockaddr **)((char *)ifa + ifa_offs[i]),
@@ -901,7 +901,7 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_tun,tap) {
 	   "trying nat interface %s", NATIF));
 	   
   /* find the interface we will use: */
-  rc = tme_eth_ifaddrs_find(NATIF, &ifa, NULL, NULL);
+  rc = tme_eth_ifaddrs_find(NATIF, AF_UNSPEC, &ifa, NULL, NULL);
 
   if (rc != TME_OK) {
     tme_output_append_error(_output, _("couldn't find an interface %s"), NATIF);
@@ -1281,11 +1281,6 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_tun,tap) {
   close(dummy_fd);
 #endif // TME_DO_APF
 
-#ifdef SIOCAIFADDR
-  // For BSD, we run setuid until here
-  setuid(getuid());
-#endif
-
   return tme_eth_init(element, tap_fd, 4096, NULL, hwaddr, _tme_tun_tap_connections_new);
 
 #undef TAPINET

--- a/contrib/tme-0.8/tmesh/tmesh-threads.c
+++ b/contrib/tme-0.8/tmesh/tmesh-threads.c
@@ -57,6 +57,11 @@ void tme_threads_gtk_init(void)
     return;
   }
 
+  /* make sure we aren't running setuid */
+#ifdef HAVE_SETUID
+  setuid(getuid());
+#endif
+  
   /* conjure up an argv.  this is pretty bad: */
   argv = argv_buffer;
   argc = 0;

--- a/contrib/tme-0.8/tmesh/tmesh.c
+++ b/contrib/tme-0.8/tmesh/tmesh.c
@@ -846,9 +846,6 @@ main(int argc, char **argv)
 #endif // HAVE_PTHREAD_SETSCHEDPARAM  
 #endif
   
-  if(using_gtk)
-    tme_threads_gtk_init();
-  
   /* initialize libtmesh: */
   (void) tmesh_init();
 
@@ -924,6 +921,9 @@ main(int argc, char **argv)
     tme_thread_create(&tmesh_thread, (tme_thread_t) _tmesh_th, NULL);
   }
 
+  if(using_gtk)
+    tme_threads_gtk_init();
+  
   /* run the threads: */
   tme_threads_run();