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 |
|---|---|---|---|---|
// handleUpdate performs an update to the latest available version procedure. | <mask> httpError(w, http.StatusInternalServerError, "Couldn't write body: %s", err)
<mask> }
<mask> }
<mask>
<mask> // Perform an update procedure to the latest available version
<mask> func handleUpdate(w http.ResponseWriter, _ *http.Request) {
<mask> if Context.updater.NewVersion() == "" {
<mask> httpError(w, http.StatusBadRequest, "/update request isn't allowed now")
<mask> return
<mask> }
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Complete an update procedure
func finishUpdate() {
</s> add // finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { </s> remove cleanup()
</s> add cleanup(ctx) </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlupdate.go |
// The background context is used because the underlying functions wrap
// it with timeout and shut down the server, which handles current
// request. It also should be done in a separate goroutine due to the
// same reason.
go func() {
finishUpdate(context.Background())
}() | <mask> if f, ok := w.(http.Flusher); ok {
<mask> f.Flush()
<mask> }
<mask>
<mask> go finishUpdate()
<mask> }
<mask>
<mask> // versionResponse is the response for /control/version.json endpoint.
<mask> type versionResponse struct {
<mask> Disabled bool `json:"disabled"`
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request. It is also should be done in a separate
// goroutine due to the same reason. </s> remove // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> add // The Shutdown() method of (*http.Server) needs to be called in a
// separate goroutine, because it waits until all requests are handled
// and will be blocked by it's own caller. </s> remove // Complete an update procedure
func finishUpdate() {
</s> add // finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlupdate.go |
// finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { | <mask> vr.CanAutoUpdate = &canUpdate
<mask> }
<mask> }
<mask>
<mask> // Complete an update procedure
<mask> func finishUpdate() {
<mask> log.Info("Stopping all tasks")
<mask> cleanup()
<mask> cleanupAlways()
<mask>
<mask> exeName := "AdGuardHome"
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove cleanup()
</s> add cleanup(ctx) </s> remove // Perform an update procedure to the latest available version
</s> add // handleUpdate performs an update to the latest available version procedure. </s> remove func cleanup() {
</s> add // cleanup stops and resets all the modules.
func cleanup(ctx context.Context) { </s> remove Context.web.Close()
</s> add Context.web.Close(ctx) </s> remove cleanup()
</s> add cleanup(context.Background()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlupdate.go |
cleanup(ctx) | <mask>
<mask> // Complete an update procedure
<mask> func finishUpdate() {
<mask> log.Info("Stopping all tasks")
<mask> cleanup()
<mask> cleanupAlways()
<mask>
<mask> exeName := "AdGuardHome"
<mask> if runtime.GOOS == "windows" {
<mask> exeName = "AdGuardHome.exe"
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Complete an update procedure
func finishUpdate() {
</s> add // finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { </s> remove // Perform an update procedure to the latest available version
</s> add // handleUpdate performs an update to the latest available version procedure. </s> remove func cleanup() {
</s> add // cleanup stops and resets all the modules.
func cleanup(ctx context.Context) { </s> remove Context.web.Close()
</s> add Context.web.Close(ctx) </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlupdate.go |
cleanup(context.Background()) | <mask> Context.clients.Reload()
<mask> Context.tls.Reload()
<mask>
<mask> default:
<mask> cleanup()
<mask> cleanupAlways()
<mask> os.Exit(0)
<mask> }
<mask> }
<mask> }()
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove cleanup()
</s> add cleanup(context.Background()) </s> remove // Complete an update procedure
func finishUpdate() {
</s> add // finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) </s> remove cleanup()
</s> add cleanup(ctx) </s> remove func cleanup() {
</s> add // cleanup stops and resets all the modules.
func cleanup(ctx context.Context) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/home.go |
// StartMods initializes and starts the DNS server after installation. | <mask> // wait indefinitely for other go-routines to complete their job
<mask> select {}
<mask> }
<mask>
<mask> // StartMods - initialize and start DNS after installation
<mask> func StartMods() error {
<mask> err := initDNSServer()
<mask> if err != nil {
<mask> return err
<mask> }
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove resp, err := w.queryAll(ip.String())
</s> add resp, err := w.queryAll(ctx, ip.String()) </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/home.go |
// cleanup stops and resets all the modules.
func cleanup(ctx context.Context) { | <mask> })
<mask> }
<mask> }
<mask>
<mask> func cleanup() {
<mask> log.Info("Stopping AdGuard Home")
<mask>
<mask> if Context.web != nil {
<mask> Context.web.Close()
<mask> Context.web = nil
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove Context.web.Close()
</s> add Context.web.Close(ctx) </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove // Complete an update procedure
func finishUpdate() {
</s> add // finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) </s> remove cleanup()
</s> add cleanup(ctx) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/home.go |
Context.web.Close(ctx) | <mask> func cleanup() {
<mask> log.Info("Stopping AdGuard Home")
<mask>
<mask> if Context.web != nil {
<mask> Context.web.Close()
<mask> Context.web = nil
<mask> }
<mask> if Context.auth != nil {
<mask> Context.auth.Close()
<mask> Context.auth = nil
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove func cleanup() {
</s> add // cleanup stops and resets all the modules.
func cleanup(ctx context.Context) { </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) </s> remove _ = web.httpsServer.server.Shutdown(context.TODO())
</s> add ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove cleanup()
</s> add cleanup(ctx) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/home.go |
cleanup(context.Background()) | <mask> }
<mask> time.Sleep(1 * time.Second)
<mask> }
<mask>
<mask> cleanup()
<mask> cleanupAlways()
<mask> }
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove cleanup()
</s> add cleanup(context.Background()) </s> remove // Complete an update procedure
func finishUpdate() {
</s> add // finishUpdate completes an update procedure.
func finishUpdate(ctx context.Context) { </s> remove func cleanup() {
</s> add // cleanup stops and resets all the modules.
func cleanup(ctx context.Context) { </s> remove cleanup()
</s> add cleanup(ctx) </s> remove Context.web.Close()
</s> add Context.web.Close(ctx) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/home_test.go |
"context" | <mask>
<mask> import (
<mask> "crypto"
<mask> "crypto/ecdsa"
<mask> "crypto/rsa"
<mask> "crypto/tls"
<mask> "crypto/x509"
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove cleanup()
</s> add cleanup(ctx) </s> remove Context.web.TLSConfigChanged(tlsConf)
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/tls.go |
// Start updates the configuration of TLSMod and starts it. | <mask> }
<mask> t.certLastMod = fi.ModTime().UTC()
<mask> }
<mask>
<mask> // Start - start the module
<mask> func (t *TLSMod) Start() {
<mask> if !tlsWebHandlersRegistered {
<mask> tlsWebHandlersRegistered = true
<mask> t.registerWebHandlers()
<mask> }
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Reload - reload certificate file
</s> add // Reload updates the configuration of TLSMod and restarts it. </s> remove // Close - stop HTTP server, possibly waiting for all active connections to be closed
func (web *Web) Close() {
</s> add // Close gracefully shuts down the HTTP servers.
func (web *Web) Close(ctx context.Context) { </s> remove Context.web.TLSConfigChanged(tlsConf)
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) </s> remove // TLSConfigChanged - called when TLS configuration has changed
func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
</s> add // TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { </s> remove w := Whois{}
w.timeoutMsec = 5000
w.clients = clients
cconf := cache.Config{}
cconf.EnableLRU = true
cconf.MaxCount = 10000
w.ipAddrs = cache.New(cconf)
</s> add w := Whois{
timeoutMsec: 5000,
clients: clients,
ipAddrs: cache.New(cache.Config{
EnableLRU: true,
MaxCount: 10000,
}),
ipChan: make(chan net.IP, 255),
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/tls.go |
// The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) | <mask>
<mask> t.confLock.Lock()
<mask> tlsConf := t.conf
<mask> t.confLock.Unlock()
<mask> Context.web.TLSConfigChanged(tlsConf)
<mask> }
<mask>
<mask> // Reload - reload certificate file
<mask> func (t *TLSMod) Reload() {
<mask> t.confLock.Lock()
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Reload - reload certificate file
</s> add // Reload updates the configuration of TLSMod and restarts it. </s> remove Context.web.TLSConfigChanged(tlsConf)
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. </s> remove // TLSConfigChanged - called when TLS configuration has changed
func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
</s> add // TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { </s> remove // StartMods - initialize and start DNS after installation
</s> add // StartMods initializes and starts the DNS server after installation. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/tls.go |
// Reload updates the configuration of TLSMod and restarts it. | <mask> t.confLock.Unlock()
<mask> Context.web.TLSConfigChanged(tlsConf)
<mask> }
<mask>
<mask> // Reload - reload certificate file
<mask> func (t *TLSMod) Reload() {
<mask> t.confLock.Lock()
<mask> tlsConf := t.conf
<mask> t.confLock.Unlock()
<mask>
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove Context.web.TLSConfigChanged(tlsConf)
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) </s> remove Context.web.TLSConfigChanged(tlsConf)
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. </s> remove // TLSConfigChanged - called when TLS configuration has changed
func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
</s> add // TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { </s> remove // StartMods - initialize and start DNS after installation
</s> add // StartMods initializes and starts the DNS server after installation. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/tls.go |
// The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) | <mask>
<mask> t.confLock.Lock()
<mask> tlsConf = t.conf
<mask> t.confLock.Unlock()
<mask> Context.web.TLSConfigChanged(tlsConf)
<mask> }
<mask>
<mask> // Set certificate and private key data
<mask> func tlsLoadConfig(tls *tlsConfigSettings, status *tlsConfigStatus) bool {
<mask> tls.CertificateChainData = []byte(tls.CertificateChain)
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Reload - reload certificate file
</s> add // Reload updates the configuration of TLSMod and restarts it. </s> remove Context.web.TLSConfigChanged(tlsConf)
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) </s> remove // TLSConfigChanged - called when TLS configuration has changed
func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
</s> add // TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. </s> remove resp, err := w.queryAll(ip.String())
</s> add resp, err := w.queryAll(ctx, ip.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/tls.go |
// The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request. It is also should be done in a separate
// goroutine due to the same reason. | <mask> if f, ok := w.(http.Flusher); ok {
<mask> f.Flush()
<mask> }
<mask>
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTPS {
<mask> go func() {
<mask> Context.web.TLSConfigChanged(data)
<mask> }()
<mask> }
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> add // The Shutdown() method of (*http.Server) needs to be called in a
// separate goroutine, because it waits until all requests are handled
// and will be blocked by it's own caller. </s> remove Context.web.TLSConfigChanged(data)
</s> add Context.web.TLSConfigChanged(context.Background(), data) </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) </s> remove go finishUpdate()
</s> add // The background context is used because the underlying functions wrap
// it with timeout and shut down the server, which handles current
// request. It also should be done in a separate goroutine due to the
// same reason.
go func() {
finishUpdate(context.Background())
}() </s> remove // Get IP address from channel; get WHOIS info; associate info with a client
</s> add // workerLoop processes the IP addresses it got from the channel and associates
// the retrieving WHOIS info with a client. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/tls.go |
Context.web.TLSConfigChanged(context.Background(), data) | <mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTPS {
<mask> go func() {
<mask> Context.web.TLSConfigChanged(data)
<mask> }()
<mask> }
<mask> }
<mask>
<mask> func verifyCertChain(data *tlsConfigStatus, certChain, serverName string) error {
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> add // The Shutdown() method of (*http.Server) needs to be called in a
// separate goroutine, because it waits until all requests are handled
// and will be blocked by it's own caller. </s> remove // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request. It is also should be done in a separate
// goroutine due to the same reason. </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) </s> remove go finishUpdate()
</s> add // The background context is used because the underlying functions wrap
// it with timeout and shut down the server, which handles current
// request. It also should be done in a separate goroutine due to the
// same reason.
go func() {
finishUpdate(context.Background())
}() </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/tls.go |
// TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { | <mask> }
<mask> return true
<mask> }
<mask>
<mask> // TLSConfigChanged - called when TLS configuration has changed
<mask> func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
<mask> log.Debug("Web: applying new TLS configuration")
<mask> web.conf.PortHTTPS = tlsConf.PortHTTPS
<mask> web.forceHTTPS = (tlsConf.ForceHTTPS && tlsConf.Enabled && tlsConf.PortHTTPS != 0)
<mask>
<mask> enabled := tlsConf.Enabled &&
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Close - stop HTTP server, possibly waiting for all active connections to be closed
func (web *Web) Close() {
</s> add // Close gracefully shuts down the HTTP servers.
func (web *Web) Close(ctx context.Context) { </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/web.go |
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} | <mask> }
<mask>
<mask> web.httpsServer.cond.L.Lock()
<mask> if web.httpsServer.server != nil {
<mask> _ = web.httpsServer.server.Shutdown(context.TODO())
<mask> }
<mask> web.httpsServer.enabled = enabled
<mask> web.httpsServer.cert = cert
<mask> web.httpsServer.cond.Broadcast()
<mask> web.httpsServer.cond.L.Unlock()
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) </s> remove // Close - stop HTTP server, possibly waiting for all active connections to be closed
func (web *Web) Close() {
</s> add // Close gracefully shuts down the HTTP servers.
func (web *Web) Close(ctx context.Context) { </s> remove Context.web.Close()
</s> add Context.web.Close(ctx) </s> remove // TLSConfigChanged - called when TLS configuration has changed
func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
</s> add // TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/web.go |
// Close gracefully shuts down the HTTP servers.
func (web *Web) Close(ctx context.Context) { | <mask> // We use ErrServerClosed as a sign that we need to rebind on new address, so go back to the start of the loop
<mask> }
<mask> }
<mask>
<mask> // Close - stop HTTP server, possibly waiting for all active connections to be closed
<mask> func (web *Web) Close() {
<mask> log.Info("Stopping HTTP server...")
<mask> web.httpsServer.cond.L.Lock()
<mask> web.httpsServer.shutdown = true
<mask> web.httpsServer.cond.L.Unlock()
<mask> if web.httpsServer.server != nil {
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> add // The Shutdown() method of (*http.Server) needs to be called in a
// separate goroutine, because it waits until all requests are handled
// and will be blocked by it's own caller. </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/web.go |
shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} | <mask> log.Info("Stopping HTTP server...")
<mask> web.httpsServer.cond.L.Lock()
<mask> web.httpsServer.shutdown = true
<mask> web.httpsServer.cond.L.Unlock()
<mask> if web.httpsServer.server != nil {
<mask> _ = web.httpsServer.server.Shutdown(context.TODO())
<mask> }
<mask> if web.httpServer != nil {
<mask> _ = web.httpServer.Shutdown(context.TODO())
<mask> }
<mask> if web.httpServerBeta != nil {
<mask> _ = web.httpServerBeta.Shutdown(context.TODO())
<mask> }
<mask>
<mask> log.Info("Stopped HTTP server")
<mask> }
<mask>
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove _ = web.httpsServer.server.Shutdown(context.TODO())
</s> add ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) </s> remove // Close - stop HTTP server, possibly waiting for all active connections to be closed
func (web *Web) Close() {
</s> add // Close gracefully shuts down the HTTP servers.
func (web *Web) Close(ctx context.Context) { </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/web.go |
shut(web.httpsServer.server)
shut(web.httpServer)
shut(web.httpServerBeta)
| <mask> }
<mask>
<mask> log.Info("Stopped HTTP server")
<mask> }
<mask>
<mask> func (web *Web) tlsServerLoop() {
<mask> for {
<mask> web.httpsServer.cond.L.Lock()
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Close - stop HTTP server, possibly waiting for all active connections to be closed
func (web *Web) Close() {
</s> add // Close gracefully shuts down the HTTP servers.
func (web *Web) Close(ctx context.Context) { </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) </s> remove // TLSConfigChanged - called when TLS configuration has changed
func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
</s> add // TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/web.go |
// initWhois creates the Whois module context. | <mask> // If IP address couldn't be resolved, it stays here for some time to prevent further attempts to resolve the same IP.
<mask> ipAddrs cache.Cache
<mask> }
<mask>
<mask> // Create module context
<mask> func initWhois(clients *clientsContainer) *Whois {
<mask> w := Whois{}
<mask> w.timeoutMsec = 5000
<mask> w.clients = clients
<mask>
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove w := Whois{}
w.timeoutMsec = 5000
w.clients = clients
cconf := cache.Config{}
cconf.EnableLRU = true
cconf.MaxCount = 10000
w.ipAddrs = cache.New(cconf)
</s> add w := Whois{
timeoutMsec: 5000,
clients: clients,
ipAddrs: cache.New(cache.Config{
EnableLRU: true,
MaxCount: 10000,
}),
ipChan: make(chan net.IP, 255),
} </s> remove // Get IP address from channel; get WHOIS info; associate info with a client
</s> add // workerLoop processes the IP addresses it got from the channel and associates
// the retrieving WHOIS info with a client. </s> remove go finishUpdate()
</s> add // The background context is used because the underlying functions wrap
// it with timeout and shut down the server, which handles current
// request. It also should be done in a separate goroutine due to the
// same reason.
go func() {
finishUpdate(context.Background())
}() </s> remove // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request. It is also should be done in a separate
// goroutine due to the same reason. </s> remove // Close - stop HTTP server, possibly waiting for all active connections to be closed
func (web *Web) Close() {
</s> add // Close gracefully shuts down the HTTP servers.
func (web *Web) Close(ctx context.Context) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
w := Whois{
timeoutMsec: 5000,
clients: clients,
ipAddrs: cache.New(cache.Config{
EnableLRU: true,
MaxCount: 10000,
}),
ipChan: make(chan net.IP, 255),
} | <mask> }
<mask>
<mask> // Create module context
<mask> func initWhois(clients *clientsContainer) *Whois {
<mask> w := Whois{}
<mask> w.timeoutMsec = 5000
<mask> w.clients = clients
<mask>
<mask> cconf := cache.Config{}
<mask> cconf.EnableLRU = true
<mask> cconf.MaxCount = 10000
<mask> w.ipAddrs = cache.New(cconf)
<mask>
<mask> w.ipChan = make(chan net.IP, 255)
<mask> go w.workerLoop()
<mask> return &w
<mask> }
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove w.ipChan = make(chan net.IP, 255)
</s> add </s> remove // Create module context
</s> add // initWhois creates the Whois module context. </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove go func() {
_ = web.httpServerBeta.Shutdown(context.TODO())
}()
</s> add go shut(web.httpServerBeta) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
<mask> cconf.EnableLRU = true
<mask> cconf.MaxCount = 10000
<mask> w.ipAddrs = cache.New(cconf)
<mask>
<mask> w.ipChan = make(chan net.IP, 255)
<mask> go w.workerLoop()
<mask> return &w
<mask> }
<mask>
<mask> // If the value is too large - cut it and append "..."
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove w := Whois{}
w.timeoutMsec = 5000
w.clients = clients
cconf := cache.Config{}
cconf.EnableLRU = true
cconf.MaxCount = 10000
w.ipAddrs = cache.New(cconf)
</s> add w := Whois{
timeoutMsec: 5000,
clients: clients,
ipAddrs: cache.New(cache.Config{
EnableLRU: true,
MaxCount: 10000,
}),
ipChan: make(chan net.IP, 255),
} </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. </s> remove // Create module context
</s> add // initWhois creates the Whois module context. </s> remove // TLSConfigChanged - called when TLS configuration has changed
func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
</s> add // TLSConfigChanged updates the TLS configuration and restarts the HTTPS server
// if necessary.
func (web *Web) TLSConfigChanged(ctx context.Context, tlsConf tlsConfigSettings) { </s> remove go func() {
_ = web.httpServer.Shutdown(context.TODO())
}()
</s> add ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go | |
func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { | <mask> // MaxConnReadSize is an upper limit in bytes for reading from net.Conn.
<mask> const MaxConnReadSize = 64 * 1024
<mask>
<mask> // Send request to a server and receive the response
<mask> func (w *Whois) query(target, serverAddr string) (string, error) {
<mask> addr, _, _ := net.SplitHostPort(serverAddr)
<mask> if addr == "whois.arin.net" {
<mask> target = "n + " + target
<mask> }
<mask> conn, err := customDialContext(context.TODO(), "tcp", serverAddr)
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove conn, err := customDialContext(context.TODO(), "tcp", serverAddr)
</s> add conn, err := customDialContext(ctx, "tcp", serverAddr) </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove resp, err := w.query(target, server)
</s> add resp, err := w.query(ctx, target, server) </s> remove // Get IP address from channel; get WHOIS info; associate info with a client
</s> add // workerLoop processes the IP addresses it got from the channel and associates
// the retrieving WHOIS info with a client. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
conn, err := customDialContext(ctx, "tcp", serverAddr) | <mask> addr, _, _ := net.SplitHostPort(serverAddr)
<mask> if addr == "whois.arin.net" {
<mask> target = "n + " + target
<mask> }
<mask> conn, err := customDialContext(context.TODO(), "tcp", serverAddr)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask> defer conn.Close()
<mask>
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { </s> remove if web.httpsServer.server != nil {
_ = web.httpsServer.server.Shutdown(context.TODO())
}
if web.httpServer != nil {
_ = web.httpServer.Shutdown(context.TODO())
}
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
</s> add shut := func(srv *http.Server) {
if srv == nil {
return
}
ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove resp, err := w.query(target, server)
</s> add resp, err := w.query(ctx, target, server) </s> remove _ = web.httpsServer.server.Shutdown(context.TODO())
</s> add ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
err = web.httpsServer.server.Shutdown(ctx)
cancel()
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { | <mask> return string(data), nil
<mask> }
<mask>
<mask> // Query WHOIS servers (handle redirects)
<mask> func (w *Whois) queryAll(target string) (string, error) {
<mask> server := net.JoinHostPort(defaultServer, defaultPort)
<mask> const maxRedirects = 5
<mask> for i := 0; i != maxRedirects; i++ {
<mask> resp, err := w.query(target, server)
<mask> if err != nil {
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove resp, err := w.query(target, server)
</s> add resp, err := w.query(ctx, target, server) </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { </s> remove resp, err := w.queryAll(ip.String())
</s> add resp, err := w.queryAll(ctx, ip.String()) </s> remove func (w *Whois) process(ip net.IP) [][]string {
</s> add func (w *Whois) process(ctx context.Context, ip net.IP) [][]string { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
resp, err := w.query(ctx, target, server) | <mask> func (w *Whois) queryAll(target string) (string, error) {
<mask> server := net.JoinHostPort(defaultServer, defaultPort)
<mask> const maxRedirects = 5
<mask> for i := 0; i != maxRedirects; i++ {
<mask> resp, err := w.query(target, server)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask> log.Debug("Whois: received response (%d bytes) from %s IP:%s", len(resp), server, target)
<mask>
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove func (w *Whois) process(ip net.IP) [][]string {
</s> add func (w *Whois) process(ctx context.Context, ip net.IP) [][]string { </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { </s> remove resp, err := w.queryAll(ip.String())
</s> add resp, err := w.queryAll(ctx, ip.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
func (w *Whois) process(ctx context.Context, ip net.IP) [][]string { | <mask> return "", fmt.Errorf("whois: redirect loop")
<mask> }
<mask>
<mask> // Request WHOIS information
<mask> func (w *Whois) process(ip net.IP) [][]string {
<mask> data := [][]string{}
<mask> resp, err := w.queryAll(ip.String())
<mask> if err != nil {
<mask> log.Debug("Whois: error: %s IP:%s", err, ip)
<mask> return data
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove resp, err := w.queryAll(ip.String())
</s> add resp, err := w.queryAll(ctx, ip.String()) </s> remove resp, err := w.query(target, server)
</s> add resp, err := w.query(ctx, target, server) </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove conn, err := customDialContext(context.TODO(), "tcp", serverAddr)
</s> add conn, err := customDialContext(ctx, "tcp", serverAddr) </s> remove info := w.process(ip)
</s> add info := w.process(context.Background(), ip) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
resp, err := w.queryAll(ctx, ip.String()) | <mask>
<mask> // Request WHOIS information
<mask> func (w *Whois) process(ip net.IP) [][]string {
<mask> data := [][]string{}
<mask> resp, err := w.queryAll(ip.String())
<mask> if err != nil {
<mask> log.Debug("Whois: error: %s IP:%s", err, ip)
<mask> return data
<mask> }
<mask>
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove func (w *Whois) process(ip net.IP) [][]string {
</s> add func (w *Whois) process(ctx context.Context, ip net.IP) [][]string { </s> remove resp, err := w.query(target, server)
</s> add resp, err := w.query(ctx, target, server) </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove info := w.process(ip)
</s> add info := w.process(context.Background(), ip) </s> remove // Get IP address from channel; get WHOIS info; associate info with a client
</s> add // workerLoop processes the IP addresses it got from the channel and associates
// the retrieving WHOIS info with a client. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
// workerLoop processes the IP addresses it got from the channel and associates
// the retrieving WHOIS info with a client. | <mask> log.Debug("Whois: queue is full")
<mask> }
<mask> }
<mask>
<mask> // Get IP address from channel; get WHOIS info; associate info with a client
<mask> func (w *Whois) workerLoop() {
<mask> for {
<mask> ip := <-w.ipChan
<mask>
<mask> info := w.process(ip)
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove info := w.process(ip)
</s> add info := w.process(context.Background(), ip) </s> remove func (w *Whois) process(ip net.IP) [][]string {
</s> add func (w *Whois) process(ctx context.Context, ip net.IP) [][]string { </s> remove resp, err := w.queryAll(ip.String())
</s> add resp, err := w.queryAll(ctx, ip.String()) </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
info := w.process(context.Background(), ip) | <mask> func (w *Whois) workerLoop() {
<mask> for {
<mask> ip := <-w.ipChan
<mask>
<mask> info := w.process(ip)
<mask> if len(info) == 0 {
<mask> continue
<mask> }
<mask>
<mask> w.clients.SetWhoisInfo(ip, info)
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove // Get IP address from channel; get WHOIS info; associate info with a client
</s> add // workerLoop processes the IP addresses it got from the channel and associates
// the retrieving WHOIS info with a client. </s> remove func (w *Whois) process(ip net.IP) [][]string {
</s> add func (w *Whois) process(ctx context.Context, ip net.IP) [][]string { </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove func (w *Whois) query(target, serverAddr string) (string, error) {
</s> add func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) { </s> remove resp, err := w.query(target, server)
</s> add resp, err := w.query(ctx, target, server) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois.go |
"context" | <mask> package home
<mask>
<mask> import (
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/stretchr/testify/assert"
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove cleanup()
</s> add cleanup(ctx) </s> remove Context.web.TLSConfigChanged(tlsConf)
</s> add // The background context is used because the TLSConfigChanged wraps
// context with timeout on its own and shuts down the server, which
// handles current request.
Context.web.TLSConfigChanged(context.Background(), tlsConf) </s> remove // Start - start the module
</s> add // Start updates the configuration of TLSMod and starts it. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois_test.go |
resp, err := w.queryAll(context.Background(), "8.8.8.8") | <mask> func TestWhois(t *testing.T) {
<mask> assert.Nil(t, prepareTestDNSServer())
<mask>
<mask> w := Whois{timeoutMsec: 5000}
<mask> resp, err := w.queryAll("8.8.8.8")
<mask> assert.Nil(t, err)
<mask> m := whoisParse(resp)
<mask> assert.Equal(t, "Google LLC", m["orgname"])
<mask> assert.Equal(t, "US", m["country"])
<mask> assert.Equal(t, "Mountain View", m["city"])
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:28:23 2021 +0300
all: fix docs
commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:22:00 2021 +0300
all: doc changes
commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:12:55 2021 +0300
Merge branch 'master' into 2552-context
commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 19:10:03 2021 +0300
home: imp docs, fix naming
commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 26 18:14:07 2021 +0300
home: improve code quality
commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 20:28:51 2021 +0300
home: add docs
commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 25 14:50:11 2021 +0300
home: rm context.TODO() instances </s> remove resp, err := w.queryAll(ip.String())
</s> add resp, err := w.queryAll(ctx, ip.String()) </s> remove resp, err := w.query(target, server)
</s> add resp, err := w.query(ctx, target, server) </s> remove func (w *Whois) queryAll(target string) (string, error) {
</s> add func (w *Whois) queryAll(ctx context.Context, target string) (string, error) { </s> remove func (w *Whois) process(ip net.IP) [][]string {
</s> add func (w *Whois) process(ctx context.Context, ip net.IP) [][]string { </s> remove w := Whois{}
w.timeoutMsec = 5000
w.clients = clients
cconf := cache.Config{}
cconf.EnableLRU = true
cconf.MaxCount = 10000
w.ipAddrs = cache.New(cconf)
</s> add w := Whois{
timeoutMsec: 5000,
clients: clients,
ipAddrs: cache.New(cache.Config{
EnableLRU: true,
MaxCount: 10000,
}),
ipChan: make(chan net.IP, 255),
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/whois_test.go |
github.com/AdguardTeam/dnsproxy v0.37.1 | <mask>
<mask> go 1.15
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.35.5
<mask> github.com/AdguardTeam/golibs v0.4.5
<mask> github.com/AdguardTeam/urlfilter v0.14.4
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.3
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 </s> remove github.com/AdguardTeam/dnsproxy v0.35.5 h1:SsRF0eDzuLGaSUDKABIu9Mn1joi4v4kvEU1vju2DQPQ=
github.com/AdguardTeam/dnsproxy v0.35.5/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
</s> add github.com/AdguardTeam/dnsproxy v0.37.1 h1:vULyF1+xSI7vV99m8GD2hmOuCQrpu87awyeSe5qtFbA=
github.com/AdguardTeam/dnsproxy v0.37.1/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE= </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.1/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
github.com/ameshkov/dnscrypt/v2 v2.0.3 h1:PE6VVc8QUMYJv9dTwcDcX5cYXf58XPi1WVPHrLf8MDs=
github.com/ameshkov/dnscrypt/v2 v2.0.3/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 h1:DG4Uf7LSDg6XDj9sp3maxh3Ur26jeGQaP5MeYosn6v0=
github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= </s> remove const currentSchemaVersion = 9
</s> add const currentSchemaVersion = 10 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.mod |
github.com/ameshkov/dnscrypt/v2 v2.1.3 | <mask> github.com/AdguardTeam/dnsproxy v0.35.5
<mask> github.com/AdguardTeam/golibs v0.4.5
<mask> github.com/AdguardTeam/urlfilter v0.14.4
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/go-ping/ping v0.0.0-20210216210419-25d1413fb7bb
<mask> github.com/gobuffalo/envy v1.9.0 // indirect
<mask> github.com/gobuffalo/packr v1.30.1
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.35.5
</s> add github.com/AdguardTeam/dnsproxy v0.37.1 </s> remove github.com/AdguardTeam/dnsproxy v0.35.5 h1:SsRF0eDzuLGaSUDKABIu9Mn1joi4v4kvEU1vju2DQPQ=
github.com/AdguardTeam/dnsproxy v0.35.5/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
</s> add github.com/AdguardTeam/dnsproxy v0.37.1 h1:vULyF1+xSI7vV99m8GD2hmOuCQrpu87awyeSe5qtFbA=
github.com/AdguardTeam/dnsproxy v0.37.1/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE= </s> remove github.com/lucas-clemente/quic-go v0.19.3
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
</s> add github.com/lucas-clemente/quic-go v0.20.1 </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.1/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
github.com/ameshkov/dnscrypt/v2 v2.0.3 h1:PE6VVc8QUMYJv9dTwcDcX5cYXf58XPi1WVPHrLf8MDs=
github.com/ameshkov/dnscrypt/v2 v2.0.3/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 h1:DG4Uf7LSDg6XDj9sp3maxh3Ur26jeGQaP5MeYosn6v0=
github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= </s> remove const currentSchemaVersion = 9
</s> add const currentSchemaVersion = 10 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.mod |
github.com/lucas-clemente/quic-go v0.20.1 | <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
<mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/karrick/godirwalk v1.16.1 // indirect
<mask> github.com/lucas-clemente/quic-go v0.19.3
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/netlink v1.4.0
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
<mask> github.com/miekg/dns v1.1.40
<mask> github.com/rogpeppe/go-internal v1.7.0 // indirect
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.3
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 </s> remove github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add </s> remove const currentSchemaVersion = 9
</s> add const currentSchemaVersion = 10 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.mod |
github.com/AdguardTeam/dnsproxy v0.37.1 h1:vULyF1+xSI7vV99m8GD2hmOuCQrpu87awyeSe5qtFbA=
github.com/AdguardTeam/dnsproxy v0.37.1/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE= | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.35.5 h1:SsRF0eDzuLGaSUDKABIu9Mn1joi4v4kvEU1vju2DQPQ=
<mask> github.com/AdguardTeam/dnsproxy v0.35.5/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
<mask> github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.35.5
</s> add github.com/AdguardTeam/dnsproxy v0.37.1 </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.3
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 </s> remove go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
</s> add github.com/lucas-clemente/quic-go v0.20.1 </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.1/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
github.com/ameshkov/dnscrypt/v2 v2.0.3 h1:PE6VVc8QUMYJv9dTwcDcX5cYXf58XPi1WVPHrLf8MDs=
github.com/ameshkov/dnscrypt/v2 v2.0.3/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 h1:DG4Uf7LSDg6XDj9sp3maxh3Ur26jeGQaP5MeYosn6v0=
github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
github.com/ameshkov/dnscrypt/v2 v2.1.3 h1:DG4Uf7LSDg6XDj9sp3maxh3Ur26jeGQaP5MeYosn6v0=
github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= | <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
<mask> github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.1/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.3 h1:PE6VVc8QUMYJv9dTwcDcX5cYXf58XPi1WVPHrLf8MDs=
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.3/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
<mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
<mask> github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.3
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 </s> remove github.com/AdguardTeam/dnsproxy v0.35.5
</s> add github.com/AdguardTeam/dnsproxy v0.37.1 </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ= | <mask> github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
<mask> github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
<mask> github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
<mask> github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
<mask> github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
<mask> github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
</s> add </s> remove rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= | <mask> github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg=
<mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
<mask> github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
<mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
<mask> github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
<mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
</s> add </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.3
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
<mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
<mask> github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
<mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
<mask> github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
<mask> github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
<mask> github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
<mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
<mask> github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
<mask> github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
<mask> github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
<mask> github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
<mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
<mask> github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
<mask> github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
<mask> github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
<mask> github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
<mask> github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
<mask> github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
<mask> github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
<mask> github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
<mask> github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= | <mask> github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
<mask> github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
<mask> github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
<mask> github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
<mask> github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
<mask> github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
</s> add </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= | <mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
<mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
<mask> github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
<mask> github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
<mask> github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
<mask> github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/lucas-clemente/quic-go v0.19.3
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
</s> add github.com/lucas-clemente/quic-go v0.20.1 </s> remove rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= | <mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
<mask> github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
<mask> github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/lucas-clemente/quic-go v0.19.3
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
</s> add github.com/lucas-clemente/quic-go v0.20.1 </s> remove github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
<mask> github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI=
<mask> github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI=
<mask> github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
<mask> github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
<mask> github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/lucas-clemente/quic-go v0.19.3
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
</s> add github.com/lucas-clemente/quic-go v0.20.1 </s> remove github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.1/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
github.com/ameshkov/dnscrypt/v2 v2.0.3 h1:PE6VVc8QUMYJv9dTwcDcX5cYXf58XPi1WVPHrLf8MDs=
github.com/ameshkov/dnscrypt/v2 v2.0.3/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 h1:DG4Uf7LSDg6XDj9sp3maxh3Ur26jeGQaP5MeYosn6v0=
github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= | <mask> github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
<mask> github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
</s> add github.com/lucas-clemente/quic-go v0.20.1 </s> remove github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.1/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
github.com/ameshkov/dnscrypt/v2 v2.0.3 h1:PE6VVc8QUMYJv9dTwcDcX5cYXf58XPi1WVPHrLf8MDs=
github.com/ameshkov/dnscrypt/v2 v2.0.3/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 h1:DG4Uf7LSDg6XDj9sp3maxh3Ur26jeGQaP5MeYosn6v0=
github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 h1:aFkJ6lx4FPip+S+Uw4aTegFMct9shDvP+79PsSxpm3w=
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
<mask> github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
<mask> github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
<mask> github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
<mask> github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA=
<mask> github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
<mask> github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
<mask> github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/lucas-clemente/quic-go v0.19.3
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
</s> add github.com/lucas-clemente/quic-go v0.20.1 </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
<mask> go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
<mask> go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
<mask> go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
<mask> go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
<mask> go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
<mask> go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
<mask> go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
<mask> go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
<mask> go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
<mask> golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
</s> add </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove github.com/ameshkov/dnscrypt/v2 v2.0.3
</s> add github.com/ameshkov/dnscrypt/v2 v2.1.3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | <mask> golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= </s> remove rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
</s> add </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201214095126-aec9a390925b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c=
<mask> golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove golang.org/x/sys v0.0.0-20201214095126-aec9a390925b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
<mask> golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
<mask> golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= | <mask> google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
<mask> google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
<mask> google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
<mask> google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
<mask> google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
<mask> google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
<mask> google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= | <mask> google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
<mask> google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
<mask> google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
<mask> google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
<mask> google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
<mask> google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
<mask> google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
<mask> google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum |
<mask> honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
<mask> howett.net/plist v0.0.0-20201203080718-1454fab16a06 h1:QDxUo/w2COstK1wIBYpzQlHX/NqaQTcf9jyz347nI58=
<mask> howett.net/plist v0.0.0-20201203080718-1454fab16a06/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
<mask> rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
<mask> rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
<mask> rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
<mask> sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
<mask> sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/lucas-clemente/quic-go v0.19.3 h1:eCDQqvGBB+kCTkA0XrAFtNe81FMa0/fn4QSoeAbmiF4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
</s> add github.com/lucas-clemente/quic-go v0.20.1 h1:hb5m76V8QS/8Nw/suHvXqo3BMHAozvIkcnzpJdpanSk=
github.com/lucas-clemente/quic-go v0.20.1/go.mod h1:fZq/HUDIM+mW6X6wtzORjC0E/WDBMKe5Hf9bgjISwLk= </s> remove github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | go.sum | |
cliSrvName = qs.ConnectionState().TLS.ServerName | <mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> cliSrvName = qs.ConnectionState().ServerName
<mask> }
<mask>
<mask> clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName, srvConf.StrictSNICheck)
<mask> if err != nil {
<mask> dctx.err = fmt.Errorf("client id check: %w", err)
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
</s> add return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal) </s> remove cs.ServerName = c.serverName
</s> add cs.TLS.ServerName = c.serverName </s> remove QUICListenAddrs: []*net.UDPAddr{{}},
</s> add QUICListenAddrs: []*net.UDPAddr{{IP: net.IP{127, 0, 0, 1}}}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/dnsforward/clientid.go |
cs.TLS.ServerName = c.serverName | <mask> }
<mask>
<mask> // ConnectionState implements the quicSession interface for testQUICSession.
<mask> func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
<mask> cs.ServerName = c.serverName
<mask>
<mask> return cs
<mask> }
<mask>
<mask> func TestProcessClientID(t *testing.T) {
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove QUICListenAddrs: []*net.UDPAddr{{}},
</s> add QUICListenAddrs: []*net.UDPAddr{{IP: net.IP{127, 0, 0, 1}}}, </s> remove cliSrvName = qs.ConnectionState().ServerName
</s> add cliSrvName = qs.ConnectionState().TLS.ServerName </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
</s> add return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/dnsforward/clientid_test.go |
QUICListenAddrs: []*net.UDPAddr{{IP: net.IP{127, 0, 0, 1}}}, | <mask> }
<mask>
<mask> func TestDoQServer(t *testing.T) {
<mask> s, _ := createTestTLS(t, TLSConfig{
<mask> QUICListenAddrs: []*net.UDPAddr{{}},
<mask> })
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> IPv4: map[string][]net.IP{
<mask> "google-public-dns-a.google.com.": {{8, 8, 8, 8}},
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove cs.ServerName = c.serverName
</s> add cs.TLS.ServerName = c.serverName </s> remove cliSrvName = qs.ConnectionState().ServerName
</s> add cliSrvName = qs.ConnectionState().TLS.ServerName </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
</s> add return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/dnsforward/dnsforward_test.go |
"net/url" | <mask> package home
<mask>
<mask> import (
<mask> "fmt"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
<mask> "runtime"
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.35.5
</s> add github.com/AdguardTeam/dnsproxy v0.37.1 </s> remove const currentSchemaVersion = 9
</s> add const currentSchemaVersion = 10 </s> remove github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/home/upgrade.go |
"strconv"
"strings" | <mask> "path/filepath"
<mask> "runtime"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/google/renameio/maybe"
<mask> "golang.org/x/crypto/bcrypt"
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/home/upgrade.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/google/renameio/maybe"
<mask> "golang.org/x/crypto/bcrypt"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove const currentSchemaVersion = 9
</s> add const currentSchemaVersion = 10 </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
</s> add </s> remove github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/home/upgrade.go |
const currentSchemaVersion = 10 | <mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> // currentSchemaVersion is the current schema version.
<mask> const currentSchemaVersion = 9
<mask>
<mask> // These aliases are provided for convenience.
<mask> type (
<mask> any = interface{}
<mask> yarr = []any
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove cs.ServerName = c.serverName
</s> add cs.TLS.ServerName = c.serverName </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove cliSrvName = qs.ConnectionState().ServerName
</s> add cliSrvName = qs.ConnectionState().TLS.ServerName </s> remove return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
</s> add return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/home/upgrade.go |
upgradeSchema9to10, | <mask> upgradeSchema7to8,
<mask> upgradeSchema8to9,
<mask> }
<mask>
<mask> n := 0
<mask> for i, u := range upgrades {
<mask> if i >= oldVersion {
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
</s> add return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal) </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove cliSrvName = qs.ConnectionState().ServerName
</s> add cliSrvName = qs.ConnectionState().TLS.ServerName </s> remove cs.ServerName = c.serverName
</s> add cs.TLS.ServerName = c.serverName </s> remove QUICListenAddrs: []*net.UDPAddr{{}},
</s> add QUICListenAddrs: []*net.UDPAddr{{IP: net.IP{127, 0, 0, 1}}}, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/home/upgrade.go |
return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal) | <mask>
<mask> bindHostVal := dns["bind_host"]
<mask> bindHost, ok := bindHostVal.(string)
<mask> if !ok {
<mask> return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
<mask> }
<mask>
<mask> delete(dns, "bind_host")
<mask> dns["bind_hosts"] = yarr{bindHost}
<mask>
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
</s> add return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) </s> remove cliSrvName = qs.ConnectionState().ServerName
</s> add cliSrvName = qs.ConnectionState().TLS.ServerName </s> remove cs.ServerName = c.serverName
</s> add cs.TLS.ServerName = c.serverName </s> remove QUICListenAddrs: []*net.UDPAddr{{}},
</s> add QUICListenAddrs: []*net.UDPAddr{{IP: net.IP{127, 0, 0, 1}}}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/home/upgrade.go |
return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal) | <mask> }
<mask>
<mask> autohostTLD, ok := autohostTLDVal.(string)
<mask> if !ok {
<mask> return fmt.Errorf("undexpected type of dns.autohost_tld: %T", autohostTLDVal)
<mask> }
<mask>
<mask> delete(dns, "autohost_tld")
<mask> dns["local_domain_name"] = autohostTLD
<mask>
</s> Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master
Closes #2843.
Squashed commit of the following:
commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:39:11 2021 +0300
all: fix docs
commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 19:25:24 2021 +0300
all: imp code, docs
commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 20 18:41:14 2021 +0300
all: upd dnsproxy </s> remove return fmt.Errorf("undexpected type of dns.bind_host: %T", bindHostVal)
</s> add return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal) </s> remove cliSrvName = qs.ConnectionState().ServerName
</s> add cliSrvName = qs.ConnectionState().TLS.ServerName </s> remove cs.ServerName = c.serverName
</s> add cs.TLS.ServerName = c.serverName </s> remove QUICListenAddrs: []*net.UDPAddr{{}},
</s> add QUICListenAddrs: []*net.UDPAddr{{IP: net.IP{127, 0, 0, 1}}}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c26675585dad6ea87ac794e08f6599d7d3c5ffc7 | internal/home/upgrade.go |
"github.com/AdguardTeam/AdGuardHome/util"
| <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
<mask> text := fmt.Sprintf(format, args...)
<mask> log.Info("DHCP: %s %s: %s", r.Method, r.URL, text)
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/dhcp_http.go |
ifaces, err := util.GetValidNetInterfaces() | <mask>
<mask> func (s *Server) handleDHCPInterfaces(w http.ResponseWriter, r *http.Request) {
<mask> response := map[string]interface{}{}
<mask>
<mask> ifaces, err := GetValidNetInterfaces()
<mask> if err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
<mask> return
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() </s> remove
ifaces, e := getValidNetInterfacesForWeb()
</s> add ifaces, e := util.GetValidNetInterfacesForWeb() </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add </s> remove err := configureSyslog()
</s> add err := util.ConfigureSyslog(serviceName) </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/dhcp_http.go |
staticIP["ip"] = util.GetSubnet(interfaceName) | <mask> staticIPStatus = "error"
<mask> staticIP["error"] = err.Error()
<mask> } else if !isStaticIP {
<mask> staticIPStatus = "no"
<mask> staticIP["ip"] = GetFullIP(interfaceName)
<mask> }
<mask> staticIP["static"] = staticIPStatus
<mask>
<mask> result := map[string]interface{}{}
<mask> result["other_server"] = othSrv
</s> +(dhcpd): added static IP for MacOS </s> remove respData.StaticIP.IP = dhcpd.GetFullIP(interfaceName)
</s> add respData.StaticIP.IP = util.GetSubnet(interfaceName) </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/dhcp_http.go |
"regexp" | <mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "os/exec"
<mask> "runtime"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/util"
<mask>
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go |
"github.com/AdguardTeam/AdGuardHome/util"
| <mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/golibs/file"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go |
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
<mask> // invalid interface is a ppp interface or the one that doesn't allow broadcasts
<mask> func GetValidNetInterfaces() ([]net.Interface, error) {
<mask> ifaces, err := net.Interfaces()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
<mask> }
<mask>
<mask> netIfaces := []net.Interface{}
<mask>
<mask> for i := range ifaces {
<mask> if ifaces[i].Flags&net.FlagPointToPoint != 0 {
<mask> // this interface is ppp, we're not interested in this one
<mask> continue
<mask> }
<mask>
<mask> iface := ifaces[i]
<mask> netIfaces = append(netIfaces, iface)
<mask> }
<mask>
<mask> return netIfaces, nil
<mask> }
<mask>
<mask> // Check if network interface has a static IP configured
<mask> // Supports: Raspbian.
<mask> func HasStaticIP(ifaceName string) (bool, error) {
<mask> if runtime.GOOS == "linux" {
<mask> body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
</s> +(dhcpd): added static IP for MacOS </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) </s> remove return nil
</s> add return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) </s> remove line := SplitNext(&data, '\n')
</s> add line := util.SplitNext(&data, '\n') | [
"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/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go | |
// Set a static IP for the specified network interface | <mask>
<mask> return false, fmt.Errorf("Cannot check if IP is static: not supported on %s", runtime.GOOS)
<mask> }
<mask>
<mask> // Get IP address with netmask
<mask> func GetFullIP(ifaceName string) string {
<mask> cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
<mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args)
<mask> d, err := cmd.Output()
<mask> if err != nil || cmd.ProcessState.ExitCode() != 0 {
<mask> return ""
<mask> }
<mask>
<mask> fields := strings.Fields(string(d))
<mask> if len(fields) < 4 {
<mask> return ""
<mask> }
<mask> _, _, err = net.ParseCIDR(fields[3])
<mask> if err != nil {
<mask> return ""
<mask> }
<mask>
<mask> return fields[3]
<mask> }
<mask>
<mask> // Set a static IP for network interface
<mask> // Supports: Raspbian.
<mask> func SetStaticIP(ifaceName string) error {
<mask> ip := GetFullIP(ifaceName)
<mask> if len(ip) == 0 {
<mask> return errors.New("Can't get IP address")
<mask> }
</s> +(dhcpd): added static IP for MacOS </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove return nil
</s> add return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) </s> remove ln := SplitNext(&data, '\n')
</s> add ln := util.SplitNext(&data, '\n') | [
"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/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go |
if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) | <mask>
<mask> // Set a static IP for network interface
<mask> // Supports: Raspbian.
<mask> func SetStaticIP(ifaceName string) error {
<mask> ip := GetFullIP(ifaceName)
<mask> if len(ip) == 0 {
<mask> return errors.New("Can't get IP address")
<mask> }
<mask>
<mask> ip4, _, err := net.ParseCIDR(ip)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> gatewayIP := getGatewayIP(ifaceName)
<mask> add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
<mask>
<mask> body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> body = append(body, []byte(add)...)
<mask> err = file.SafeWrite("/etc/dhcpcd.conf", body)
<mask> if err != nil {
</s> +(dhcpd): added static IP for MacOS </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove body = append(body, []byte(add)...)
err = file.SafeWrite("/etc/dhcpcd.conf", body)
if err != nil {
return err
</s> add if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) </s> remove func setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string { </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add </s> remove return nil
</s> add return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go |
if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> body = append(body, []byte(add)...)
<mask> err = file.SafeWrite("/etc/dhcpcd.conf", body)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove func setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string { </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go |
return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // for dhcpcd.conf
<mask> func hasStaticIPDhcpcdConf(dhcpConf, ifaceName string) bool {
<mask> lines := strings.Split(dhcpConf, "\n")
</s> +(dhcpd): added static IP for MacOS </s> remove func setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string { </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove body = append(body, []byte(add)...)
err = file.SafeWrite("/etc/dhcpcd.conf", body)
if err != nil {
return err
</s> add if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) </s> remove line := SplitNext(&data, '\n')
</s> add line := util.SplitNext(&data, '\n') | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go |
func updateStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string { | <mask> return fields[2]
<mask> }
<mask>
<mask> // for dhcpcd.conf
<mask> func setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
<mask> var body []byte
<mask>
<mask> add := fmt.Sprintf("\ninterface %s\nstatic ip_address=%s\n",
<mask> ifaceName, ip)
<mask> body = append(body, []byte(add)...)
</s> +(dhcpd): added static IP for MacOS </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove body = append(body, []byte(add)...)
err = file.SafeWrite("/etc/dhcpcd.conf", body)
if err != nil {
return err
</s> add if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) </s> remove return nil
</s> add return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils.go |
s := updateStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2") | <mask> static routers=192.168.0.1
<mask> static domain_name_servers=192.168.0.2
<mask>
<mask> `
<mask> s := setStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2")
<mask> assert.Equal(t, dhcpcdConf, s)
<mask>
<mask> // without gateway
<mask> dhcpcdConf = `
<mask> interface wlan0
</s> +(dhcpd): added static IP for MacOS </s> remove s = setStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2")
</s> add s = updateStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2") </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove return nil
</s> add return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils_test.go |
s = updateStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2") | <mask> static ip_address=192.168.0.2/24
<mask> static domain_name_servers=192.168.0.2
<mask>
<mask> `
<mask> s = setStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2")
<mask> assert.Equal(t, dhcpcdConf, s)
<mask> }
</s> +(dhcpd): added static IP for MacOS </s> remove s := setStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2")
</s> add s := updateStaticIPDhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2") </s> remove return nil
</s> add return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove respData.StaticIP.IP = dhcpd.GetFullIP(interfaceName)
</s> add respData.StaticIP.IP = util.GetSubnet(interfaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | dhcpd/network_utils_test.go |
"net" | <mask>
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "net/http"
<mask> "net/url"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/util"
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control.go |
"net/url"
"strconv"
"strings"
"github.com/AdguardTeam/AdGuardHome/util" | <mask> "net"
<mask> "net/http"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/NYTimes/gziphandler"
<mask> )
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control.go |
ifaces, e := util.GetValidNetInterfacesForWeb() | <mask> func getDNSAddresses() []string {
<mask> dnsAddresses := []string{}
<mask>
<mask> if config.DNS.BindHost == "0.0.0.0" {
<mask>
<mask> ifaces, e := getValidNetInterfacesForWeb()
<mask> if e != nil {
<mask> log.Error("Couldn't get network interfaces: %v", e)
<mask> return []string{}
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() </s> remove ifaces, err := GetValidNetInterfaces()
</s> add ifaces, err := util.GetValidNetInterfaces() </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control.go |
"github.com/AdguardTeam/AdGuardHome/util"
| <mask> "path/filepath"
<mask> "runtime"
<mask> "strconv"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> type firstRunData struct {
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
ifaces, err := util.GetValidNetInterfacesForWeb() | <mask> data := firstRunData{}
<mask> data.WebPort = 80
<mask> data.DNSPort = 53
<mask>
<mask> ifaces, err := getValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
<mask> return
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove ifaces, err := GetValidNetInterfaces()
</s> add ifaces, err := util.GetValidNetInterfaces() </s> remove
ifaces, e := getValidNetInterfacesForWeb()
</s> add ifaces, e := util.GetValidNetInterfacesForWeb() </s> remove err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) | <mask> return
<mask> }
<mask>
<mask> if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
<mask> err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
<mask> if err != nil {
<mask> respData.Web.Status = fmt.Sprintf("%v", err)
<mask> }
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) | <mask> }
<mask> }
<mask>
<mask> if reqData.DNS.Port != 0 {
<mask> err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask>
<mask> if errorIsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove if errorIsAddrInUse(err) {
</s> add if util.ErrorIsAddrInUse(err) { </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove setRlimit(config.RlimitNoFile)
</s> add util.SetRlimit(config.RlimitNoFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
if util.ErrorIsAddrInUse(err) { | <mask>
<mask> if reqData.DNS.Port != 0 {
<mask> err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask>
<mask> if errorIsAddrInUse(err) {
<mask> canAutofix := checkDNSStubListener()
<mask> if canAutofix && reqData.DNS.Autofix {
<mask>
<mask> err = disableDNSStubListener()
<mask> if err != nil {
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove setRlimit(config.RlimitNoFile)
</s> add util.SetRlimit(config.RlimitNoFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) | <mask> if err != nil {
<mask> log.Error("Couldn't disable DNSStubListener: %s", err)
<mask> }
<mask>
<mask> err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask> canAutofix = false
<mask> }
<mask>
<mask> respData.DNS.CanAutofix = canAutofix
<mask> }
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove if errorIsAddrInUse(err) {
</s> add if util.ErrorIsAddrInUse(err) { </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) | <mask> respData.DNS.CanAutofix = canAutofix
<mask> }
<mask>
<mask> if err == nil {
<mask> err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask> }
<mask>
<mask> if err != nil {
<mask> respData.DNS.Status = fmt.Sprintf("%v", err)
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove if errorIsAddrInUse(err) {
</s> add if util.ErrorIsAddrInUse(err) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) | <mask> if err != nil {
<mask> respData.DNS.Status = fmt.Sprintf("%v", err)
<mask>
<mask> } else {
<mask>
<mask> interfaceName := getInterfaceByIP(reqData.DNS.IP)
<mask> staticIPStatus := "yes"
<mask>
<mask> if len(interfaceName) == 0 {
<mask> staticIPStatus = "error"
<mask> respData.StaticIP.Error = fmt.Sprintf("Couldn't find network interface by IP %s", reqData.DNS.IP)
</s> +(dhcpd): added static IP for MacOS </s> remove respData.StaticIP.IP = dhcpd.GetFullIP(interfaceName)
</s> add respData.StaticIP.IP = util.GetSubnet(interfaceName) </s> remove staticIP["ip"] = GetFullIP(interfaceName)
</s> add staticIP["ip"] = util.GetSubnet(interfaceName) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
respData.StaticIP.IP = util.GetSubnet(interfaceName) | <mask> staticIPStatus = "error"
<mask> respData.StaticIP.Error = err.Error()
<mask> } else if !isStaticIP {
<mask> staticIPStatus = "no"
<mask> respData.StaticIP.IP = dhcpd.GetFullIP(interfaceName)
<mask> }
<mask> }
<mask> respData.StaticIP.Static = staticIPStatus
<mask> }
<mask> }
</s> +(dhcpd): added static IP for MacOS </s> remove staticIP["ip"] = GetFullIP(interfaceName)
</s> add staticIP["ip"] = util.GetSubnet(interfaceName) </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) | <mask> }
<mask>
<mask> // validate that hosts and ports are bindable
<mask> if restartHTTP {
<mask> err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Impossible to listen on IP:port %s due to %s",
<mask> net.JoinHostPort(newSettings.Web.IP, strconv.Itoa(newSettings.Web.Port)), err)
<mask> return
<mask> }
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | <mask> return
<mask> }
<mask> }
<mask>
<mask> err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) | <mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
<mask> err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_install.go |
"github.com/AdguardTeam/AdGuardHome/util"
| <mask> "reflect"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // Set certificate and private key data
<mask> func tlsLoadConfig(tls *tlsConfig, status *tlsConfigStatus) bool {
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_tls.go |
err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) | <mask> if Context.httpsServer.server != nil {
<mask> alreadyRunning = true
<mask> }
<mask> if !alreadyRunning {
<mask> err = checkPortAvailable(config.BindHost, data.PortHTTPS)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "port %d is not available, cannot enable HTTPS on it", data.PortHTTPS)
<mask> return
<mask> }
<mask> }
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove Context.httpServer.Shutdown(context.TODO())
</s> add _ = Context.httpServer.Shutdown(context.TODO()) </s> remove Context.httpsServer.server.Shutdown(context.TODO())
</s> add _ = Context.httpsServer.server.Shutdown(context.TODO()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_tls.go |
err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) | <mask> if Context.httpsServer.server != nil {
<mask> alreadyRunning = true
<mask> }
<mask> if !alreadyRunning {
<mask> err = checkPortAvailable(config.BindHost, data.PortHTTPS)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "port %d is not available, cannot enable HTTPS on it", data.PortHTTPS)
<mask> return
<mask> }
<mask> }
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_tls.go |
"github.com/AdguardTeam/AdGuardHome/util"
| <mask> "strings"
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // Convert version.json data to our JSON response
<mask> func getVersionResp(data []byte) []byte {
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_update.go |
if !util.FileExists(u.curBinName) { | <mask> if runtime.GOOS == "windows" {
<mask> binName = "AdGuardHome.exe"
<mask> }
<mask> u.curBinName = filepath.Join(workDir, binName)
<mask> if !fileExists(u.curBinName) {
<mask> return nil, fmt.Errorf("Executable file %s doesn't exist", u.curBinName)
<mask> }
<mask> u.bkpBinName = filepath.Join(u.backupDir, binName)
<mask> u.newBinName = filepath.Join(u.updateDir, "AdGuardHome", binName)
<mask> if strings.HasSuffix(pkgFileName, ".zip") {
</s> +(dhcpd): added static IP for MacOS </s> remove body = append(body, []byte(add)...)
err = file.SafeWrite("/etc/dhcpcd.conf", body)
if err != nil {
return err
</s> add if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove setRlimit(config.RlimitNoFile)
</s> add util.SetRlimit(config.RlimitNoFile) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/control_update.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.