Re: [nft PATCH 1/2] proto: add protocol key in some proto_desc for identifying it

[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.

> 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