- support for proxy ARP per interface

- fix sysctl for IPV6_DISABLE_AUTOCONF
- typos, formatting
- MTU for ethernet already supported [ remove from TODO ]

svn-id: @1056

diff --git a/TODO b/TODO
index 6a29af6a9ef3de519ccb7df31efc2491c26f997e..ef2e34ddb6c8272f87b0acb25baf56653d66ae01 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,13 +1,12 @@
-$Id: TODO,v 1.15 2002/01/22 23:45:27 gotar Exp $
+$Id: TODO,v 1.16 2003/01/15 22:33:57 ankry Exp $
 
 Features missing:
 - IPSec (freeswan) support
 - NLS with national characters support
 
 Important:
-- don't set any flags automaticly; always follow user
+- don't set any flags automatically; always follow user
   suggestion (multicast, arp)
-- MTU for ethernet
 - merge baggins changes in atm-rc (added support for RFC1483/2684 Bridged
   protocol)
 

diff --git a/sysconfig/interfaces/ifcfg-description b/sysconfig/interfaces/ifcfg-description
index 69b2e6feab7d32f47a2eec7204f977e724e85b73..c0f2850a4d16243ec64634f9e733acc7dafe9166 100644 (file)
--- a/sysconfig/interfaces/ifcfg-description
+++ b/sysconfig/interfaces/ifcfg-description
@@ -1,4 +1,4 @@
-#      $Id: ifcfg-description,v 1.18 2002/11/12 15:54:04 kloczek Exp $
+#      $Id: ifcfg-description,v 1.19 2003/01/15 22:34:06 ankry Exp $
 DEVICE=<name>
 [ BOOTPROTO={none|bootp|dhcp|pump} ]
   You can specify which dhcp client to use with the DHCP_CLIENT, if
@@ -31,8 +31,8 @@ IP6_PRIM_IF=""                #
 IP6_SRC_IF=""          # 
 
 [ ONBOOT={no|yes} ]
-[ MULTICAST={|no|yes} ]        - for eth automamaticly set to yes
-[ ARP={no|yes} ]       - for eth automamaticly set to yes
+[ MULTICAST={|no|yes} ]        - for eth automatically set to yes
+[ ARP={no|yes} ]       - for eth automatically set to yes
 [ IPV6_DISABLE_AUTOCONF={yes|no} ] - disable IPv6 autoconfiguration
 
 [ IPX=yes|no ]
@@ -45,6 +45,7 @@ fi
 
 [ MTU= ]
 [ METRIC= ]
+[ PROXYARP={yes|no} ]
 
 QDISC=[sfq|teql0|red|prio|...] (queueing discipline)
 QDISC_CLASS=[htb|cbq|none]     (use cbq|htb as class based discipline;

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 22a8dfd98b28845365006dece84bb2e8899ca7a9..fba928bbf80312d4e71226834d2c697f2b7f0272 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup,v 1.69 2002/07/13 23:04:42 misiek Exp $
+#      $Id: ifup,v 1.70 2003/01/15 22:34:10 ankry Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -82,7 +82,7 @@ if is_yes "$SLAVE" && [ -n "$MASTER" -a -x /sbin/ifenslave ]; then
 fi
 
 if [ -n "$MACADDR" ]; then
-   ip link set ${DEVICE} address ${MACADDR}
+    ip link set ${DEVICE} address ${MACADDR}
 fi
 
 ip link set ${DEVICE} multicast ${MULTICAST} ${ARP} down
@@ -92,7 +92,7 @@ if [ -n "$MTU" ]; then
 fi
 
 if is_yes "${IPV6_NETWORKING}" && is_yes "${IPV6_DISABLE_AUTOCONF}"; then
-       run_cmd "Disabling IPv6 autoconfiguration" sysctl -w net.ipv6.conf.${DEVICE}=0
+    run_cmd "Disabling IPv6 autoconfiguration" sysctl -w net.ipv6.conf.${DEVICE}.autoconf=0
 fi
 
 if is_wireless_device "${DEVICE}"; then
@@ -217,6 +217,10 @@ else
     setup_ip_gw_ro
 fi
 
+# device have to have ip address set before
+if [ is_yes "$PROXYARP" ]; then
+    run_cmd "Enabling proxy ARP on ${DEVICE}" sysctl -w net.ipv4.conf.${DEVICE}.proxy_arp=1
+fi
 
 if [ "$HANDLING" = "3" ]; then
        exit 0