[netfilter-cvslog] r7368 - in trunk/conntrack-tools: . include src
pablo at netfilter.org
pablo at netfilter.org
Thu Feb 14 15:44:59 CET 2008
Author: pablo at netfilter.org
Date: 2008-02-14 15:44:59 +0100 (Thu, 14 Feb 2008)
New Revision: 7368
Modified:
trunk/conntrack-tools/ChangeLog
trunk/conntrack-tools/include/queue.h
trunk/conntrack-tools/src/alarm.c
trunk/conntrack-tools/src/main.c
trunk/conntrack-tools/src/netlink.c
trunk/conntrack-tools/src/run.c
Log:
From: Max Kellermann <max at duempel.org>
whitespace cleanups
Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog 2008-02-14 14:25:11 UTC (rev 7367)
+++ trunk/conntrack-tools/ChangeLog 2008-02-14 14:44:59 UTC (rev 7368)
@@ -100,6 +100,7 @@
o introduce alarm_pending()
o cleanup: use size_t instead of integer
o several cleanups in the rbtree-based alarm
+o whitespace cleanups
version 0.9.5 (2007/07/29)
------------------------------
Modified: trunk/conntrack-tools/include/queue.h
===================================================================
--- trunk/conntrack-tools/include/queue.h 2008-02-14 14:25:11 UTC (rev 7367)
+++ trunk/conntrack-tools/include/queue.h 2008-02-14 14:44:59 UTC (rev 7368)
@@ -21,8 +21,8 @@
unsigned int queue_len(const struct queue *b);
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,
+void queue_iterate(struct queue *b,
+ const void *data,
int (*iterate)(void *data1, const void *data2));
#endif
Modified: trunk/conntrack-tools/src/alarm.c
===================================================================
--- trunk/conntrack-tools/src/alarm.c 2008-02-14 14:25:11 UTC (rev 7367)
+++ trunk/conntrack-tools/src/alarm.c 2008-02-14 14:44:59 UTC (rev 7368)
@@ -1,6 +1,6 @@
/*
* (C) 2006-2008 by Pablo Neira Ayuso <pablo at netfilter.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -85,7 +85,7 @@
static struct timeval *
calculate_next_run(struct timeval *cand,
- struct timeval *tv,
+ struct timeval *tv,
struct timeval *next_run)
{
if (cand->tv_sec != LONG_MAX) {
Modified: trunk/conntrack-tools/src/main.c
===================================================================
--- trunk/conntrack-tools/src/main.c 2008-02-14 14:25:11 UTC (rev 7367)
+++ trunk/conntrack-tools/src/main.c 2008-02-14 14:44:59 UTC (rev 7368)
@@ -1,6 +1,6 @@
/*
* (C) 2006-2007 by Pablo Neira Ayuso <pablo at netfilter.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -34,7 +34,7 @@
"Daemon mode commands:\n"
" -d [options]\t\tRun in daemon mode\n";
-static const char usage_client_commands[] =
+static const char usage_client_commands[] =
"Client mode commands:\n"
" -c, commit external cache to conntrack table\n"
" -f, flush internal and external cache\n"
@@ -244,7 +244,7 @@
exit(EXIT_FAILURE);
} else if (pid)
exit(EXIT_SUCCESS);
-
+
setsid();
close(STDOUT_FILENO);
Modified: trunk/conntrack-tools/src/netlink.c
===================================================================
--- trunk/conntrack-tools/src/netlink.c 2008-02-14 14:25:11 UTC (rev 7367)
+++ trunk/conntrack-tools/src/netlink.c 2008-02-14 14:44:59 UTC (rev 7368)
@@ -1,6 +1,6 @@
/*
* (C) 2006 by Pablo Neira Ayuso <pablo at netfilter.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -35,7 +35,7 @@
return 0;
}
- /* Accept SNAT'ed traffic: not really coming to the local machine */
+ /* Accept SNAT'ed traffic: not really coming to the local machine */
if (nfct_getobjopt(ct, NFCT_GOPT_IS_SNAT)) {
debug_ct(ct, "SNAT");
return 0;
@@ -54,7 +54,7 @@
struct nf_conntrack *ct,
void *data)
{
- /*
+ /*
* Ignore this conntrack: it talks about a
* connection that is not interesting for us.
*/
@@ -94,7 +94,7 @@
/* set up socket buffer size */
if (CONFIG(netlink_buffer_size))
- nfnl_rcvbufsiz(nfct_nfnlh(STATE(event)),
+ nfnl_rcvbufsiz(nfct_nfnlh(STATE(event)),
CONFIG(netlink_buffer_size));
else {
socklen_t socklen = sizeof(unsigned int);
@@ -109,7 +109,7 @@
/* ensure that maximum grown size is >= than maximum size */
if (CONFIG(netlink_buffer_size_max_grown) < CONFIG(netlink_buffer_size))
- CONFIG(netlink_buffer_size_max_grown) =
+ CONFIG(netlink_buffer_size_max_grown) =
CONFIG(netlink_buffer_size);
/* register callback for events */
@@ -122,7 +122,7 @@
struct nf_conntrack *ct,
void *data)
{
- /*
+ /*
* Ignore this conntrack: it talks about a
* connection that is not interesting for us.
*/
@@ -167,7 +167,7 @@
return;
if (s > CONFIG(netlink_buffer_size_max_grown)) {
- dlog(LOG_WARNING,
+ dlog(LOG_WARNING,
"maximum netlink socket buffer "
"size has been reached. We are likely to "
"be losing events, this may lead to "
Modified: trunk/conntrack-tools/src/run.c
===================================================================
--- trunk/conntrack-tools/src/run.c 2008-02-14 14:25:11 UTC (rev 7367)
+++ trunk/conntrack-tools/src/run.c 2008-02-14 14:44:59 UTC (rev 7368)
@@ -48,7 +48,7 @@
sigprocmask(SIG_UNBLOCK, &STATE(block), NULL);
- exit(0);
+ exit(0);
}
static void child(int foo)
@@ -115,7 +115,7 @@
}
if (nl_init_event_handler() == -1) {
- dlog(LOG_ERR, "can't open netlink handler: %s",
+ dlog(LOG_ERR, "can't open netlink handler: %s",
strerror(errno));
dlog(LOG_ERR, "no ctnetlink kernel support?");
return -1;
@@ -128,7 +128,7 @@
return -1;
}
- /* Signals handling */
+ /* Signals handling */
sigemptyset(&STATE(block));
sigaddset(&STATE(block), SIGTERM);
sigaddset(&STATE(block), SIGINT);
@@ -177,7 +177,7 @@
}
/* signals are racy */
- sigprocmask(SIG_BLOCK, &STATE(block), NULL);
+ sigprocmask(SIG_BLOCK, &STATE(block), NULL);
/* order received via UNIX socket */
if (FD_ISSET(STATE(local).fd, &readfds))
@@ -189,8 +189,8 @@
if (ret == -1) {
switch(errno) {
case ENOBUFS:
- /*
- * It seems that ctnetlink can't back off,
+ /*
+ * It seems that ctnetlink can't back off,
* it's likely that we're losing events.
* Solution: duplicate the socket buffer
* size and resync with master conntrack table.
More information about the netfilter-cvslog
mailing list