a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <A.Garipov@AdGuard.COM>
Date:   Mon Feb 15 13:14:16 2021 +0300

    all: doc changes

commit 3c964f814f2bc92e807aad3f5bad342eb455fe28
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 15 12:54:27 2021 +0300

    dhcpd: fix dhcpv6 status json
This commit is contained in:
Ainar Garipov 2021-02-15 13:32:16 +03:00
parent e272e19516
commit 8a0bc5468b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -23,11 +23,13 @@ and this project adheres to
longer prevent the DHCP server from starting ([#2667]). longer prevent the DHCP server from starting ([#2667]).
- The server name sent by clients of TLS APIs is not only checked when - The server name sent by clients of TLS APIs is not only checked when
`strict_sni_check` is enabled ([#2664]). `strict_sni_check` is enabled ([#2664]).
- HTTP API request body size limit for the `/control/access/set` API is - HTTP API request body size limit for the `POST /control/access/set` HTTP API
increased ([#2666]). is increased ([#2666]).
### Fixed ### 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 - DHCPv6 server's `ra_slaac_only` and `ra_allow_slaac` settings aren't reset to
`false` on update any more ([#2653]). `false` on update any more ([#2653]).
- The `Vary` header is now added along with `Access-Control-Allow-Origin` to - 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 [#2664]: https://github.com/AdguardTeam/AdGuardHome/issues/2664
[#2666]: https://github.com/AdguardTeam/AdGuardHome/issues/2666 [#2666]: https://github.com/AdguardTeam/AdGuardHome/issues/2666
[#2667]: https://github.com/AdguardTeam/AdGuardHome/issues/2667 [#2667]: https://github.com/AdguardTeam/AdGuardHome/issues/2667
[#2678]: https://github.com/AdguardTeam/AdGuardHome/issues/2678

2
internal/dhcpd/server.go
View File

@ -79,7 +79,7 @@ type V6ServerConf struct {
// The first IP address for dynamic leases // The first IP address for dynamic leases
// The last allowed IP address ends with 0xff byte // 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 LeaseDuration uint32 `yaml:"lease_duration" json:"lease_duration"` // in seconds