X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet.c;h=6e4fa6632219038614d8d9f04ccd271fdf2eb5fc;hp=4e00341632872ae153e91d7a2a38368e742d9c29;hb=5019dd879177b5ab9413e5c0aa72a15d0e585acf;hpb=f83803c1bf6557d5af93982e7cd987e151eba401

diff --git a/src/net.c b/src/net.c
index 4e00341..6e4fa66 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.61 2000/11/04 13:25:15 zarq Exp $
+    $Id: net.c,v 1.35.4.65 2000/11/04 17:09:10 guus Exp $
 */
 
 #include "config.h"
@@ -86,12 +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 **p;
-  int i;
-
-  asprintf(&scriptname, "%s/%s", confbase, name);
+  char *s;
 
   if((pid = fork()) < 0)
     {
@@ -102,17 +97,34 @@ int execute_script(const char* name)
 
   if(pid)
     {
-      free(scriptname);
       return 0;
     }
 
   /* Child here */
 
-  env = xmalloc(sizeof(environment) + 1 * sizeof(char*));
-  while(p = environment, i = 0; *p != NULL; p++)
-    env[++i] = *p;
-  asprintf(&(env[0]), "IFNAME=%s", interface_name);
-  execle(scriptname, NULL, env);
+  asprintf(&scriptname, "%s/%s", confbase, name);
+  asprintf(&s, "IFNAME=%s", interface_name);
+  putenv(s);
+  free(s);
+
+  if(netname)
+    {
+      asprintf(&s, "NETNAME=%s", netname);
+      putenv(s);
+      free(s);
+    }
+  else
+    {
+      unsetenv("NETNAME");
+    }
+
+  if(chdir(confbase) < 0)
+    {
+      syslog(LOG_ERR, _("Couldn't chdir to `%s': %m"),
+	     confbase);
+    }
+  
+  execl(scriptname, NULL);
   /* No return on success */
   
   if(errno != ENOENT)  /* Ignore if the file does not exist */
@@ -346,10 +358,21 @@ cp
         }
 
       return -1;
-   }
+    }
 
   cl = subnet->owner;
     
+  if(cl == myself)
+    {
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_NOTICE, _("Packet with destination %d.%d.%d.%d is looping back to us!"),
+	         IP_ADDR_V(to));
+        }
+
+      return -1;
+    }
+
   /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
 
   /* FIXME - check for indirection and reprogram it The Right Way(tm) this time. */