From patchwork Mon Dec 25 14:59:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 852824 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TvB1v8Ob"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z52Mc4BMLz9s03 for ; Tue, 26 Dec 2017 01:59:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752718AbdLYO7k (ORCPT ); Mon, 25 Dec 2017 09:59:40 -0500 Received: from mail-pl0-f68.google.com ([209.85.160.68]:44328 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752321AbdLYO7j (ORCPT ); Mon, 25 Dec 2017 09:59:39 -0500 Received: by mail-pl0-f68.google.com with SMTP id n13so16767332plp.11 for ; Mon, 25 Dec 2017 06:59:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=oDDW+qoglFN00UnaxjqwU736o2UghmFour6F4aHzbsA=; b=TvB1v8Obfnnyrni18k3jBLCUQFxuCyPwTl+P0iWWNBDTTZMpP83PdVOyTYfjGCqzcl jNXZZ8TiogfjLRfzqgPAiKGTWI64Dbjc531mJp6pX9CBrtmmTKrHiCHzRWjHFWRFdBY7 +icNkWq8AX9pz3xOvRF1yci6A3YDlRwBa4umI0LzmUFMteuqCXEWM1sN+E1bO5FhJDTd GBLI6o5b4toG1xYidZgcRLNTonOsUpDM2sW/kDarzJcZuHNB2hXY9bMeZduneJfPiT01 NRoay7R9BP9Ni3lxvtdAWO74VaD7s3v5TtFXbqQeXPxYFi1pMtSdOPdR+aRlq7aMbz0L QayQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oDDW+qoglFN00UnaxjqwU736o2UghmFour6F4aHzbsA=; b=lZEj8h+rQFxPi+zoI0uFwyP2+Rt0cp94Lgp3uhR0sMnXUVj5CZa/eSQD5/exAuhOHH Zb6mJMdbUPUAEU9hqGaG41ekJpWBH0Zp6f6YIew7AWET8BKVeBYNfwpKrdR+dwtpFjlI EtjjAVLi2Mli6Wb69TfUmGDNIX65utFR6QZ9n/JymTUygMCnpnciTrJMqgl7gYgJd2wL W3NwOpOfLUfCODz74Absp0uC+TY25gVWYJnTrgq2Q37Fk/lq/eJO1sHg68uJ3O/9eLoI IvQPoE+rBkY1zVTMUAOZ+aU0IvssUcC/kSLdAjHNzOS8cOmhG9ZquOHz7Uo/sHXV5SBu DUjA== X-Gm-Message-State: AKGB3mKs41L2waY2ISBoRtpBa5wW0r5ZSLT3w2TP3r0u3Pwgl0BcFFOL eXgcFuK6GXf6LTDOHM9oh+w= X-Google-Smtp-Source: ACJfBovg+lFM6pzQMXqIKywTdpw7pxyL6Yx/4CPOEruGNlM3NFkdpV7wCxRNHiVY4KsrJGWTXG7gng== X-Received: by 10.84.231.1 with SMTP id f1mr22793616plk.352.1514213979227; Mon, 25 Dec 2017 06:59:39 -0800 (PST) Received: from ap-To-be-filled-by-O-E-M.8.8.8.8 ([125.130.197.10]) by smtp.gmail.com with ESMTPSA id r77sm55594938pfa.78.2017.12.25.06.59.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Dec 2017 06:59:38 -0800 (PST) From: Taehee Yoo To: pablo@netfilter.org, fw@strlen.de, netfilter-devel@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH V4 2/5] netfilter: nf_nat_snmp_basic: remove debug parameter Date: Mon, 25 Dec 2017 23:59:32 +0900 Message-Id: <20171225145932.3902-1-ap420073@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org To see debug message of nf_nat_snmp_basic, we should set debug value when we insert this module. but it is inconvenient and only using of the dynamic debugging is enough to debug. This patch just removes debug code. then in the next patch, debugging code will be added. Signed-off-by: Taehee Yoo --- V4 : - rename nf_nat_snmp_basic.c to nf_nat_snmp_basic_main.c to fix compile error V3 : - be separated by previous patch. V2 : - Add missing nf_nat_snmp_basic.asn1 file V1 : - Initial patch net/ipv4/netfilter/nf_nat_snmp_basic.c | 62 ---------------------------------- 1 file changed, 62 deletions(-) diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c index d6f03fe9f..e5ec946 100644 --- a/net/ipv4/netfilter/nf_nat_snmp_basic.c +++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c @@ -66,7 +66,6 @@ MODULE_ALIAS("ip_nat_snmp_basic"); #define SNMP_TRAP_PORT 162 #define NOCT1(n) (*(u8 *)(n)) -static int debug; static DEFINE_SPINLOCK(snmp_lock); /* @@ -888,23 +887,13 @@ static inline void mangle_address(unsigned char *begin, __sum16 *check) { if (map->from == NOCT1(addr)) { - u_int32_t old; - - if (debug) - memcpy(&old, addr, sizeof(old)); - *addr = map->to; /* Update UDP checksum if being used */ if (*check) { fast_csum(check, &map->from, &map->to, addr - begin); - } - - if (debug) - printk(KERN_DEBUG "bsalg: mapped %pI4 to %pI4\n", - &old, addr); } } @@ -995,10 +984,6 @@ static int snmp_parse_mangle(unsigned char *msg, struct asn1_octstr comm; struct snmp_object *obj; - if (debug > 1) - print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE, 16, 1, - msg, len, 0); - asn1_open(&ctx, msg, len); /* @@ -1018,8 +1003,6 @@ static int snmp_parse_mangle(unsigned char *msg, return 0; if (!asn1_uint_decode (&ctx, end, &vers)) return 0; - if (debug > 1) - pr_debug("bsalg: snmp version: %u\n", vers + 1); if (vers > 1) return 1; @@ -1032,14 +1015,6 @@ static int snmp_parse_mangle(unsigned char *msg, return 0; if (!asn1_octets_decode(&ctx, end, &comm.data, &comm.len)) return 0; - if (debug > 1) { - unsigned int i; - - pr_debug("bsalg: community: "); - for (i = 0; i < comm.len; i++) - pr_cont("%c", comm.data[i]); - pr_cont("\n"); - } kfree(comm.data); /* @@ -1049,23 +1024,6 @@ static int snmp_parse_mangle(unsigned char *msg, return 0; if (cls != ASN1_CTX || con != ASN1_CON) return 0; - if (debug > 1) { - static const unsigned char *const pdus[] = { - [SNMP_PDU_GET] = "get", - [SNMP_PDU_NEXT] = "get-next", - [SNMP_PDU_RESPONSE] = "response", - [SNMP_PDU_SET] = "set", - [SNMP_PDU_TRAP1] = "trapv1", - [SNMP_PDU_BULK] = "bulk", - [SNMP_PDU_INFORM] = "inform", - [SNMP_PDU_TRAP2] = "trapv2" - }; - - if (pdutype > SNMP_PDU_TRAP2) - pr_debug("bsalg: bad pdu type %u\n", pdutype); - else - pr_debug("bsalg: pdu: %s\n", pdus[pdutype]); - } if (pdutype != SNMP_PDU_RESPONSE && pdutype != SNMP_PDU_TRAP1 && pdutype != SNMP_PDU_TRAP2) return 1; @@ -1088,11 +1046,6 @@ static int snmp_parse_mangle(unsigned char *msg, if (!snmp_request_decode(&ctx, &req)) return 0; - - if (debug > 1) - pr_debug("bsalg: request: id=0x%lx error_status=%u " - "error_index=%u\n", req.id, req.error_status, - req.error_index); } /* @@ -1105,8 +1058,6 @@ static int snmp_parse_mangle(unsigned char *msg, return 0; while (!asn1_eoc_decode(&ctx, eoc)) { - unsigned int i; - if (!snmp_object_decode(&ctx, &obj)) { if (obj) { kfree(obj->id); @@ -1115,17 +1066,6 @@ static int snmp_parse_mangle(unsigned char *msg, return 0; } - if (debug > 1) { - pr_debug("bsalg: object: "); - for (i = 0; i < obj->id_len; i++) { - if (i > 0) - pr_cont("."); - pr_cont("%lu", obj->id[i]); - } - pr_cont(": type=%u\n", obj->type); - - } - if (obj->type == SNMP_IPADDR) mangle_address(ctx.begin, ctx.pointer - 4, map, check); @@ -1252,5 +1192,3 @@ static void __exit nf_nat_snmp_basic_fini(void) module_init(nf_nat_snmp_basic_init); module_exit(nf_nat_snmp_basic_fini); - -module_param(debug, int, 0600);