patch-2.4.4 linux/net/ipv4/netfilter/ipt_MASQUERADE.c
Next file: linux/net/ipv4/netfilter/ipt_REJECT.c
Previous file: linux/net/ipv4/netfilter/ipchains_core.c
Back to the patch index
Back to the overall index
- Lines: 68
- Date:
Fri Apr 27 14:15:01 2001
- Orig file:
v2.4.3/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
- Orig date:
Mon Jan 29 16:19:41 2001
diff -u --recursive --new-file v2.4.3/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -127,14 +127,32 @@
return ret;
}
-int masq_device_event(struct notifier_block *this,
- unsigned long event,
- void *ptr)
+static int masq_device_event(struct notifier_block *this,
+ unsigned long event,
+ void *ptr)
{
struct net_device *dev = ptr;
- if (event == NETDEV_DOWN || event == NETDEV_CHANGEADDR) {
- /* Device was downed/changed (diald) Search entire table for
+ if (event == NETDEV_DOWN) {
+ /* Device was downed. Search entire table for
+ conntracks which were associated with that device,
+ and forget them. */
+ IP_NF_ASSERT(dev->ifindex != 0);
+
+ ip_ct_selective_cleanup(device_cmp, (void *)(long)dev->ifindex);
+ }
+
+ return NOTIFY_DONE;
+}
+
+static int masq_inet_event(struct notifier_block *this,
+ unsigned long event,
+ void *ptr)
+{
+ struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
+
+ if (event == NETDEV_DOWN) {
+ /* IP address was deleted. Search entire table for
conntracks which were associated with that device,
and forget them. */
IP_NF_ASSERT(dev->ifindex != 0);
@@ -151,6 +169,12 @@
0
};
+static struct notifier_block masq_inet_notifier = {
+ masq_inet_event,
+ NULL,
+ 0
+};
+
static struct ipt_target masquerade
= { { NULL, NULL }, "MASQUERADE", masquerade_target, masquerade_check, NULL,
THIS_MODULE };
@@ -164,6 +188,8 @@
if (ret == 0) {
/* Register for device down reports */
register_netdevice_notifier(&masq_dev_notifier);
+ /* Register IP address change reports */
+ register_inetaddr_notifier(&masq_inet_notifier);
}
return ret;
@@ -173,6 +199,7 @@
{
ipt_unregister_target(&masquerade);
unregister_netdevice_notifier(&masq_dev_notifier);
+ unregister_inetaddr_notifier(&masq_inet_notifier);
}
module_init(init);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)