[libnetfilter_queue PATCH 2/2] utils: add the parameter queue number in nfqnl_test

[libnetfilter_queue PATCH 2/2] utils: add the parameter queue number in nfqnl_test

[Alvaro Neira Ayuso]

From: Álvaro Neira Ayuso <alvaroneay@gmail.com>

This patch allows to stablish the number of the queue that
we want to read the packets.

Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
 utils/nfqnl_test.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
index 4decd50..8272fa1 100644
--- a/utils/nfqnl_test.c
+++ b/utils/nfqnl_test.c
@@ -85,8 +85,18 @@ int main(int argc, char **argv)
 	struct nfq_q_handle *qh;
 	int fd;
 	int rv;
+	int queue = 0;
 	char buf[4096] __attribute__ ((aligned));
 
+	if (argc == 2) {
+		queue = atoi(argv[1]);
+		if (queue > 65535) {
+			fprintf(stderr, "queue number is bigger than 65535\n");
+			exit(1);
+		}
+	}
+
 	printf("opening library handle\n");
 	h = nfq_open();
 	if (!h) {
@@ -106,8 +116,8 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	printf("binding this socket to queue '0'\n");
-	qh = nfq_create_queue(h,  0, &cb, NULL);
+	printf("binding this socket to queue '%d'\n", queue);
+	qh = nfq_create_queue(h,  queue, &cb, NULL);
 	if (!qh) {
 		fprintf(stderr, "error during nfq_create_queue()\n");
 		exit(1);
-- 
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

Re: [libnetfilter_queue PATCH 2/2] utils: add the parameter queue number in nfqnl_test

[Pablo Neira Ayuso]

On Fri, Jun 06, 2014 at 11:58:03AM +0200, Alvaro Neira Ayuso wrote:
> From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
> 
> This patch allows to stablish the number of the queue that
> we want to read the packets.
> 
> Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
> ---
>  utils/nfqnl_test.c |   14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
> index 4decd50..8272fa1 100644
> --- a/utils/nfqnl_test.c
> +++ b/utils/nfqnl_test.c
> @@ -85,8 +85,18 @@ int main(int argc, char **argv)
>  	struct nfq_q_handle *qh;
>  	int fd;
>  	int rv;
> +	int queue = 0;

This signed, change it to unsigned.

>  	char buf[4096] __attribute__ ((aligned));
>  
> +	if (argc == 2) {
> +		queue = atoi(argv[1]);
> +		if (queue > 65535) {
> +			fprintf(stderr, "queue number is bigger than 65535\n");

I'd suggest something like.

                                        Usage: %s [<0-65535>]

> +			exit(1);

Please, use exit(EXIT_FAILURE);

> +		}
> +	}
> +
>  	printf("opening library handle\n");
>  	h = nfq_open();
>  	if (!h) {
> @@ -106,8 +116,8 @@ int main(int argc, char **argv)
>  		exit(1);
>  	}
>  
> -	printf("binding this socket to queue '0'\n");
> -	qh = nfq_create_queue(h,  0, &cb, NULL);
> +	printf("binding this socket to queue '%d'\n", queue);
> +	qh = nfq_create_queue(h,  queue, &cb, NULL);
>  	if (!qh) {
>  		fprintf(stderr, "error during nfq_create_queue()\n");
>  		exit(1);
> -- 
> 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

[libnetfilter_queue PATCH v2] utils: add the parameter queue number in nfqnl_test

[Alvaro Neira Ayuso]

From: Álvaro Neira Ayuso <alvaroneay@gmail.com>

This patch allows to stablish the number of the queue that
we want to read the packets.

Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
[changes in v2]
* I have changed the variable queue to unsigned
* I have changed the message in case that queue > 65535 and also I have used
  exit(EXIT_FAILURE) in error case.

 utils/nfqnl_test.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
index 4decd50..557db1d 100644
--- a/utils/nfqnl_test.c
+++ b/utils/nfqnl_test.c
@@ -85,8 +85,17 @@ int main(int argc, char **argv)
 	struct nfq_q_handle *qh;
 	int fd;
 	int rv;
+	uint32_t queue = 0;
 	char buf[4096] __attribute__ ((aligned));
 
+	if (argc == 2) {
+		queue = atoi(argv[1]);
+		if (queue > 65535) {
+			fprintf(stderr, "Usage: %s [<0-65535>]\n", argv[1]);
+			exit(EXIT_FAILURE);
+		}
+	}
+
 	printf("opening library handle\n");
 	h = nfq_open();
 	if (!h) {
@@ -106,8 +115,8 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	printf("binding this socket to queue '0'\n");
-	qh = nfq_create_queue(h,  0, &cb, NULL);
+	printf("binding this socket to queue '%d'\n", queue);
+	qh = nfq_create_queue(h,  queue, &cb, NULL);
 	if (!qh) {
 		fprintf(stderr, "error during nfq_create_queue()\n");
 		exit(1);
-- 
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

Re: [libnetfilter_queue PATCH v2] utils: add the parameter queue number in nfqnl_test

[Pablo Neira Ayuso]

On Fri, Jun 06, 2014 at 12:20:05PM +0200, Alvaro Neira Ayuso wrote:
> From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
> 
> This patch allows to stablish the number of the queue that
> we want to read the packets.
> 
> Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
> ---
> [changes in v2]
> * I have changed the variable queue to unsigned
> * I have changed the message in case that queue > 65535 and also I have used
>   exit(EXIT_FAILURE) in error case.
> 
>  utils/nfqnl_test.c |   13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
> index 4decd50..557db1d 100644
> --- a/utils/nfqnl_test.c
> +++ b/utils/nfqnl_test.c
> @@ -85,8 +85,17 @@ int main(int argc, char **argv)
>  	struct nfq_q_handle *qh;
>  	int fd;
>  	int rv;
> +	uint32_t queue = 0;
>  	char buf[4096] __attribute__ ((aligned));
>  
> +	if (argc == 2) {
> +		queue = atoi(argv[1]);
> +		if (queue > 65535) {
> +			fprintf(stderr, "Usage: %s [<0-65535>]\n", argv[1]);
                                                                   ^^^^^^^

You did *not* test the error path, this is argv[0].
--
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

Re: [libnetfilter_queue PATCH v2] utils: add the parameter queue number in nfqnl_test

[Álvaro Neira Ayuso]

El 06/06/14 12:44, Pablo Neira Ayuso escribió:
> On Fri, Jun 06, 2014 at 12:20:05PM +0200, Alvaro Neira Ayuso wrote:
>> From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
>>
>> This patch allows to stablish the number of the queue that
>> we want to read the packets.
>>
>> Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
>> ---
>> [changes in v2]
>> * I have changed the variable queue to unsigned
>> * I have changed the message in case that queue > 65535 and also I have used
>>    exit(EXIT_FAILURE) in error case.
>>
>>   utils/nfqnl_test.c |   13 +++++++++++--
>>   1 file changed, 11 insertions(+), 2 deletions(-)
>>
>> diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
>> index 4decd50..557db1d 100644
>> --- a/utils/nfqnl_test.c
>> +++ b/utils/nfqnl_test.c
>> @@ -85,8 +85,17 @@ int main(int argc, char **argv)
>>   	struct nfq_q_handle *qh;
>>   	int fd;
>>   	int rv;
>> +	uint32_t queue = 0;
>>   	char buf[4096] __attribute__ ((aligned));
>>
>> +	if (argc == 2) {
>> +		queue = atoi(argv[1]);
>> +		if (queue > 65535) {
>> +			fprintf(stderr, "Usage: %s [<0-65535>]\n", argv[1]);
>                                                                     ^^^^^^^
>
> You did *not* test the error path, this is argv[0].
>

Sure, sorry. I have understood wrong.

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

[libnetfilter_queue PATCH 2/2 v3] utils: add the parameter queue number in nfqnl_test

[Alvaro Neira Ayuso]

From: Álvaro Neira Ayuso <alvaroneay@gmail.com>

This patch allows to stablish the number of the queue that
we want to read the packets.

Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
[changes in v3]
* I have changed the argument 1 to 0 in the error message.

 utils/nfqnl_test.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
index 4decd50..8c503f3 100644
--- a/utils/nfqnl_test.c
+++ b/utils/nfqnl_test.c
@@ -85,8 +85,17 @@ int main(int argc, char **argv)
 	struct nfq_q_handle *qh;
 	int fd;
 	int rv;
+	uint32_t queue = 0;
 	char buf[4096] __attribute__ ((aligned));
 
+	if (argc == 2) {
+		queue = atoi(argv[1]);
+		if (queue > 65535) {
+			fprintf(stderr, "Usage: %s [<0-65535>]\n", argv[0]);
+			exit(EXIT_FAILURE);
+		}
+	}
+
 	printf("opening library handle\n");
 	h = nfq_open();
 	if (!h) {
@@ -106,8 +115,8 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	printf("binding this socket to queue '0'\n");
-	qh = nfq_create_queue(h,  0, &cb, NULL);
+	printf("binding this socket to queue '%d'\n", queue);
+	qh = nfq_create_queue(h,  queue, &cb, NULL);
 	if (!qh) {
 		fprintf(stderr, "error during nfq_create_queue()\n");
 		exit(1);
-- 
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

Re: [libnetfilter_queue PATCH 2/2 v3] utils: add the parameter queue number in nfqnl_test

[Florian Westphal]

Alvaro Neira Ayuso <alvaroneay@gmail.com> wrote:
> From: Álvaro Neira Ayuso <alvaroneay@gmail.com>
> 
> This patch allows to stablish the number of the queue that
> we want to read the packets.

Applied, thanks Álvaro.
--
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