From: Lennart Poettering Date: Tue, 19 Aug 2014 19:57:37 +0000 (+0200) Subject: socket: suffix newly added TCP sockopt time properties with "Sec" X-Git-Tag: v216~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cd761e4df278cdef6fda9d7f50be512d3c1d7ae;p=thirdparty%2Fsystemd.git socket: suffix newly added TCP sockopt time properties with "Sec" This is what we have done so far for all other time values, and hence we should do this here. This indicates the default unit of time values specified here, if they don't contain a unit. --- diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 4483905832e..238029a2516 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -488,7 +488,7 @@ - KeepAliveTime= + KeepAliveTimeSec= Takes time (in seconds) as argument . The connection needs to remain idle before TCP starts sending keepalive probes. This controls the TCP_KEEPIDLE socket option (see @@ -500,7 +500,7 @@ - KeepAliveInterval= + KeepAliveIntervalSec= Takes time (in seconds) as argument between individual keepalive probes, if the socket option SO_KEEPALIVE has been set on this socket seconds as argument. This controls the TCP_KEEPINTVL socket option (see @@ -546,7 +546,7 @@ - DeferAccept= + DeferAcceptSec= Takes time (in seconds) as argument. If set, the diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c index e9e24302899..50b16744274 100644 --- a/src/core/dbus-socket.c +++ b/src/core/dbus-socket.c @@ -97,10 +97,10 @@ const sd_bus_vtable bus_socket_vtable[] = { SD_BUS_PROPERTY("DirectoryMode", "u", bus_property_get_mode, offsetof(Socket, directory_mode), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Accept", "b", bus_property_get_bool, offsetof(Socket, accept), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KeepAlive", "b", bus_property_get_bool, offsetof(Socket, keep_alive), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("KeepAliveTime", "t", bus_property_get_usec, offsetof(Socket, keep_alive_time), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("KeepAliveInterval", "t", bus_property_get_usec, offsetof(Socket, keep_alive_interval), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("KeepAliveTimeUSec", "t", bus_property_get_usec, offsetof(Socket, keep_alive_time), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("KeepAliveIntervalUSec", "t", bus_property_get_usec, offsetof(Socket, keep_alive_interval), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KeepAliveProbes", "u", bus_property_get_unsigned, offsetof(Socket, keep_alive_cnt), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("DeferAccept" , "t", bus_property_get_usec, offsetof(Socket, defer_accept), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("DeferAcceptUSec" , "t", bus_property_get_usec, offsetof(Socket, defer_accept), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("NoDelay", "b", bus_property_get_bool, offsetof(Socket, no_delay), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Priority", "i", bus_property_get_int, offsetof(Socket, priority), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("ReceiveBuffer", "t", bus_property_get_size, offsetof(Socket, receive_buffer), SD_BUS_VTABLE_PROPERTY_CONST), diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 index b4e2b257431..24aa80d9ea3 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -231,10 +231,10 @@ Socket.DirectoryMode, config_parse_mode, 0, Socket.Accept, config_parse_bool, 0, offsetof(Socket, accept) Socket.MaxConnections, config_parse_unsigned, 0, offsetof(Socket, max_connections) Socket.KeepAlive, config_parse_bool, 0, offsetof(Socket, keep_alive) -Socket.KeepAliveTime, config_parse_sec, 0, offsetof(Socket, keep_alive_time) -Socket.KeepAliveInterval, config_parse_sec, 0, offsetof(Socket, keep_alive_interval) +Socket.KeepAliveTimeSec, config_parse_sec, 0, offsetof(Socket, keep_alive_time) +Socket.KeepAliveIntervalSec, config_parse_sec, 0, offsetof(Socket, keep_alive_interval) Socket.KeepAliveProbes, config_parse_unsigned, 0, offsetof(Socket, keep_alive_cnt) -Socket.DeferAccept, config_parse_sec, 0, offsetof(Socket, defer_accept) +Socket.DeferAcceptSec, config_parse_sec, 0, offsetof(Socket, defer_accept) Socket.NoDelay, config_parse_bool, 0, offsetof(Socket, no_delay) Socket.Priority, config_parse_int, 0, offsetof(Socket, priority) Socket.ReceiveBuffer, config_parse_iec_size, 0, offsetof(Socket, receive_buffer) diff --git a/src/core/socket.c b/src/core/socket.c index a16b20d7392..1189f451d25 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -596,28 +596,25 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { prefix, strna(s->user), prefix, strna(s->group)); - if(s->keep_alive_time) + if (s->keep_alive_time > 0) fprintf(f, - "%sKeepAliveTime: %s\n", - prefix, format_timespan(time_string, FORMAT_TIMESPAN_MAX, - s->keep_alive_time, USEC_PER_SEC)); + "%sKeepAliveTimeSec: %s\n", + prefix, format_timespan(time_string, FORMAT_TIMESPAN_MAX, s->keep_alive_time, USEC_PER_SEC)); - if(s->keep_alive_interval) + if (s->keep_alive_interval) fprintf(f, - "%sKeepAliveInterval: %s\n", - prefix, format_timespan(time_string, FORMAT_TIMESPAN_MAX, - s->keep_alive_interval, USEC_PER_SEC)); + "%sKeepAliveIntervalSec: %s\n", + prefix, format_timespan(time_string, FORMAT_TIMESPAN_MAX, s->keep_alive_interval, USEC_PER_SEC)); - if(s->keep_alive_cnt) + if (s->keep_alive_cnt) fprintf(f, "%sKeepAliveProbes: %u\n", prefix, s->keep_alive_cnt); - if(s->defer_accept) + if (s->defer_accept) fprintf(f, - "%sDeferAccept: %s\n", - prefix, format_timespan(time_string, FORMAT_TIMESPAN_MAX, - s->defer_accept, USEC_PER_SEC)); + "%sDeferAcceptSec: %s\n", + prefix, format_timespan(time_string, FORMAT_TIMESPAN_MAX, s->defer_accept, USEC_PER_SEC)); LIST_FOREACH(port, p, s->ports) {