daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: all: rm var shadowing vol. 3

Browse Source 
Updates #2803.

Squashed commit of the following:

commit ce711ae2e08c3714a4e0c6d177c02f7801c05fce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 11 20:58:40 2021 +0300

    all: imp code, docs

commit e91094e461893c27eda879b33b5ed2c7085510df
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 11 20:42:14 2021 +0300

    all: rm var shadowing vol. 3
This commit is contained in:
Ainar Garipov
2021-03-11 21:30:52 +03:00
parent 4cf44dd1d4
commit 968831c5b9
13 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/dhcpd/routeradv.go
View File

@@ -188,20 +188,20 @@ func (ra *raCtx) Init() error {
}
defer func() {
if !success {
cerr := ra.Close()
if cerr != nil {
log.Error("closing context: %s", cerr)
derr := ra.Close()
if derr != nil {
log.Error("closing context: %s", derr)
}
}
}()
con6 := ra.conn.IPv6PacketConn()
if err := con6.SetHopLimit(255); err != nil {
if err = con6.SetHopLimit(255); err != nil {
return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err)
}
if err := con6.SetMulticastHopLimit(255); err != nil {
if err = con6.SetMulticastHopLimit(255); err != nil {
return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err)
}