From ec2119432531746efda821f16e359c5807c2f7f0 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 9 May 2010 23:24:43 +0200 Subject: nfq: deprecate nfq_set_verdict_mark() in favour of nfq_set_verdict2() This patch deprecates nfq_set_verdict_mark() in favour of nfq_set_verdict2() which does exactly the same but it also convert the mark value from host-byte order to network-byte order as expected by nfnetlink_queue. I know, this is hackish, but I prefer adding new functions instead of API versioning which is also ugly. Signed-off-by: Pablo Neira Ayuso --- include/libnetfilter_queue/libnetfilter_queue.h | 20 ++++++++++++++------ src/libnetfilter_queue.c | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h index 1a72c51..88a9b8c 100644 --- a/include/libnetfilter_queue/libnetfilter_queue.h +++ b/include/libnetfilter_queue/libnetfilter_queue.h @@ -62,12 +62,20 @@ extern int nfq_set_verdict(struct nfq_q_handle *qh, u_int32_t data_len, unsigned char *buf); -extern int nfq_set_verdict_mark(struct nfq_q_handle *qh, - u_int32_t id, - u_int32_t verdict, - u_int32_t mark, - u_int32_t datalen, - unsigned char *buf); +extern int nfq_set_verdict2(struct nfq_q_handle *qh, + u_int32_t id, + u_int32_t verdict, + u_int32_t mark, + u_int32_t datalen, + unsigned char *buf); + +extern __attribute__((deprecated)) +int nfq_set_verdict_mark(struct nfq_q_handle *qh, + u_int32_t id, + u_int32_t verdict, + u_int32_t mark, + u_int32_t datalen, + unsigned char *buf); /* message parsing function */ diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c index df19519..7e62317 100644 --- a/src/libnetfilter_queue.c +++ b/src/libnetfilter_queue.c @@ -678,6 +678,22 @@ int nfq_set_verdict(struct nfq_q_handle *qh, u_int32_t id, return __set_verdict(qh, id, verdict, 0, 0, data_len, buf); } +/** + * nfq_set_verdict2 - like nfq_set_verdict, but you can set the mark. + * \param qh Netfilter queue handle obtained by call to nfq_create_queue(). + * \param id ID assigned to packet by netfilter. + * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP) + * \param mark mark to put on packet + * \param data_len number of bytes of data pointed to by #buf + * \param buf the buffer that contains the packet data + */ +int nfq_set_verdict2(struct nfq_q_handle *qh, u_int32_t id, + u_int32_t verdict, u_int32_t mark, + u_int32_t data_len, unsigned char *buf) +{ + return __set_verdict(qh, id, verdict, htonl(mark), 1, data_len, buf); +} + /** * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark. * \param qh Netfilter queue handle obtained by call to nfq_create_queue(). @@ -686,6 +702,9 @@ int nfq_set_verdict(struct nfq_q_handle *qh, u_int32_t id, * \param mark mark to put on packet * \param data_len number of bytes of data pointed to by #buf * \param buf the buffer that contains the packet data + * + * This function is deprecated since it is broken, its use is highly + * discouraged. Please, use nfq_set_verdict2 instead. */ int nfq_set_verdict_mark(struct nfq_q_handle *qh, u_int32_t id, u_int32_t verdict, u_int32_t mark, -- cgit v1.2.3