44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
From d3f99205f84172f6f9e41061a5aa9414eccf3571 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Thu, 23 Sep 2021 14:57:29 +0900
|
|
Subject: [PATCH] sd-dhcp6-client: constify one argument
|
|
|
|
(cherry picked from commit dc95e21d33708e807d3e5872af428383aac3f9b7)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd/commit/d3f99205f84172f6f9e41061a5aa9414eccf3571
|
|
---
|
|
src/libsystemd-network/dhcp6-internal.h | 2 +-
|
|
src/libsystemd-network/dhcp6-option.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h
|
|
index 35cafc96ec..96d7de8cae 100644
|
|
--- a/src/libsystemd-network/dhcp6-internal.h
|
|
+++ b/src/libsystemd-network/dhcp6-internal.h
|
|
@@ -105,7 +105,7 @@ int dhcp6_option_parse(uint8_t **buf, size_t *buflen, uint16_t *optcode,
|
|
size_t *optlen, uint8_t **optvalue);
|
|
int dhcp6_option_parse_status(DHCP6Option *option, size_t len);
|
|
int dhcp6_option_parse_ia(sd_dhcp6_client *client, DHCP6Option *iaoption, be32_t iaid, DHCP6IA *ia, uint16_t *ret_status_code);
|
|
-int dhcp6_option_parse_ip6addrs(uint8_t *optval, uint16_t optlen,
|
|
+int dhcp6_option_parse_ip6addrs(const uint8_t *optval, uint16_t optlen,
|
|
struct in6_addr **addrs, size_t count);
|
|
int dhcp6_option_parse_domainname_list(const uint8_t *optval, uint16_t optlen,
|
|
char ***str_arr);
|
|
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
|
|
index 34d7e997dd..0709cfd4fd 100644
|
|
--- a/src/libsystemd-network/dhcp6-option.c
|
|
+++ b/src/libsystemd-network/dhcp6-option.c
|
|
@@ -707,7 +707,7 @@ int dhcp6_option_parse_ia(
|
|
return 1;
|
|
}
|
|
|
|
-int dhcp6_option_parse_ip6addrs(uint8_t *optval, uint16_t optlen,
|
|
+int dhcp6_option_parse_ip6addrs(const uint8_t *optval, uint16_t optlen,
|
|
struct in6_addr **addrs, size_t count) {
|
|
|
|
if (optlen == 0 || optlen % sizeof(struct in6_addr) != 0)
|
|
--
|
|
2.33.0
|
|
|