Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest

1 files changed, 41 insertions, 0 deletions

diff --git a/src/core/systemd/nm-sd-utils-dhcp.c b/src/core/systemd/nm-sd-utils-dhcp.c
new file mode 100644
index 00000000..b5aa315a
--- /dev/null
+++ b/src/core/systemd/nm-sd-utils-dhcp.c
@@ -0,0 +1,41 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2019 Red Hat, Inc.
+ */
+
+#include "src/core/systemd/nm-default-systemd.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;
+}