[netfilter-cvslog] r4457 - in trunk/libnetfilter_queue: include/libnetfilter_queue src utils

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-05 11:18:54 +0100 (Sat, 05 Nov 2005)
New Revision: 4457

Modified:
   trunk/libnetfilter_queue/include/libnetfilter_queue/libnetfilter_queue.h
   trunk/libnetfilter_queue/src/libnetfilter_queue.c
   trunk/libnetfilter_queue/utils/nfqnl_test.c
Log:
get rid of superfluous 'datalength' parameter of nfq_get_payload() function


Modified: trunk/libnetfilter_queue/include/libnetfilter_queue/libnetfilter_queue.h
===================================================================
--- trunk/libnetfilter_queue/include/libnetfilter_queue/libnetfilter_queue.h	2005-11-05 10:00:43 UTC (rev 4456)
+++ trunk/libnetfilter_queue/include/libnetfilter_queue/libnetfilter_queue.h	2005-11-05 10:18:54 UTC (rev 4457)
@@ -79,9 +79,8 @@
 
 extern struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad);
 
-/* return 0 if problem */
-extern int nfq_get_payload(struct nfq_data *nfad,
-			     char ** data, unsigned int* datalen);
+/* return -1 if problem, length otherwise */
+extern int nfq_get_payload(struct nfq_data *nfad, char **data);
 
 
 

Modified: trunk/libnetfilter_queue/src/libnetfilter_queue.c
===================================================================
--- trunk/libnetfilter_queue/src/libnetfilter_queue.c	2005-11-05 10:00:43 UTC (rev 4456)
+++ trunk/libnetfilter_queue/src/libnetfilter_queue.c	2005-11-05 10:18:54 UTC (rev 4457)
@@ -369,13 +369,11 @@
 					struct nfqnl_msg_packet_hw);
 }
 
-int nfq_get_payload(struct nfq_data *nfad, char **data,
-		      unsigned int *datalen)
+int nfq_get_payload(struct nfq_data *nfad, char **data)
 {
 	*data = nfnl_get_pointer_to_data(nfad->data, NFQA_PAYLOAD, char);
-	if (*data) {
-		*datalen = NFA_PAYLOAD(nfad->data[NFQA_PAYLOAD-1]);
-		return 1;
-	}
-	return 0;
+	if (*data)
+		return NFA_PAYLOAD(nfad->data[NFQA_PAYLOAD-1]);
+
+	return -1;
 }

Modified: trunk/libnetfilter_queue/utils/nfqnl_test.c
===================================================================
--- trunk/libnetfilter_queue/utils/nfqnl_test.c	2005-11-05 10:00:43 UTC (rev 4456)
+++ trunk/libnetfilter_queue/utils/nfqnl_test.c	2005-11-05 10:18:54 UTC (rev 4457)
@@ -14,8 +14,7 @@
 	struct nfqnl_msg_packet_hdr *ph;
 	u_int32_t mark,ifi; 
 	int ret;
-	unsigned int datalength;
-	char * data;
+	char *data;
 	
 	ph = nfq_get_msg_packet_hdr(tb);
 	if (ph){
@@ -36,9 +35,9 @@
 	if (ifi)
 		printf("outdev=%u ", ifi);
 
-	ret = nfq_get_payload(tb, &data, &datalength);
-	if (ret)
-		printf("payload_len=%d ", datalength);
+	ret = nfq_get_payload(tb, &data);
+	if (ret >= 0)
+		printf("payload_len=%d ", ret);
 
 	fputc('\n', stdout);