Skip to content

Eliminate two duplicated lines codes to enhance the xt_hashlimit.c of ne... #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gfreewind wants to merge 2 commits into from
Closed

Eliminate two duplicated lines codes to enhance the xt_hashlimit.c of ne... #128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d239f95
Eliminate two duplicated lines codes to enhance the xt_hashlimit.c of…
gfreewind Oct 24, 2014
a392824
Merge branch 'master' of github.com:torvalds/linux
gfreewind Nov 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions net/netfilter/xt_hashlimit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ dsthash_find(const struct xt_hashlimit_htable *ht,
/* allocate dsthash_ent, initialize dst, put in htable and lock it */
static struct dsthash_ent *
dsthash_alloc_init(struct xt_hashlimit_htable *ht,
const struct dsthash_dst *dst, bool *race)
const struct dsthash_dst *dst, bool *new)
{
struct dsthash_ent *ent;

Expand All @@ -170,7 +170,6 @@ dsthash_alloc_init(struct xt_hashlimit_htable *ht,
ent = dsthash_find(ht, dst);
if (ent != NULL) {
spin_unlock(&ht->lock);
*race = true;
return ent;
}

Expand All @@ -194,6 +193,7 @@ dsthash_alloc_init(struct xt_hashlimit_htable *ht,
spin_lock(&ent->lock);
hlist_add_head_rcu(&ent->node, &ht->hash[hash_dst(ht, dst)]);
ht->count++;
*new = true;
}
spin_unlock(&ht->lock);
return ent;
Expand Down Expand Up @@ -610,7 +610,7 @@ hashlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
unsigned long now = jiffies;
struct dsthash_ent *dh;
struct dsthash_dst dst;
bool race = false;
bool new = false;
u32 cost;

if (hashlimit_init_dst(hinfo, &dst, skb, par->thoff) < 0)
Expand All @@ -619,18 +619,16 @@ hashlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
rcu_read_lock_bh();
dh = dsthash_find(hinfo, &dst);
if (dh == NULL) {
dh = dsthash_alloc_init(hinfo, &dst, &race);
dh = dsthash_alloc_init(hinfo, &dst, &new);
if (dh == NULL) {
rcu_read_unlock_bh();
goto hotdrop;
} else if (race) {
/* Already got an entry, update expiration timeout */
dh->expires = now + msecs_to_jiffies(hinfo->cfg.expire);
rateinfo_recalc(dh, now, hinfo->cfg.mode);
} else {
dh->expires = jiffies + msecs_to_jiffies(hinfo->cfg.expire);
rateinfo_init(dh, hinfo);
}
}

if (unlikely(new)) {
dh->expires = jiffies + msecs_to_jiffies(hinfo->cfg.expire);
rateinfo_init(dh, hinfo);
} else {
/* update expiration timeout */
dh->expires = now + msecs_to_jiffies(hinfo->cfg.expire);
Expand Down