diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-11-05 10:18:54 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-11-05 10:18:54 +0000 |
| commit | 1ebf621ad94f9854d5ff531816fb799294675811 (patch) | |
| tree | 1ac9f918afbcf82af3053d5ee2bb9c6c98120f73 | |
| parent | de73c2fe742c29acada99aace6c381a3c26aaf8b (diff) | |
get rid of superfluous 'datalength' parameter of nfq_get_payload() function
| -rw-r--r-- | include/libnetfilter_queue/libnetfilter_queue.h | 5 | ||||
| -rw-r--r-- | src/libnetfilter_queue.c | 12 | ||||
| -rw-r--r-- | utils/nfqnl_test.c | 9 |
3 files changed, 11 insertions, 15 deletions
diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h index 6d31eea..93331e1 100644 --- a/include/libnetfilter_queue/libnetfilter_queue.h +++ b/include/libnetfilter_queue/libnetfilter_queue.h @@ -79,9 +79,8 @@ extern u_int32_t nfq_get_physoutdev(struct nfq_data *nfad); 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); diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c index dfea209..8844012 100644 --- a/src/libnetfilter_queue.c +++ b/src/libnetfilter_queue.c @@ -369,13 +369,11 @@ struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad) 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; } diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c index a687215..af224de 100644 --- a/utils/nfqnl_test.c +++ b/utils/nfqnl_test.c @@ -14,8 +14,7 @@ static u_int32_t print_pkt (struct nfq_data *tb) 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 @@ static u_int32_t print_pkt (struct nfq_data *tb) 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); |