anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-08 05:34:58 +02:00
Code Issues Releases Wiki Activity

xt_psd: consider protocol when searching port list

Browse Source 
If we saw a TCP packet on port X, and we receive a UDP packet from the
same host to port X, we counted this as "port X", and did not see this
as a new packet.

Change compare to also consider protocol number and move it to a helper
to de-bloat the overlay large match function.

This change makes psd more aggressive with mixed TCP/UDP traffic.
This commit is contained in:
Florian Westphal
2012-06-01 14:20:42 +02:00
committed by Jan Engelhardt
parent 35ce1adf5e
commit 12d0a8702c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/xt_psd.c
View File

@@ -106,6 +106,19 @@ static inline int hashfunc(struct in_addr addr)
return hash & (HASH_SIZE - 1); return hash & (HASH_SIZE - 1);
} }
static bool port_in_list(struct host *host, uint8_t proto, uint16_t port)
{
unsigned int i;
for (i = 0; i < host->count; ++i) {
if (host->ports[i].proto != proto)
continue;
if (host->ports[i].number == port)
return true;
}
return false;
}
static bool static bool
xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match) xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
{ {
@@ -121,7 +134,7 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
u_int8_t proto; u_int8_t proto;
unsigned long now; unsigned long now;
struct host *curr, *last, **head; struct host *curr, *last, **head;
int hash, index, count; int hash, count;
/* Parameters from userspace */ /* Parameters from userspace */
const struct xt_psd_info *psdinfo = match->matchinfo; const struct xt_psd_info *psdinfo = match->matchinfo;
@@ -182,14 +195,8 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
if (now - curr->timestamp <= (psdinfo->delay_threshold*HZ)/100 && if (now - curr->timestamp <= (psdinfo->delay_threshold*HZ)/100 &&
time_after_eq(now, curr->timestamp)) { time_after_eq(now, curr->timestamp)) {
/* Just update the appropriate list entry if we've seen this port already */ if (port_in_list(curr, proto, dest_port))
for (index = 0; index < curr->count; index++) { goto out_no_match;
if (curr->ports[index].number == dest_port) {
curr->ports[index].proto = proto;
goto out_no_match;
}
}
/* TCP/ACK and/or TCP/RST to a new port? This could be an outgoing connection. */ /* TCP/ACK and/or TCP/RST to a new port? This could be an outgoing connection. */
if (proto == IPPROTO_TCP && (tcph->ack || tcph->rst)) if (proto == IPPROTO_TCP && (tcph->ack || tcph->rst))
goto out_no_match; goto out_no_match;