* [nft PATCH 1/2] proto: add protocol key in some proto_desc for identifying it
@ 2014-07-11 8:42 Alvaro Neira Ayuso
2014-07-11 9:14 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Alvaro Neira Ayuso @ 2014-07-11 8:42 UTC (permalink / raw)
To: netfilter-devel; +Cc: kaber
From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
I have added this protocol_key for having more information
for making more easy identify it
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
src/proto.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/proto.c b/src/proto.c
index 546ef10..4192108 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -249,6 +249,7 @@ const struct proto_desc proto_ah = {
const struct proto_desc proto_esp = {
.name = "esp",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_ESP,
.templates = {
[ESPHDR_SPI] = ESPHDR_FIELD("spi", spi),
[ESPHDR_SEQUENCE] = ESPHDR_FIELD("sequence", seq_no),
@@ -326,6 +327,7 @@ static const struct datatype icmp_type_type = {
const struct proto_desc proto_icmp = {
.name = "icmp",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_ICMP,
.templates = {
[ICMPHDR_TYPE] = ICMPHDR_TYPE("type", &icmp_type_type, type),
[ICMPHDR_CODE] = ICMPHDR_FIELD("code", code),
@@ -348,6 +350,7 @@ const struct proto_desc proto_icmp = {
const struct proto_desc proto_udp = {
.name = "udp",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_UDP,
.templates = {
[UDPHDR_SPORT] = INET_SERVICE("sport", struct udphdr, source),
[UDPHDR_DPORT] = INET_SERVICE("dport", struct udphdr, dest),
@@ -359,6 +362,7 @@ const struct proto_desc proto_udp = {
const struct proto_desc proto_udplite = {
.name = "udplite",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_UDPLITE,
.templates = {
[UDPHDR_SPORT] = INET_SERVICE("sport", struct udphdr, source),
[UDPHDR_DPORT] = INET_SERVICE("dport", struct udphdr, dest),
@@ -403,6 +407,7 @@ static const struct datatype tcp_flag_type = {
const struct proto_desc proto_tcp = {
.name = "tcp",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_TCP,
.templates = {
[TCPHDR_SPORT] = INET_SERVICE("sport", struct tcphdr, source),
[TCPHDR_DPORT] = INET_SERVICE("dport", struct tcphdr, dest),
@@ -456,6 +461,7 @@ static const struct datatype dccp_pkttype_type = {
const struct proto_desc proto_dccp = {
.name = "dccp",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_DCCP,
.templates = {
[DCCPHDR_SPORT] = INET_SERVICE("sport", struct dccp_hdr, dccph_sport),
[DCCPHDR_DPORT] = INET_SERVICE("dport", struct dccp_hdr, dccph_dport),
@@ -473,6 +479,7 @@ const struct proto_desc proto_dccp = {
const struct proto_desc proto_sctp = {
.name = "sctp",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_SCTP,
.templates = {
[SCTPHDR_SPORT] = INET_SERVICE("sport", struct sctphdr, source),
[SCTPHDR_DPORT] = INET_SERVICE("dport", struct sctphdr, dest),
@@ -566,6 +573,7 @@ static const struct datatype icmp6_type_type = {
const struct proto_desc proto_icmp6 = {
.name = "icmpv6",
.base = PROTO_BASE_TRANSPORT_HDR,
+ .protocol_key = IPPROTO_ICMPV6,
.templates = {
[ICMP6HDR_TYPE] = ICMP6HDR_TYPE("type", &icmp6_type_type, icmp6_type),
[ICMP6HDR_CODE] = ICMP6HDR_FIELD("code", icmp6_code),
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [nft PATCH 1/2] proto: add protocol key in some proto_desc for identifying it
2014-07-11 8:42 [nft PATCH 1/2] proto: add protocol key in some proto_desc for identifying it Alvaro Neira Ayuso
@ 2014-07-11 9:14 ` Pablo Neira Ayuso
2014-07-11 9:21 ` Alvaro Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-11 9:14 UTC (permalink / raw)
To: Alvaro Neira Ayuso; +Cc: netfilter-devel, kaber
On Fri, Jul 11, 2014 at 10:42:45AM +0200, Alvaro Neira Ayuso wrote:
> From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
>
> I have added this protocol_key for having more information
> for making more easy identify it
You cannot add something which is left unused.
IOW, the policy is to add something that you start using from the same
patch.
> Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
> ---
> src/proto.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/src/proto.c b/src/proto.c
> index 546ef10..4192108 100644
> --- a/src/proto.c
> +++ b/src/proto.c
> @@ -249,6 +249,7 @@ const struct proto_desc proto_ah = {
> const struct proto_desc proto_esp = {
> .name = "esp",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_ESP,
> .templates = {
> [ESPHDR_SPI] = ESPHDR_FIELD("spi", spi),
> [ESPHDR_SEQUENCE] = ESPHDR_FIELD("sequence", seq_no),
> @@ -326,6 +327,7 @@ static const struct datatype icmp_type_type = {
> const struct proto_desc proto_icmp = {
> .name = "icmp",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_ICMP,
> .templates = {
> [ICMPHDR_TYPE] = ICMPHDR_TYPE("type", &icmp_type_type, type),
> [ICMPHDR_CODE] = ICMPHDR_FIELD("code", code),
> @@ -348,6 +350,7 @@ const struct proto_desc proto_icmp = {
> const struct proto_desc proto_udp = {
> .name = "udp",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_UDP,
> .templates = {
> [UDPHDR_SPORT] = INET_SERVICE("sport", struct udphdr, source),
> [UDPHDR_DPORT] = INET_SERVICE("dport", struct udphdr, dest),
> @@ -359,6 +362,7 @@ const struct proto_desc proto_udp = {
> const struct proto_desc proto_udplite = {
> .name = "udplite",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_UDPLITE,
> .templates = {
> [UDPHDR_SPORT] = INET_SERVICE("sport", struct udphdr, source),
> [UDPHDR_DPORT] = INET_SERVICE("dport", struct udphdr, dest),
> @@ -403,6 +407,7 @@ static const struct datatype tcp_flag_type = {
> const struct proto_desc proto_tcp = {
> .name = "tcp",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_TCP,
> .templates = {
> [TCPHDR_SPORT] = INET_SERVICE("sport", struct tcphdr, source),
> [TCPHDR_DPORT] = INET_SERVICE("dport", struct tcphdr, dest),
> @@ -456,6 +461,7 @@ static const struct datatype dccp_pkttype_type = {
> const struct proto_desc proto_dccp = {
> .name = "dccp",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_DCCP,
> .templates = {
> [DCCPHDR_SPORT] = INET_SERVICE("sport", struct dccp_hdr, dccph_sport),
> [DCCPHDR_DPORT] = INET_SERVICE("dport", struct dccp_hdr, dccph_dport),
> @@ -473,6 +479,7 @@ const struct proto_desc proto_dccp = {
> const struct proto_desc proto_sctp = {
> .name = "sctp",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_SCTP,
> .templates = {
> [SCTPHDR_SPORT] = INET_SERVICE("sport", struct sctphdr, source),
> [SCTPHDR_DPORT] = INET_SERVICE("dport", struct sctphdr, dest),
> @@ -566,6 +573,7 @@ static const struct datatype icmp6_type_type = {
> const struct proto_desc proto_icmp6 = {
> .name = "icmpv6",
> .base = PROTO_BASE_TRANSPORT_HDR,
> + .protocol_key = IPPROTO_ICMPV6,
> .templates = {
> [ICMP6HDR_TYPE] = ICMP6HDR_TYPE("type", &icmp6_type_type, icmp6_type),
> [ICMP6HDR_CODE] = ICMP6HDR_FIELD("code", icmp6_code),
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [nft PATCH 1/2] proto: add protocol key in some proto_desc for identifying it
2014-07-11 9:14 ` Pablo Neira Ayuso
@ 2014-07-11 9:21 ` Alvaro Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Alvaro Neira Ayuso @ 2014-07-11 9:21 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Development Mailing list, Patrick McHardy
2014-07-11 11:14 GMT+02:00 Pablo Neira Ayuso <pablo@netfilter.org>:
> On Fri, Jul 11, 2014 at 10:42:45AM +0200, Alvaro Neira Ayuso wrote:
>> From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
>>
>> I have added this protocol_key for having more information
>> for making more easy identify it
>
> You cannot add something which is left unused.
>
> IOW, the policy is to add something that you start using from the same
> patch.
Catched, I'm going to use that in a future patch for the reject. I'm
going to send this patch when I finish the other. Sorry and thanks.
>
>> Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
>> ---
>> src/proto.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/src/proto.c b/src/proto.c
>> index 546ef10..4192108 100644
>> --- a/src/proto.c
>> +++ b/src/proto.c
>> @@ -249,6 +249,7 @@ const struct proto_desc proto_ah = {
>> const struct proto_desc proto_esp = {
>> .name = "esp",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_ESP,
>> .templates = {
>> [ESPHDR_SPI] = ESPHDR_FIELD("spi", spi),
>> [ESPHDR_SEQUENCE] = ESPHDR_FIELD("sequence", seq_no),
>> @@ -326,6 +327,7 @@ static const struct datatype icmp_type_type = {
>> const struct proto_desc proto_icmp = {
>> .name = "icmp",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_ICMP,
>> .templates = {
>> [ICMPHDR_TYPE] = ICMPHDR_TYPE("type", &icmp_type_type, type),
>> [ICMPHDR_CODE] = ICMPHDR_FIELD("code", code),
>> @@ -348,6 +350,7 @@ const struct proto_desc proto_icmp = {
>> const struct proto_desc proto_udp = {
>> .name = "udp",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_UDP,
>> .templates = {
>> [UDPHDR_SPORT] = INET_SERVICE("sport", struct udphdr, source),
>> [UDPHDR_DPORT] = INET_SERVICE("dport", struct udphdr, dest),
>> @@ -359,6 +362,7 @@ const struct proto_desc proto_udp = {
>> const struct proto_desc proto_udplite = {
>> .name = "udplite",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_UDPLITE,
>> .templates = {
>> [UDPHDR_SPORT] = INET_SERVICE("sport", struct udphdr, source),
>> [UDPHDR_DPORT] = INET_SERVICE("dport", struct udphdr, dest),
>> @@ -403,6 +407,7 @@ static const struct datatype tcp_flag_type = {
>> const struct proto_desc proto_tcp = {
>> .name = "tcp",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_TCP,
>> .templates = {
>> [TCPHDR_SPORT] = INET_SERVICE("sport", struct tcphdr, source),
>> [TCPHDR_DPORT] = INET_SERVICE("dport", struct tcphdr, dest),
>> @@ -456,6 +461,7 @@ static const struct datatype dccp_pkttype_type = {
>> const struct proto_desc proto_dccp = {
>> .name = "dccp",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_DCCP,
>> .templates = {
>> [DCCPHDR_SPORT] = INET_SERVICE("sport", struct dccp_hdr, dccph_sport),
>> [DCCPHDR_DPORT] = INET_SERVICE("dport", struct dccp_hdr, dccph_dport),
>> @@ -473,6 +479,7 @@ const struct proto_desc proto_dccp = {
>> const struct proto_desc proto_sctp = {
>> .name = "sctp",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_SCTP,
>> .templates = {
>> [SCTPHDR_SPORT] = INET_SERVICE("sport", struct sctphdr, source),
>> [SCTPHDR_DPORT] = INET_SERVICE("dport", struct sctphdr, dest),
>> @@ -566,6 +573,7 @@ static const struct datatype icmp6_type_type = {
>> const struct proto_desc proto_icmp6 = {
>> .name = "icmpv6",
>> .base = PROTO_BASE_TRANSPORT_HDR,
>> + .protocol_key = IPPROTO_ICMPV6,
>> .templates = {
>> [ICMP6HDR_TYPE] = ICMP6HDR_TYPE("type", &icmp6_type_type, icmp6_type),
>> [ICMP6HDR_CODE] = ICMP6HDR_FIELD("code", icmp6_code),
>> --
>> 1.7.10.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Álvaro Neira Ayuso
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-11 9:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-11 8:42 [nft PATCH 1/2] proto: add protocol key in some proto_desc for identifying it Alvaro Neira Ayuso
2014-07-11 9:14 ` Pablo Neira Ayuso
2014-07-11 9:21 ` Alvaro Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).