diff --git a/Makefile.am b/Makefile.am index 5589f0550d..4c6b22546e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1836,6 +1836,8 @@ src_libnm_systemd_core_la_SOURCES = \ src/systemd/nm-sd-utils-core.h \ src/systemd/nm-sd.c \ src/systemd/nm-sd.h \ + src/systemd/nm-sd-utils-dhcp.h \ + src/systemd/nm-sd-utils-dhcp.c \ src/systemd/sd-adapt-core/condition.h \ src/systemd/sd-adapt-core/conf-parser.h \ src/systemd/sd-adapt-core/device-util.h \ diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 599c95e8a4..af1d0c8b35 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -25,6 +25,7 @@ libnm_systemd_core = static_library( 'src/libsystemd/sd-id128/sd-id128.c', 'nm-sd.c', 'nm-sd-utils-core.c', + 'nm-sd-utils-dhcp.c', ), include_directories: [ src_inc, diff --git a/src/systemd/nm-sd-utils-dhcp.c b/src/systemd/nm-sd-utils-dhcp.c new file mode 100644 index 0000000000..49a924b62c --- /dev/null +++ b/src/systemd/nm-sd-utils-dhcp.c @@ -0,0 +1,54 @@ +/* + * This library 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 of the License, or (at your option) any later version. + * + * This library 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 this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * (C) Copyright 2019 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-sd-utils-dhcp.h" + +#include "sd-adapt-core/nm-sd-adapt-core.h" +#include "src/libsystemd-network/dhcp-lease-internal.h" + +int +nm_sd_dhcp_lease_get_private_options (sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options) +{ + struct sd_dhcp_raw_option *raw_option; + int cnt = 0; + + g_return_val_if_fail (lease, -EINVAL); + g_return_val_if_fail (out_options, -EINVAL); + g_return_val_if_fail (*out_options == NULL, -EINVAL); + + if (lease->private_options == NULL) + return -ENODATA; + + LIST_FOREACH (options, raw_option, lease->private_options) + cnt++; + + *out_options = g_new (nm_sd_dhcp_option, cnt); + cnt = 0; + + LIST_FOREACH (options, raw_option, lease->private_options) { + (*out_options)[cnt].code = raw_option->tag; + (*out_options)[cnt].data = raw_option->data; + (*out_options)[cnt].data_len = raw_option->length; + cnt++; + } + + return cnt; +} diff --git a/src/systemd/nm-sd-utils-dhcp.h b/src/systemd/nm-sd-utils-dhcp.h new file mode 100644 index 0000000000..496bf374ac --- /dev/null +++ b/src/systemd/nm-sd-utils-dhcp.h @@ -0,0 +1,34 @@ +/* + * This library 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 of the License, or (at your option) any later version. + * + * This library 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 this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * (C) Copyright 2019 Red Hat, Inc. + */ + +#ifndef __NETWORKMANAGER_DHCP_SYSTEMD_UTILS_H__ +#define __NETWORKMANAGER_DHCP_SYSTEMD_UTILS_H__ + +#include "nm-sd.h" + +typedef struct { + uint8_t code; + uint8_t data_len; + void *data; +} nm_sd_dhcp_option; + +int +nm_sd_dhcp_lease_get_private_options (sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options); + +#endif /* __NETWORKMANAGER_DHCP_SYSTEMD_UTILS_H__ */