From 8a0bc5468b5173b27ab856ec636fe299a00737ad Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Mon, 15 Feb 2021 13:32:16 +0300 Subject: [PATCH] Pull request #1004: dhcpd: fix dhcpv6 status json Merge in DNS/adguard-home from 2678-json-tag to master Updates #2678. Squashed commit of the following: commit 7c272ae8830ac10b0e0154656cf472b003315349 Author: Ainar Garipov Date: Mon Feb 15 13:14:16 2021 +0300 all: doc changes commit 3c964f814f2bc92e807aad3f5bad342eb455fe28 Author: Ainar Garipov Date: Mon Feb 15 12:54:27 2021 +0300 dhcpd: fix dhcpv6 status json --- CHANGELOG.md | 7 +++++-- internal/dhcpd/server.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23edf804..4a7407c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,11 +23,13 @@ and this project adheres to longer prevent the DHCP server from starting ([#2667]). - The server name sent by clients of TLS APIs is not only checked when `strict_sni_check` is enabled ([#2664]). -- HTTP API request body size limit for the `/control/access/set` API is - increased ([#2666]). +- HTTP API request body size limit for the `POST /control/access/set` HTTP API + is increased ([#2666]). ### Fixed +- The field `"range_start"` in the `GET /control/dhcp/status` HTTP API response + is now correctly named again ([#2678]). - DHCPv6 server's `ra_slaac_only` and `ra_allow_slaac` settings aren't reset to `false` on update any more ([#2653]). - The `Vary` header is now added along with `Access-Control-Allow-Origin` to @@ -43,6 +45,7 @@ and this project adheres to [#2664]: https://github.com/AdguardTeam/AdGuardHome/issues/2664 [#2666]: https://github.com/AdguardTeam/AdGuardHome/issues/2666 [#2667]: https://github.com/AdguardTeam/AdGuardHome/issues/2667 +[#2678]: https://github.com/AdguardTeam/AdGuardHome/issues/2678 diff --git a/internal/dhcpd/server.go b/internal/dhcpd/server.go index 1d3ce460..2fac533e 100644 --- a/internal/dhcpd/server.go +++ b/internal/dhcpd/server.go @@ -79,7 +79,7 @@ type V6ServerConf struct { // The first IP address for dynamic leases // The last allowed IP address ends with 0xff byte - RangeStart net.IP `yaml:"range_start"` + RangeStart net.IP `yaml:"range_start" json:"range_start"` LeaseDuration uint32 `yaml:"lease_duration" json:"lease_duration"` // in seconds