summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/stats/conntrackd.conf4
-rw-r--r--doc/sync/alarm/conntrackd.conf4
-rw-r--r--doc/sync/ftfw/conntrackd.conf4
-rw-r--r--doc/sync/notrack/conntrackd.conf4
-rw-r--r--src/read_config_lex.l8
5 files changed, 13 insertions, 11 deletions
diff --git a/doc/stats/conntrackd.conf b/doc/stats/conntrackd.conf
index 54e2322..1f1a697 100644
--- a/doc/stats/conntrackd.conf
+++ b/doc/stats/conntrackd.conf
@@ -49,12 +49,12 @@ General {
#
# Netlink socket buffer size
#
- SocketBufferSize 262142
+ NetlinkBufferSize 262142
#
# Increase the socket buffer up to maximun if required
#
- SocketBufferSizeMaxGrown 655355
+ NetlinkBufferSizeMaxGrowth 655355
#
# Event filtering: This clause allows you to filter certain traffic,
diff --git a/doc/sync/alarm/conntrackd.conf b/doc/sync/alarm/conntrackd.conf
index aa87541..cefda00 100644
--- a/doc/sync/alarm/conntrackd.conf
+++ b/doc/sync/alarm/conntrackd.conf
@@ -190,7 +190,7 @@ General {
# and high CPU consumption. This example configuration file sets the
# size to 2 MBytes to avoid this sort of problems.
#
- SocketBufferSize 2097152
+ NetlinkBufferSize 2097152
#
# The daemon doubles the size of the netlink event socket buffer size
@@ -198,7 +198,7 @@ General {
# maximum buffer size growth that can be reached. This example file
# sets the size to 8 MBytes.
#
- SocketBufferSizeMaxGrowth 8388608
+ NetlinkBufferSizeMaxGrowth 8388608
#
# If the daemon detects that Netlink is dropping state-change events,
diff --git a/doc/sync/ftfw/conntrackd.conf b/doc/sync/ftfw/conntrackd.conf
index 790026b..d7e4123 100644
--- a/doc/sync/ftfw/conntrackd.conf
+++ b/doc/sync/ftfw/conntrackd.conf
@@ -199,7 +199,7 @@ General {
# and high CPU consumption. This example configuration file sets the
# size to 2 MBytes to avoid this sort of problems.
#
- SocketBufferSize 2097152
+ NetlinkBufferSize 2097152
#
# The daemon doubles the size of the netlink event socket buffer size
@@ -207,7 +207,7 @@ General {
# maximum buffer size growth that can be reached. This example file
# sets the size to 8 MBytes.
#
- SocketBufferSizeMaxGrowth 8388608
+ NetlinkBufferSizeMaxGrowth 8388608
#
# If the daemon detects that Netlink is dropping state-change events,
diff --git a/doc/sync/notrack/conntrackd.conf b/doc/sync/notrack/conntrackd.conf
index 755b08b..884d536 100644
--- a/doc/sync/notrack/conntrackd.conf
+++ b/doc/sync/notrack/conntrackd.conf
@@ -180,7 +180,7 @@ General {
# and high CPU consumption. This example configuration file sets the
# size to 2 MBytes to avoid this sort of problems.
#
- SocketBufferSize 2097152
+ NetlinkBufferSize 2097152
#
# The daemon doubles the size of the netlink event socket buffer size
@@ -188,7 +188,7 @@ General {
# maximum buffer size growth that can be reached. This example file
# sets the size to 8 MBytes.
#
- SocketBufferSizeMaxGrowth 8388608
+ NetlinkBufferSizeMaxGrowth 8388608
#
# If the daemon detects that Netlink is dropping state-change events,
diff --git a/src/read_config_lex.l b/src/read_config_lex.l
index a1830fd..d75e299 100644
--- a/src/read_config_lex.l
+++ b/src/read_config_lex.l
@@ -82,9 +82,11 @@ notrack [N|n][O|o][T|t][R|r][A|a][C|c][K|k]
"Sync" { return T_SYNC; }
"Stats" { return T_STATS; }
"RelaxTransitions" { return T_RELAX_TRANSITIONS; }
-"SocketBufferSize" { return T_BUFFER_SIZE; }
-"SocketBufferSizeMaxGrown" { return T_BUFFER_SIZE_MAX_GROWN; }
-"SocketBufferSizeMaxGrowth" { return T_BUFFER_SIZE_MAX_GROWN; }
+"SocketBufferSize" { return T_BUFFER_SIZE; /* alias */ }
+"SocketBufferSizeMaxGrown" { return T_BUFFER_SIZE_MAX_GROWN; /* alias */ }
+"SocketBufferSizeMaxGrowth" { return T_BUFFER_SIZE_MAX_GROWN; /* alias */ }
+"NetlinkBufferSize" { return T_BUFFER_SIZE; }
+"NetlinkBufferSizeMaxGrowth" { return T_BUFFER_SIZE_MAX_GROWN; }
"Mode" { return T_SYNC_MODE; }
"ListenTo" { return T_LISTEN_TO; }
"Family" { return T_FAMILY; }