#ifdef CONFIG_UNIX_DONTROUTE added.

diff --git a/sysdep/cf/README b/sysdep/cf/README
index a34427527da82ca6294688660fcace04dfb6b5d6..b278fc5affe8a29cace3317e96a16a2f077369ad 100644 (file)
--- a/sysdep/cf/README
+++ b/sysdep/cf/README
@@ -8,6 +8,7 @@ CONFIG_ALL_TABLES_AT_ONCE       Kernel scanner wants to process all tables at once
 
 CONFIG_UNIX_IFACE      Use Unix interface scanner
 CONFIG_UNIX_SET                Use Unix route setting
+CONFIG_UNIX_DONTROUTE   Use setsockopts DONTROUTE (undef for *BSD)
 CONFIG_LINUX_SCAN      Use Linux /proc/net/route scanner
 
 CONFIG_ALL_MULTICAST   krt-iface: All devices support multicasting (i.e., ignore IFF_MULTICAST)

diff --git a/sysdep/cf/bsd.h b/sysdep/cf/bsd.h
index cfce773ebb81086bb9d8ced8459da331ad9adf0d..f147506498f786f8180a8ff8360b0a45fcbe841c 100644 (file)
--- a/sysdep/cf/bsd.h
+++ b/sysdep/cf/bsd.h
@@ -12,6 +12,7 @@
 
 #undef CONFIG_UNIX_IFACE
 #undef CONFIG_UNIX_SET
+#undef CONFIG_UNIX_DONTROUTE
 
 #define CONFIG_ALL_MULTICAST
 #define CONFIG_UNNUM_MULTICAST

diff --git a/sysdep/cf/linux-20.h b/sysdep/cf/linux-20.h
index 5c6a2377756b95f7bdc9f587d245ff23b8785e73..247f0f1d65b1f3366cd2b6e4446464370648c49f 100644 (file)
--- a/sysdep/cf/linux-20.h
+++ b/sysdep/cf/linux-20.h
@@ -12,6 +12,7 @@
 
 #define CONFIG_UNIX_IFACE
 #define CONFIG_UNIX_SET
+#define CONFIG_UNIX_DONTROUTE
 #define CONFIG_LINUX_SCAN
 
 #define CONFIG_LINUX_MC_MREQ_BIND

diff --git a/sysdep/cf/linux-21.h b/sysdep/cf/linux-21.h
index 17882c81c346f958058f747c728a72c16dd69ce9..57ae796263f350752863d2f909f51b6ad166fa38 100644 (file)
--- a/sysdep/cf/linux-21.h
+++ b/sysdep/cf/linux-21.h
@@ -12,6 +12,7 @@
 
 #define CONFIG_UNIX_IFACE
 #define CONFIG_UNIX_SET
+#define CONFIG_UNIX_DONTROUTE
 #define CONFIG_LINUX_SCAN
 
 #define CONFIG_LINUX_MC_MREQN

diff --git a/sysdep/cf/linux-22.h b/sysdep/cf/linux-22.h
index 52a4681af58d17e409f18bd556beda67ab3593b3..f3629433e58f209cbed8b764014a3508771af1ae 100644 (file)
--- a/sysdep/cf/linux-22.h
+++ b/sysdep/cf/linux-22.h
@@ -12,6 +12,7 @@
 #define CONFIG_ALL_TABLES_AT_ONCE
 
 #define CONFIG_LINUX_MC_MREQN
+#define CONFIG_UNIX_DONTROUTE
 
 /*
 Link: sysdep/linux/netlink

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index c3bd5f8cd28ef5e20dff8504f5745e1eeb47d12f..070150f67f161e6432aad3e936a32b3aacdb3c51 100644 (file)
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -578,8 +578,10 @@ sk_setup(sock *s)
     WARN("IP_TOS");
   if (s->ttl >= 0 && setsockopt(fd, SOL_IP, IP_TTL, &s->ttl, sizeof(s->ttl)) < 0)
     ERR("IP_TTL");
-  //if (s->ttl == 1 && setsockopt(fd, SOL_SOCKET, SO_DONTROUTE, &one, sizeof(one)) < 0)
-  //  ERR("SO_DONTROUTE");
+#ifdef CONFIG_UNIX_DONTROUTE
+  if (s->ttl == 1 && setsockopt(fd, SOL_SOCKET, SO_DONTROUTE, &one, sizeof(one)) < 0)
+    ERR("SO_DONTROUTE");
+#endif 
 #endif
   err = NULL;
 bad: