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

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

netfilter: rename netlink related "pid" variables to "portid" 



Get rid of the confusing mix of pid and portid and use portid consistently
for all netlink related socket identities.

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

include/linux/netfilter/nfnetlink.h

+5 −4
Original line number Diff line number Diff line
@@ -29,10 +29,11 @@ extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); 
extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);



extern int nfnetlink_has_listeners(struct net *net, unsigned int group);

extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned int group,

			  int echo, gfp_t flags);

extern int nfnetlink_set_err(struct net *net, u32 pid, u32 group, int error);

extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u_int32_t pid, int flags);

extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 portid,

			  unsigned int group, int echo, gfp_t flags);

extern int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error);

extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net,

			     u32 portid, int flags);



extern void nfnl_lock(__u8 subsys_id);

extern void nfnl_unlock(__u8 subsys_id);

include/net/netfilter/nf_conntrack.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ extern int nf_conntrack_hash_check_insert(struct nf_conn *ct); 
extern void nf_ct_delete_from_lists(struct nf_conn *ct);

extern void nf_ct_dying_timeout(struct nf_conn *ct);



extern void nf_conntrack_flush_report(struct net *net, u32 pid, int report);

extern void nf_conntrack_flush_report(struct net *net, u32 portid, int report);



extern bool nf_ct_get_tuplepr(const struct sk_buff *skb,

			      unsigned int nhoff, u_int16_t l3num,

include/net/netfilter/nf_conntrack_expect.h

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ nf_ct_find_expectation(struct net *net, u16 zone, 
		       const struct nf_conntrack_tuple *tuple);



void nf_ct_unlink_expect_report(struct nf_conntrack_expect *exp,

				u32 pid, int report);

				u32 portid, int report);

static inline void nf_ct_unlink_expect(struct nf_conntrack_expect *exp)

{

	nf_ct_unlink_expect_report(exp, 0, 0);
@@ -106,7 +106,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t, 
		       u_int8_t, const __be16 *, const __be16 *);

void nf_ct_expect_put(struct nf_conntrack_expect *exp);

int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 

				u32 pid, int report);

				u32 portid, int report);

static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect)

{

	return nf_ct_expect_related_report(expect, 0, 0);

net/netfilter/nf_conntrack_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1260,7 +1260,7 @@ void nf_ct_iterate_cleanup(struct net *net, 
EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup);



struct __nf_ct_flush_report {

	u32 pid;

	u32 portid;

	int report;

};
@@ -1275,7 +1275,7 @@ static int kill_report(struct nf_conn *i, void *data) 


	/* If we fail to deliver the event, death_by_timeout() will retry */

	if (nf_conntrack_event_report(IPCT_DESTROY, i,

				      fr->pid, fr->report) < 0)

				      fr->portid, fr->report) < 0)

		return 1;



	/* Avoid the delivery of the destroy event in death_by_timeout(). */
@@ -1298,10 +1298,10 @@ void nf_ct_free_hashtable(void *hash, unsigned int size) 
}

EXPORT_SYMBOL_GPL(nf_ct_free_hashtable);



void nf_conntrack_flush_report(struct net *net, u32 pid, int report)

void nf_conntrack_flush_report(struct net *net, u32 portid, int report)

{

	struct __nf_ct_flush_report fr = {

		.pid 	= pid,

		.portid	= portid,

		.report = report,

	};

	nf_ct_iterate_cleanup(net, kill_report, &fr);

net/netfilter/nf_conntrack_expect.c

+4 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static struct kmem_cache *nf_ct_expect_cachep __read_mostly; 


/* nf_conntrack_expect helper functions */

void nf_ct_unlink_expect_report(struct nf_conntrack_expect *exp,

				u32 pid, int report)

				u32 portid, int report)

{

	struct nf_conn_help *master_help = nfct_help(exp->master);

	struct net *net = nf_ct_exp_net(exp);
@@ -54,7 +54,7 @@ void nf_ct_unlink_expect_report(struct nf_conntrack_expect *exp, 
	hlist_del(&exp->lnode);

	master_help->expecting[exp->class]--;



	nf_ct_expect_event_report(IPEXP_DESTROY, exp, pid, report);

	nf_ct_expect_event_report(IPEXP_DESTROY, exp, portid, report);

	nf_ct_expect_put(exp);



	NF_CT_STAT_INC(net, expect_delete);
@@ -412,7 +412,7 @@ out: 
}



int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 

				u32 pid, int report)

				u32 portid, int report)

{

	int ret;
@@ -425,7 +425,7 @@ int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
	if (ret < 0)

		goto out;

	spin_unlock_bh(&nf_conntrack_lock);

	nf_ct_expect_event_report(IPEXP_NEW, expect, pid, report);

	nf_ct_expect_event_report(IPEXP_NEW, expect, portid, report);

	return ret;

out:

	spin_unlock_bh(&nf_conntrack_lock);