90 lines
4.0 KiB
Diff
90 lines
4.0 KiB
Diff
From 9dcf9e12a68640f413d52f48d1d9786c4c71e073 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Fri, 24 Sep 2021 13:34:14 +0900
|
|
Subject: [PATCH] sd-dhcp6-client: constify several arguments
|
|
|
|
(cherry picked from commit 3f8227bf830cc2b87ea9bce5394a71c186d12956)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd/commit/9dcf9e12a68640f413d52f48d1d9786c4c71e073
|
|
---
|
|
src/libsystemd-network/dhcp6-lease-internal.h | 10 ++++------
|
|
src/libsystemd-network/sd-dhcp6-lease.c | 12 +++++-------
|
|
2 files changed, 9 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h
|
|
index 391b4f1fa9..41b43ba7a4 100644
|
|
--- a/src/libsystemd-network/dhcp6-lease-internal.h
|
|
+++ b/src/libsystemd-network/dhcp6-lease-internal.h
|
|
@@ -50,12 +50,10 @@ int dhcp6_lease_get_rapid_commit(sd_dhcp6_lease *lease, bool *rapid_commit);
|
|
int dhcp6_lease_get_iaid(sd_dhcp6_lease *lease, be32_t *iaid);
|
|
int dhcp6_lease_get_pd_iaid(sd_dhcp6_lease *lease, be32_t *iaid);
|
|
|
|
-int dhcp6_lease_set_dns(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen);
|
|
-int dhcp6_lease_set_domains(sd_dhcp6_lease *lease, uint8_t *optval,
|
|
- size_t optlen);
|
|
-int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen);
|
|
-int dhcp6_lease_set_sntp(sd_dhcp6_lease *lease, uint8_t *optval,
|
|
- size_t optlen) ;
|
|
+int dhcp6_lease_set_dns(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
|
|
+int dhcp6_lease_set_domains(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
|
|
+int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
|
|
+int dhcp6_lease_set_sntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) ;
|
|
int dhcp6_lease_set_fqdn(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
|
|
|
|
int dhcp6_lease_new(sd_dhcp6_lease **ret);
|
|
diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c
|
|
index 9c77b146c7..8378971422 100644
|
|
--- a/src/libsystemd-network/sd-dhcp6-lease.c
|
|
+++ b/src/libsystemd-network/sd-dhcp6-lease.c
|
|
@@ -193,7 +193,7 @@ void sd_dhcp6_lease_reset_pd_prefix_iter(sd_dhcp6_lease *lease) {
|
|
lease->prefix_iter = lease->pd.addresses;
|
|
}
|
|
|
|
-int dhcp6_lease_set_dns(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen) {
|
|
+int dhcp6_lease_set_dns(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) {
|
|
assert_return(lease, -EINVAL);
|
|
assert_return(optval, -EINVAL);
|
|
|
|
@@ -215,8 +215,7 @@ int sd_dhcp6_lease_get_dns(sd_dhcp6_lease *lease, const struct in6_addr **addrs)
|
|
return -ENOENT;
|
|
}
|
|
|
|
-int dhcp6_lease_set_domains(sd_dhcp6_lease *lease, uint8_t *optval,
|
|
- size_t optlen) {
|
|
+int dhcp6_lease_set_domains(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) {
|
|
int r;
|
|
char **domains;
|
|
|
|
@@ -248,7 +247,7 @@ int sd_dhcp6_lease_get_domains(sd_dhcp6_lease *lease, char ***domains) {
|
|
return -ENOENT;
|
|
}
|
|
|
|
-int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen) {
|
|
+int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) {
|
|
int r;
|
|
|
|
assert_return(lease, -EINVAL);
|
|
@@ -295,7 +294,7 @@ int dhcp6_lease_set_ntp(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen) {
|
|
return 0;
|
|
}
|
|
|
|
-int dhcp6_lease_set_sntp(sd_dhcp6_lease *lease, uint8_t *optval, size_t optlen) {
|
|
+int dhcp6_lease_set_sntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) {
|
|
assert_return(lease, -EINVAL);
|
|
assert_return(optval, -EINVAL);
|
|
|
|
@@ -335,8 +334,7 @@ int sd_dhcp6_lease_get_ntp_fqdn(sd_dhcp6_lease *lease, char ***ntp_fqdn) {
|
|
return -ENOENT;
|
|
}
|
|
|
|
-int dhcp6_lease_set_fqdn(sd_dhcp6_lease *lease, const uint8_t *optval,
|
|
- size_t optlen) {
|
|
+int dhcp6_lease_set_fqdn(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) {
|
|
int r;
|
|
char *fqdn;
|
|
|
|
--
|
|
2.33.0
|
|
|