diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2005-10-10 23:53:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-10-10 23:53:16 -0400 |
| commit | a1bcc3f26885b0a8bf04799551de2e9574ccbda1 (patch) | |
| tree | 36397c29c8ad0eeb945117674734fc235ab4bebc /net/ipv4 | |
| parent | d000eaf7720cb12cd03cd3d55f71be44357d27a9 (diff) | |
[NETFILTER] ctnetlink: ICMP ID is not mandatory
The ID is only required by ICMP type 8 (echo), so it's not
mandatory for all sort of ICMP connections. This patch makes
mandatory only the type and the code for ICMP netlink messages.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c index 838d1d69b36e..98f0015dd255 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c | |||
| @@ -296,8 +296,7 @@ static int icmp_nfattr_to_tuple(struct nfattr *tb[], | |||
| 296 | struct ip_conntrack_tuple *tuple) | 296 | struct ip_conntrack_tuple *tuple) |
| 297 | { | 297 | { |
| 298 | if (!tb[CTA_PROTO_ICMP_TYPE-1] | 298 | if (!tb[CTA_PROTO_ICMP_TYPE-1] |
| 299 | || !tb[CTA_PROTO_ICMP_CODE-1] | 299 | || !tb[CTA_PROTO_ICMP_CODE-1]) |
| 300 | || !tb[CTA_PROTO_ICMP_ID-1]) | ||
| 301 | return -1; | 300 | return -1; |
| 302 | 301 | ||
| 303 | tuple->dst.u.icmp.type = | 302 | tuple->dst.u.icmp.type = |