diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 05:35:08 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:08 -0400 |
commit | c2a2c7e0cc39e7f9336cd67e8307a110bdba82f3 (patch) | |
tree | 7f9636ad72ab8f2309b2d5b3ca74f8c074ac807a /net/netfilter/nf_conntrack_proto_dccp.c | |
parent | c04d05529a6e0bf97183a2caf76a0c7f07f5b78c (diff) |
netfilter: netns nf_conntrack: per-netns net.netfilter.nf_conntrack_log_invalid sysctl
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_dccp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_proto_dccp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c index 769680e68b5..8fcf1762fab 100644 --- a/net/netfilter/nf_conntrack_proto_dccp.c +++ b/net/netfilter/nf_conntrack_proto_dccp.c | |||
@@ -418,6 +418,7 @@ static bool dccp_invert_tuple(struct nf_conntrack_tuple *inv, | |||
418 | static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb, | 418 | static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb, |
419 | unsigned int dataoff) | 419 | unsigned int dataoff) |
420 | { | 420 | { |
421 | struct net *net = nf_ct_net(ct); | ||
421 | struct dccp_hdr _dh, *dh; | 422 | struct dccp_hdr _dh, *dh; |
422 | const char *msg; | 423 | const char *msg; |
423 | u_int8_t state; | 424 | u_int8_t state; |
@@ -445,7 +446,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb, | |||
445 | return true; | 446 | return true; |
446 | 447 | ||
447 | out_invalid: | 448 | out_invalid: |
448 | if (LOG_INVALID(IPPROTO_DCCP)) | 449 | if (LOG_INVALID(net, IPPROTO_DCCP)) |
449 | nf_log_packet(nf_ct_l3num(ct), 0, skb, NULL, NULL, NULL, msg); | 450 | nf_log_packet(nf_ct_l3num(ct), 0, skb, NULL, NULL, NULL, msg); |
450 | return false; | 451 | return false; |
451 | } | 452 | } |
@@ -463,6 +464,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb, | |||
463 | unsigned int dataoff, enum ip_conntrack_info ctinfo, | 464 | unsigned int dataoff, enum ip_conntrack_info ctinfo, |
464 | u_int8_t pf, unsigned int hooknum) | 465 | u_int8_t pf, unsigned int hooknum) |
465 | { | 466 | { |
467 | struct net *net = nf_ct_net(ct); | ||
466 | enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); | 468 | enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); |
467 | struct dccp_hdr _dh, *dh; | 469 | struct dccp_hdr _dh, *dh; |
468 | u_int8_t type, old_state, new_state; | 470 | u_int8_t type, old_state, new_state; |
@@ -524,13 +526,13 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb, | |||
524 | ct->proto.dccp.last_pkt = type; | 526 | ct->proto.dccp.last_pkt = type; |
525 | 527 | ||
526 | write_unlock_bh(&dccp_lock); | 528 | write_unlock_bh(&dccp_lock); |
527 | if (LOG_INVALID(IPPROTO_DCCP)) | 529 | if (LOG_INVALID(net, IPPROTO_DCCP)) |
528 | nf_log_packet(pf, 0, skb, NULL, NULL, NULL, | 530 | nf_log_packet(pf, 0, skb, NULL, NULL, NULL, |
529 | "nf_ct_dccp: invalid packet ignored "); | 531 | "nf_ct_dccp: invalid packet ignored "); |
530 | return NF_ACCEPT; | 532 | return NF_ACCEPT; |
531 | case CT_DCCP_INVALID: | 533 | case CT_DCCP_INVALID: |
532 | write_unlock_bh(&dccp_lock); | 534 | write_unlock_bh(&dccp_lock); |
533 | if (LOG_INVALID(IPPROTO_DCCP)) | 535 | if (LOG_INVALID(net, IPPROTO_DCCP)) |
534 | nf_log_packet(pf, 0, skb, NULL, NULL, NULL, | 536 | nf_log_packet(pf, 0, skb, NULL, NULL, NULL, |
535 | "nf_ct_dccp: invalid state transition "); | 537 | "nf_ct_dccp: invalid state transition "); |
536 | return -NF_ACCEPT; | 538 | return -NF_ACCEPT; |
@@ -590,7 +592,7 @@ static int dccp_error(struct net *net, struct sk_buff *skb, | |||
590 | return NF_ACCEPT; | 592 | return NF_ACCEPT; |
591 | 593 | ||
592 | out_invalid: | 594 | out_invalid: |
593 | if (LOG_INVALID(IPPROTO_DCCP)) | 595 | if (LOG_INVALID(net, IPPROTO_DCCP)) |
594 | nf_log_packet(pf, 0, skb, NULL, NULL, NULL, msg); | 596 | nf_log_packet(pf, 0, skb, NULL, NULL, NULL, msg); |
595 | return -NF_ACCEPT; | 597 | return -NF_ACCEPT; |
596 | } | 598 | } |