diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-01-17 13:01:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-17 13:01:31 -0800 |
| commit | ab67a4d511188680beb8a0d82a90f55dbeb53d5c (patch) | |
| tree | c2a9842b9877df27a50448506c3cfe3a6f00f6df | |
| parent | ae82af54d73becd66804d942cf39b049e625fa89 (diff) | |
| download | kernel-crypto-ab67a4d511188680beb8a0d82a90f55dbeb53d5c.tar.gz kernel-crypto-ab67a4d511188680beb8a0d82a90f55dbeb53d5c.tar.xz kernel-crypto-ab67a4d511188680beb8a0d82a90f55dbeb53d5c.zip | |
[EBTABLES]: Handle SCTP/DCCP in ebt_{ip,log}
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/netfilter/ebt_ip.c | 4 | ||||
| -rw-r--r-- | net/bridge/netfilter/ebt_log.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c index f158fe67dd6..dc5d0b2427c 100644 --- a/net/bridge/netfilter/ebt_ip.c +++ b/net/bridge/netfilter/ebt_ip.c @@ -92,7 +92,9 @@ static int ebt_ip_check(const char *tablename, unsigned int hookmask, if (info->invflags & EBT_IP_PROTO) return -EINVAL; if (info->protocol != IPPROTO_TCP && - info->protocol != IPPROTO_UDP) + info->protocol != IPPROTO_UDP && + info->protocol != IPPROTO_SCTP && + info->protocol != IPPROTO_DCCP) return -EINVAL; } if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1]) diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index a29c1232c42..0128fbbe232 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c @@ -95,7 +95,9 @@ ebt_log_packet(unsigned int pf, unsigned int hooknum, "tos=0x%02X, IP proto=%d", NIPQUAD(ih->saddr), NIPQUAD(ih->daddr), ih->tos, ih->protocol); if (ih->protocol == IPPROTO_TCP || - ih->protocol == IPPROTO_UDP) { + ih->protocol == IPPROTO_UDP || + ih->protocol == IPPROTO_SCTP || + ih->protocol == IPPROTO_DCCP) { struct tcpudphdr _ports, *pptr; pptr = skb_header_pointer(skb, ih->ihl*4, |