From b44cd8821087f2afebf85fec5b588f5720a9415c Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 24 May 2014 18:48:41 +0200 Subject: [PATCH] sd-dhcp-server: add basic functionality for creating/destroying server instance --- .gitignore | 1 + Makefile.am | 12 +++ src/libsystemd-network/dhcp-network.c | 1 + src/libsystemd-network/dhcp-server-internal.h | 40 ++++++++ src/libsystemd-network/sd-dhcp-server.c | 92 +++++++++++++++++++ src/libsystemd-network/test-dhcp-server.c | 62 +++++++++++++ src/systemd/sd-dhcp-server.h | 41 +++++++++ 7 files changed, 249 insertions(+) create mode 100644 src/libsystemd-network/dhcp-server-internal.h create mode 100644 src/libsystemd-network/sd-dhcp-server.c create mode 100644 src/libsystemd-network/test-dhcp-server.c create mode 100644 src/systemd/sd-dhcp-server.h diff --git a/.gitignore b/.gitignore index bcebb96e0..ed29762a1 100644 --- a/.gitignore +++ b/.gitignore @@ -141,6 +141,7 @@ /test-date /test-device-nodes /test-dhcp-client +/test-dhcp-server /test-dhcp-option /test-resolve /test-ellipsize diff --git a/Makefile.am b/Makefile.am index 53082cf2a..2ceee2a99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2553,15 +2553,18 @@ libsystemd_network_la_CFLAGS = \ libsystemd_network_la_SOURCES = \ src/systemd/sd-network.h \ src/systemd/sd-dhcp-client.h \ + src/systemd/sd-dhcp-server.h \ src/systemd/sd-dhcp-lease.h \ src/systemd/sd-ipv4ll.h \ src/network/sd-network.c \ src/network/network-util.h \ src/libsystemd-network/sd-dhcp-client.c \ + src/libsystemd-network/sd-dhcp-server.c \ src/libsystemd-network/dhcp-network.c \ src/libsystemd-network/dhcp-option.c \ src/libsystemd-network/dhcp-packet.c \ src/libsystemd-network/dhcp-internal.h \ + src/libsystemd-network/dhcp-server-internal.h \ src/libsystemd-network/dhcp-protocol.h \ src/libsystemd-network/dhcp-lease-internal.h \ src/libsystemd-network/sd-dhcp-lease.c \ @@ -2601,6 +2604,14 @@ test_dhcp_client_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_dhcp_server_SOURCES = \ + src/libsystemd-network/test-dhcp-server.c + +test_dhcp_server_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + test_ipv4ll_SOURCES = \ src/systemd/sd-ipv4ll.h \ src/libsystemd-network/ipv4ll-internal.h \ @@ -2615,6 +2626,7 @@ test_ipv4ll_LDADD = \ tests += \ test-dhcp-option \ test-dhcp-client \ + test-dhcp-server \ test-ipv4ll # ------------------------------------------------------------------------------ diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c index 6fac80e87..266bf1317 100644 --- a/src/libsystemd-network/dhcp-network.c +++ b/src/libsystemd-network/dhcp-network.c @@ -117,6 +117,7 @@ int dhcp_network_bind_udp_socket(be32_t address, uint16_t port) { r = setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)); if (r < 0) return -errno; + if (address == INADDR_ANY) { int on = 1; diff --git a/src/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h new file mode 100644 index 000000000..e09b35936 --- /dev/null +++ b/src/libsystemd-network/dhcp-server-internal.h @@ -0,0 +1,40 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright (C) 2013 Intel Corporation. All rights reserved. + Copyright (C) 2014 Tom Gundersen + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include "sd-event.h" +#include "sd-dhcp-server.h" + +#include "refcnt.h" +#include "util.h" +#include "log.h" + +struct sd_dhcp_server { + RefCount n_ref; + + sd_event *event; + int event_priority; +}; + +DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_server*, sd_dhcp_server_unref); +#define _cleanup_dhcp_server_unref_ _cleanup_(sd_dhcp_server_unrefp) + +#define log_dhcp_server(client, fmt, ...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, "DHCP SERVER: " fmt, ##__VA_ARGS__) diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c new file mode 100644 index 000000000..885d68d33 --- /dev/null +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -0,0 +1,92 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright (C) 2013 Intel Corporation. All rights reserved. + Copyright (C) 2014 Tom Gundersen + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include "sd-dhcp-server.h" +#include "dhcp-server-internal.h" + +sd_dhcp_server *sd_dhcp_server_ref(sd_dhcp_server *server) { + if (server) + assert_se(REFCNT_INC(server->n_ref) >= 2); + + return server; +} + +sd_dhcp_server *sd_dhcp_server_unref(sd_dhcp_server *server) { + if (server && REFCNT_DEC(server->n_ref) <= 0) { + log_dhcp_server(server, "UNREF"); + + sd_event_unref(server->event); + free(server); + } + + return NULL; +} + +int sd_dhcp_server_new(sd_dhcp_server **ret) { + _cleanup_dhcp_server_unref_ sd_dhcp_server *server = NULL; + + assert_return(ret, -EINVAL); + + server = new0(sd_dhcp_server, 1); + if (!server) + return -ENOMEM; + + server->n_ref = REFCNT_INIT; + + *ret = server; + server = NULL; + + return 0; +} + +int sd_dhcp_server_attach_event(sd_dhcp_server *server, sd_event *event, int priority) { + int r; + + assert_return(server, -EINVAL); + assert_return(!server->event, -EBUSY); + + if (event) + server->event = sd_event_ref(event); + else { + r = sd_event_default(&server->event); + if (r < 0) + return r; + } + + server->event_priority = priority; + + return 0; +} + +int sd_dhcp_server_detach_event(sd_dhcp_server *server) { + assert_return(server, -EINVAL); + + server->event = sd_event_unref(server->event); + + return 0; +} + +sd_event *sd_dhcp_server_get_event(sd_dhcp_server *server) { + assert_return(server, NULL); + + return server->event; +} diff --git a/src/libsystemd-network/test-dhcp-server.c b/src/libsystemd-network/test-dhcp-server.c new file mode 100644 index 000000000..bd0913d51 --- /dev/null +++ b/src/libsystemd-network/test-dhcp-server.c @@ -0,0 +1,62 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright (C) 2013 Intel Corporation. All rights reserved. + Copyright (C) 2014 Tom Gundersen + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include + +#include "sd-event.h" +#include "event-util.h" + +#include "sd-dhcp-server.h" +#include "dhcp-server-internal.h" + +static void test_basic(sd_event *event) { + _cleanup_dhcp_server_unref_ sd_dhcp_server *server = NULL; + + assert_se(sd_dhcp_server_new(&server) >= 0); + assert_se(server); + + assert_se(sd_dhcp_server_attach_event(server, event, 0) >= 0); + assert_se(sd_dhcp_server_attach_event(server, event, 0) == -EBUSY); + assert_se(sd_dhcp_server_get_event(server) == event); + assert_se(sd_dhcp_server_detach_event(server) >= 0); + assert_se(!sd_dhcp_server_get_event(server)); + assert_se(sd_dhcp_server_attach_event(server, NULL, 0) >= 0); + assert_se(sd_dhcp_server_attach_event(server, NULL, 0) == -EBUSY); + + assert_se(sd_dhcp_server_ref(server) == server); + assert_se(!sd_dhcp_server_unref(server)); +} + +int main(int argc, char *argv[]) { + _cleanup_event_unref_ sd_event *e; + + log_set_max_level(LOG_DEBUG); + log_parse_environment(); + log_open(); + + assert_se(sd_event_new(&e) >= 0); + + test_basic(e); + + return 0; +} diff --git a/src/systemd/sd-dhcp-server.h b/src/systemd/sd-dhcp-server.h new file mode 100644 index 000000000..ab3e707ad --- /dev/null +++ b/src/systemd/sd-dhcp-server.h @@ -0,0 +1,41 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#ifndef foosddhcpserverhfoo +#define foosddhcpserverhfoo + +/*** + This file is part of systemd. + + Copyright (C) 2013 Intel Corporation. All rights reserved. + Copyright (C) 2014 Tom Gundersen + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include + +#include "sd-event.h" + +typedef struct sd_dhcp_server sd_dhcp_server; + +sd_dhcp_server *sd_dhcp_server_ref(sd_dhcp_server *server); +sd_dhcp_server *sd_dhcp_server_unref(sd_dhcp_server *server); + +int sd_dhcp_server_new(sd_dhcp_server **ret); + +int sd_dhcp_server_attach_event(sd_dhcp_server *client, sd_event *event, int priority); +int sd_dhcp_server_detach_event(sd_dhcp_server *client); +sd_event *sd_dhcp_server_get_event(sd_dhcp_server *client); + +#endif -- 2.30.2