Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/809436/?format=api
{ "id": 809436, "url": "http://patchwork.ozlabs.org/api/1.2/patches/809436/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1504478574-13281-1-git-send-email-pablo@netfilter.org/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/1.2/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504478574-13281-1-git-send-email-pablo@netfilter.org>", "list_archive_url": null, "date": "2017-09-03T22:42:43", "name": "[36/47] netfilter: conntrack: place print_tuple in procfs part", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6460f41112798020a2d2ef8f57e28a227effc691", "submitter": { "id": 1315, "url": "http://patchwork.ozlabs.org/api/1.2/people/1315/?format=api", "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/1.2/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/1504478574-13281-1-git-send-email-pablo@netfilter.org/mbox/", "series": [ { "id": 1283, "url": "http://patchwork.ozlabs.org/api/1.2/series/1283/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1283", "date": "2017-09-03T22:40:11", "name": null, "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1283/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809436/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809436/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlp0b3BCPz9s8J\n\tfor <patchwork-incoming@ozlabs.org>;\n\tMon, 4 Sep 2017 08:43:11 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753493AbdICWnI (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSun, 3 Sep 2017 18:43:08 -0400", "from mail.us.es ([193.147.175.20]:53040 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753359AbdICWnG (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tSun, 3 Sep 2017 18:43:06 -0400", "from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 33DF3190F61\n\tfor <netdev@vger.kernel.org>; Mon, 4 Sep 2017 00:42:39 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 19748B5027\n\tfor <netdev@vger.kernel.org>; Mon, 4 Sep 2017 00:42:39 +0200 (CEST)", "by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 0F38DB5024; Mon, 4 Sep 2017 00:42:39 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 9B2F12DC84;\n\tMon, 4 Sep 2017 00:42:36 +0200 (CEST)", "from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 00:42:36 +0200 (CEST)", "from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 432D34265A20;\n\tMon, 4 Sep 2017 00:42:33 +0200 (CEST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int", "X-Spam-Level": "", "X-Spam-Status": "No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1", "X-Virus-Status": "clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)", "X-SMTPAUTHUS": "auth mail.us.es", "From": "Pablo Neira Ayuso <pablo@netfilter.org>", "To": "netfilter-devel@vger.kernel.org", "Cc": "davem@davemloft.net, netdev@vger.kernel.org", "Subject": "[PATCH 36/47] netfilter: conntrack: place print_tuple in procfs part", "Date": "Mon, 4 Sep 2017 00:42:43 +0200", "Message-Id": "<1504478574-13281-1-git-send-email-pablo@netfilter.org>", "X-Mailer": "git-send-email 2.1.4", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: Florian Westphal <fw@strlen.de>\n\nCONFIG_NF_CONNTRACK_PROCFS is deprecated, no need to use a function\npointer in the trackers for this. Place the printf formatting in\nthe one place that uses it.\n\nSigned-off-by: Florian Westphal <fw@strlen.de>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\n include/net/netfilter/nf_conntrack_l3proto.h | 4 --\n include/net/netfilter/nf_conntrack_l4proto.h | 4 --\n net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 8 ----\n net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 11 -----\n net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 ----\n net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 11 -----\n net/netfilter/nf_conntrack_l3proto_generic.c | 6 ---\n net/netfilter/nf_conntrack_proto_dccp.c | 10 -----\n net/netfilter/nf_conntrack_proto_generic.c | 7 ----\n net/netfilter/nf_conntrack_proto_gre.c | 10 -----\n net/netfilter/nf_conntrack_proto_sctp.c | 11 -----\n net/netfilter/nf_conntrack_proto_tcp.c | 11 -----\n net/netfilter/nf_conntrack_proto_udp.c | 13 ------\n net/netfilter/nf_conntrack_standalone.c | 58 +++++++++++++++++++++++++-\n 14 files changed, 56 insertions(+), 116 deletions(-)", "diff": "diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h\nindex e31861e4fa6a..dabb53b0913c 100644\n--- a/include/net/netfilter/nf_conntrack_l3proto.h\n+++ b/include/net/netfilter/nf_conntrack_l3proto.h\n@@ -37,10 +37,6 @@ struct nf_conntrack_l3proto {\n \tbool (*invert_tuple)(struct nf_conntrack_tuple *inverse,\n \t\t\t const struct nf_conntrack_tuple *orig);\n \n-\t/* Print out the per-protocol part of the tuple. */\n-\tvoid (*print_tuple)(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *);\n-\n \t/*\n \t * Called before tracking. \n \t *\t*dataoff: offset of protocol header (TCP, UDP,...) in skb\ndiff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h\nindex 15c58dd3f701..7e8da04a5eb6 100644\n--- a/include/net/netfilter/nf_conntrack_l4proto.h\n+++ b/include/net/netfilter/nf_conntrack_l4proto.h\n@@ -61,10 +61,6 @@ struct nf_conntrack_l4proto {\n \t/* called by gc worker if table is full */\n \tbool (*can_early_drop)(const struct nf_conn *ct);\n \n-\t/* Print out the per-protocol part of the tuple. Return like seq_* */\n-\tvoid (*print_tuple)(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *);\n-\n \t/* Print out the private part of the conntrack. */\n \tvoid (*print_conntrack)(struct seq_file *s, struct nf_conn *);\n \ndiff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c\nindex 9f7ea862068c..fe374da4bc13 100644\n--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c\n+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c\n@@ -63,13 +63,6 @@ static bool ipv4_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-static void ipv4_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"src=%pI4 dst=%pI4 \",\n-\t\t &tuple->src.u3.ip, &tuple->dst.u3.ip);\n-}\n-\n static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,\n \t\t\t unsigned int *dataoff, u_int8_t *protonum)\n {\n@@ -355,7 +348,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {\n \t.l3proto\t = PF_INET,\n \t.pkt_to_tuple\t = ipv4_pkt_to_tuple,\n \t.invert_tuple\t = ipv4_invert_tuple,\n-\t.print_tuple\t = ipv4_print_tuple,\n \t.get_l4proto\t = ipv4_get_l4proto,\n #if IS_ENABLED(CONFIG_NF_CT_NETLINK)\n \t.tuple_to_nlattr = ipv4_tuple_to_nlattr,\ndiff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\nindex fdbeb03e4600..434b4e20f6db 100644\n--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\n+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\n@@ -71,16 +71,6 @@ static bool icmp_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-/* Print out the per-protocol part of the tuple. */\n-static void icmp_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"type=%u code=%u id=%u \",\n-\t\t tuple->dst.u.icmp.type,\n-\t\t tuple->dst.u.icmp.code,\n-\t\t ntohs(tuple->src.u.icmp.id));\n-}\n-\n static unsigned int *icmp_get_timeouts(struct net *net)\n {\n \treturn &icmp_pernet(net)->timeout;\n@@ -364,7 +354,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =\n \t.l4proto\t\t= IPPROTO_ICMP,\n \t.pkt_to_tuple\t\t= icmp_pkt_to_tuple,\n \t.invert_tuple\t\t= icmp_invert_tuple,\n-\t.print_tuple\t\t= icmp_print_tuple,\n \t.packet\t\t\t= icmp_packet,\n \t.get_timeouts\t\t= icmp_get_timeouts,\n \t.new\t\t\t= icmp_new,\ndiff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c\nindex 91d37fbe28de..fe01dc953c56 100644\n--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c\n+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c\n@@ -67,13 +67,6 @@ static bool ipv6_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-static void ipv6_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"src=%pI6 dst=%pI6 \",\n-\t\t tuple->src.u3.ip6, tuple->dst.u3.ip6);\n-}\n-\n static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,\n \t\t\t unsigned int *dataoff, u_int8_t *protonum)\n {\n@@ -350,7 +343,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {\n \t.l3proto\t\t= PF_INET6,\n \t.pkt_to_tuple\t\t= ipv6_pkt_to_tuple,\n \t.invert_tuple\t\t= ipv6_invert_tuple,\n-\t.print_tuple\t\t= ipv6_print_tuple,\n \t.get_l4proto\t\t= ipv6_get_l4proto,\n #if IS_ENABLED(CONFIG_NF_CT_NETLINK)\n \t.tuple_to_nlattr\t= ipv6_tuple_to_nlattr,\ndiff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\nindex 805ab122767a..808f63e2e1ff 100644\n--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\n+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\n@@ -84,16 +84,6 @@ static bool icmpv6_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-/* Print out the per-protocol part of the tuple. */\n-static void icmpv6_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"type=%u code=%u id=%u \",\n-\t\t tuple->dst.u.icmp.type,\n-\t\t tuple->dst.u.icmp.code,\n-\t\t ntohs(tuple->src.u.icmp.id));\n-}\n-\n static unsigned int *icmpv6_get_timeouts(struct net *net)\n {\n \treturn &icmpv6_pernet(net)->timeout;\n@@ -369,7 +359,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =\n \t.l4proto\t\t= IPPROTO_ICMPV6,\n \t.pkt_to_tuple\t\t= icmpv6_pkt_to_tuple,\n \t.invert_tuple\t\t= icmpv6_invert_tuple,\n-\t.print_tuple\t\t= icmpv6_print_tuple,\n \t.packet\t\t\t= icmpv6_packet,\n \t.get_timeouts\t\t= icmpv6_get_timeouts,\n \t.new\t\t\t= icmpv6_new,\ndiff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c\nindex 0387971582bc..397e6911214f 100644\n--- a/net/netfilter/nf_conntrack_l3proto_generic.c\n+++ b/net/netfilter/nf_conntrack_l3proto_generic.c\n@@ -49,11 +49,6 @@ static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-static void generic_print_tuple(struct seq_file *s,\n-\t\t\t\tconst struct nf_conntrack_tuple *tuple)\n-{\n-}\n-\n static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,\n \t\t\t unsigned int *dataoff, u_int8_t *protonum)\n {\n@@ -66,7 +61,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_generic __read_mostly = {\n \t.l3proto\t = PF_UNSPEC,\n \t.pkt_to_tuple\t = generic_pkt_to_tuple,\n \t.invert_tuple\t = generic_invert_tuple,\n-\t.print_tuple\t = generic_print_tuple,\n \t.get_l4proto\t = generic_get_l4proto,\n };\n EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic);\ndiff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c\nindex a0492184a0a8..d2df49ac390a 100644\n--- a/net/netfilter/nf_conntrack_proto_dccp.c\n+++ b/net/netfilter/nf_conntrack_proto_dccp.c\n@@ -623,14 +623,6 @@ static bool dccp_can_early_drop(const struct nf_conn *ct)\n \treturn false;\n }\n \n-static void dccp_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"sport=%hu dport=%hu \",\n-\t\t ntohs(tuple->src.u.dccp.port),\n-\t\t ntohs(tuple->dst.u.dccp.port));\n-}\n-\n static void dccp_print_conntrack(struct seq_file *s, struct nf_conn *ct)\n {\n \tseq_printf(s, \"%s \", dccp_state_names[ct->proto.dccp.state]);\n@@ -887,7 +879,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 __read_mostly = {\n \t.get_timeouts\t\t= dccp_get_timeouts,\n \t.error\t\t\t= dccp_error,\n \t.can_early_drop\t\t= dccp_can_early_drop,\n-\t.print_tuple\t\t= dccp_print_tuple,\n \t.print_conntrack\t= dccp_print_conntrack,\n #if IS_ENABLED(CONFIG_NF_CT_NETLINK)\n \t.to_nlattr\t\t= dccp_to_nlattr,\n@@ -922,7 +913,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 __read_mostly = {\n \t.get_timeouts\t\t= dccp_get_timeouts,\n \t.error\t\t\t= dccp_error,\n \t.can_early_drop\t\t= dccp_can_early_drop,\n-\t.print_tuple\t\t= dccp_print_tuple,\n \t.print_conntrack\t= dccp_print_conntrack,\n #if IS_ENABLED(CONFIG_NF_CT_NETLINK)\n \t.to_nlattr\t\t= dccp_to_nlattr,\ndiff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c\nindex 4fe8b3312823..2bc3d0c1a5bf 100644\n--- a/net/netfilter/nf_conntrack_proto_generic.c\n+++ b/net/netfilter/nf_conntrack_proto_generic.c\n@@ -62,12 +62,6 @@ static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-/* Print out the per-protocol part of the tuple. */\n-static void generic_print_tuple(struct seq_file *s,\n-\t\t\t\tconst struct nf_conntrack_tuple *tuple)\n-{\n-}\n-\n static unsigned int *generic_get_timeouts(struct net *net)\n {\n \treturn &(generic_pernet(net)->timeout);\n@@ -189,7 +183,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_generic __read_mostly =\n \t.l4proto\t\t= 255,\n \t.pkt_to_tuple\t\t= generic_pkt_to_tuple,\n \t.invert_tuple\t\t= generic_invert_tuple,\n-\t.print_tuple\t\t= generic_print_tuple,\n \t.packet\t\t\t= generic_packet,\n \t.get_timeouts\t\t= generic_get_timeouts,\n \t.new\t\t\t= generic_new,\ndiff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c\nindex 984bcfdbd4d7..cd28095dd7a4 100644\n--- a/net/netfilter/nf_conntrack_proto_gre.c\n+++ b/net/netfilter/nf_conntrack_proto_gre.c\n@@ -224,15 +224,6 @@ static bool gre_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,\n \treturn true;\n }\n \n-/* print gre part of tuple */\n-static void gre_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"srckey=0x%x dstkey=0x%x \",\n-\t\t ntohs(tuple->src.u.gre.key),\n-\t\t ntohs(tuple->dst.u.gre.key));\n-}\n-\n /* print private data for conntrack */\n static void gre_print_conntrack(struct seq_file *s, struct nf_conn *ct)\n {\n@@ -366,7 +357,6 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = {\n \t.l4proto\t = IPPROTO_GRE,\n \t.pkt_to_tuple\t = gre_pkt_to_tuple,\n \t.invert_tuple\t = gre_invert_tuple,\n-\t.print_tuple\t = gre_print_tuple,\n \t.print_conntrack = gre_print_conntrack,\n \t.get_timeouts = gre_get_timeouts,\n \t.packet\t\t = gre_packet,\ndiff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c\nindex 1d7a995ea049..da83b401be17 100644\n--- a/net/netfilter/nf_conntrack_proto_sctp.c\n+++ b/net/netfilter/nf_conntrack_proto_sctp.c\n@@ -174,15 +174,6 @@ static bool sctp_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-/* Print out the per-protocol part of the tuple. */\n-static void sctp_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"sport=%hu dport=%hu \",\n-\t\t ntohs(tuple->src.u.sctp.port),\n-\t\t ntohs(tuple->dst.u.sctp.port));\n-}\n-\n /* Print out the private part of the conntrack. */\n static void sctp_print_conntrack(struct seq_file *s, struct nf_conn *ct)\n {\n@@ -793,7 +784,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = {\n \t.l4proto \t\t= IPPROTO_SCTP,\n \t.pkt_to_tuple \t\t= sctp_pkt_to_tuple,\n \t.invert_tuple \t\t= sctp_invert_tuple,\n-\t.print_tuple \t\t= sctp_print_tuple,\n \t.print_conntrack\t= sctp_print_conntrack,\n \t.packet \t\t= sctp_packet,\n \t.get_timeouts\t\t= sctp_get_timeouts,\n@@ -829,7 +819,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = {\n \t.l4proto \t\t= IPPROTO_SCTP,\n \t.pkt_to_tuple \t\t= sctp_pkt_to_tuple,\n \t.invert_tuple \t\t= sctp_invert_tuple,\n-\t.print_tuple \t\t= sctp_print_tuple,\n \t.print_conntrack\t= sctp_print_conntrack,\n \t.packet \t\t= sctp_packet,\n \t.get_timeouts\t\t= sctp_get_timeouts,\ndiff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c\nindex e3e59e3d0592..c868b36b8945 100644\n--- a/net/netfilter/nf_conntrack_proto_tcp.c\n+++ b/net/netfilter/nf_conntrack_proto_tcp.c\n@@ -301,15 +301,6 @@ static bool tcp_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-/* Print out the per-protocol part of the tuple. */\n-static void tcp_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"sport=%hu dport=%hu \",\n-\t\t ntohs(tuple->src.u.tcp.port),\n-\t\t ntohs(tuple->dst.u.tcp.port));\n-}\n-\n /* Print out the private part of the conntrack. */\n static void tcp_print_conntrack(struct seq_file *s, struct nf_conn *ct)\n {\n@@ -1558,7 +1549,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 __read_mostly =\n \t.l4proto \t\t= IPPROTO_TCP,\n \t.pkt_to_tuple \t\t= tcp_pkt_to_tuple,\n \t.invert_tuple \t\t= tcp_invert_tuple,\n-\t.print_tuple \t\t= tcp_print_tuple,\n \t.print_conntrack \t= tcp_print_conntrack,\n \t.packet \t\t= tcp_packet,\n \t.get_timeouts\t\t= tcp_get_timeouts,\n@@ -1595,7 +1585,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 __read_mostly =\n \t.l4proto \t\t= IPPROTO_TCP,\n \t.pkt_to_tuple \t\t= tcp_pkt_to_tuple,\n \t.invert_tuple \t\t= tcp_invert_tuple,\n-\t.print_tuple \t\t= tcp_print_tuple,\n \t.print_conntrack \t= tcp_print_conntrack,\n \t.packet \t\t= tcp_packet,\n \t.get_timeouts\t\t= tcp_get_timeouts,\ndiff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c\nindex ec861a1169f1..dcf3030d2226 100644\n--- a/net/netfilter/nf_conntrack_proto_udp.c\n+++ b/net/netfilter/nf_conntrack_proto_udp.c\n@@ -63,15 +63,6 @@ static bool udp_invert_tuple(struct nf_conntrack_tuple *tuple,\n \treturn true;\n }\n \n-/* Print out the per-protocol part of the tuple. */\n-static void udp_print_tuple(struct seq_file *s,\n-\t\t\t const struct nf_conntrack_tuple *tuple)\n-{\n-\tseq_printf(s, \"sport=%hu dport=%hu \",\n-\t\t ntohs(tuple->src.u.udp.port),\n-\t\t ntohs(tuple->dst.u.udp.port));\n-}\n-\n static unsigned int *udp_get_timeouts(struct net *net)\n {\n \treturn udp_pernet(net)->timeouts;\n@@ -316,7 +307,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =\n \t.allow_clash\t\t= true,\n \t.pkt_to_tuple\t\t= udp_pkt_to_tuple,\n \t.invert_tuple\t\t= udp_invert_tuple,\n-\t.print_tuple\t\t= udp_print_tuple,\n \t.packet\t\t\t= udp_packet,\n \t.get_timeouts\t\t= udp_get_timeouts,\n \t.new\t\t\t= udp_new,\n@@ -349,7 +339,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =\n \t.allow_clash\t\t= true,\n \t.pkt_to_tuple\t\t= udp_pkt_to_tuple,\n \t.invert_tuple\t\t= udp_invert_tuple,\n-\t.print_tuple\t\t= udp_print_tuple,\n \t.packet\t\t\t= udp_packet,\n \t.get_timeouts\t\t= udp_get_timeouts,\n \t.new\t\t\t= udp_new,\n@@ -382,7 +371,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =\n \t.allow_clash\t\t= true,\n \t.pkt_to_tuple\t\t= udp_pkt_to_tuple,\n \t.invert_tuple\t\t= udp_invert_tuple,\n-\t.print_tuple\t\t= udp_print_tuple,\n \t.packet\t\t\t= udp_packet,\n \t.get_timeouts\t\t= udp_get_timeouts,\n \t.new\t\t\t= udp_new,\n@@ -415,7 +403,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =\n \t.allow_clash\t\t= true,\n \t.pkt_to_tuple\t\t= udp_pkt_to_tuple,\n \t.invert_tuple\t\t= udp_invert_tuple,\n-\t.print_tuple\t\t= udp_print_tuple,\n \t.packet\t\t\t= udp_packet,\n \t.get_timeouts\t\t= udp_get_timeouts,\n \t.new\t\t\t= udp_new,\ndiff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c\nindex b28f9e93f574..9eb85858d764 100644\n--- a/net/netfilter/nf_conntrack_standalone.c\n+++ b/net/netfilter/nf_conntrack_standalone.c\n@@ -41,8 +41,62 @@ print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,\n const struct nf_conntrack_l3proto *l3proto,\n const struct nf_conntrack_l4proto *l4proto)\n {\n-\tl3proto->print_tuple(s, tuple);\n-\tl4proto->print_tuple(s, tuple);\n+\tswitch (l3proto->l3proto) {\n+\tcase NFPROTO_IPV4:\n+\t\tseq_printf(s, \"src=%pI4 dst=%pI4 \",\n+\t\t\t &tuple->src.u3.ip, &tuple->dst.u3.ip);\n+\t\tbreak;\n+\tcase NFPROTO_IPV6:\n+\t\tseq_printf(s, \"src=%pI6 dst=%pI6 \",\n+\t\t\t tuple->src.u3.ip6, tuple->dst.u3.ip6);\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\n+\tswitch (l4proto->l4proto) {\n+\tcase IPPROTO_ICMP:\n+\t\tseq_printf(s, \"type=%u code=%u id=%u \",\n+\t\t\t tuple->dst.u.icmp.type,\n+\t\t\t tuple->dst.u.icmp.code,\n+\t\t\t ntohs(tuple->src.u.icmp.id));\n+\t\tbreak;\n+\tcase IPPROTO_TCP:\n+\t\tseq_printf(s, \"sport=%hu dport=%hu \",\n+\t\t\t ntohs(tuple->src.u.tcp.port),\n+\t\t\t ntohs(tuple->dst.u.tcp.port));\n+\t\tbreak;\n+\tcase IPPROTO_UDPLITE: /* fallthrough */\n+\tcase IPPROTO_UDP:\n+\t\tseq_printf(s, \"sport=%hu dport=%hu \",\n+\t\t\t ntohs(tuple->src.u.udp.port),\n+\t\t\t ntohs(tuple->dst.u.udp.port));\n+\n+\t\tbreak;\n+\tcase IPPROTO_DCCP:\n+\t\tseq_printf(s, \"sport=%hu dport=%hu \",\n+\t\t\t ntohs(tuple->src.u.dccp.port),\n+\t\t\t ntohs(tuple->dst.u.dccp.port));\n+\t\tbreak;\n+\tcase IPPROTO_SCTP:\n+\t\tseq_printf(s, \"sport=%hu dport=%hu \",\n+\t\t\t ntohs(tuple->src.u.sctp.port),\n+\t\t\t ntohs(tuple->dst.u.sctp.port));\n+\t\tbreak;\n+\tcase IPPROTO_ICMPV6:\n+\t\tseq_printf(s, \"type=%u code=%u id=%u \",\n+\t\t\t tuple->dst.u.icmp.type,\n+\t\t\t tuple->dst.u.icmp.code,\n+\t\t\t ntohs(tuple->src.u.icmp.id));\n+\t\tbreak;\n+\tcase IPPROTO_GRE:\n+\t\tseq_printf(s, \"srckey=0x%x dstkey=0x%x \",\n+\t\t\t ntohs(tuple->src.u.gre.key),\n+\t\t\t ntohs(tuple->dst.u.gre.key));\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n }\n EXPORT_SYMBOL_GPL(print_tuple);\n \n", "prefixes": [ "36/47" ] }