From dbfdea75ef9dfcae0d09044c65b2372c7483d0f7 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Tue, 6 Jun 2017 12:58:44 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- src/local.c | 4 +++- src/read_config_yy.y | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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 #include +#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 '}' -- cgit v1.2.3