projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4b55837
)
sd-dhcp: change uint8_t *duid to const void*
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Tue, 3 May 2016 16:08:56 +0000
(12:08 -0400)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Tue, 3 May 2016 16:08:56 +0000
(12:08 -0400)
src/libsystemd-network/sd-dhcp-client.c
patch
|
blob
|
history
src/libsystemd-network/sd-dhcp6-client.c
patch
|
blob
|
history
src/systemd/sd-dhcp-client.h
patch
|
blob
|
history
src/systemd/sd-dhcp6-client.h
patch
|
blob
|
history
diff --git
a/src/libsystemd-network/sd-dhcp-client.c
b/src/libsystemd-network/sd-dhcp-client.c
index
1571754
..
2ca25c9
100644
(file)
--- 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
7dd4990
..
d3714b1
100644
(file)
--- 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
6fcf781
..
20b8c28
100644
(file)
--- 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
e29bcfd
..
90f62ea
100644
(file)
--- 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,