netfilter: conntrack: constify list of builtin trackers
Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
3921584674
commit
cd9ceafc0a
|
@ -125,18 +125,18 @@ int nf_ct_l4proto_pernet_register_one(struct net *net,
|
|||
void nf_ct_l4proto_pernet_unregister_one(struct net *net,
|
||||
const struct nf_conntrack_l4proto *proto);
|
||||
int nf_ct_l4proto_pernet_register(struct net *net,
|
||||
struct nf_conntrack_l4proto *const proto[],
|
||||
const struct nf_conntrack_l4proto *const proto[],
|
||||
unsigned int num_proto);
|
||||
void nf_ct_l4proto_pernet_unregister(struct net *net,
|
||||
struct nf_conntrack_l4proto *const proto[],
|
||||
const struct nf_conntrack_l4proto *const proto[],
|
||||
unsigned int num_proto);
|
||||
|
||||
/* Protocol global registration. */
|
||||
int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *proto);
|
||||
int nf_ct_l4proto_register_one(const struct nf_conntrack_l4proto *proto);
|
||||
void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *proto);
|
||||
int nf_ct_l4proto_register(struct nf_conntrack_l4proto *proto[],
|
||||
int nf_ct_l4proto_register(const struct nf_conntrack_l4proto * const proto[],
|
||||
unsigned int num_proto);
|
||||
void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *proto[],
|
||||
void nf_ct_l4proto_unregister(const struct nf_conntrack_l4proto * const proto[],
|
||||
unsigned int num_proto);
|
||||
|
||||
/* Generic netlink helpers */
|
||||
|
|
|
@ -368,7 +368,7 @@ MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));
|
|||
MODULE_ALIAS("ip_conntrack");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static struct nf_conntrack_l4proto *builtin_l4proto4[] = {
|
||||
static const struct nf_conntrack_l4proto * const builtin_l4proto4[] = {
|
||||
&nf_conntrack_l4proto_tcp4,
|
||||
&nf_conntrack_l4proto_udp4,
|
||||
&nf_conntrack_l4proto_icmp,
|
||||
|
|
|
@ -368,7 +368,7 @@ static struct nf_sockopt_ops so_getorigdst6 = {
|
|||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static struct nf_conntrack_l4proto *builtin_l4proto6[] = {
|
||||
static const struct nf_conntrack_l4proto * const builtin_l4proto6[] = {
|
||||
&nf_conntrack_l4proto_tcp6,
|
||||
&nf_conntrack_l4proto_udp6,
|
||||
&nf_conntrack_l4proto_icmpv6,
|
||||
|
|
|
@ -385,7 +385,7 @@ void nf_ct_l4proto_unregister_sysctl(struct net *net,
|
|||
|
||||
/* FIXME: Allow NULL functions and sub in pointers to generic for
|
||||
them. --RR */
|
||||
int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *l4proto)
|
||||
int nf_ct_l4proto_register_one(const struct nf_conntrack_l4proto *l4proto)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
|
@ -498,7 +498,7 @@ void nf_ct_l4proto_pernet_unregister_one(struct net *net,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_unregister_one);
|
||||
|
||||
int nf_ct_l4proto_register(struct nf_conntrack_l4proto *l4proto[],
|
||||
int nf_ct_l4proto_register(const struct nf_conntrack_l4proto * const l4proto[],
|
||||
unsigned int num_proto)
|
||||
{
|
||||
int ret = -EINVAL, ver;
|
||||
|
@ -520,7 +520,7 @@ int nf_ct_l4proto_register(struct nf_conntrack_l4proto *l4proto[],
|
|||
EXPORT_SYMBOL_GPL(nf_ct_l4proto_register);
|
||||
|
||||
int nf_ct_l4proto_pernet_register(struct net *net,
|
||||
struct nf_conntrack_l4proto *const l4proto[],
|
||||
const struct nf_conntrack_l4proto *const l4proto[],
|
||||
unsigned int num_proto)
|
||||
{
|
||||
int ret = -EINVAL;
|
||||
|
@ -541,7 +541,7 @@ int nf_ct_l4proto_pernet_register(struct net *net,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_register);
|
||||
|
||||
void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *l4proto[],
|
||||
void nf_ct_l4proto_unregister(const struct nf_conntrack_l4proto * const l4proto[],
|
||||
unsigned int num_proto)
|
||||
{
|
||||
mutex_lock(&nf_ct_proto_mutex);
|
||||
|
@ -551,12 +551,12 @@ void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *l4proto[],
|
|||
|
||||
synchronize_net();
|
||||
/* Remove all contrack entries for this protocol */
|
||||
nf_ct_iterate_destroy(kill_l4proto, l4proto);
|
||||
nf_ct_iterate_destroy(kill_l4proto, (void *)l4proto);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister);
|
||||
|
||||
void nf_ct_l4proto_pernet_unregister(struct net *net,
|
||||
struct nf_conntrack_l4proto *const l4proto[],
|
||||
const struct nf_conntrack_l4proto *const l4proto[],
|
||||
unsigned int num_proto)
|
||||
{
|
||||
while (num_proto-- != 0)
|
||||
|
|
Loading…
Reference in a new issue