docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> return
<mask> }
<mask>
<mask> h.ServeHTTP(w, r)
<mask> })
<mask> }
<mask>
<mask> // wrapIndexBeta returns handler that deals with new client.
<mask> func (web *Web) wrapIndexBeta(http.Handler) (wrapped http.Handler) {
</s> Pull request: replace agherr with golibs' errors
Merge in DN... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/middlewares.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "encoding/binary"
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> Pull req... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/rdns.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // workerLoop handles incoming IP addresses from ipChan and adds it into
<mask> // clients.
<mask> func (r *RDNS) workerLoop() {
<mask> defer agherr.LogPanic("rdns")
<mask>
<mask> for ip := range r.ipCh {
<mask> host, err := r.exchanger.Exchange(ip)
<mask> if err != nil {
<mask> log.D... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/rdns.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> import (
<mask> "bytes"
<mask> "encoding/binary"
<mask> "errors"
<mask> "net"
<mask> "sync"
<mask> "testing"
<mask> "time"
<mask>
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
commit 5ab... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/rdns_test.go |
keep keep add keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
</s> Pull reque... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/rdns_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "2a00:1450:400c:c06::93": {"ipv6.domain"},
<mask> },
<mask> }
<mask> errUpstream := &aghtest.TestErrUpstream{
<mask> Err: errors.New("1234"),
<mask> }
<mask>
<mask> testCases := []struct {
<mask> ups upstream.Upstream
<mask> wantLog string
</s> Pull request: replace agherr with gol... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/rdns_test.go |
keep keep keep replace keep keep keep keep keep | <mask> package home
<mask>
<mask> import (
<mask> "errors"
<mask> "fmt"
<mask> "io/fs"
<mask> "os"
<mask> "runtime"
<mask> "strconv"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
commit 5aba278a31c5a213b... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/service.go |
keep add keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/kardianos/service"
<mask> )
<mask>
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "crypto/x509"
<mask> "encoding/base64"
<mask> "encoding/json"
<mask> "encoding/pem"
<mask> "errors"
<mask> "fmt"
<mask> "net/http"
<mask> "os"
<mask> "path/filepath"
<mask> "reflect"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep add keep keep keep keep keep keep | <mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "golang.org/x/sys/cpu"
<mask> )
<mask>
<mask> var tlsWebHandlersRegistered = false
<mask>
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> for _, cert := range certs {
<mask> parsed, err := x509.ParseCertificate(cert.Bytes)
<mask> if err != nil {
<mask> data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
<mask> return errors.New(data.WarningValidation)
<mask> }
<mask> parsedCerts = append(parsedCerts, ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if len(parsedCerts) == 0 {
<mask> data.WarningValidation = "You have specified an empty certificate"
<mask> return errors.New(data.WarningValidation)
<mask> }
<mask>
<mask> data.ValidCert = true
<mask>
<mask> // spew.Dump(parsedCerts)
</s> Pull request: replace agherr with ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if key == nil {
<mask> data.WarningValidation = "No valid keys were found"
<mask> return errors.New(data.WarningValidation)
<mask> }
<mask>
<mask> // parse the decoded key
<mask> _, keytype, err := parsePrivateKey(key.Bytes)
<mask> if err != nil {
</s> Pull request: replace... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // parse the decoded key
<mask> _, keytype, err := parsePrivateKey(key.Bytes)
<mask> if err != nil {
<mask> data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err)
<mask> return errors.New(data.WarningValidation)
<mask> }
<mask>
<mask> data.ValidKey = true
<mask> data.Key... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return key, "RSA", nil
<mask> case *ecdsa.PrivateKey:
<mask> return key, "ECDSA", nil
<mask> default:
<mask> return nil, "", errors.New("tls: found unknown private key type in PKCS#8 wrapping")
<mask> }
<mask> }
<mask>
<mask> if key, err := x509.ParseECPrivateKey(der); err == nil {
<m... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if key, err := x509.ParseECPrivateKey(der); err == nil {
<mask> return key, "ECDSA", nil
<mask> }
<mask>
<mask> return nil, "", errors.New("tls: failed to parse private key")
<mask> }
<mask>
<mask> // unmarshalTLS handles base64-encoded certificates transparently
<mask> func unmarshalTLS(r *http.... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/tls.go |
keep keep keep replace keep keep keep keep keep | <mask> package home
<mask>
<mask> import (
<mask> "errors"
<mask> "fmt"
<mask> "net/url"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
commit 5aba278a31c5... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/upgrade.go |
keep add keep keep keep keep keep | <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"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-ho... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/upgrade.go |
keep keep keep add keep keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> const (
<mask> defaultServer = "whois.arin.net"
</s> Pull request: replace agherr with golibs' errors
Merge in... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/whois.go |
keep keep keep keep replace keep keep keep keep keep | <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(ctx context.Context, target, serverAddr string) (string, error) {
<mask> addr, _, _ := net.Spli... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/whois.go |
keep keep keep replace keep keep keep keep keep keep keep replace keep keep keep | <mask> if err != nil {
<mask> return "", err
<mask> }
<mask> defer conn.Close()
<mask>
<mask> connReadCloser, err := aghio.LimitReadCloser(conn, MaxConnReadSize)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask> defer conn.Close()
<mask>
<mask> connReadCloser, err := aghio.LimitRead... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/whois.go |
keep keep keep keep replace keep keep keep keep keep | <mask> connReadCloser, err := aghio.LimitReadCloser(conn, MaxConnReadSize)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask> defer connReadCloser.Close()
<mask>
<mask> _ = conn.SetReadDeadline(time.Now().Add(time.Duration(w.timeoutMsec) * time.Millisecond))
<mask> _, err = conn.Write([]byte(... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/whois.go |
keep keep keep replace keep keep keep keep replace keep | <mask> }
<mask>
<mask> // This use of ReadAll is now safe, because we limited the conn Reader.
<mask> data, err := io.ReadAll(connReadCloser)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> return string(data), nil
<mask> }
</s> Pull request: replace agherr with golibs' errors
... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/home/whois.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Package querylog provides query log functions and interfaces.
<mask> package querylog
<mask>
<mask> import (
<mask> "errors"
<mask> "fmt"
<mask> "net"
<mask> "os"
<mask> "strings"
<mask> "sync"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-error... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlog.go |
keep keep add keep keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squash... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlog.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // Timestamp not found errors.
<mask> const (
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-ho... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlogfile.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> )
<mask>
<mask> // Timestamp not found errors.
<mask> const (
<mask> ErrTSNotFound agherr.Error = "ts not found"
<mask> ErrTSTooLate agherr.Error = "ts too late"
<mask> ErrTSTooEarly agherr.Error = "ts too early"
<mask> )
<mask>
<mask> // TODO: Find a way to grow buffer instead of relying on this... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlogfile.go |
keep keep keep keep replace keep keep keep keep keep | <mask> package querylog
<mask>
<mask> import (
<mask> "encoding/binary"
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "math"
<mask> "net"
<mask> "os"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
com... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlogfile_test.go |
keep add keep keep keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // prepareTestFile prepares one test query log file with the specified lines
<mask> // count.
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-hom... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlogfile_test.go |
keep replace keep keep keep keep replace keep | <mask> import (
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "os"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commi... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlogreader.go |
keep keep keep keep replace keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> if len(errs) > 0 {
<mask> return agherr.Many("Error while closing QLogReader", errs...)
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the fol... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/qlogreader.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "net/http"
<mask> "path/filepath"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
</s> Pull request: replace... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylog.go |
keep keep add keep keep keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // QueryLog - main interface
<mask> type QueryLog interface {
</s> Pull request: replace agherr with golibs' errors
Merge i... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylog.go |
keep keep replace keep replace keep keep keep keep | <mask> switch {
<mask> case p.Question == nil:
<mask> return agherr.Error("question is nil")
<mask> case len(p.Question.Question) != 1:
<mask> return agherr.Error("more than one question")
<mask> case len(p.Question.Question[0].Name) == 0:
<mask> return agherr.Error("no host in question")
<mask> case... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylog.go |
keep replace keep replace keep keep keep keep | <mask> case len(p.Question.Question[0].Name) == 0:
<mask> return agherr.Error("no host in question")
<mask> case p.ClientIP == nil:
<mask> return agherr.Error("no client ip")
<mask> default:
<mask> return nil
<mask> }
<mask> }
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguar... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylog.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> import (
<mask> "bytes"
<mask> "encoding/json"
<mask> "errors"
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the follo... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylogfile.go |
keep add keep keep keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // flushLogBuffer flushes the current buffer to file and resets the current buffer
<mask> func (l *queryLog) flushLogBuffer(fullFlush bool) error {
<mask> if !l.conf.FileEnabled {
</s> Pull request: replace agherr with ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylogfile.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> // flushToFile saves the specified log entries to the query log file
<mask> func (l *queryLog) flushToFile(buffer []*logEntry) error {
<mask> if len(buffer) == 0 {
<mask> log.Debug("querylog: there's nothing to write to a file")
<mask> return nil
<mask> }
<mask... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylogfile.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> var b bytes.Buffer
<mask> e := json.NewEncoder(&b)
<mask> for _, entry := range buffer {
<mask> err := e.Encode(entry)
<mask> if err != nil {
<mask> log.Error("Failed to marshal entry: %s", err)
<mask> return err
<mask> }
<mask> }
</s> Pull request: replace agherr with golibs' ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylogfile.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> elapsed := time.Since(start)
<mask> log.Debug("%d elements serialized via json in %v: %d kB, %v/entry, %v/entry", len(buffer), elapsed, b.Len()/1024, float64(b.Len())/float64(len(buffer)), elapsed/time.Duration(len(buffer)))
<mask>
<mask> var err error
<mask> var zb bytes.Buffer
<mask> filen... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylogfile.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> log.Error("failed to create file \"%s\": %s", filename, err)
<mask> return err
<mask> }
<mask> defer f.Close()
<mask>
<mask> n, err := f.Write(zb.Bytes())
<mask> if err != nil {
<mask> log.Error("Couldn't write to file: %s", err)
<mask> return err
</s> Pull request... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylogfile.go |
keep keep keep keep replace keep keep keep keep keep | <mask> f, err := os.Open(l.logFile)
<mask> if err != nil {
<mask> return -1
<mask> }
<mask> defer f.Close()
<mask>
<mask> buf := make([]byte, 500)
<mask> r, err := f.Read(buf)
<mask> if err != nil {
<mask> return -1
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/querylogfile.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Error("querylog: failed to open qlog reader: %s", err)
<mask>
<mask> return entries, oldest, 0
<mask> }
<mask> defer r.Close()
<mask>
<mask> if params.olderThan.IsZero() {
<mask> err = r.SeekStart()
<mask> } else {
<mask> err = r.SeekTS(params.olderThan.UnixNano())
</s> Pull request:... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/querylog/search.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "bytes"
<mask> "encoding/binary"
<mask> "encoding/gob"
<mask> "errors"
<mask> "fmt"
<mask> "net"
<mask> "os"
<mask> "sort"
<mask> "sync"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the follow... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/stats/unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "sort"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> bolt "go.etcd.io/bbolt"
<mask> )
<mask>
<mask> // TODO(a.garipov): Rewrite all of this. Add proper error handling and
</s> Pull request: repl... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/stats/unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> unitDel := 0
<mask>
<mask> // TODO(a.garipov): See if this is actually necessary. Looks
<mask> // like a rather bizarre solution.
<mask> errStop := agherr.Error("stop iteration")
<mask> forEachBkt := func(name []byte, _ *bolt.Bucket) (cberr error) {
<mask> nameID := uint32(btoi(name))
<mas... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/stats/unit.go |
keep keep keep add keep keep keep keep keep | <mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "io"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> "github.com/AdguardTeam/golibs/errors"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-er... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/check.go |
keep keep add keep keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> )
<mask>
<mask> // TODO(a.garipov): Make configurable.
<mask> const versionCheckPeriod = 8 * time.Hour
<mask>
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/check.go |
keep keep keep keep replace keep keep keep keep keep | <mask> const MaxResponseSize = 64 * 1024
<mask>
<mask> // VersionInfo downloads the latest version information. If forceRecheck is
<mask> // false and there are cached results, those results are returned.
<mask> func (u *Updater) VersionInfo(forceRecheck bool) (VersionInfo, error) {
<mask> u.mu.Lock()
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/check.go |
keep add keep keep keep keep | <mask> }
<mask>
<mask> vcu := u.versionCheckURL
<mask> resp, err = u.client.Get(vcu)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", vcu, err)
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/check.go |
keep replace keep keep keep replace | <mask> vcu := u.versionCheckURL
<mask> resp, err := u.client.Get(vcu)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", vcu, err)
<mask> }
<mask> defer resp.Body.Close()
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-er... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/check.go |
keep replace keep keep keep replace | <mask>
<mask> resp.Body, err = aghio.LimitReadCloser(resp.Body, MaxResponseSize)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: LimitReadCloser: %w", err)
<mask> }
<mask> defer resp.Body.Close()
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/check.go |
keep keep keep keep replace keep keep keep keep keep | <mask> defer resp.Body.Close()
<mask>
<mask> // This use of ReadAll is safe, because we just limited the appropriate
<mask> // ReadCloser.
<mask> body, err := io.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", vcu, err)
<mask> }
<mask>
<m... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/check.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "archive/tar"
<mask> "archive/zip"
<mask> "compress/gzip"
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of t... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep add keep keep keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // Updater is the AdGuard Home updater.
<mask> type Updater struct {
<mask> client *http.Client
</s> Pull reque... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep replace replace keep keep keep replace keep keep keep keep | <mask> const MaxPackageFileSize = 32 * 1024 * 1024
<mask>
<mask> // Download package file and save it to disk
<mask> func (u *Updater) downloadPackageFile(url, filename string) error {
<mask> resp, err := u.client.Get(url)
<mask> if err != nil {
<mask> return fmt.Errorf("http request failed: %w", err)
<mas... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep replace keep keep keep replace keep keep keep | <mask>
<mask> resp.Body, err = aghio.LimitReadCloser(resp.Body, MaxPackageFileSize)
<mask> if err != nil {
<mask> return fmt.Errorf("http request failed: %w", err)
<mask> }
<mask> defer resp.Body.Close()
<mask>
<mask> log.Debug("updater: reading HTTP body")
<mask> // This use of ReadAll is now safe, ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep keep replace keep keep keep keep keep | <mask> defer resp.Body.Close()
<mask>
<mask> log.Debug("updater: reading HTTP body")
<mask> // This use of ReadAll is now safe, because we limited body's Reader.
<mask> body, err := io.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return fmt.Errorf("io.ReadAll() failed: %w", err)
<mask> }
<mask>
... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep replace keep replace keep | <mask> // Existing files are overwritten
<mask> // All files are created inside 'outdir', subdirectories are not created
<mask> // Return the list of files (not directories) written
<mask> func tarGzFileUnpack(tarfile, outdir string) ([]string, error) {
<mask> f, err := os.Open(tarfile)
</s> Pull request: replac... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> f, err := os.Open(tarfile)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("os.Open(): %w", err)
<mask> }
<mask> defer func() {
<mask> _ = f.Close()
<mask> }()
<mask>
<mask> gzReader, err := gzip.NewReader(f)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("gzip.NewReader(): %w... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep add keep keep keep keep keep | <mask> if err != nil {
<mask> return nil, fmt.Errorf("gzip.NewReader(): %w", err)
<mask> }
<mask>
<mask> tarReader := tar.NewReader(gzReader)
<mask> for {
<mask> var hdr *tar.Header
<mask> hdr, err = tarReader.Next()
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home fr... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep replace replace keep keep replace replace replace replace replace replace replace replace keep keep | <mask>
<mask> var files []string
<mask> var err2 error
<mask> tarReader := tar.NewReader(gzReader)
<mask> for {
<mask> var header *tar.Header
<mask> header, err = tarReader.Next()
<mask> if err == io.EOF {
<mask> err2 = nil
<mask> break
<mask> }
<mask> if err != nil {
<mask> err2 = ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep replace keep replace replace replace keep keep | <mask> break
<mask> }
<mask>
<mask> _, inputNameOnly := filepath.Split(header.Name)
<mask> if inputNameOnly == "" {
<mask> continue
<mask> }
<mask>
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
c... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep keep replace keep replace replace replace replace replace replace replace replace replace replace keep keep | <mask> if inputNameOnly == "" {
<mask> continue
<mask> }
<mask>
<mask> outputName := filepath.Join(outdir, inputNameOnly)
<mask>
<mask> if header.Typeflag == tar.TypeDir {
<mask> if inputNameOnly == "AdGuardHome" {
<mask> // Top-level AdGuardHome/. Skip it.
<mask> //
<mask> // TO... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep replace replace replace keep replace replace keep | <mask> continue
<mask> }
<mask>
<mask> err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777))
<mask> if err != nil && !errors.Is(err, os.ErrExist) {
<mask> err2 = fmt.Errorf("os.Mkdir(%q): %w", outputName, err)
<mask>
<mask> break
<mask> }
<mask>
</s> Pull request: replace aghe... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep replace keep replace replace replace replace | <mask>
<mask> log.Debug("updater: created directory %q", outputName)
<mask>
<mask> continue
<mask> } else if header.Typeflag != tar.TypeReg {
<mask> log.Debug("updater: %s: unknown file type %d, skipping", inputNameOnly, header.Typeflag)
<mask> continue
</s> Pull request: replace agherr with gol... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace replace keep keep keep | <mask> log.Debug("updater: %s: unknown file type %d, skipping", inputNameOnly, header.Typeflag)
<mask> continue
<mask> }
<mask>
<mask> var f io.WriteCloser
<mask> f, err = os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777))
<mask> if err != nil {
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep keep replace replace keep keep keep keep replace keep keep keep keep | <mask> log.Debug("updater: created file %s", outputName)
<mask> files = append(files, header.Name)
<mask> }
<mask>
<mask> _ = gzReader.Close()
<mask> return files, err2
<mask> }
<mask>
<mask> // Unpack all files from .zip file to the specified directory
<mask> // Existing files are overwritten
<mask... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep replace replace keep keep keep replace | <mask> // Existing files are overwritten
<mask> // All files are created inside 'outdir', subdirectories are not created
<mask> // Return the list of files (not directories) written
<mask> func zipFileUnpack(zipfile, outdir string) ([]string, error) {
<mask> r, err := zip.OpenReader(zipfile)
<mask> if err != ni... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep replace replace replace replace replace keep replace | <mask>
<mask> var files []string
<mask> var err2 error
<mask> var zr io.ReadCloser
<mask> for _, zf := range r.File {
<mask> zr, err = zf.Open()
<mask> if err != nil {
<mask> err2 = fmt.Errorf("zip file Open(): %w", err)
</s> Pull request: replace agherr with golibs' errors
Merge in DNS/adguard-ho... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace rep... | <mask>
<mask> fi := zf.FileInfo()
<mask> inputNameOnly := fi.Name()
<mask> if inputNameOnly == "" {
<mask> continue
<mask> }
<mask>
<mask> outputName := filepath.Join(outdir, inputNameOnly)
<mask>
<mask> if fi.IsDir() {
<mask> if inputNameOnly == "AdGuardHome" {
<mask> // Top-level ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> log.Tracef("created file %s", outputName)
<mask> files = append(files, inputNameOnly)
<mask> }
<mask>
<mask> _ = zr.Close()
<mask> return files, err2
<mask> }
<mask>
<mask> // Copy file on disk
<mask> func copyFile(src, dst string) error {
<mask> d, e := os.ReadFile(src)
</s> Pull request: ... | https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38 | internal/updater/updater.go |
keep keep add keep keep keep keep keep | <mask> log.Fatal(err)
<mask> }
<mask>
<mask> URL := fmt.Sprintf("http://%s", address)
<mask> log.Println("Go to " + URL)
<mask> log.Fatal(http.ListenAndServe(address, nil))
<mask> }
<mask>
</s> Start DHCP on launch if it's enabled in config. </s> remove // implement
</s> add </s> add "github.com/joo... | https://github.com/AdguardTeam/AdGuardHome/commit/03effab345e2bc9e77926a64acd426f71b5004cd | app.go |
keep keep keep add keep keep keep keep | <mask> "net"
<mask> "net/http"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> )
<mask>
<mask> var dhcpServer = dhcpd.Server{}
<mask>
</s> Start DHCP on launch if it's enabled in config. </s> add err = startDHCPServer()
if err != nil {
log.Fatal(err)
}
</s> remove // implement
</s>... | https://github.com/AdguardTeam/AdGuardHome/commit/03effab345e2bc9e77926a64acd426f71b5004cd | dhcp.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return
<mask> }
<mask> }
<mask>
<mask> // implement
<mask> func handleDHCPFindActiveServer(w http.ResponseWriter, r *http.Request) {
<mask> found, err := dhcpd.CheckIfOtherDHCPServersPresent(config.DHCP.InterfaceName)
<mask> result := map[string]interface{}{}
<mask> if err != nil {
<mask> resu... | https://github.com/AdguardTeam/AdGuardHome/commit/03effab345e2bc9e77926a64acd426f71b5004cd | dhcp.go |
replace replace replace replace replace replace replace replace | <mask> coverage:
<mask> status:
<mask> project:
<mask> default:
<mask> target: 40%
<mask> threshold: null
<mask> patch: false
<mask> changes: false
</s> Pull request: all: reformat yaml, add yaml formatting standard
Merge in DNS/adguard-home from 2297-yaml to master
Closes... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .codecov.yml |
replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep replace replace | <mask> # Number of days of inactivity before an issue becomes stale
<mask> daysUntilStale: 60
<mask> # Number of days of inactivity before a stale issue is closed
<mask> daysUntilClose: 7
<mask> # Issues with these labels will never be considered stale
<mask> exemptLabels:
<mask> - 'bug'
<mask> - 'enhanceme... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .github/stale.yml |
replace keep replace replace replace keep keep keep keep keep | <mask> name: build
<mask>
<mask> env:
<mask> GO_VERSION: 1.14
<mask> NODE_VERSION: 13
<mask>
<mask> on:
<mask> push:
<mask> branches:
<mask> - '*'
</s> Pull request: all: reformat yaml, add yaml formatting standard
Merge in DNS/adguard-home from 2297-yaml to master
Closes #2297.
Squashed... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .github/workflows/build.yml |
keep keep keep replace replace replace replace replace replace replace keep replace | <mask> GO_VERSION: 1.14
<mask> NODE_VERSION: 13
<mask>
<mask> on:
<mask> push:
<mask> branches:
<mask> - '*'
<mask> tags:
<mask> - v*
<mask> pull_request:
<mask>
<mask> jobs:
</s> Pull request: all: reformat yaml, add yaml formatting standard
Merge in DNS/adguard-home from 22... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .github/workflows/build.yml |
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 replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace... | <mask> pull_request:
<mask>
<mask> jobs:
<mask>
<mask> test:
<mask> runs-on: ${{ matrix.os }}
<mask> env:
<mask> GO111MODULE: on
<mask> GOPROXY: https://goproxy.io
<mask> strategy:
<mask> fail-fast: false
<mask> matrix:
<mask> os:
<mask> - ubuntu... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .github/workflows/build.yml |
replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace ... | <mask> name: golangci-lint
<mask> on:
<mask> push:
<mask> tags:
<mask> - v*
<mask> branches:
<mask> - '*'
<mask> pull_request:
<mask> jobs:
<mask> golangci:
<mask> runs-on: ubuntu-latest
<mask> steps:
<mask> - uses: actions/checkout@v2
<mask> - name: golangci-... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .github/workflows/lint.yml |
keep replace keep replace keep keep keep keep | <mask> # options for analysis running
<mask> run:
<mask> # default concurrency is a available CPU number
<mask> concurrency: 4
<mask>
<mask> # timeout for analysis, e.g. 30s, 5m, default is 1m
<mask> deadline: 2m
<mask>
</s> Pull request: all: reformat yaml, add yaml formatting standard
Merge in DNS... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .golangci.yml |
keep keep keep keep replace keep keep keep keep keep | <mask> # default concurrency is a available CPU number
<mask> concurrency: 4
<mask>
<mask> # timeout for analysis, e.g. 30s, 5m, default is 1m
<mask> deadline: 2m
<mask>
<mask> # which files to skip: they will be analyzed, but issues from them
<mask> # won't be reported. Default value is empty lis... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .golangci.yml |
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep replace replace keep keep keep | <mask> # which files to skip: they will be analyzed, but issues from them
<mask> # won't be reported. Default value is empty list, but there is
<mask> # no need to include all autogenerated files, we confidently recognize
<mask> # autogenerated files. If it's not please let us know.
<mask> skip-files:
<... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .golangci.yml |
keep keep keep keep replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask> errcheck:
<mask> # [deprecated] comma-separated list of pairs of the form pkg:regex
<mask> # the regex is used to ignore names within pkg. (default "fmt:.*").
<mask> # see https://github.com/kisielk/errcheck#the-deprecated-method for details
<mask> ignore: fmt:.*,net:SetReadDeadline,net/ht... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .golangci.yml |
keep keep keep keep replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask> - unconvert
<mask> disable-all: true
<mask> fast: true
<mask>
<mask> issues:
<mask> # List of regexps of issue texts to exclude, empty list by default.
<mask> # But independently from this option we use default exclude patterns,
<mask> # it can be disabled by `exclude-use-default: false`. ... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .golangci.yml |
replace keep replace replace replace keep keep keep keep keep | <mask> project_name: AdGuardHome
<mask>
<mask> env:
<mask> - GO111MODULE=on
<mask> - GOPROXY=https://goproxy.io
<mask>
<mask> before:
<mask> hooks:
<mask> - go mod download
<mask> - go generate ./...
</s> Pull request: all: reformat yaml, add yaml formatting standard
Merge in DNS/adguard-hom... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .goreleaser.yml |
keep keep keep replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask> - GO111MODULE=on
<mask> - GOPROXY=https://goproxy.io
<mask>
<mask> before:
<mask> hooks:
<mask> - go mod download
<mask> - go generate ./...
<mask>
<mask> builds:
<mask> - main: ./main.go
<mask> ldflags:
<mask> - -s -w -X main.version={{.Version}} -X main.channel={{.Env.CH... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .goreleaser.yml |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask> - goos: freebsd
<mask> goarch: mipsle
<mask>
<mask> archives:
<mask> - # Archive name template.
<mask> # Defaults:
<mask> # - if format is `tar.gz`, `tar.xz`, `gz` or `zip`:
<mask> # - `{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .goreleaser.yml |
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 replace replace replace replace replace replace replace replace replace replace replace keep replace replace | <mask> AdGuard Home is a network-wide software for blocking ads & tracking. After
<mask> you set it up, it'll cover ALL your home devices, and you don't need any
<mask> client-side software for that.
<mask>
<mask> It operates as a DNS server that re-routes tracking domains to a "black hole... | https://github.com/AdguardTeam/AdGuardHome/commit/046ec13fdc5ec008fd4ac9b77cc943a96be2605c | .goreleaser.yml |
keep keep add keep keep keep keep keep keep | <mask> SafeSearchEnabled bool
<mask> SafeBrowsingEnabled bool
<mask> ParentalEnabled bool
<mask> }
<mask>
<mask> type clientJSON struct {
<mask> IP string `json:"ip"`
<mask> MAC string `json:"mac"`
<mask> Name string `json:"name"`
</s> + clients: ad... | https://github.com/AdguardTeam/AdGuardHome/commit/04a477c14a1eeea6426c07d5ae0434afe0b6b398 | home/clients.go |
keep keep add keep keep keep keep keep | <mask> ParentalEnabled bool `json:"parental_enabled"`
<mask> SafeSearchEnabled bool `json:"safebrowsing_enabled"`
<mask> SafeBrowsingEnabled bool `json:"safesearch_enabled"`
<mask> }
<mask>
<mask> type clientSource uint
<mask>
<mask> const (
</s> + clients: add BlockedServices field </s> add ... | https://github.com/AdguardTeam/AdGuardHome/commit/04a477c14a1eeea6426c07d5ae0434afe0b6b398 | home/clients.go |
keep keep keep add keep keep keep keep | <mask> FilteringEnabled: c.FilteringEnabled,
<mask> ParentalEnabled: c.ParentalEnabled,
<mask> SafeSearchEnabled: c.SafeSearchEnabled,
<mask> SafeBrowsingEnabled: c.SafeBrowsingEnabled,
<mask> }
<mask>
<mask> if len(c.MAC) != 0 {
<mask> hwAddr, _ := net.ParseMAC(c.MAC)
</s> + clien... | https://github.com/AdguardTeam/AdGuardHome/commit/04a477c14a1eeea6426c07d5ae0434afe0b6b398 | home/clients.go |
keep keep keep add keep keep keep keep | <mask> FilteringEnabled: cj.FilteringEnabled,
<mask> ParentalEnabled: cj.ParentalEnabled,
<mask> SafeSearchEnabled: cj.SafeSearchEnabled,
<mask> SafeBrowsingEnabled: cj.SafeBrowsingEnabled,
<mask> }
<mask> return &c, nil
<mask> }
<mask>
</s> + clients: add BlockedServices field </s> add Us... | https://github.com/AdguardTeam/AdGuardHome/commit/04a477c14a1eeea6426c07d5ae0434afe0b6b398 | home/clients.go |
keep keep add keep keep keep keep keep keep | <mask> "bytes"
<mask> "fmt"
<mask> "net"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "golang.org/x/exp/slices"
<mask> )
<mask>
</s> Pull request: 5035-netip-arp-hosts
Updates #5035.
Squashed commit of the following:
commit d1c4493ee4e28d05670c20532ebae1aa809d18da
Autho... | https://github.com/AdguardTeam/AdGuardHome/commit/04c8e3b2886bb02866ace61f796733c82b3e9aca | internal/aghnet/arpdb.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // implementation of ARP is able to retrieve that.
<mask> Name string
<mask>
<mask> // IP contains either IPv4 or IPv6.
<mask> IP net.IP
<mask>
<mask> // MAC contains the hardware address.
<mask> MAC net.HardwareAddr
<mask> }
<mask>
</s> Pull request: 5035-netip-arp-hosts
Updates #5035.
Squ... | https://github.com/AdguardTeam/AdGuardHome/commit/04c8e3b2886bb02866ace61f796733c82b3e9aca | internal/aghnet/arpdb.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Clone returns the deep copy of n.
<mask> func (n Neighbor) Clone() (clone Neighbor) {
<mask> return Neighbor{
<mask> Name: n.Name,
<mask> IP: slices.Clone(n.IP),
<mask> MAC: slices.Clone(n.MAC),
<mask> }
<mask> }
<mask>
<mask> // neighs is the helper type that stores neighbors to avoid c... | https://github.com/AdguardTeam/AdGuardHome/commit/04c8e3b2886bb02866ace61f796733c82b3e9aca | internal/aghnet/arpdb.go |
keep add keep keep keep keep keep keep | <mask> "bufio"
<mask> "net"
<mask> "strings"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> )
</s> Pull request: 5035-netip-arp-hosts
Updates #5035.
Squashed commit of the following:
commit d1c4493ee4e28d05670c20532ebae1aa809d18da... | https://github.com/AdguardTeam/AdGuardHome/commit/04c8e3b2886bb02866ace61f796733c82b3e9aca | internal/aghnet/arpdb_bsd.go |
keep keep keep keep replace keep keep keep keep keep | <mask> n := Neighbor{}
<mask>
<mask> if ipStr := fields[1]; len(ipStr) < 2 {
<mask> continue
<mask> } else if ip := net.ParseIP(ipStr[1 : len(ipStr)-1]); ip == nil {
<mask> continue
<mask> } else {
<mask> n.IP = ip
<mask> }
<mask>
</s> Pull request: 5035-netip-arp-hosts
Updates #5035.
... | https://github.com/AdguardTeam/AdGuardHome/commit/04c8e3b2886bb02866ace61f796733c82b3e9aca | internal/aghnet/arpdb_bsd.go |
keep keep keep keep replace keep keep keep keep keep | <mask> n.IP = ip
<mask> }
<mask>
<mask> hwStr := fields[3]
<mask> if mac, err := net.ParseMAC(hwStr); err != nil {
<mask> continue
<mask> } else {
<mask> n.MAC = mac
<mask> }
<mask>
</s> Pull request: 5035-netip-arp-hosts
Updates #5035.
Squashed commit of the following:
commit d1c4493... | https://github.com/AdguardTeam/AdGuardHome/commit/04c8e3b2886bb02866ace61f796733c82b3e9aca | internal/aghnet/arpdb_bsd.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.