summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-05-03 12:08:56 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-05-03 12:08:56 -0400
commitf7a92d1a7e351886fc1debb7f4b448287d18c20c (patch)
tree6b3af012a388abd436b6933ab0adf5e266caecc5
parent4b558378a730789ed99c190182c977e2055f0c00 (diff)
sd-dhcp: change uint8_t *duid to const void*
-rw-r--r--src/libsystemd-network/sd-dhcp-client.c2
-rw-r--r--src/libsystemd-network/sd-dhcp6-client.c3
-rw-r--r--src/systemd/sd-dhcp-client.h2
-rw-r--r--src/systemd/sd-dhcp6-client.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 1571754355..2ca25c9b33 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -322,7 +322,7 @@ int sd_dhcp_client_set_iaid_duid(
sd_dhcp_client *client,
uint32_t iaid,
uint16_t duid_type,
- uint8_t *duid,
+ const void *duid,
size_t duid_len) {
DHCP_CLIENT_DONT_DESTROY(client);
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 7dd4990bda..d3714b174f 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -189,8 +189,9 @@ static int client_ensure_duid(sd_dhcp6_client *client) {
int sd_dhcp6_client_set_duid(
sd_dhcp6_client *client,
uint16_t duid_type,
- uint8_t *duid,
+ const void *duid,
size_t duid_len) {
+
int r;
assert_return(client, -EINVAL);
assert_return(IN_SET(client->state, DHCP6_STATE_STOPPED), -EBUSY);
diff --git a/src/systemd/sd-dhcp-client.h b/src/systemd/sd-dhcp-client.h
index 6fcf781d90..20b8c2873f 100644
--- a/src/systemd/sd-dhcp-client.h
+++ b/src/systemd/sd-dhcp-client.h
@@ -116,7 +116,7 @@ int sd_dhcp_client_set_iaid_duid(
sd_dhcp_client *client,
uint32_t iaid,
uint16_t duid_type,
- uint8_t *duid,
+ const void *duid,
size_t duid_len);
int sd_dhcp_client_get_client_id(
sd_dhcp_client *client,
diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h
index e29bcfdb8c..90f62eaca4 100644
--- a/src/systemd/sd-dhcp6-client.h
+++ b/src/systemd/sd-dhcp6-client.h
@@ -96,7 +96,7 @@ int sd_dhcp6_client_set_mac(
int sd_dhcp6_client_set_duid(
sd_dhcp6_client *client,
uint16_t duid_type,
- uint8_t *duid,
+ const void *duid,
size_t duid_len);
int sd_dhcp6_client_set_iaid(
sd_dhcp6_client *client,