aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-07-08 01:38:54 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-11 01:18:18 -0400
commit91e8db80065d655ce1b6d74cadc921671e8d5285 (patch)
treec1368bd66a32c17cb7638082ca003ebf7461f63a /net
parentd3c3f4243e135b3d8c41d98be0cb2f54a4141abf (diff)
[NETFILTER]: nf_conntrack_h323: turn some printks into DEBUGPs
Don't spam the ringbuffer with decoding errors. The only printks remaining are for dropped packets when we're certain they are H.323. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_h323_main.c25
1 files changed, 10 insertions, 15 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 8c57b8119bfb..aa5ba99b7a08 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -163,9 +163,7 @@ static int get_tpkt_data(struct sk_buff **pskb, unsigned int protoff,
163 } 163 }
164 164
165 /* Fragmented TPKT */ 165 /* Fragmented TPKT */
166 if (net_ratelimit()) 166 DEBUGP("nf_ct_h323: fragmented TPKT\n");
167 printk("nf_ct_h323: "
168 "fragmented TPKT\n");
169 goto clear_out; 167 goto clear_out;
170 } 168 }
171 169
@@ -596,10 +594,9 @@ static int h245_help(struct sk_buff **pskb, unsigned int protoff,
596 ret = DecodeMultimediaSystemControlMessage(data, datalen, 594 ret = DecodeMultimediaSystemControlMessage(data, datalen,
597 &mscm); 595 &mscm);
598 if (ret < 0) { 596 if (ret < 0) {
599 if (net_ratelimit()) 597 DEBUGP("nf_ct_h245: decoding error: %s\n",
600 printk("nf_ct_h245: decoding error: %s\n", 598 ret == H323_ERROR_BOUND ?
601 ret == H323_ERROR_BOUND ? 599 "out of bound" : "out of range");
602 "out of bound" : "out of range");
603 /* We don't drop when decoding error */ 600 /* We don't drop when decoding error */
604 break; 601 break;
605 } 602 }
@@ -1137,10 +1134,9 @@ static int q931_help(struct sk_buff **pskb, unsigned int protoff,
1137 /* Decode Q.931 signal */ 1134 /* Decode Q.931 signal */
1138 ret = DecodeQ931(data, datalen, &q931); 1135 ret = DecodeQ931(data, datalen, &q931);
1139 if (ret < 0) { 1136 if (ret < 0) {
1140 if (net_ratelimit()) 1137 DEBUGP("nf_ct_q931: decoding error: %s\n",
1141 printk("nf_ct_q931: decoding error: %s\n", 1138 ret == H323_ERROR_BOUND ?
1142 ret == H323_ERROR_BOUND ? 1139 "out of bound" : "out of range");
1143 "out of bound" : "out of range");
1144 /* We don't drop when decoding error */ 1140 /* We don't drop when decoding error */
1145 break; 1141 break;
1146 } 1142 }
@@ -1711,10 +1707,9 @@ static int ras_help(struct sk_buff **pskb, unsigned int protoff,
1711 /* Decode RAS message */ 1707 /* Decode RAS message */
1712 ret = DecodeRasMessage(data, datalen, &ras); 1708 ret = DecodeRasMessage(data, datalen, &ras);
1713 if (ret < 0) { 1709 if (ret < 0) {
1714 if (net_ratelimit()) 1710 DEBUGP("nf_ct_ras: decoding error: %s\n",
1715 printk("nf_ct_ras: decoding error: %s\n", 1711 ret == H323_ERROR_BOUND ?
1716 ret == H323_ERROR_BOUND ? 1712 "out of bound" : "out of range");
1717 "out of bound" : "out of range");
1718 goto accept; 1713 goto accept;
1719 } 1714 }
1720 1715