diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-15 14:10:36 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-15 14:10:36 +0000 |
| commit | 83bcf7f49c07e952868099b5027199c8f7ea3c1a (patch) | |
| tree | 9beb56feded65ab3850a75960502acd21cb2ae9a | |
| parent | 82290b2b0bd2ebb5539b61b98e993ae807c2e8d7 (diff) | |
| download | conntrack-tools-83bcf7f49c07e952868099b5027199c8f7ea3c1a.tar.gz conntrack-tools-83bcf7f49c07e952868099b5027199c8f7ea3c1a.zip | |
minor constification fixes
update libnfnetlink dependencies
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/queue.h | 2 | ||||
| -rw-r--r-- | src/queue.c | 2 | ||||
| -rw-r--r-- | src/sync-ftfw.c | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 75c6898..6a9d882 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ case $target in esac dnl Dependencies -LIBNFNETLINK_REQUIRED=0.0.25 +LIBNFNETLINK_REQUIRED=0.0.32 LIBNETFILTER_CONNTRACK_REQUIRED=0.0.88 PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,, diff --git a/include/queue.h b/include/queue.h index 2e08e56..ab04d62 100644 --- a/include/queue.h +++ b/include/queue.h @@ -26,6 +26,6 @@ int queue_add(struct queue *b, const void *data, size_t size); void queue_del(struct queue *b, void *data); void queue_iterate(struct queue *b, const void *data, - int (*iterate)(void *data1, void *data2)); + int (*iterate)(void *data1, const void *data2)); #endif diff --git a/src/queue.c b/src/queue.c index 1c31157..80b3342 100644 --- a/src/queue.c +++ b/src/queue.c @@ -110,7 +110,7 @@ void queue_del(struct queue *b, void *data) void queue_iterate(struct queue *b, const void *data, - int (*iterate)(void *data1, void *data2)) + int (*iterate)(void *data1, const void *data2)) { struct list_head *i, *tmp; struct queue_node *n; diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c index d881298..2d79293 100644 --- a/src/sync-ftfw.c +++ b/src/sync-ftfw.c @@ -157,7 +157,7 @@ static int ftfw_local(int fd, int type, void *data) return ret; } -static int rs_queue_to_tx(void *data1, void *data2) +static int rs_queue_to_tx(void *data1, const void *data2) { struct nethdr *net = data1; const struct nethdr_ack *nack = data2; @@ -170,7 +170,7 @@ static int rs_queue_to_tx(void *data1, void *data2) return 0; } -static int rs_queue_empty(void *data1, void *data2) +static int rs_queue_empty(void *data1, const void *data2) { struct nethdr *net = data1; const struct nethdr_ack *h = data2; @@ -237,7 +237,7 @@ static int ftfw_recv(const struct nethdr *net) } if (IS_NACK(net)) { - struct nethdr_ack *nack = (struct nethdr_ack *) net; + const struct nethdr_ack *nack = (const struct nethdr_ack *) net; dp("NACK: from seq=%u to seq=%u\n", nack->from, nack->to); rs_list_to_tx(STATE_SYNC(internal), nack->from, nack->to); @@ -248,7 +248,7 @@ static int ftfw_recv(const struct nethdr *net) cache_iterate(STATE_SYNC(internal), NULL, do_cache_to_tx); return 1; } else if (IS_ACK(net)) { - struct nethdr_ack *h = (struct nethdr_ack *) net; + const struct nethdr_ack *h = (const struct nethdr_ack *) net; dp("ACK: from seq=%u to seq=%u\n", h->from, h->to); rs_list_empty(STATE_SYNC(internal), h->from, h->to); @@ -289,7 +289,7 @@ insert: } } -static int tx_queue_xmit(void *data1, void *data2) +static int tx_queue_xmit(void *data1, const void *data2) { struct nethdr *net = data1; int len = prepare_send_netmsg(STATE_SYNC(mcast_client), net); |