- Check for packets that are looping back.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index bd991e9..6e4fa66 100644 (file)
--- 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.62 2000/11/04 14:16:46 zarq Exp $
+    $Id: net.c,v 1.35.4.65 2000/11/04 17:09:10 guus Exp $
 */
 
 #include "config.h"
@@ -88,8 +88,6 @@ int execute_script(const char* name)
   pid_t pid;
   char *s;
 
-  asprintf(&scriptname, "%s/%s", confbase, name);
-
   if((pid = fork()) < 0)
     {
       syslog(LOG_ERR, _("System call `%s' failed: %m"),
@@ -99,14 +97,33 @@ int execute_script(const char* name)
 
   if(pid)
     {
-      free(scriptname);
       return 0;
     }
 
   /* Child here */
 
+  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 */
   
@@ -341,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. */