docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
err := json.NewDecoder(r.Body).Decode(conf) | <mask> conf := dhcpServerConfigJSON{}
<mask> conf.Enabled = boolToNullBool(s.conf.Enabled)
<mask> conf.InterfaceName = s.conf.InterfaceName
<mask>
<mask> err := json.NewDecoder(r.Body).Decode(&conf)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest,
<mask> "failed to parse new dhcp config json: %s", err)
<mask>
<mask> return
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} </s> remove if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
</s> add srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove s.Stop()
</s> add err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove return
}
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) | <mask>
<mask> return
<mask> }
<mask>
<mask> var s4 DHCPServer
<mask> var s6 DHCPServer
<mask> v4Enabled := false
<mask> v6Enabled := false
<mask>
<mask> if conf.V4 != nil {
<mask> v4Conf := v4JSONToServerConf(conf.V4)
<mask> v4Conf.Enabled = conf.Enabled == nbTrue
<mask> if len(v4Conf.RangeStart) == 0 {
<mask> v4Conf.Enabled = false
<mask> }
<mask>
<mask> v4Enabled = v4Conf.Enabled
<mask> v4Conf.InterfaceName = conf.InterfaceName
<mask>
<mask> c4 := V4ServerConf{}
<mask> s.srv4.WriteDiskConfig4(&c4)
<mask> v4Conf.notify = c4.notify
<mask> v4Conf.ICMPTimeout = c4.ICMPTimeout
<mask> v4Conf.Options = c4.Options
<mask>
<mask> s4, err = v4Create(v4Conf)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest,
<mask> "invalid dhcpv4 configuration: %s", err)
<mask>
<mask> return
<mask> }
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
</s> add srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) </s> remove return
}
</s> add return </s> remove s.srv4, err4 = v4Create(v4conf)
</s> add s.srv4, err = v4Create(v4conf)
if err != nil {
return nil, fmt.Errorf("creating dhcpv4 srv: %w", err)
} </s> remove var err4, err6 error
</s> add </s> remove s.Stop()
</s> add err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
return | <mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest,
<mask> "invalid dhcpv4 configuration: %s", err)
<mask>
<mask> return
<mask> }
<mask> }
<mask>
<mask> if conf.V6 != nil {
<mask> v6Conf := v6JSONToServerConf(conf.V6)
<mask> v6Conf.Enabled = conf.Enabled == nbTrue
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
</s> add srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) </s> remove return
}
</s> add return </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove s.Stop()
</s> add err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove if lj.IP == nil {
</s> add if l.IP == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) | <mask> return
<mask> }
<mask> }
<mask>
<mask> if conf.V6 != nil {
<mask> v6Conf := v6JSONToServerConf(conf.V6)
<mask> v6Conf.Enabled = conf.Enabled == nbTrue
<mask> if len(v6Conf.RangeStart) == 0 {
<mask> v6Conf.Enabled = false
<mask> }
<mask>
<mask> // Don't overwrite the RA/SLAAC settings from the config file.
<mask> //
<mask> // TODO(a.garipov): Perhaps include them into the request to
<mask> // allow changing them from the HTTP API?
<mask> v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
<mask> v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
<mask>
<mask> v6Enabled = v6Conf.Enabled
<mask> v6Conf.InterfaceName = conf.InterfaceName
<mask> v6Conf.notify = s.onNotify
<mask>
<mask> s6, err = v6Create(v6Conf)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest,
<mask> "invalid dhcpv6 configuration: %s", err)
<mask>
<mask> return
<mask> }
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove return
}
</s> add return </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove s.Stop()
</s> add err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove return
}
</s> add return </s> remove Context.dhcpServer = dhcpd.Create(config.DHCP)
if Context.dhcpServer == nil {
</s> add Context.dhcpServer, err = dhcpd.Create(config.DHCP)
if Context.dhcpServer == nil || err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
return | <mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest,
<mask> "invalid dhcpv6 configuration: %s", err)
<mask>
<mask> return
<mask> }
<mask> }
<mask>
<mask> if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
<mask> httpError(r, w, http.StatusBadRequest,
<mask> "dhcpv4 or dhcpv6 configuration must be complete")
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove return
}
</s> add return </s> remove if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
</s> add srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove if lj.IP == nil {
</s> add if l.IP == nil { </s> remove if lj.IP == nil {
</s> add if l.IP == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} | <mask>
<mask> return
<mask> }
<mask>
<mask> s.Stop()
<mask>
<mask> if conf.Enabled != nbNull {
<mask> s.conf.Enabled = conf.Enabled == nbTrue
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove return
}
</s> add return </s> remove return
}
</s> add return </s> remove func Create(conf ServerConfig) *Server {
s := &Server{}
</s> add func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
</s> add srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
if srv4 != nil {
s.srv4 = srv4 | <mask> if conf.InterfaceName != "" {
<mask> s.conf.InterfaceName = conf.InterfaceName
<mask> }
<mask>
<mask> if s4 != nil {
<mask> s.srv4 = s4
<mask> }
<mask>
<mask> if s6 != nil {
<mask> s.srv6 = s6
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove if s6 != nil {
s.srv6 = s6
</s> add if srv6 != nil {
s.srv6 = srv6 </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove s.dbLoad()
</s> add err = s.dbLoad()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "loading leases db: %s", err)
return
} </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} </s> remove func Create(conf ServerConfig) *Server {
s := &Server{}
</s> add func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
if srv6 != nil {
s.srv6 = srv6 | <mask> if s4 != nil {
<mask> s.srv4 = s4
<mask> }
<mask>
<mask> if s6 != nil {
<mask> s.srv6 = s6
<mask> }
<mask>
<mask> s.conf.ConfigModified()
<mask> s.dbLoad()
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove if s4 != nil {
s.srv4 = s4
</s> add if srv4 != nil {
s.srv4 = srv4 </s> remove s.dbLoad()
</s> add err = s.dbLoad()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "loading leases db: %s", err)
return
} </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove s.srv4.ResetLeases(leases4)
</s> add err = s.srv4.ResetLeases(leases4)
if err != nil {
return fmt.Errorf("resetting dhcpv4 leases: %w", err)
} </s> remove s.srv6.ResetLeases(leases6)
</s> add err = s.srv6.ResetLeases(leases6)
if err != nil {
return fmt.Errorf("resetting dhcpv6 leases: %w", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
err = s.dbLoad()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "loading leases db: %s", err)
return
} | <mask> s.srv6 = s6
<mask> }
<mask>
<mask> s.conf.ConfigModified()
<mask> s.dbLoad()
<mask>
<mask> if s.conf.Enabled {
<mask> var code int
<mask> code, err = s.enableDHCP(conf.InterfaceName)
<mask> if err != nil {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove if s6 != nil {
s.srv6 = s6
</s> add if srv6 != nil {
s.srv6 = srv6 </s> remove if s4 != nil {
s.srv4 = s4
</s> add if srv4 != nil {
s.srv4 = srv4 </s> remove var s4 DHCPServer
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.Options = c4.Options
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
</s> add srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err) </s> remove s.Stop()
</s> add err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove var err4, err6 error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) | <mask> }
<mask> }
<mask>
<mask> func (s *Server) handleDHCPAddStaticLease(w http.ResponseWriter, r *http.Request) {
<mask> lj := Lease{}
<mask> err := json.NewDecoder(r.Body).Decode(&lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
if l.IP == nil { | <mask>
<mask> return
<mask> }
<mask>
<mask> if lj.IP == nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid IP")
<mask>
<mask> return
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove if lj.IP == nil {
</s> add if l.IP == nil { </s> remove return
}
</s> add return </s> remove return
}
</s> add return </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
ip4 := l.IP.To4() | <mask>
<mask> return
<mask> }
<mask>
<mask> ip4 := lj.IP.To4()
<mask>
<mask> if ip4 == nil {
<mask> lj.IP = lj.IP.To16()
<mask>
<mask> err = s.srv6.AddStaticLease(lj)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove ip4 := lj.IP.To4()
</s> add ip4 := l.IP.To4() </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
l.IP = l.IP.To16() | <mask>
<mask> ip4 := lj.IP.To4()
<mask>
<mask> if ip4 == nil {
<mask> lj.IP = lj.IP.To16()
<mask>
<mask> err = s.srv6.AddStaticLease(lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) </s> remove ip4 := lj.IP.To4()
</s> add ip4 := l.IP.To4() </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) </s> remove lj.IP = ip4
err = s.srv4.AddStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
err = s.srv6.AddStaticLease(l) | <mask>
<mask> if ip4 == nil {
<mask> lj.IP = lj.IP.To16()
<mask>
<mask> err = s.srv6.AddStaticLease(lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> }
<mask>
<mask> return
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove lj.IP = ip4
err = s.srv4.RemoveStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.RemoveStaticLease(l) </s> remove lj.IP = ip4
err = s.srv4.AddStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
l.IP = ip4
err = s.srv4.AddStaticLease(l) | <mask>
<mask> return
<mask> }
<mask>
<mask> lj.IP = ip4
<mask> err = s.srv4.AddStaticLease(lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = ip4
err = s.srv4.RemoveStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.RemoveStaticLease(l) </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) | <mask> }
<mask> }
<mask>
<mask> func (s *Server) handleDHCPRemoveStaticLease(w http.ResponseWriter, r *http.Request) {
<mask> lj := Lease{}
<mask> err := json.NewDecoder(r.Body).Decode(&lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
if l.IP == nil { | <mask>
<mask> return
<mask> }
<mask>
<mask> if lj.IP == nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid IP")
<mask>
<mask> return
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
ip4 := l.IP.To4() | <mask>
<mask> return
<mask> }
<mask>
<mask> ip4 := lj.IP.To4()
<mask>
<mask> if ip4 == nil {
<mask> lj.IP = lj.IP.To16()
<mask>
<mask> err = s.srv6.RemoveStaticLease(lj)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove ip4 := lj.IP.To4()
</s> add ip4 := l.IP.To4() </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
l.IP = l.IP.To16() | <mask>
<mask> ip4 := lj.IP.To4()
<mask>
<mask> if ip4 == nil {
<mask> lj.IP = lj.IP.To16()
<mask>
<mask> err = s.srv6.RemoveStaticLease(lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) </s> remove ip4 := lj.IP.To4()
</s> add ip4 := l.IP.To4() </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) </s> remove lj.IP = ip4
err = s.srv4.AddStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
err = s.srv6.RemoveStaticLease(l) | <mask>
<mask> if ip4 == nil {
<mask> lj.IP = lj.IP.To16()
<mask>
<mask> err = s.srv6.RemoveStaticLease(lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> }
<mask>
<mask> return
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove lj.IP = ip4
err = s.srv4.RemoveStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.RemoveStaticLease(l) </s> remove lj.IP = ip4
err = s.srv4.AddStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
l.IP = ip4
err = s.srv4.RemoveStaticLease(l) | <mask>
<mask> return
<mask> }
<mask>
<mask> lj.IP = ip4
<mask> err = s.srv4.RemoveStaticLease(lj)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove lj.IP = ip4
err = s.srv4.AddStaticLease(lj)
</s> add l.IP = ip4
err = s.srv4.AddStaticLease(l) </s> remove err = s.srv6.RemoveStaticLease(lj)
</s> add err = s.srv6.RemoveStaticLease(l) </s> remove err = s.srv6.AddStaticLease(lj)
</s> add err = s.srv6.AddStaticLease(l) </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() </s> remove lj.IP = lj.IP.To16()
</s> add l.IP = l.IP.To16() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} | <mask> }
<mask> }
<mask>
<mask> func (s *Server) handleReset(w http.ResponseWriter, r *http.Request) {
<mask> s.Stop()
<mask>
<mask> err := os.Remove(s.conf.DBFilePath)
<mask> if err != nil && !errors.Is(err, os.ErrNotExist) {
<mask> log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
</s> add log.Error("dhcp: removing db: %s", err) </s> remove return
</s> add return nil </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
err = os.Remove(s.conf.DBFilePath) | <mask>
<mask> func (s *Server) handleReset(w http.ResponseWriter, r *http.Request) {
<mask> s.Stop()
<mask>
<mask> err := os.Remove(s.conf.DBFilePath)
<mask> if err != nil && !errors.Is(err, os.ErrNotExist) {
<mask> log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
<mask> }
<mask>
<mask> oldconf := s.conf
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
</s> add log.Error("dhcp: removing db: %s", err) </s> remove return
</s> add return nil </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
log.Error("dhcp: removing db: %s", err) | <mask> s.Stop()
<mask>
<mask> err := os.Remove(s.conf.DBFilePath)
<mask> if err != nil && !errors.Is(err, os.ErrNotExist) {
<mask> log.Error("dhcp: removing %q: %s", s.conf.DBFilePath, err)
<mask> }
<mask>
<mask> oldconf := s.conf
<mask> s.conf = ServerConfig{}
<mask> s.conf.WorkDir = oldconf.WorkDir
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove return
</s> add return nil </s> remove log.Error("dhcp: can't read file %q: %v", s.conf.DBFilePath, err)
</s> add return fmt.Errorf("reading db: %w", err) </s> remove s.Stop()
</s> add err = s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
func (s *Server) handleResetLeases(w http.ResponseWriter, r *http.Request) {
err := s.resetLeases()
if err != nil {
msg := "resetting leases: %s"
httpError(r, w, http.StatusInternalServerError, msg, err)
return
}
}
| <mask> }
<mask>
<mask> func (s *Server) registerHandlers() {
<mask> s.conf.HTTPRegister(http.MethodGet, "/control/dhcp/status", s.handleDHCPStatus)
<mask> s.conf.HTTPRegister(http.MethodGet, "/control/dhcp/interfaces", s.handleDHCPInterfaces)
<mask> s.conf.HTTPRegister(http.MethodPost, "/control/dhcp/set_config", s.handleDHCPSetConfig)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) </s> remove func (s *Server) dbLoad() {
</s> add func (s *Server) dbLoad() (err error) { </s> remove func (s *Server) Stop() {
s.srv4.Stop()
s.srv6.Stop()
}
</s> add func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
s.conf.HTTPRegister(http.MethodPost, "/control/dhcp/reset_leases", s.handleResetLeases) | <mask> s.conf.HTTPRegister(http.MethodPost, "/control/dhcp/find_active_dhcp", s.handleDHCPFindActiveServer)
<mask> s.conf.HTTPRegister(http.MethodPost, "/control/dhcp/add_static_lease", s.handleDHCPAddStaticLease)
<mask> s.conf.HTTPRegister(http.MethodPost, "/control/dhcp/remove_static_lease", s.handleDHCPRemoveStaticLease)
<mask> s.conf.HTTPRegister(http.MethodPost, "/control/dhcp/reset", s.handleReset)
<mask> }
<mask>
<mask> // jsonError is a generic JSON error response.
<mask> //
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove
// JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
// int.
func JoinHostPort(host string, port int) (hostport string) {
return net.JoinHostPort(host, strconv.Itoa(port))
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/http.go |
// ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) | <mask> )
<mask>
<mask> // DHCPServer - DHCP server interface
<mask> type DHCPServer interface {
<mask> // ResetLeases - reset leases
<mask> ResetLeases(leases []*Lease)
<mask> // GetLeases - get leases
<mask> GetLeases(flags int) []Lease
<mask> // AddStaticLease - add a static lease
<mask> AddStaticLease(lease Lease) error
<mask> // RemoveStaticLease - remove a static lease
<mask> RemoveStaticLease(l Lease) error
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove AddStaticLease(lease Lease) error
</s> add AddStaticLease(l *Lease) (err error) </s> remove RemoveStaticLease(l Lease) error
</s> add RemoveStaticLease(l *Lease) (err error) </s> remove return res
</s> add return leases </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/server.go |
AddStaticLease(l *Lease) (err error) | <mask> ResetLeases(leases []*Lease)
<mask> // GetLeases - get leases
<mask> GetLeases(flags int) []Lease
<mask> // AddStaticLease - add a static lease
<mask> AddStaticLease(lease Lease) error
<mask> // RemoveStaticLease - remove a static lease
<mask> RemoveStaticLease(l Lease) error
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> FindMACbyIP(ip net.IP) net.HardwareAddr
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove RemoveStaticLease(l Lease) error
</s> add RemoveStaticLease(l *Lease) (err error) </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) </s> remove return res
</s> add return leases </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/server.go |
RemoveStaticLease(l *Lease) (err error) | <mask> GetLeases(flags int) []Lease
<mask> // AddStaticLease - add a static lease
<mask> AddStaticLease(lease Lease) error
<mask> // RemoveStaticLease - remove a static lease
<mask> RemoveStaticLease(l Lease) error
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> FindMACbyIP(ip net.IP) net.HardwareAddr
<mask>
<mask> // WriteDiskConfig4 - copy disk configuration
<mask> WriteDiskConfig4(c *V4ServerConf)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove AddStaticLease(lease Lease) error
</s> add AddStaticLease(l *Lease) (err error) </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) </s> remove return res
</s> add return leases </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/server.go |
Start() (err error) | <mask> // WriteDiskConfig6 - copy disk configuration
<mask> WriteDiskConfig6(c *V6ServerConf)
<mask>
<mask> // Start - start server
<mask> Start() error
<mask> // Stop - stop server
<mask> Stop()
<mask>
<mask> getLeasesRef() []*Lease
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove Stop()
</s> add Stop() (err error) </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove RemoveStaticLease(l Lease) error
</s> add RemoveStaticLease(l *Lease) (err error) </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() </s> remove log.Error("dhcpv6: s.ra.Close: %s", err)
</s> add return fmt.Errorf("closing ra ctx: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/server.go |
Stop() (err error) | <mask>
<mask> // Start - start server
<mask> Start() error
<mask> // Stop - stop server
<mask> Stop()
<mask>
<mask> getLeasesRef() []*Lease
<mask> }
<mask>
<mask> // V4ServerConf - server configuration
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove Start() error
</s> add Start() (err error) </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() </s> remove log.Error("dhcpv6: s.ra.Close: %s", err)
</s> add return fmt.Errorf("closing ra ctx: %w", err) </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/server.go |
// ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() | <mask>
<mask> return hostname
<mask> }
<mask>
<mask> // ResetLeases - reset leases
<mask> func (s *v4Server) ResetLeases(leases []*Lease) {
<mask> var err error
<mask>
<mask> if !s.conf.Enabled {
<mask> return
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) </s> remove for _, l := range ll {
</s> add for _, l := range leases { </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
return nil | <mask>
<mask> continue
<mask> }
<mask> }
<mask> }
<mask>
<mask> // getLeasesRef returns the actual leases slice. For internal use only.
<mask> func (s *v4Server) getLeasesRef() []*Lease {
<mask> return s.leases
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove return result
</s> add return leases </s> remove func (s *v4Server) rmLease(lease Lease) (err error) {
</s> add func (s *v4Server) rmLease(lease *Lease) (err error) { </s> remove return res
</s> add return leases </s> remove func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil }
</s> add func (s *winServer) ResetLeases(_ []*Lease) (err error) { return nil }
func (s *winServer) GetLeases(_ GetLeasesFlags) (leases []*Lease) { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) RemoveStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) (mac net.HardwareAddr) { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() (err error) { return nil }
func (s *winServer) Stop() (err error) { return nil }
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { | <mask> }
<mask>
<mask> // GetLeases returns the list of current DHCP leases. It is safe for concurrent
<mask> // use.
<mask> func (s *v4Server) GetLeases(flags int) (res []Lease) {
<mask> // The function shouldn't return nil, because zero-length slice behaves
<mask> // differently in cases like marshalling. Our front-end also requires
<mask> // a non-nil value in the response.
<mask> res = []Lease{}
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove res = []Lease{}
</s> add leases = []*Lease{} </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove // TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
leases = []*Lease{} | <mask> func (s *v4Server) GetLeases(flags int) (res []Lease) {
<mask> // The function shouldn't return nil, because zero-length slice behaves
<mask> // differently in cases like marshalling. Our front-end also requires
<mask> // a non-nil value in the response.
<mask> res = []Lease{}
<mask>
<mask> // TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
<mask> // accept booleans. Seriously, this doesn't even save stack space.
<mask> getDynamic := flags&LeasesDynamic != 0
<mask> getStatic := flags&LeasesStatic != 0
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
</s> add </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
<mask> // differently in cases like marshalling. Our front-end also requires
<mask> // a non-nil value in the response.
<mask> res = []Lease{}
<mask>
<mask> // TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
<mask> // accept booleans. Seriously, this doesn't even save stack space.
<mask> getDynamic := flags&LeasesDynamic != 0
<mask> getStatic := flags&LeasesStatic != 0
<mask>
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove res = []Lease{}
</s> add leases = []*Lease{} </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go | |
leases = append(leases, l.Clone()) | <mask>
<mask> now := time.Now()
<mask> for _, l := range s.leases {
<mask> if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
<mask> res = append(res, *l)
<mask>
<mask> continue
<mask> }
<mask>
<mask> if getStatic && l.IsStatic() {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) </s> remove for _, l := range ll {
</s> add for _, l := range leases { </s> remove return res
</s> add return leases </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
leases = append(leases, l.Clone()) | <mask> continue
<mask> }
<mask>
<mask> if getStatic && l.IsStatic() {
<mask> res = append(res, *l)
<mask> }
<mask> }
<mask>
<mask> return res
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) </s> remove return res
</s> add return leases </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove return
}
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
return leases | <mask> res = append(res, *l)
<mask> }
<mask> }
<mask>
<mask> return res
<mask> }
<mask>
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> func (s *v4Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
<mask> now := time.Now()
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { </s> remove AddStaticLease(lease Lease) error
</s> add AddStaticLease(l *Lease) (err error) </s> remove RemoveStaticLease(l Lease) error
</s> add RemoveStaticLease(l *Lease) (err error) </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
func (s *v4Server) rmLease(lease *Lease) (err error) { | <mask> return nil
<mask> }
<mask>
<mask> // rmLease removes a lease with the same properties.
<mask> func (s *v4Server) rmLease(lease Lease) (err error) {
<mask> if len(s.leases) == 0 {
<mask> return nil
<mask> }
<mask>
<mask> for i, l := range s.leases {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) rmLease(lease Lease) error {
</s> add func (s *v6Server) rmLease(lease *Lease) (err error) { </s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { </s> remove func (s *v4Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) RemoveStaticLease(l *Lease) (err error) { </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove func (s *v6Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) RemoveStaticLease(l *Lease) (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
func (s *v4Server) AddStaticLease(l *Lease) (err error) { | <mask> return errors.Error("lease not found")
<mask> }
<mask>
<mask> // AddStaticLease adds a static lease. It is safe for concurrent use.
<mask> func (s *v4Server) AddStaticLease(l Lease) (err error) {
<mask> defer func() { err = errors.Annotate(err, "dhcpv4: adding static lease: %w") }()
<mask>
<mask> if ip4 := l.IP.To4(); ip4 == nil {
<mask> return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) AddStaticLease(l *Lease) (err error) { </s> remove func (s *v4Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) RemoveStaticLease(l *Lease) (err error) { </s> remove func (s *v6Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) RemoveStaticLease(l *Lease) (err error) { </s> remove // ResetLeases - reset leases
func (s *v4Server) ResetLeases(leases []*Lease) {
var err error
</s> add // ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
err = s.rmDynamicLease(l) | <mask> func() {
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> err = s.rmDynamicLease(&l)
<mask> if err != nil {
<mask> err = fmt.Errorf(
<mask> "removing dynamic leases for %s (%s): %w",
<mask> l.IP,
<mask> l.HWAddr,
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err = s.addLease(&l)
</s> add err = s.addLease(l) </s> remove // ResetLeases - reset leases
func (s *v4Server) ResetLeases(leases []*Lease) {
var err error
</s> add // ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove func (s *v6Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) RemoveStaticLease(l *Lease) (err error) { </s> remove func (s *v6Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) AddStaticLease(l *Lease) (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
err = s.addLease(l) | <mask>
<mask> return
<mask> }
<mask>
<mask> err = s.addLease(&l)
<mask> if err != nil {
<mask> err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
<mask>
<mask> return
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err = s.rmDynamicLease(&l)
</s> add err = s.rmDynamicLease(l) </s> remove require.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.Error(t, err) </s> remove log.Error("json.Marshal: %v", err)
return
</s> add return fmt.Errorf("encoding db: %w", err) </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove s.addLease(&l)
</s> add s.addLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
func (s *v4Server) RemoveStaticLease(l *Lease) (err error) { | <mask> return nil
<mask> }
<mask>
<mask> // RemoveStaticLease removes a static lease. It is safe for concurrent use.
<mask> func (s *v4Server) RemoveStaticLease(l Lease) (err error) {
<mask> defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
<mask>
<mask> if len(l.IP) != 4 {
<mask> return fmt.Errorf("invalid IP")
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) RemoveStaticLease(l *Lease) (err error) { </s> remove func (s *v6Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) AddStaticLease(l *Lease) (err error) { </s> remove func (s *v4Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) AddStaticLease(l *Lease) (err error) { </s> remove // ResetLeases - reset leases
func (s *v4Server) ResetLeases(leases []*Lease) {
var err error
</s> add // ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
func (s *v4Server) Stop() (err error) { | <mask> return nil
<mask> }
<mask>
<mask> // Stop - stop server
<mask> func (s *v4Server) Stop() {
<mask> if s.srv == nil {
<mask> return
<mask> }
<mask>
<mask> log.Debug("dhcpv4: stopping")
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("dhcpv6: s.ra.Close: %s", err)
</s> add return fmt.Errorf("closing ra ctx: %w", err) </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() </s> remove Stop()
</s> add Stop() (err error) </s> remove Start() error
</s> add Start() (err error) </s> remove func (s *Server) Stop() {
s.srv4.Stop()
s.srv6.Stop()
}
</s> add func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
err = s.srv.Close() | <mask> return
<mask> }
<mask>
<mask> log.Debug("dhcpv4: stopping")
<mask> err := s.srv.Close()
<mask> if err != nil {
<mask> log.Error("dhcpv4: srv.Close: %s", err)
<mask> }
<mask>
<mask> // Signal to the clients containers in packages home and dnsforward that
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("dhcpv4: srv.Close: %s", err)
</s> add return fmt.Errorf("closing dhcpv4 srv: %w", err) </s> remove log.Error("dhcpv6: srv.Close: %s", err)
</s> add return fmt.Errorf("closing dhcpv6 srv: %w", err) </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove Context.dhcpServer = dhcpd.Create(config.DHCP)
if Context.dhcpServer == nil {
</s> add Context.dhcpServer, err = dhcpd.Create(config.DHCP)
if Context.dhcpServer == nil || err != nil { </s> remove if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
</s> add srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
return fmt.Errorf("closing dhcpv4 srv: %w", err) | <mask>
<mask> log.Debug("dhcpv4: stopping")
<mask> err := s.srv.Close()
<mask> if err != nil {
<mask> log.Error("dhcpv4: srv.Close: %s", err)
<mask> }
<mask>
<mask> // Signal to the clients containers in packages home and dnsforward that
<mask> // it should remove all DHCP clients.
<mask> s.conf.notify(LeaseChangedRemovedAll)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err := s.srv.Close()
</s> add err = s.srv.Close() </s> remove log.Error("dhcpv6: srv.Close: %s", err)
</s> add return fmt.Errorf("closing dhcpv6 srv: %w", err) </s> remove Context.dhcpServer = dhcpd.Create(config.DHCP)
if Context.dhcpServer == nil {
</s> add Context.dhcpServer, err = dhcpd.Create(config.DHCP)
if Context.dhcpServer == nil || err != nil { </s> remove log.Info("Stopping AdGuard Home")
</s> add log.Info("stopping AdGuard Home") </s> remove func (s *Server) dbStore() {
var leases []leaseJSON
</s> add func (s *Server) dbStore() (err error) {
// Use an empty slice here as opposed to nil so that it doesn't write
// "null" into the database file if leases are empty.
leases := []leaseJSON{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
return nil | <mask>
<mask> s.srv = nil
<mask> }
<mask>
<mask> // Create DHCPv4 server
<mask> func v4Create(conf V4ServerConf) (srv DHCPServer, err error) {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil }
</s> add func (s *winServer) ResetLeases(_ []*Lease) (err error) { return nil }
func (s *winServer) GetLeases(_ GetLeasesFlags) (leases []*Lease) { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) RemoveStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) (mac net.HardwareAddr) { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() (err error) { return nil }
func (s *winServer) Stop() (err error) { return nil }
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove func Create(conf ServerConfig) *Server {
s := &Server{}
</s> add func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4.go |
func (s *winServer) ResetLeases(_ []*Lease) (err error) { return nil }
func (s *winServer) GetLeases(_ GetLeasesFlags) (leases []*Lease) { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) RemoveStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) (mac net.HardwareAddr) { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() (err error) { return nil }
func (s *winServer) Stop() (err error) { return nil }
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } | <mask> import "net"
<mask>
<mask> type winServer struct{}
<mask>
<mask> func (s *winServer) ResetLeases(leases []*Lease) {}
<mask> func (s *winServer) GetLeases(flags int) []Lease { return nil }
<mask> func (s *winServer) getLeasesRef() []*Lease { return nil }
<mask> func (s *winServer) AddStaticLease(lease Lease) error { return nil }
<mask> func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
<mask> func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
<mask> func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
<mask> func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
<mask> func (s *winServer) Start() error { return nil }
<mask> func (s *winServer) Stop() {}
<mask> func (s *winServer) Reset() {}
<mask> func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
<mask> func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) </s> remove // ResetLeases - reset leases
func (s *v4Server) ResetLeases(leases []*Lease) {
var err error
</s> add // ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove func (s *v4Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) RemoveStaticLease(l *Lease) (err error) { </s> remove func (s *v6Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) RemoveStaticLease(l *Lease) (err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v46_windows.go |
l := &Lease{ | <mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Empty(t, ls)
<mask>
<mask> // Add static lease.
<mask> l := Lease{
<mask> Hostname: "static-1.local",
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> IP: net.IP{192, 168, 10, 150},
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove l := Lease{
</s> add l := &Lease{ </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove leases := []Lease{{
</s> add leases := []*Lease{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4_test.go |
err = s.RemoveStaticLease(&Lease{ | <mask> assert.Equal(t, l.HWAddr, ls[0].HWAddr)
<mask> assert.True(t, ls[0].IsStatic())
<mask>
<mask> // Try to remove static lease.
<mask> err = s.RemoveStaticLease(Lease{
<mask> IP: net.IP{192, 168, 10, 110},
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> })
<mask> assert.Error(t, err)
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove leases := []Lease{{
</s> add leases := []*Lease{{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4_test.go |
stLeases := []*Lease{{ | <mask> err = s.addLease(&dynLeases[i])
<mask> require.NoError(t, err)
<mask> }
<mask>
<mask> stLeases := []Lease{{
<mask> Hostname: "static-1.local",
<mask> HWAddr: net.HardwareAddr{0x33, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> IP: net.IP{192, 168, 10, 150},
<mask> }, {
<mask> Hostname: "static-2.local",
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove leases := []Lease{{
</s> add leases := []*Lease{{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ </s> remove }
return []dhcpd.Lease{l}
</s> add }} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4_test.go |
l := &Lease{ | <mask> require.True(t, ok)
<mask>
<mask> s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}}
<mask>
<mask> l := Lease{
<mask> Hostname: "static-1.local",
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> IP: net.IP{192, 168, 10, 150},
<mask> }
<mask> err = s.AddStaticLease(l)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove l := Lease{
</s> add l := &Lease{ </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ </s> remove leases := []Lease{{
</s> add leases := []*Lease{{ </s> remove err = s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove }
return []dhcpd.Lease{l}
</s> add }} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v4_test.go |
// ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
| <mask> }
<mask> return start[15] <= ip[15]
<mask> }
<mask>
<mask> // ResetLeases - reset leases
<mask> func (s *v6Server) ResetLeases(ll []*Lease) {
<mask> s.leases = nil
<mask> for _, l := range ll {
<mask>
<mask> if l.Expiry.Unix() != leaseExpireStatic &&
<mask> !ip6InRange(s.conf.ipStart, l.IP) {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove for _, l := range ll {
</s> add for _, l := range leases { </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) </s> remove // ResetLeases - reset leases
func (s *v4Server) ResetLeases(leases []*Lease) {
var err error
</s> add // ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
for _, l := range leases { | <mask>
<mask> // ResetLeases - reset leases
<mask> func (s *v6Server) ResetLeases(ll []*Lease) {
<mask> s.leases = nil
<mask> for _, l := range ll {
<mask>
<mask> if l.Expiry.Unix() != leaseExpireStatic &&
<mask> !ip6InRange(s.conf.ipStart, l.IP) {
<mask>
<mask> log.Debug("dhcpv6: skipping a lease with IP %v: not within current IP range", l.IP)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove func (s *v6Server) rmLease(lease Lease) error {
</s> add func (s *v6Server) rmLease(lease *Lease) (err error) { </s> remove // ResetLeases - reset leases
ResetLeases(leases []*Lease)
// GetLeases - get leases
GetLeases(flags int) []Lease
</s> add // ResetLeases resets leases.
ResetLeases(leases []*Lease) (err error)
// GetLeases returns deep clones of the current leases.
GetLeases(flags GetLeasesFlags) (leases []*Lease) </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove res = append(res, *l)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
return nil | <mask> }
<mask>
<mask> s.addLease(l)
<mask> }
<mask> }
<mask>
<mask> // GetLeases returns the list of current DHCP leases. It is safe for concurrent
<mask> // use.
<mask> func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) {
<mask> // The function shouldn't return nil value because zero-length slice
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *Server) Leases(flags int) (leases []Lease) {
</s> add func (s *Server) Leases(flags GetLeasesFlags) (leases []*Lease) { </s> remove // flags for Leases() function
const (
LeasesDynamic = 1
LeasesStatic = 2
LeasesAll = LeasesDynamic | LeasesStatic
)
</s> add err = s.srv6.Stop()
if err != nil {
return err
}
return nil
} </s> remove result := []Lease{}
</s> add leases = []*Lease{} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
// GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { | <mask> s.addLease(l)
<mask> }
<mask> }
<mask>
<mask> // GetLeases - get current leases
<mask> func (s *v6Server) GetLeases(flags int) []Lease {
<mask> // The function shouldn't return nil value because zero-length slice
<mask> // behaves differently in cases like marshalling. Our front-end also
<mask> // requires non-nil value in the response.
<mask> result := []Lease{}
<mask> s.leasesLock.Lock()
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove res = []Lease{}
</s> add leases = []*Lease{} </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove // TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
leases = []*Lease{} | <mask> func (s *v6Server) GetLeases(flags int) []Lease {
<mask> // The function shouldn't return nil value because zero-length slice
<mask> // behaves differently in cases like marshalling. Our front-end also
<mask> // requires non-nil value in the response.
<mask> result := []Lease{}
<mask> s.leasesLock.Lock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() == leaseExpireStatic {
<mask> if (flags & LeasesStatic) != 0 {
<mask> result = append(result, *lease)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove func (s *v4Server) GetLeases(flags int) (res []Lease) {
</s> add func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove res = []Lease{}
</s> add leases = []*Lease{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { | <mask> // behaves differently in cases like marshalling. Our front-end also
<mask> // requires non-nil value in the response.
<mask> result := []Lease{}
<mask> s.leasesLock.Lock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() == leaseExpireStatic {
<mask> if (flags & LeasesStatic) != 0 {
<mask> result = append(result, *lease)
<mask> }
<mask> } else {
<mask> if (flags & LeasesDynamic) != 0 {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove // TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
leases = append(leases, l.Clone()) | <mask> s.leasesLock.Lock()
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() == leaseExpireStatic {
<mask> if (flags & LeasesStatic) != 0 {
<mask> result = append(result, *lease)
<mask> }
<mask> } else {
<mask> if (flags & LeasesDynamic) != 0 {
<mask> result = append(result, *lease)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove func (s *v4Server) rmLease(lease Lease) (err error) {
</s> add func (s *v4Server) rmLease(lease *Lease) (err error) { </s> remove for _, l := range ll {
</s> add for _, l := range leases { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
leases = append(leases, l.Clone()) | <mask> result = append(result, *lease)
<mask> }
<mask> } else {
<mask> if (flags & LeasesDynamic) != 0 {
<mask> result = append(result, *lease)
<mask> }
<mask> }
<mask> }
<mask> s.leasesLock.Unlock()
<mask> return result
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove result := []Lease{}
</s> add leases = []*Lease{} </s> remove return result
</s> add return leases </s> remove var err4, err6 error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
return leases | <mask> }
<mask> }
<mask> }
<mask> s.leasesLock.Unlock()
<mask> return result
<mask> }
<mask>
<mask> // getLeasesRef returns the actual leases slice. For internal use only.
<mask> func (s *v6Server) getLeasesRef() []*Lease {
<mask> return s.leases
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove // GetLeases - get current leases
func (s *v6Server) GetLeases(flags int) []Lease {
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) { </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { | <mask> }
<mask>
<mask> // Remove a dynamic lease with the same properties
<mask> // Return error if a static lease is found
<mask> func (s *v6Server) rmDynamicLease(lease Lease) error {
<mask> for i := 0; i < len(s.leases); i++ {
<mask> l := s.leases[i]
<mask>
<mask> if bytes.Equal(l.HWAddr, lease.HWAddr) {
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) rmLease(lease Lease) error {
</s> add func (s *v6Server) rmLease(lease *Lease) (err error) { </s> remove func (s *v4Server) rmLease(lease Lease) (err error) {
</s> add func (s *v4Server) rmLease(lease *Lease) (err error) { </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) </s> remove AddStaticLease(lease Lease) error
</s> add AddStaticLease(l *Lease) (err error) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
func (s *v6Server) AddStaticLease(l *Lease) (err error) { | <mask> return nil
<mask> }
<mask>
<mask> // AddStaticLease adds a static lease. It is safe for concurrent use.
<mask> func (s *v6Server) AddStaticLease(l Lease) (err error) {
<mask> defer func() { err = errors.Annotate(err, "dhcpv6: %w") }()
<mask>
<mask> if len(l.IP) != 16 {
<mask> return fmt.Errorf("invalid IP")
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) RemoveStaticLease(l *Lease) (err error) { </s> remove func (s *v4Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) RemoveStaticLease(l *Lease) (err error) { </s> remove func (s *v4Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) AddStaticLease(l *Lease) (err error) { </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove // ResetLeases - reset leases
func (s *v4Server) ResetLeases(leases []*Lease) {
var err error
</s> add // ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
s.addLease(l) | <mask> if err != nil {
<mask> s.leasesLock.Unlock()
<mask> return err
<mask> }
<mask> s.addLease(&l)
<mask> s.conf.notify(LeaseChangedDBStore)
<mask> s.leasesLock.Unlock()
<mask>
<mask> s.conf.notify(LeaseChangedAddedStatic)
<mask> return nil
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err = s.rmDynamicLease(&l)
</s> add err = s.rmDynamicLease(l) </s> remove err = s.addLease(&l)
</s> add err = s.addLease(l) </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> remove return result
</s> add return leases </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
func (s *v6Server) RemoveStaticLease(l *Lease) (err error) { | <mask> return nil
<mask> }
<mask>
<mask> // RemoveStaticLease removes a static lease. It is safe for concurrent use.
<mask> func (s *v6Server) RemoveStaticLease(l Lease) (err error) {
<mask> defer func() { err = errors.Annotate(err, "dhcpv6: %w") }()
<mask>
<mask> if len(l.IP) != 16 {
<mask> return fmt.Errorf("invalid IP")
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v6Server) AddStaticLease(l *Lease) (err error) { </s> remove func (s *v4Server) RemoveStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) RemoveStaticLease(l *Lease) (err error) { </s> remove func (s *v4Server) AddStaticLease(l Lease) (err error) {
</s> add func (s *v4Server) AddStaticLease(l *Lease) (err error) { </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove // ResetLeases - reset leases
func (s *v4Server) ResetLeases(leases []*Lease) {
var err error
</s> add // ResetLeases resets leases.
func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
func (s *v6Server) rmLease(lease *Lease) (err error) { | <mask> log.Debug("dhcpv6: added lease %s <-> %s", l.IP, l.HWAddr)
<mask> }
<mask>
<mask> // Remove a lease with the same properties
<mask> func (s *v6Server) rmLease(lease Lease) error {
<mask> for i, l := range s.leases {
<mask> if net.IP.Equal(l.IP, lease.IP) {
<mask>
<mask> if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
<mask> l.Hostname != lease.Hostname {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { </s> remove func (s *v4Server) rmLease(lease Lease) (err error) {
</s> add func (s *v4Server) rmLease(lease *Lease) (err error) { </s> remove for _, l := range ll {
</s> add for _, l := range leases { </s> remove for _, lease := range s.leases {
if lease.Expiry.Unix() == leaseExpireStatic {
</s> add for _, l := range s.leases {
if l.Expiry.Unix() == leaseExpireStatic { </s> remove func (s *Server) AddStaticLease(lease Lease) error {
return s.srv4.AddStaticLease(lease)
</s> add func (s *Server) AddStaticLease(l *Lease) error {
return s.srv4.AddStaticLease(l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
func (s *v6Server) Stop() (err error) {
err = s.ra.Close() | <mask> return nil
<mask> }
<mask>
<mask> // Stop - stop server
<mask> func (s *v6Server) Stop() {
<mask> err := s.ra.Close()
<mask> if err != nil {
<mask> log.Error("dhcpv6: s.ra.Close: %s", err)
<mask> }
<mask>
<mask> // DHCPv6 server may not be initialized if ra_slaac_only=true
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("dhcpv6: s.ra.Close: %s", err)
</s> add return fmt.Errorf("closing ra ctx: %w", err) </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove Stop()
</s> add Stop() (err error) </s> remove Start() error
</s> add Start() (err error) </s> remove func (s *Server) Stop() {
s.srv4.Stop()
s.srv6.Stop()
}
</s> add func (s *Server) Stop() (err error) {
err = s.srv4.Stop()
if err != nil {
return err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
return fmt.Errorf("closing ra ctx: %w", err) | <mask> // Stop - stop server
<mask> func (s *v6Server) Stop() {
<mask> err := s.ra.Close()
<mask> if err != nil {
<mask> log.Error("dhcpv6: s.ra.Close: %s", err)
<mask> }
<mask>
<mask> // DHCPv6 server may not be initialized if ra_slaac_only=true
<mask> if s.srv == nil {
<mask> return
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove Stop()
</s> add Stop() (err error) </s> remove Start() error
</s> add Start() (err error) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
return fmt.Errorf("closing dhcpv6 srv: %w", err) | <mask>
<mask> log.Debug("dhcpv6: stopping")
<mask> err = s.srv.Close()
<mask> if err != nil {
<mask> log.Error("dhcpv6: srv.Close: %s", err)
<mask> }
<mask>
<mask> // now server.Serve() will return
<mask> s.srv = nil
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err := s.srv.Close()
</s> add err = s.srv.Close() </s> remove log.Error("dhcpv4: srv.Close: %s", err)
</s> add return fmt.Errorf("closing dhcpv4 srv: %w", err) </s> remove log.Error("dhcpv6: s.ra.Close: %s", err)
</s> add return fmt.Errorf("closing ra ctx: %w", err) </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
return nil | <mask> }
<mask>
<mask> // now server.Serve() will return
<mask> s.srv = nil
<mask> }
<mask>
<mask> // Create DHCPv6 server
<mask> func v6Create(conf V6ServerConf) (DHCPServer, error) {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove log.Error("dhcpv6: srv.Close: %s", err)
</s> add return fmt.Errorf("closing dhcpv6 srv: %w", err) </s> remove func (s *winServer) ResetLeases(leases []*Lease) {}
func (s *winServer) GetLeases(flags int) []Lease { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(lease Lease) error { return nil }
func (s *winServer) RemoveStaticLease(l Lease) error { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) net.HardwareAddr { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() error { return nil }
func (s *winServer) Stop() {}
func (s *winServer) Reset() {}
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil }
</s> add func (s *winServer) ResetLeases(_ []*Lease) (err error) { return nil }
func (s *winServer) GetLeases(_ GetLeasesFlags) (leases []*Lease) { return nil }
func (s *winServer) getLeasesRef() []*Lease { return nil }
func (s *winServer) AddStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) RemoveStaticLease(_ *Lease) (err error) { return nil }
func (s *winServer) FindMACbyIP(ip net.IP) (mac net.HardwareAddr) { return nil }
func (s *winServer) WriteDiskConfig4(c *V4ServerConf) {}
func (s *winServer) WriteDiskConfig6(c *V6ServerConf) {}
func (s *winServer) Start() (err error) { return nil }
func (s *winServer) Stop() (err error) { return nil }
func v4Create(conf V4ServerConf) (DHCPServer, error) { return &winServer{}, nil }
func v6Create(conf V6ServerConf) (DHCPServer, error) { return &winServer{}, nil } </s> remove func (s *v4Server) Stop() {
</s> add func (s *v4Server) Stop() (err error) { </s> remove func (s *v6Server) Stop() {
err := s.ra.Close()
</s> add func (s *v6Server) Stop() (err error) {
err = s.ra.Close() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6.go |
require.NoError(t, err) | <mask> Enabled: true,
<mask> RangeStart: net.ParseIP("2001::1"),
<mask> notify: notify6,
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> require.Empty(t, s.GetLeases(LeasesStatic))
<mask>
<mask> // Add static lease.
<mask> l := Lease{
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove }))
</s> add })
require.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
l := &Lease{ | <mask>
<mask> require.Empty(t, s.GetLeases(LeasesStatic))
<mask>
<mask> // Add static lease.
<mask> l := Lease{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
err = s.AddStaticLease(l)
require.NoError(t, err) | <mask> l := Lease{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask>
<mask> // Try to add the same static lease.
<mask> require.NotNil(t, s.AddStaticLease(l))
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.Error(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
err = s.AddStaticLease(l)
require.Error(t, err) | <mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask>
<mask> // Try to add the same static lease.
<mask> require.NotNil(t, s.AddStaticLease(l))
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> require.Len(t, ls, 1)
<mask> assert.Equal(t, l.IP, ls[0].IP)
<mask> assert.Equal(t, l.HWAddr, ls[0].HWAddr)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove err = s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove }))
</s> add })
require.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
err = s.RemoveStaticLease(&Lease{ | <mask> assert.Equal(t, l.HWAddr, ls[0].HWAddr)
<mask> assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix())
<mask>
<mask> // Try to remove non-existent static lease.
<mask> require.NotNil(t, s.RemoveStaticLease(Lease{
<mask> IP: net.ParseIP("2001::2"),
<mask> HWAddr: l.HWAddr,
<mask> }))
<mask>
<mask> // Remove static lease.
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove }))
</s> add })
require.Error(t, err) </s> remove err = s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove require.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.Error(t, err) </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
})
require.Error(t, err) | <mask> // Try to remove non-existent static lease.
<mask> require.NotNil(t, s.RemoveStaticLease(Lease{
<mask> IP: net.ParseIP("2001::2"),
<mask> HWAddr: l.HWAddr,
<mask> }))
<mask>
<mask> // Remove static lease.
<mask> require.Nil(t, s.RemoveStaticLease(l))
<mask>
<mask> assert.Empty(t, s.GetLeases(LeasesStatic))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove require.Nil(t, s.RemoveStaticLease(l))
</s> add err = s.RemoveStaticLease(l)
require.NoError(t, err) </s> remove err = s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.NotNil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
err = s.RemoveStaticLease(l)
require.NoError(t, err) | <mask> HWAddr: l.HWAddr,
<mask> }))
<mask>
<mask> // Remove static lease.
<mask> require.Nil(t, s.RemoveStaticLease(l))
<mask>
<mask> assert.Empty(t, s.GetLeases(LeasesStatic))
<mask> }
<mask>
<mask> func TestV6_AddReplace(t *testing.T) {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove }))
</s> add })
require.Error(t, err) </s> remove require.NotNil(t, s.RemoveStaticLease(Lease{
</s> add err = s.RemoveStaticLease(&Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err)
| <mask> Enabled: true,
<mask> RangeStart: net.ParseIP("2001::1"),
<mask> notify: notify6,
<mask> })
<mask> require.Nil(t, err)
<mask> s, ok := sIface.(*v6Server)
<mask> require.True(t, ok)
<mask>
<mask> // Add dynamic leases.
<mask> dynLeases := []*Lease{{
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove err = srv4.addLease(&leases[0])
</s> add err = srv4.addLease(leases[0]) </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
stLeases := []*Lease{{ | <mask> for _, l := range dynLeases {
<mask> s.addLease(l)
<mask> }
<mask>
<mask> stLeases := []Lease{{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0x33, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }, {
<mask> IP: net.ParseIP("2001::3"),
<mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove l := Lease{
</s> add l := &Lease{ </s> remove leases := []Lease{{
</s> add leases := []*Lease{{ </s> remove l := Lease{
</s> add l := &Lease{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
err = s.AddStaticLease(l)
require.NoError(t, err) | <mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
<mask>
<mask> for _, l := range stLeases {
<mask> require.Nil(t, s.AddStaticLease(l))
<mask> }
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> require.Len(t, ls, 2)
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> Enabled: true,
<mask> RangeStart: net.ParseIP("2001::1"),
<mask> notify: notify6,
<mask> })
<mask> require.Nil(t, err)
<mask> s, ok := sIface.(*v6Server)
<mask> require.True(t, ok)
<mask>
<mask> dnsAddr := net.ParseIP("2000::1")
<mask> s.conf.dnsIPAddrs = []net.IP{dnsAddr}
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove err = srv4.addLease(&leases[0])
</s> add err = srv4.addLease(leases[0]) </s> remove l := Lease{
</s> add l := &Lease{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
l := &Lease{ | <mask> HwType: iana.HWTypeEthernet,
<mask> LinkLayerAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask>
<mask> l := Lease{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove stLeases := []Lease{{
</s> add stLeases := []*Lease{{ </s> remove l := Lease{
</s> add l := &Lease{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
err = s.AddStaticLease(l)
require.NoError(t, err) | <mask> l := Lease{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> require.Nil(t, s.AddStaticLease(l))
<mask>
<mask> var req, resp, msg *dhcpv6.Message
<mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask> t.Run("solicit", func(t *testing.T) {
<mask> req, err = dhcpv6.NewSolicit(mac)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove l := Lease{
</s> add l := &Lease{ </s> remove l := Lease{
</s> add l := &Lease{ </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> var req, resp, msg *dhcpv6.Message
<mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask> t.Run("solicit", func(t *testing.T) {
<mask> req, err = dhcpv6.NewSolicit(mac)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewAdvertiseFromSolicit(msg)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> req, err = dhcpv6.NewSolicit(mac)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewAdvertiseFromSolicit(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewAdvertiseFromSolicit(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask> resp.AddOption(dhcpv6.OptServerID(s.sid))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err)
| <mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask> resp.AddOption(dhcpv6.OptServerID(s.sid))
<mask>
<mask> var oia *dhcpv6.OptIANA
<mask> var oiaAddr *dhcpv6.OptIAAddress
<mask> t.Run("advertise", func(t *testing.T) {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> })
<mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> req, err = dhcpv6.NewRequestFromAdvertise(resp)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewReplyFromMessage(msg)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> req, err = dhcpv6.NewRequestFromAdvertise(resp)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewReplyFromMessage(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewReplyFromMessage(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
<mask> t.Run("reply", func(t *testing.T) {
<mask> require.Equal(t, dhcpv6.MessageTypeReply, resp.Type())
<mask> oia = resp.Options.OneIANA()
<mask> oiaAddr = oia.Options.OneAddress()
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err)
| <mask> Enabled: true,
<mask> RangeStart: net.ParseIP("2001::2"),
<mask> notify: notify6,
<mask> })
<mask> require.Nil(t, err)
<mask> s, ok := sIface.(*v6Server)
<mask> require.True(t, ok)
<mask>
<mask> dnsAddr := net.ParseIP("2000::1")
<mask> s.conf.dnsIPAddrs = []net.IP{dnsAddr}
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove err = srv4.addLease(&leases[0])
</s> add err = srv4.addLease(leases[0]) </s> remove l := Lease{
</s> add l := &Lease{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> var req, resp, msg *dhcpv6.Message
<mask> mac := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
<mask> t.Run("solicit", func(t *testing.T) {
<mask> req, err = dhcpv6.NewSolicit(mac)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewAdvertiseFromSolicit(msg)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> req, err = dhcpv6.NewSolicit(mac)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewAdvertiseFromSolicit(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewAdvertiseFromSolicit(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask> resp.AddOption(dhcpv6.OptServerID(s.sid))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err)
| <mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask> resp.AddOption(dhcpv6.OptServerID(s.sid))
<mask>
<mask> var oia *dhcpv6.OptIANA
<mask> var oiaAddr *dhcpv6.OptIAAddress
<mask> t.Run("advertise", func(t *testing.T) {
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> })
<mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> req, err = dhcpv6.NewRequestFromAdvertise(resp)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewReplyFromMessage(msg)
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> req, err = dhcpv6.NewRequestFromAdvertise(resp)
<mask> require.Nil(t, err)
<mask>
<mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewReplyFromMessage(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
require.NoError(t, err) | <mask> msg, err = req.GetInnerMessage()
<mask> require.Nil(t, err)
<mask>
<mask> resp, err = dhcpv6.NewReplyFromMessage(msg)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, s.process(msg, req, resp))
<mask> })
<mask> require.Nil(t, err)
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/dhcpd/v6_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.