X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=bd991e905689ea910fdfa0101467718eeb3c062a;hp=049f28e3dc9fb930cccafcdca9fcab5e62afe649;hb=d38772ebc42f5ad1d946ee89d955f5d43bb2fe8c;hpb=73aa7fbf7e1b623398d1bc1493f567ce4d846f22

diff --git a/src/net.c b/src/net.c
index 049f28e3..bd991e90 100644
--- 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.
 
-    $Id: net.c,v 1.35.4.58 2000/11/03 22:33:16 zarq Exp $
+    $Id: net.c,v 1.35.4.62 2000/11/04 14:16:46 zarq Exp $
 */
 
 #include "config.h"
@@ -78,32 +78,6 @@ char *interface_name = NULL;  /* Contains the name of the interface */
 
 subnet_t mymac;
 
-/*
-  strip off the MAC adresses of an ethernet frame
-*/
-void strip_mac_addresses(vpn_packet_t *p)
-{
-cp
-  memmove(p->data, p->data + 12, p->len -= 12);
-cp
-}
-
-/*
-  reassemble MAC addresses
-*/
-void add_mac_addresses(vpn_packet_t *p)
-{
-cp
-  memcpy(p->data + 12, p->data, p->len);
-  p->len += 12;
-  p->data[0] = p->data[6] = 0xfe;
-  p->data[1] = p->data[7] = 0xfd;
-  /* Really evil pointer stuff just below! */
-  *((ip_t*)(&p->data[2])) = (ip_t)(htonl(myself->address));
-  *((ip_t*)(&p->data[8])) = *((ip_t*)(&p->data[26]));
-cp
-}
-
 /*
   Execute the given script.
   This function doesn't really belong here.
@@ -112,8 +86,7 @@ int execute_script(const char* name)
 {
   char *scriptname;
   pid_t pid;
-  char **env;
-  extern char **environment;  /* From tincd.c; contains our env */
+  char *s;
 
   asprintf(&scriptname, "%s/%s", confbase, name);
 
@@ -132,10 +105,9 @@ int execute_script(const char* name)
 
   /* Child here */
 
-  env = xmalloc(sizeof(environment) + 1 * sizeof(char*));
-  memcpy(&(env[1]), environment, sizeof(environment));
-  asprintf(&(env[0]), "IFNAME=%s", interface_name);
-  execle(scriptname, NULL, env);
+  asprintf(&s, "IFNAME=%s", interface_name);
+  putenv(s);
+  execl(scriptname, NULL);
   /* No return on success */
   
   if(errno != ENOENT)  /* Ignore if the file does not exist */
@@ -929,7 +901,6 @@ cp
 void close_network_connections(void)
 {
   conn_list_t *p;
-  char *scriptname;
 cp
   for(p = conn_list; p != NULL; p = p->next)
     {
@@ -946,10 +917,11 @@ cp
         myself = NULL;
       }
 
-  /* Execute tinc-down script right before shutting down the interface */
+  close(tap_fd);
+
+  /* Execute tinc-down script right after shutting down the interface */
   execute_script("tinc-down");
 
-  close(tap_fd);
   destroy_conn_list();
 
   syslog(LOG_NOTICE, _("Terminating"));