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

xt_psd: restore skb_header_pointer functionality for UDP

Browse Source
This commit is contained in:
Jan Engelhardt
2011-08-11 15:43:57 +02:00
parent e0154bfa4c
commit 6c17eb46b5
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/changelog.txt
View File

@@ -3,6 +3,7 @@ HEAD
==== ====
- xt_TARPIT: fix kernel warning about RTAX_HOPLIMIT being used - xt_TARPIT: fix kernel warning about RTAX_HOPLIMIT being used
- xt_TEE: abort build when the feature is already provided by mainline - xt_TEE: abort build when the feature is already provided by mainline
- xt_psd: restore functionality with UDP
v1.37 (2011-06-25) v1.37 (2011-06-25)

29
extensions/xt_psd.c
View File

@@ -104,7 +104,9 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
{ {
const struct iphdr *iph; const struct iphdr *iph;
const struct tcphdr *tcph; const struct tcphdr *tcph;
const struct udphdr *udph;
struct tcphdr _tcph; struct tcphdr _tcph;
struct udphdr _udph;
struct in_addr addr; struct in_addr addr;
u_int16_t src_port,dest_port; u_int16_t src_port,dest_port;
u_int8_t tcp_flags, proto; u_int8_t tcp_flags, proto;
@@ -135,18 +137,25 @@ xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
addr.s_addr = iph->saddr; addr.s_addr = iph->saddr;
tcph = skb_header_pointer(pskb, match->thoff, sizeof(_tcph), &_tcph); if (proto == IPPROTO_TCP) {
if (tcph == NULL) tcph = skb_header_pointer(pskb, match->thoff,
return false; sizeof(_tcph), &_tcph);
if (tcph == NULL)
return false;
/* Yep, it's dirty */ /* Yep, it's dirty */
src_port = tcph->source; src_port = tcph->source;
dest_port = tcph->dest; dest_port = tcph->dest;
if (proto == IPPROTO_TCP)
tcp_flags = *((u_int8_t*)tcph + 13); tcp_flags = *((u_int8_t*)tcph + 13);
else } else if (proto == IPPROTO_UDP) {
tcp_flags = 0x00; udph = skb_header_pointer(pskb, match->thoff,
sizeof(_udph), &_udph);
if (udph == NULL)
return false;
src_port = udph->source;
dest_port = udph->dest;
tcp_flags = 0;
}
/* 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] */