[systemd-commits] 3 commits - TODO man/systemd.socket.xml src/analyze src/core
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Aug 14 07:36:42 PDT 2014
TODO | 8 +++++++-
man/systemd.socket.xml | 15 ---------------
src/analyze/analyze.c | 6 +++---
src/core/dbus-socket.c | 1 -
src/core/load-fragment-gperf.gperf.m4 | 1 -
src/core/socket.c | 8 --------
src/core/socket.h | 1 -
7 files changed, 10 insertions(+), 30 deletions(-)
New commits:
commit 5dcf983854c2e8314dbee239180255490ec8ae1c
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Aug 14 16:36:25 2014 +0200
update TODO
diff --git a/TODO b/TODO
index 27e28d3..64a1b51 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,9 @@ External:
Features:
+* systemd.show_status= should probably have a mode where only failed
+ units are shown.
+
* sd-event: - make it possible to embedd our event loop into foreign
event loops by passing out the epoll fd and providing three functions
that fit into GSource nicely.
@@ -46,7 +49,10 @@ Features:
http://lists.freedesktop.org/archives/systemd-devel/2014-July/021568.html
- .network setting that allows overriding of the hostname to send to the dhcp server
http://lists.freedesktop.org/archives/systemd-devel/2014-July/021550.html
- - add per-network Domains= settings
+ - add per-network Domains= settings, with a special syntax Domains=*
+ for routing all non-otherwise routed traffic to this link
+ - add UseDomains= setting to [DHCP] to add dhcp supplied domains to
+ per-interface Domains= list.
- expose in the API the following bits:
- option 15, domain name and/or option 119, search list
- option 12, host name and/or option 81, fqdn
commit 6a41c9e288fc9483aa98151338501f7654c229b6
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Aug 14 16:36:18 2014 +0200
analyze: some fixes to the --help text
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index fdbce7c..b8b47ed 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1201,8 +1201,8 @@ static void help(void) {
" --fuzz=TIMESPAN When printing the tree of the critical chain, print also\n"
" services, which finished TIMESPAN earlier, than the\n"
" latest in the branch. The unit of TIMESPAN is seconds\n"
- " unless specified with a different unit, i.e. 50ms\n\n"
- " --no-man Do not check for existence of man pages\n"
+ " unless specified with a different unit, i.e. 50ms\n"
+ " --no-man Do not check for existence of man pages\n\n"
"Commands:\n"
" time Print time spent in the kernel before reaching userspace\n"
" blame Print list of running units ordered by time to init\n"
@@ -1211,7 +1211,7 @@ static void help(void) {
" dot Output dependency graph in dot(1) format\n"
" set-log-level LEVEL Set logging threshold for systemd\n"
" dump Output state serialization of service manager\n"
- " verify Check unit files for correctness\n"
+ " verify FILE... Check unit files for correctness\n"
, program_invocation_short_name);
/* When updating this list, including descriptions, apply
commit 4d8ddba9d71e51356cc9488f906b8fef89c60c23
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Aug 14 16:34:47 2014 +0200
Revert "socket: add support for TCP fast Open"
This reverts commit 9528592ff8d7ff361da430285deba8196e8984d5.
Apparently TFO is actually the default at least for the server side now.
Also the setsockopt doesn't actually take a bool, but a qlen integer.
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 170d010..352825f 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -499,21 +499,6 @@
</varlistentry>
<varlistentry>
- <term><varname>FastOpen=</varname></term>
- <listitem><para>Takes a boolean
- argument. It works by using a TFO cookie (a TCP option) in the initial
- SYN packet to authenticate a previously connected client. If successful,
- it may start sending data to the client before the receipt of the final
- ACK packet of the three way handshake is received, skipping a round trip
- and lowering the latency in the start of transmission of data.
- This controls the TCP_FASTOPEN socket option (see
- the <ulink url="http://lwn.net/Articles/508865/">TCP
- Fast Open: expediting web services</ulink> for details.)
- Defaults to
- <option>false</option>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><varname>Priority=</varname></term>
<listitem><para>Takes an integer
argument controlling the priority for
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 71c0115..ad135a1 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -97,7 +97,6 @@ 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("FastOpen" , "b", bus_property_get_bool, offsetof(Socket, fast_open), 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),
SD_BUS_PROPERTY("SendBuffer", "t", bus_property_get_size, offsetof(Socket, send_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 08d0593..f4acdda 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -232,7 +232,6 @@ Socket.Accept, config_parse_bool, 0,
Socket.MaxConnections, config_parse_unsigned, 0, offsetof(Socket, max_connections)
Socket.KeepAlive, config_parse_bool, 0, offsetof(Socket, keep_alive)
Socket.NoDelay, config_parse_bool, 0, offsetof(Socket, no_delay)
-Socket.FastOpen, config_parse_bool, 0, offsetof(Socket, fast_open)
Socket.Priority, config_parse_int, 0, offsetof(Socket, priority)
Socket.ReceiveBuffer, config_parse_iec_size, 0, offsetof(Socket, receive_buffer)
Socket.SendBuffer, config_parse_iec_size, 0, offsetof(Socket, send_buffer)
diff --git a/src/core/socket.c b/src/core/socket.c
index 44827ad..5af1596 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -481,7 +481,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
"%sDirectoryMode: %04o\n"
"%sKeepAlive: %s\n"
"%sNoDelay: %s\n"
- "%sFastOpen: %s\n"
"%sFreeBind: %s\n"
"%sTransparent: %s\n"
"%sBroadcast: %s\n"
@@ -497,7 +496,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
prefix, s->directory_mode,
prefix, yes_no(s->keep_alive),
prefix, yes_no(s->no_delay),
- prefix, yes_no(s->fast_open),
prefix, yes_no(s->free_bind),
prefix, yes_no(s->transparent),
prefix, yes_no(s->broadcast),
@@ -800,12 +798,6 @@ static void socket_apply_socket_options(Socket *s, int fd) {
log_warning_unit(UNIT(s)->id, "TCP_NODELAY failed: %m");
}
- if (s->fast_open) {
- int b = s->fast_open;
- if (setsockopt(fd, SOL_TCP, TCP_FASTOPEN, &b, sizeof(b)) < 0)
- log_warning_unit(UNIT(s)->id, "TCP_FASTOPEN failed: %m");
- }
-
if (s->broadcast) {
int one = 1;
if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one)) < 0)
diff --git a/src/core/socket.h b/src/core/socket.h
index 6c0084c..98396e7 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -135,7 +135,6 @@ struct Socket {
/* Socket options */
bool keep_alive;
bool no_delay;
- bool fast_open;
bool free_bind;
bool transparent;
bool broadcast;
More information about the systemd-commits
mailing list