summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo Borrero Gonzalez <arturo@debian.org>2017-06-06 12:58:44 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2017-06-06 18:12:52 +0200
commitdbfdea75ef9dfcae0d09044c65b2372c7483d0f7 (patch)
tree8be7085920fd223c230c6e765591d707f5f2998b
parent6feded70f54c5df11600b708825c1466b0d9090e (diff)
conntrackd: deprecate unix backlog configuration
This configuration option doesn't add any value to users. Use the magic value of 100 (i.e, the socket will keep 100 pending connections), which I think is fair enough for what conntrackd can do in the unix socket. Signed-off-by: Arturo Borrero Gonzalez <arturo@debian.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--conntrackd.conf.58
-rw-r--r--doc/helper/conntrackd.conf1
-rw-r--r--doc/stats/conntrackd.conf1
-rw-r--r--doc/sync/alarm/conntrackd.conf1
-rw-r--r--doc/sync/ftfw/conntrackd.conf1
-rw-r--r--doc/sync/notrack/conntrackd.conf1
-rw-r--r--include/local.h1
-rw-r--r--src/local.c4
-rw-r--r--src/read_config_yy.y2
9 files changed, 5 insertions, 15 deletions
diff --git a/conntrackd.conf.5 b/conntrackd.conf.5
index 94de327..a395e14 100644
--- a/conntrackd.conf.5
+++ b/conntrackd.conf.5
@@ -609,7 +609,6 @@ Example:
.nf
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
.fi
@@ -621,9 +620,7 @@ Example: Path /var/run/conntrackd.ctl
.TP
.BI "Backlog <value>"
-Number of items in the backlog.
-
-Example: Backlog 20
+Deprecated option.
.SS FILTER
Event filtering. This clause allows you to filter certain traffic.
@@ -914,7 +911,6 @@ General {
LockFile /var/lock/conntrack.lock
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
NetlinkBufferSize 262142
NetlinkBufferSizeMaxGrowth 655355
@@ -985,7 +981,6 @@ General {
LockFile /var/lock/conntrack.lock
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
NetlinkBufferSize 2097152
NetlinkBufferSizeMaxGrowth 8388608
@@ -1048,7 +1043,6 @@ General {
LockFile /var/lock/conntrack.lock
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
NetlinkBufferSize 2097152
NetlinkBufferSizeMaxGrowth 8388608
diff --git a/doc/helper/conntrackd.conf b/doc/helper/conntrackd.conf
index 7eae8bc..1746bfd 100644
--- a/doc/helper/conntrackd.conf
+++ b/doc/helper/conntrackd.conf
@@ -145,6 +145,5 @@ General {
#
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
}
diff --git a/doc/stats/conntrackd.conf b/doc/stats/conntrackd.conf
index 6a9aec8..99453ee 100644
--- a/doc/stats/conntrackd.conf
+++ b/doc/stats/conntrackd.conf
@@ -62,7 +62,6 @@ General {
#
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
#
diff --git a/doc/sync/alarm/conntrackd.conf b/doc/sync/alarm/conntrackd.conf
index 225d1c9..e25c30e 100644
--- a/doc/sync/alarm/conntrackd.conf
+++ b/doc/sync/alarm/conntrackd.conf
@@ -283,7 +283,6 @@ General {
#
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
#
diff --git a/doc/sync/ftfw/conntrackd.conf b/doc/sync/ftfw/conntrackd.conf
index 228674c..bcbf631 100644
--- a/doc/sync/ftfw/conntrackd.conf
+++ b/doc/sync/ftfw/conntrackd.conf
@@ -306,7 +306,6 @@ General {
#
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
#
diff --git a/doc/sync/notrack/conntrackd.conf b/doc/sync/notrack/conntrackd.conf
index 3becd91..c1ad0b4 100644
--- a/doc/sync/notrack/conntrackd.conf
+++ b/doc/sync/notrack/conntrackd.conf
@@ -345,7 +345,6 @@ General {
#
UNIX {
Path /var/run/conntrackd.ctl
- Backlog 20
}
#
diff --git a/include/local.h b/include/local.h
index f9121b1..22859d7 100644
--- a/include/local.h
+++ b/include/local.h
@@ -6,7 +6,6 @@
#endif
struct local_conf {
- int backlog;
int reuseaddr;
char path[UNIX_PATH_MAX];
};
diff --git a/src/local.c b/src/local.c
index 3395b4c..2b67885 100644
--- a/src/local.c
+++ b/src/local.c
@@ -26,6 +26,8 @@
#include <arpa/inet.h>
#include <sys/un.h>
+#define UNIX_SOCKET_BACKLOG 100
+
int local_server_create(struct local_server *server, struct local_conf *conf)
{
int fd;
@@ -53,7 +55,7 @@ int local_server_create(struct local_server *server, struct local_conf *conf)
return -1;
}
- if (listen(fd, conf->backlog) == -1) {
+ if (listen(fd, UNIX_SOCKET_BACKLOG) == -1) {
close(fd);
unlink(conf->path);
return -1;
diff --git a/src/read_config_yy.y b/src/read_config_yy.y
index 7ba24f4..30a8bd4 100644
--- a/src/read_config_yy.y
+++ b/src/read_config_yy.y
@@ -655,7 +655,7 @@ unix_option : T_PATH T_PATH_VAL
unix_option : T_BACKLOG T_NUMBER
{
- conf.local.backlog = $2;
+ dlog(LOG_WARNING, "deprecated unix backlog configuration, ignoring.");
};
sync: T_SYNC '{' sync_list '}'