lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: Use nf_register_hooks for multiple registrations

Browse Source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy
2007-12-05 01:22:43 -08:00
committed by David S. Miller
parent 279c2c74b6
commit 41c5b31703
2 changed files with 57 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
net/ipv4/ipvs/ip_vs_core.c
View File

@@ -1025,43 +1025,42 @@ ip_vs_forward_icmp(unsigned int hooknum, struct sk_buff *skb,
} }
/* After packet filtering, forward packet through VS/DR, VS/TUN, static struct nf_hook_ops ip_vs_ops[] = {
or VS/NAT(change destination), so that filtering rules can be /* After packet filtering, forward packet through VS/DR, VS/TUN,
applied to IPVS. */ * or VS/NAT(change destination), so that filtering rules can be
static struct nf_hook_ops ip_vs_in_ops = { * applied to IPVS. */
{
.hook = ip_vs_in, .hook = ip_vs_in,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pf = PF_INET, .pf = PF_INET,
.hooknum = NF_INET_LOCAL_IN, .hooknum = NF_INET_LOCAL_IN,
.priority = 100, .priority = 100,
}; },
/* After packet filtering, change source only for VS/NAT */
/* After packet filtering, change source only for VS/NAT */ {
static struct nf_hook_ops ip_vs_out_ops = {
.hook = ip_vs_out, .hook = ip_vs_out,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pf = PF_INET, .pf = PF_INET,
.hooknum = NF_INET_FORWARD, .hooknum = NF_INET_FORWARD,
.priority = 100, .priority = 100,
}; },
/* After packet filtering (but before ip_vs_out_icmp), catch icmp
/* After packet filtering (but before ip_vs_out_icmp), catch icmp * destined for 0.0.0.0/0, which is for incoming IPVS connections */
destined for 0.0.0.0/0, which is for incoming IPVS connections */ {
static struct nf_hook_ops ip_vs_forward_icmp_ops = {
.hook = ip_vs_forward_icmp, .hook = ip_vs_forward_icmp,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pf = PF_INET, .pf = PF_INET,
.hooknum = NF_INET_FORWARD, .hooknum = NF_INET_FORWARD,
.priority = 99, .priority = 99,
}; },
/* Before the netfilter connection tracking, exit from POST_ROUTING */
/* Before the netfilter connection tracking, exit from POST_ROUTING */ {
static struct nf_hook_ops ip_vs_post_routing_ops = {
.hook = ip_vs_post_routing, .hook = ip_vs_post_routing,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pf = PF_INET, .pf = PF_INET,
.hooknum = NF_INET_POST_ROUTING, .hooknum = NF_INET_POST_ROUTING,
.priority = NF_IP_PRI_NAT_SRC-1, .priority = NF_IP_PRI_NAT_SRC-1,
},
}; };
@@ -1092,37 +1091,15 @@ static int __init ip_vs_init(void)
goto cleanup_app; goto cleanup_app;
} }
ret = nf_register_hook(&ip_vs_in_ops); ret = nf_register_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
if (ret < 0) { if (ret < 0) {
IP_VS_ERR("can't register in hook.\n"); IP_VS_ERR("can't register hooks.\n");
goto cleanup_conn; goto cleanup_conn;
} }
ret = nf_register_hook(&ip_vs_out_ops);
if (ret < 0) {
IP_VS_ERR("can't register out hook.\n");
goto cleanup_inops;
}
ret = nf_register_hook(&ip_vs_post_routing_ops);
if (ret < 0) {
IP_VS_ERR("can't register post_routing hook.\n");
goto cleanup_outops;
}
ret = nf_register_hook(&ip_vs_forward_icmp_ops);
if (ret < 0) {
IP_VS_ERR("can't register forward_icmp hook.\n");
goto cleanup_postroutingops;
}
IP_VS_INFO("ipvs loaded.\n"); IP_VS_INFO("ipvs loaded.\n");
return ret; return ret;
cleanup_postroutingops:
nf_unregister_hook(&ip_vs_post_routing_ops);
cleanup_outops:
nf_unregister_hook(&ip_vs_out_ops);
cleanup_inops:
nf_unregister_hook(&ip_vs_in_ops);
cleanup_conn: cleanup_conn:
ip_vs_conn_cleanup(); ip_vs_conn_cleanup();
cleanup_app: cleanup_app:
@@ -1136,10 +1113,7 @@ static int __init ip_vs_init(void)
static void __exit ip_vs_cleanup(void) static void __exit ip_vs_cleanup(void)
{ {
nf_unregister_hook(&ip_vs_forward_icmp_ops); nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
nf_unregister_hook(&ip_vs_post_routing_ops);
nf_unregister_hook(&ip_vs_out_ops);
nf_unregister_hook(&ip_vs_in_ops);
ip_vs_conn_cleanup(); ip_vs_conn_cleanup();
ip_vs_app_cleanup(); ip_vs_app_cleanup();
ip_vs_protocol_cleanup(); ip_vs_protocol_cleanup();

24
net/sched/sch_ingress.c
View File

@@ -231,20 +231,21 @@ ing_hook(unsigned int hook, struct sk_buff *skb,
} }
/* after ipt_filter */ /* after ipt_filter */
static struct nf_hook_ops ing_ops = { static struct nf_hook_ops ing_ops[] = {
{
.hook = ing_hook, .hook = ing_hook,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pf = PF_INET, .pf = PF_INET,
.hooknum = NF_INET_PRE_ROUTING, .hooknum = NF_INET_PRE_ROUTING,
.priority = NF_IP_PRI_FILTER + 1, .priority = NF_IP_PRI_FILTER + 1,
}; },
{
static struct nf_hook_ops ing6_ops = {
.hook = ing_hook, .hook = ing_hook,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pf = PF_INET6, .pf = PF_INET6,
.hooknum = NF_INET_PRE_ROUTING, .hooknum = NF_INET_PRE_ROUTING,
.priority = NF_IP6_PRI_FILTER + 1, .priority = NF_IP6_PRI_FILTER + 1,
},
}; };
#endif #endif
@@ -268,17 +269,11 @@ static int ingress_init(struct Qdisc *sch,struct rtattr *opt)
#ifndef CONFIG_NET_CLS_ACT #ifndef CONFIG_NET_CLS_ACT
#ifdef CONFIG_NETFILTER #ifdef CONFIG_NETFILTER
if (!nf_registered) { if (!nf_registered) {
if (nf_register_hook(&ing_ops) < 0) { if (nf_register_hooks(ing_ops, ARRAY_SIZE(ing_ops)) < 0) {
printk("ingress qdisc registration error \n"); printk("ingress qdisc registration error \n");
return -EINVAL; return -EINVAL;
} }
nf_registered++; nf_registered++;
if (nf_register_hook(&ing6_ops) < 0) {
printk("IPv6 ingress qdisc registration error, " \
"disabling IPv6 support.\n");
} else
nf_registered++;
} }
#endif #endif
#endif #endif
@@ -385,11 +380,8 @@ static void __exit ingress_module_exit(void)
unregister_qdisc(&ingress_qdisc_ops); unregister_qdisc(&ingress_qdisc_ops);
#ifndef CONFIG_NET_CLS_ACT #ifndef CONFIG_NET_CLS_ACT
#ifdef CONFIG_NETFILTER #ifdef CONFIG_NETFILTER
if (nf_registered) { if (nf_registered)
nf_unregister_hook(&ing_ops); nf_unregister_hooks(ing_ops, ARRAY_SIZE(ing_ops));
if (nf_registered > 1)
nf_unregister_hook(&ing6_ops);
}
#endif #endif
#endif #endif
} }