anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-06 12:45:13 +02:00
Code Issues Releases Wiki Activity

xt_psd: remove unneeded variables, make hash unsigned

Browse Source 
- dest port and dest address were only written, never read
- struct inaddr isn't needed either, just look at iph->saddr
This commit is contained in:
Florian Westphal
2012-08-16 13:59:41 +02:00
committed by Jan Engelhardt
parent 093f3b0a97
commit 61d2be172d
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/xt_psd.c
View File

@@ -69,7 +69,6 @@ struct host {
struct host *next; struct host *next;
unsigned long timestamp; unsigned long timestamp;
struct in_addr src_addr; struct in_addr src_addr;
struct in_addr dest_addr;
__be16 src_port; __be16 src_port;
uint16_t count; uint16_t count;
uint8_t weight; uint8_t weight;
@@ -92,12 +91,12 @@ static struct {
/* /*
* Convert an IP address into a hash table index. * Convert an IP address into a hash table index.
*/ */
static inline int hashfunc(struct in_addr addr) static unsigned int hashfunc(__be32 addr)
{ {
unsigned int value; unsigned int value;
int hash; unsigned int hash;
value = addr.s_addr; value = addr;
hash = 0; hash = 0;
do { do {
hash ^= value; hash ^= value;
@@ -182,12 +181,12 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
struct tcphdr tcph; struct tcphdr tcph;
struct udphdr udph; struct udphdr udph;
} _buf; } _buf;
struct in_addr addr; u_int16_t dest_port;
u_int16_t src_port,dest_port;
u_int8_t proto; u_int8_t proto;
unsigned long now; unsigned long now;
struct host *curr, *last = NULL, **head; struct host *curr, *last = NULL, **head;
int hash, count = 0; int count = 0;
unsigned int hash;
/* Parameters from userspace */ /* Parameters from userspace */
const struct xt_psd_info *psdinfo = match->matchinfo; const struct xt_psd_info *psdinfo = match->matchinfo;
@@ -198,10 +197,9 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
} }
proto = iph->protocol; proto = iph->protocol;
addr.s_addr = iph->saddr;
/* We're using IP address 0.0.0.0 for a special purpose here, so don't let /* We're using IP address 0.0.0.0 for a special purpose here, so don't let
* them spoof us. [DHCP needs this feature - HW] */ * them spoof us. [DHCP needs this feature - HW] */
if (addr.s_addr == 0) { if (iph->saddr == 0) {
pr_debug("spoofed source address (0.0.0.0)\n"); pr_debug("spoofed source address (0.0.0.0)\n");
return false; return false;
} }
@@ -213,14 +211,12 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
return false; return false;
/* Yep, it's dirty */ /* Yep, it's dirty */
src_port = tcph->source;
dest_port = tcph->dest; dest_port = tcph->dest;
} else if (proto == IPPROTO_UDP || proto == IPPROTO_UDPLITE) { } else if (proto == IPPROTO_UDP || proto == IPPROTO_UDPLITE) {
udph = skb_header_pointer(pskb, match->thoff, udph = skb_header_pointer(pskb, match->thoff,
sizeof(_buf.udph), &_buf.udph); sizeof(_buf.udph), &_buf.udph);
if (udph == NULL) if (udph == NULL)
return false; return false;
src_port = udph->source;
dest_port = udph->dest; dest_port = udph->dest;
} else { } else {
pr_debug("protocol not supported\n"); pr_debug("protocol not supported\n");
@@ -228,7 +224,7 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
} }
now = jiffies; now = jiffies;
hash = hashfunc(addr); hash = hashfunc(iph->saddr);
head = &state.hash[hash]; head = &state.hash[hash];
spin_lock(&state.lock); spin_lock(&state.lock);
@@ -236,7 +232,7 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
/* Do we know this source address already? */ /* Do we know this source address already? */
curr = *head; curr = *head;
while (curr != NULL) { while (curr != NULL) {
if (curr->src_addr.s_addr == addr.s_addr) if (curr->src_addr.s_addr == iph->saddr)
break; break;
count++; count++;
curr = host_get_next(curr, &last); curr = host_get_next(curr, &last);
@@ -279,7 +275,7 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
/* First, find it */ /* First, find it */
if (state.list[state.index].src_addr.s_addr != 0) if (state.list[state.index].src_addr.s_addr != 0)
head = &state.hash[hashfunc(state.list[state.index].src_addr)]; head = &state.hash[hashfunc(state.list[state.index].src_addr.s_addr)];
else else
head = &last; head = &last;
last = NULL; last = NULL;
@@ -310,10 +306,8 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
*head = curr; *head = curr;
/* And fill in the fields */ /* And fill in the fields */
curr->src_addr.s_addr = iph->saddr;
curr->timestamp = now; curr->timestamp = now;
curr->src_addr = addr;
curr->dest_addr.s_addr = iph->daddr;
curr->src_port = src_port;
curr->count = 1; curr->count = 1;
curr->weight = get_port_weight(psdinfo, dest_port); curr->weight = get_port_weight(psdinfo, dest_port);
curr->ports[0].number = dest_port; curr->ports[0].number = dest_port;