From ec6370a22dbb96f855011e75f08e88df9e45504d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 19 May 2011 18:10:19 +0200 Subject: [PATCH] socket: expose SO_BROADCAST --- TODO | 2 ++ man/systemd.socket.xml | 10 ++++++++++ src/dbus-socket.c | 2 ++ src/load-fragment.c | 1 + src/socket.c | 8 ++++++++ src/socket.h | 1 + 6 files changed, 24 insertions(+) diff --git a/TODO b/TODO index 389e5e97e..80e8397c8 100644 --- a/TODO +++ b/TODO @@ -19,6 +19,8 @@ F15 External: Features: +* drop -lrt req for sd-daemon.[ch] + * Make it possible to set the keymap independently from the font on the kernel cmdline. Right now setting one resets also the other. diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 53502667e..6d81f913c 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -514,6 +514,16 @@ . + + Broadcast= + Takes a boolean + value. This controls the SO_BROADCAST + option, which allows boradcast + datagrams to be sent from this + socket. Defaults to + . + + TCPCongestion= Takes a string diff --git a/src/dbus-socket.c b/src/dbus-socket.c index f6edc8016..b81569d50 100644 --- a/src/dbus-socket.c +++ b/src/dbus-socket.c @@ -50,6 +50,7 @@ " \n" \ " \n" \ " \n" \ + " \n" \ " \n" \ " \n" \ " \n" \ @@ -109,6 +110,7 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes { "org.freedesktop.systemd1.Socket", "PipeSize", bus_property_append_size, "t", &u->socket.pipe_size }, { "org.freedesktop.systemd1.Socket", "FreeBind", bus_property_append_bool, "b", &u->socket.free_bind }, { "org.freedesktop.systemd1.Socket", "Transparent", bus_property_append_bool, "b", &u->socket.transparent }, + { "org.freedesktop.systemd1.Socket", "Broadcast", bus_property_append_bool, "b", &u->socket.broadcast }, { "org.freedesktop.systemd1.Socket", "Mark", bus_property_append_int, "i", &u->socket.mark }, { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned, "u", &u->socket.max_connections }, { "org.freedesktop.systemd1.Socket", "NConnections", bus_property_append_unsigned, "u", &u->socket.n_connections }, diff --git a/src/load-fragment.c b/src/load-fragment.c index dbb076201..56eaed9ab 100644 --- a/src/load-fragment.c +++ b/src/load-fragment.c @@ -1996,6 +1996,7 @@ static int load_from_path(Unit *u, const char *path) { { "PipeSize", config_parse_size, 0, &u->socket.pipe_size, "Socket" }, { "FreeBind", config_parse_bool, 0, &u->socket.free_bind, "Socket" }, { "Transparent", config_parse_bool, 0, &u->socket.transparent, "Socket" }, + { "Broadcast", config_parse_bool, 0, &u->socket.broadcast, "Socket" }, { "TCPCongestion", config_parse_string, 0, &u->socket.tcp_congestion, "Socket" }, { "MessageQueueMaxMessages", config_parse_long, 0, &u->socket.mq_maxmsg, "Socket" }, { "MessageQueueMessageSize", config_parse_long, 0, &u->socket.mq_msgsize, "Socket" }, diff --git a/src/socket.c b/src/socket.c index e8b2d968d..1020c94de 100644 --- a/src/socket.c +++ b/src/socket.c @@ -405,6 +405,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { "%sKeepAlive: %s\n" "%sFreeBind: %s\n" "%sTransparent: %s\n" + "%sBroadcast: %s\n" "%sTCPCongestion: %s\n", prefix, socket_state_to_string(s->state), prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only), @@ -414,6 +415,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { prefix, yes_no(s->keep_alive), prefix, yes_no(s->free_bind), prefix, yes_no(s->transparent), + prefix, yes_no(s->broadcast), prefix, strna(s->tcp_congestion)); if (s->control_pid > 0) @@ -649,6 +651,12 @@ static void socket_apply_socket_options(Socket *s, int fd) { log_warning("SO_KEEPALIVE failed: %m"); } + if (s->broadcast) { + int one = 1; + if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one)) < 0) + log_warning("SO_BROADCAST failed: %m"); + } + if (s->priority >= 0) if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &s->priority, sizeof(s->priority)) < 0) log_warning("SO_PRIORITY failed: %m"); diff --git a/src/socket.h b/src/socket.h index 92f11d72e..fd13ac4e4 100644 --- a/src/socket.h +++ b/src/socket.h @@ -117,6 +117,7 @@ struct Socket { bool keep_alive; bool free_bind; bool transparent; + bool broadcast; int priority; int mark; size_t receive_buffer; -- 2.30.2