Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b18339 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanup 



- move EXPORT_SYMBOL next to exported symbol
- use EXPORT_SYMBOL_GPL since this is what the original code used

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3c47977

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+2 −5
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ ipv4_prepare(struct sk_buff **pskb, unsigned int hooknum, unsigned int *dataoff, 
}



int nf_nat_module_is_loaded = 0;

EXPORT_SYMBOL_GPL(nf_nat_module_is_loaded);



static u_int32_t ipv4_get_features(const struct nf_conntrack_tuple *tuple)

{

	if (nf_nat_module_is_loaded)
@@ -530,8 +532,3 @@ static void __exit nf_conntrack_l3proto_ipv4_fini(void) 


module_init(nf_conntrack_l3proto_ipv4_init);

module_exit(nf_conntrack_l3proto_ipv4_fini);
 


EXPORT_SYMBOL(nf_ct_ipv4_gather_frags);

#ifdef CONFIG_NF_NAT_NEEDED

EXPORT_SYMBOL(nf_nat_module_is_loaded);

#endif

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −2
Original line number Diff line number Diff line
@@ -380,5 +380,4 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = 
#endif

#endif

};



EXPORT_SYMBOL(nf_conntrack_l4proto_icmp);
 
EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_icmp);

net/netfilter/nf_conntrack_core.c

+31 −1
Original line number Diff line number Diff line
@@ -63,17 +63,27 @@ 
#endif



DEFINE_RWLOCK(nf_conntrack_lock);

EXPORT_SYMBOL_GPL(nf_conntrack_lock);



/* nf_conntrack_standalone needs this */

atomic_t nf_conntrack_count = ATOMIC_INIT(0);

EXPORT_SYMBOL_GPL(nf_conntrack_count);



void (*nf_conntrack_destroyed)(struct nf_conn *conntrack) = NULL;

void (*nf_conntrack_destroyed)(struct nf_conn *conntrack);

EXPORT_SYMBOL_GPL(nf_conntrack_destroyed);



unsigned int nf_conntrack_htable_size __read_mostly;

EXPORT_SYMBOL_GPL(nf_conntrack_htable_size);



int nf_conntrack_max __read_mostly;

EXPORT_SYMBOL_GPL(nf_conntrack_max);



struct list_head *nf_conntrack_hash __read_mostly;

EXPORT_SYMBOL_GPL(nf_conntrack_hash);



struct nf_conn nf_conntrack_untracked __read_mostly;

EXPORT_SYMBOL_GPL(nf_conntrack_untracked);



unsigned int nf_ct_log_invalid __read_mostly;

LIST_HEAD(unconfirmed);

static int nf_conntrack_vmalloc __read_mostly;
@@ -210,6 +220,7 @@ int nf_conntrack_register_cache(u_int32_t features, const char *name, 
	mutex_unlock(&nf_ct_cache_mutex);

	return ret;

}

EXPORT_SYMBOL_GPL(nf_conntrack_register_cache);



/* FIXME: In the current, only nf_conntrack_cleanup() can call this function. */

void nf_conntrack_unregister_cache(u_int32_t features)
@@ -244,6 +255,7 @@ void nf_conntrack_unregister_cache(u_int32_t features) 


	mutex_unlock(&nf_ct_cache_mutex);

}

EXPORT_SYMBOL_GPL(nf_conntrack_unregister_cache);



int

nf_ct_get_tuple(const struct sk_buff *skb,
@@ -266,6 +278,7 @@ nf_ct_get_tuple(const struct sk_buff *skb, 


	return l4proto->pkt_to_tuple(skb, dataoff, tuple);

}

EXPORT_SYMBOL_GPL(nf_ct_get_tuple);



int

nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
@@ -284,6 +297,7 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse, 
	inverse->dst.protonum = orig->dst.protonum;

	return l4proto->invert_tuple(inverse, orig);

}

EXPORT_SYMBOL_GPL(nf_ct_invert_tuple);



static void

clean_from_lists(struct nf_conn *ct)
@@ -382,6 +396,7 @@ __nf_conntrack_find(const struct nf_conntrack_tuple *tuple, 


	return NULL;

}

EXPORT_SYMBOL_GPL(__nf_conntrack_find);



/* Find a connection corresponding to a tuple. */

struct nf_conntrack_tuple_hash *
@@ -398,6 +413,7 @@ nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple, 


	return h;

}

EXPORT_SYMBOL_GPL(nf_conntrack_find_get);



static void __nf_conntrack_hash_insert(struct nf_conn *ct,

				       unsigned int hash,
@@ -421,6 +437,7 @@ void nf_conntrack_hash_insert(struct nf_conn *ct) 
	__nf_conntrack_hash_insert(ct, hash, repl_hash);

	write_unlock_bh(&nf_conntrack_lock);

}

EXPORT_SYMBOL_GPL(nf_conntrack_hash_insert);



/* Confirm a connection given skb; places it in hash table */

int
@@ -498,6 +515,7 @@ __nf_conntrack_confirm(struct sk_buff **pskb) 
	write_unlock_bh(&nf_conntrack_lock);

	return NF_DROP;

}

EXPORT_SYMBOL_GPL(__nf_conntrack_confirm);



/* Returns true if a connection correspondings to the tuple (required

   for NAT). */
@@ -513,6 +531,7 @@ nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple, 


	return h != NULL;

}

EXPORT_SYMBOL_GPL(nf_conntrack_tuple_taken);



/* There's a small race here where we may free a just-assured

   connection.  Too bad: we're in trouble anyway. */
@@ -631,6 +650,7 @@ struct nf_conn *nf_conntrack_alloc(const struct nf_conntrack_tuple *orig, 
	l3proto = __nf_ct_l3proto_find(orig->src.l3num);

	return __nf_conntrack_alloc(orig, repl, l3proto, 0);

}

EXPORT_SYMBOL_GPL(nf_conntrack_alloc);



void nf_conntrack_free(struct nf_conn *conntrack)

{
@@ -641,6 +661,7 @@ void nf_conntrack_free(struct nf_conn *conntrack) 
	kmem_cache_free(nf_ct_cache[features].cachep, conntrack);

	atomic_dec(&nf_conntrack_count);

}

EXPORT_SYMBOL_GPL(nf_conntrack_free);



/* Allocate a new conntrack: we return -ENOMEM if classification

   failed due to stress.  Otherwise it really is unclassifiable. */
@@ -845,6 +866,7 @@ nf_conntrack_in(int pf, unsigned int hooknum, struct sk_buff **pskb) 


	return ret;

}

EXPORT_SYMBOL_GPL(nf_conntrack_in);



int nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse,

			 const struct nf_conntrack_tuple *orig)
@@ -854,6 +876,7 @@ int nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse, 
				  __nf_ct_l4proto_find(orig->src.l3num,

						     orig->dst.protonum));

}

EXPORT_SYMBOL_GPL(nf_ct_invert_tuplepr);



/* Alter reply tuple (maybe alter helper).  This is for NAT, and is

   implicitly racy: see __nf_conntrack_confirm */
@@ -874,6 +897,7 @@ void nf_conntrack_alter_reply(struct nf_conn *ct, 
		help->helper = __nf_ct_helper_find(newreply);

	write_unlock_bh(&nf_conntrack_lock);

}

EXPORT_SYMBOL_GPL(nf_conntrack_alter_reply);



/* Refresh conntrack for this many jiffies and do accounting if do_acct is 1 */

void __nf_ct_refresh_acct(struct nf_conn *ct,
@@ -931,6 +955,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, 
	if (event)

		nf_conntrack_event_cache(event, skb);

}

EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct);



#if defined(CONFIG_NF_CT_NETLINK) || \

    defined(CONFIG_NF_CT_NETLINK_MODULE)
@@ -955,6 +980,7 @@ int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb, 
nfattr_failure:

	return -1;

}

EXPORT_SYMBOL_GPL(nf_ct_port_tuple_to_nfattr);



static const size_t cta_min_proto[CTA_PROTO_MAX] = {

	[CTA_PROTO_SRC_PORT-1]  = sizeof(u_int16_t),
@@ -975,6 +1001,7 @@ int nf_ct_port_nfattr_to_tuple(struct nfattr *tb[], 


	return 0;

}

EXPORT_SYMBOL_GPL(nf_ct_port_nfattr_to_tuple);

#endif



/* Used by ipt_REJECT and ip6t_REJECT. */
@@ -995,6 +1022,7 @@ void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb) 
	nskb->nfctinfo = ctinfo;

	nf_conntrack_get(nskb->nfct);

}

EXPORT_SYMBOL_GPL(__nf_conntrack_attach);



static inline int

do_iter(const struct nf_conntrack_tuple_hash *i,
@@ -1048,6 +1076,7 @@ nf_ct_iterate_cleanup(int (*iter)(struct nf_conn *i, void *data), void *data) 
		nf_ct_put(ct);

	}

}

EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup);



static int kill_all(struct nf_conn *i, void *data)

{
@@ -1067,6 +1096,7 @@ void nf_conntrack_flush() 
{

	nf_ct_iterate_cleanup(kill_all, NULL);

}

EXPORT_SYMBOL_GPL(nf_conntrack_flush);



/* Mishearing the voices in his head, our hero wonders how he's

   supposed to kill the mall. */

net/netfilter/nf_conntrack_ecache.c

+6 −0
Original line number Diff line number Diff line
@@ -28,9 +28,13 @@ 
#include <net/netfilter/nf_conntrack_core.h>



ATOMIC_NOTIFIER_HEAD(nf_conntrack_chain);

EXPORT_SYMBOL_GPL(nf_conntrack_chain);



ATOMIC_NOTIFIER_HEAD(nf_conntrack_expect_chain);

EXPORT_SYMBOL_GPL(nf_conntrack_expect_chain);



DEFINE_PER_CPU(struct nf_conntrack_ecache, nf_conntrack_ecache);

EXPORT_PER_CPU_SYMBOL_GPL(nf_conntrack_ecache);



/* deliver cached events and clear cache entry - must be called with locally

 * disabled softirqs */
@@ -59,6 +63,7 @@ void nf_ct_deliver_cached_events(const struct nf_conn *ct) 
		__nf_ct_deliver_cached_events(ecache);

	local_bh_enable();

}

EXPORT_SYMBOL_GPL(nf_ct_deliver_cached_events);



/* Deliver cached events for old pending events, if current conntrack != old */

void __nf_ct_event_cache_init(struct nf_conn *ct)
@@ -74,6 +79,7 @@ void __nf_ct_event_cache_init(struct nf_conn *ct) 
	ecache->ct = ct;

	nf_conntrack_get(&ct->ct_general);

}

EXPORT_SYMBOL_GPL(__nf_ct_event_cache_init);



/* flush the event cache - touches other CPU's data and must not be called

 * while packets are still passing through the code */

net/netfilter/nf_conntrack_expect.c

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <net/netfilter/nf_conntrack_tuple.h>



LIST_HEAD(nf_conntrack_expect_list);

EXPORT_SYMBOL_GPL(nf_conntrack_expect_list);



kmem_cache_t *nf_conntrack_expect_cachep __read_mostly;

static unsigned int nf_conntrack_expect_next_id;
@@ -43,6 +45,7 @@ void nf_ct_unlink_expect(struct nf_conntrack_expect *exp) 
	master_help->expecting--;

	nf_conntrack_expect_put(exp);

}

EXPORT_SYMBOL_GPL(nf_ct_unlink_expect);



static void expectation_timed_out(unsigned long ul_expect)

{
@@ -65,6 +68,7 @@ __nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple) 
	}

	return NULL;

}

EXPORT_SYMBOL_GPL(__nf_conntrack_expect_find);



/* Just find a expectation corresponding to a tuple. */

struct nf_conntrack_expect *
@@ -80,6 +84,7 @@ nf_conntrack_expect_find_get(const struct nf_conntrack_tuple *tuple) 


	return i;

}

EXPORT_SYMBOL_GPL(nf_conntrack_expect_find_get);



/* If an expectation for this connection is found, it gets delete from

 * global list then returned. */
@@ -125,6 +130,7 @@ void nf_ct_remove_expectations(struct nf_conn *ct) 
 		}

	}

}

EXPORT_SYMBOL_GPL(nf_ct_remove_expectations);



/* Would two expected things clash? */

static inline int expect_clash(const struct nf_conntrack_expect *a,
@@ -179,6 +185,7 @@ void nf_conntrack_unexpect_related(struct nf_conntrack_expect *exp) 
	}

	write_unlock_bh(&nf_conntrack_lock);

}

EXPORT_SYMBOL_GPL(nf_conntrack_unexpect_related);



/* We don't increase the master conntrack refcount for non-fulfilled

 * conntracks. During the conntrack destruction, the expectations are
@@ -195,6 +202,7 @@ struct nf_conntrack_expect *nf_conntrack_expect_alloc(struct nf_conn *me) 
	atomic_set(&new->use, 1);

	return new;

}

EXPORT_SYMBOL_GPL(nf_conntrack_expect_alloc);



void nf_conntrack_expect_init(struct nf_conntrack_expect *exp, int family,

			      union nf_conntrack_address *saddr,
@@ -269,6 +277,7 @@ void nf_conntrack_expect_put(struct nf_conntrack_expect *exp) 
	if (atomic_dec_and_test(&exp->use))

		kmem_cache_free(nf_conntrack_expect_cachep, exp);

}

EXPORT_SYMBOL_GPL(nf_conntrack_expect_put);



static void nf_conntrack_expect_insert(struct nf_conntrack_expect *exp)

{
@@ -351,6 +360,7 @@ int nf_conntrack_expect_related(struct nf_conntrack_expect *expect) 
	write_unlock_bh(&nf_conntrack_lock);

	return ret;

}

EXPORT_SYMBOL_GPL(nf_conntrack_expect_related);



#ifdef CONFIG_PROC_FS

static void *exp_seq_start(struct seq_file *s, loff_t *pos)