Dataset Viewer (First 5GB)
Auto-converted to Parquet Duplicate
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> mac, err := net.ParseMAC(c.MAC) <mask> if err != nil { <mask> continue <mask> } <mask> ipAddr := dhcpServer.FindIPbyMAC(mac) <mask> if ipAddr == nil { <mask> continue <mask> } <mask> if ip == ipAddr.String() { <mask> return *c, true </s> * move "dhcpServer" to "config"...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/clients.go
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> if len(c.MAC) != 0 { <mask> hwAddr, _ := net.ParseMAC(c.MAC) <mask> ipAddr := dhcpServer.FindIPbyMAC(hwAddr) <mask> if ipAddr != nil { <mask> cj.IP = ipAddr.String() <mask> } <mask> } <mask> </s> * move "dhcpServer" to "config" </s> remove ipAddr := dhcpServe...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/clients.go
keep keep add keep keep keep keep
<mask> versionCheckJSON []byte <mask> versionCheckLastTime time.Time <mask> <mask> httpServer *http.Server <mask> httpsServer HTTPSServer <mask> <mask> BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to </s> * move "dhcpServer" to "config" </s> rem...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/config.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> var dhcpServer = dhcpd.Server{} <mask> <mask> // []dhcpd.Lease -> JSON <mask> func convertLeases(inputLeases []dhcpd.Lease, includeExpires bool) []map[string]string { <mask> leases := []map[string]string{...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> } <mask> <mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) { <mask> log.Tracef("%s %v", r.Method, r.URL) <mask> leases := convertLeases(dhcpServer.Leases(), true) <mask> staticLeases := convertLeases(dhcpServer.StaticLeases(), false) <mask> status := map[string]interface{}{ <mask>...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep keep keep replace keep keep keep keep keep
<mask> httpError(w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err) <mask> return <mask> } <mask> <mask> err = dhcpServer.CheckConfig(newconfig.ServerConfig) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Invalid DHCP configuration: %s", err) <mask> return...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep replace keep keep keep keep replace keep keep
<mask> <mask> err = dhcpServer.Stop() <mask> if err != nil { <mask> log.Error("failed to stop the DHCP server: %s", err) <mask> } <mask> <mask> err = dhcpServer.Init(newconfig.ServerConfig) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Invalid DHCP configuration: %s", err) </s>...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep keep keep replace keep keep keep keep keep
<mask> return <mask> } <mask> } <mask> <mask> err = dhcpServer.Start() <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to start DHCP server: %s", err) <mask> return <mask> } <mask> } </s> * move "dhcpServer" to "config" </s> remove err = dhcpServer.CheckConfi...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep keep keep replace keep keep keep keep keep
<mask> IP: ip, <mask> HWAddr: mac, <mask> Hostname: lj.Hostname, <mask> } <mask> err = dhcpServer.AddStaticLease(lease) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "%s", err) <mask> return <mask> } <mask> returnOK(w) </s> * move "dhcpServer" to "config" </s> remov...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep keep keep replace keep keep keep keep keep
<mask> IP: ip, <mask> HWAddr: mac, <mask> Hostname: lj.Hostname, <mask> } <mask> err = dhcpServer.RemoveStaticLease(lease) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "%s", err) <mask> return <mask> } <mask> returnOK(w) </s> * move "dhcpServer" to "config" </s> re...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep replace keep keep keep keep replace keep keep keep keep
<mask> } <mask> <mask> err := dhcpServer.Init(config.DHCP) <mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't init DHCP server") <mask> } <mask> <mask> err = dhcpServer.Start() <mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't start DHCP server") <mask> } <mas...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep keep keep replace keep keep keep keep keep
<mask> if !config.DHCP.Enabled { <mask> return nil <mask> } <mask> <mask> err := dhcpServer.Stop() <mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't stop DHCP server") <mask> } <mask> <mask> return nil </s> * move "dhcpServer" to "config" </s> remove err = dhcpServer.Start() <...
https://github.com/AdguardTeam/AdGuardHome/commit/001b4b981f0fd9563fa87724fe44a32c5d7bbc4b
home/dhcp.go
keep keep add keep keep keep keep keep keep
<mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/gobuffalo/packr/v2 v2.8.1 // indirect <mask> github.com/google/go-cmp v0.5.5 // indirect <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 <mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 <mask> github....
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
go.mod
keep add keep keep keep keep keep keep
<mask> github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= <mask> github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= <mask> github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNH...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> "os" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio" <mask> "github.com/AdguardTeam/golibs/file" <mask> ) <mask> <mask> // maxConfigFileSize is the maximum length of interfaces configuration file. <mask> const maxConfigFileSize = 1024 * 1024 <mask> </s> Pull r...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/aghnet/net_linux.go
keep keep keep keep replace keep keep keep keep keep
<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 </s> Pull request: all: use renameio instead of golibs/file Merge in DNS/adguard-home from...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/aghnet/net_linux.go
keep keep keep keep replace keep keep keep keep keep
<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> Pull request: all: use renameio instead of golibs/file Merge in DNS/adguard-home from use-renameio...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/aghnet/net_linux.go
keep keep keep keep replace keep keep keep keep keep
<mask> "net" <mask> "os" <mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/file" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> const dbFilename = "leases.db" <mask> </s> Pull request: all: use renameio instead of golibs/file Merge in DNS/adguard-home from use-renameio to...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/dhcpd/db.go
keep add keep keep keep keep
<mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> const dbFilename = "leases.db" <mask> </s> Pull request: all: use renameio instead of golibs/file Merge in DNS/adguard-home from use-renameio to master Squashed commit of the following: commit 807cda37b0e9e49539c1a8ce7912b74bd3c05b08...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/dhcpd/db.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> obj := []leaseJSON{} <mask> err = json.Unmarshal(data, &obj) <mask> if err != nil { <mask> log.Error("DHCP: invalid DB: %v", err) <mask> return <mask> } <mask> <mask> numLeases := len(obj) <mask> for i := range obj { </s> Pull request: all: use renameio instead of golibs/file Merge...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/dhcpd/db.go
keep keep keep keep replace keep keep keep keep keep
<mask> for i := range obj { <mask> obj[i].IP = normalizeIP(obj[i].IP) <mask> <mask> if !(len(obj[i].IP) == 4 || len(obj[i].IP) == 16) { <mask> log.Info("DHCP: invalid IP: %s", obj[i].IP) <mask> continue <mask> } <mask> <mask> lease := Lease{ <mask> HWAddr: obj[i].HWAddr, </s> Pull reque...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/dhcpd/db.go
keep keep keep keep replace keep keep keep keep keep
<mask> if s.srv6 != nil { <mask> s.srv6.ResetLeases(leases6) <mask> } <mask> <mask> log.Info("DHCP: loaded leases v4:%d v6:%d total-read:%d from DB", <mask> len(leases4), len(leases6), numLeases) <mask> } <mask> <mask> // Skip duplicate leases <mask> // Static leases have a priority over dynamic le...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/dhcpd/db.go
keep keep keep keep replace keep keep keep keep keep keep keep keep replace keep keep keep keep
<mask> log.Error("json.Marshal: %v", err) <mask> return <mask> } <mask> <mask> err = file.SafeWrite(s.conf.DBFilePath, data) <mask> if err != nil { <mask> log.Error("DHCP: can't store lease table on disk: %v filename: %s", <mask> err, s.conf.DBFilePath) <mask> return <mask> } <mask> <mask>...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/dhcpd/db.go
keep keep keep keep replace keep
<mask> log.Error("DHCP: can't store lease table on disk: %v filename: %s", <mask> err, s.conf.DBFilePath) <mask> return <mask> } <mask> log.Info("DHCP: stored %d leases in DB", len(leases)) <mask> } </s> Pull request: all: use renameio instead of golibs/file Merge in DNS/adguard-home from use-renameio...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/dhcpd/db.go
keep keep keep keep replace keep keep keep keep keep
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" <mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog" <mask> "github.com/AdguardTeam/AdGuardHome/internal/stats" <mask> "github.com/AdguardTeam/AdGuardHome/internal/version" <mask> "github.com/AdguardTeam/golibs/file" <mask> "github.com...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/home/config.go
keep add keep keep keep keep
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version" <mask> "github.com/AdguardTeam/golibs/log" <mask> yaml "gopkg.in/yaml.v2" <mask> ) <mask> <mask> const ( </s> Pull request: all: use renameio instead of golibs/file Merge in DNS/adguard-home from use-renameio to master Squashed commit of the foll...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/home/config.go
keep keep keep keep replace keep keep keep keep keep
<mask> if err != nil { <mask> log.Error("Couldn't generate YAML file: %s", err) <mask> return err <mask> } <mask> err = file.SafeWrite(configFile, yamlText) <mask> if err != nil { <mask> log.Error("Couldn't save YAML config: %s", err) <mask> return err <mask> } <mask> </s> Pull request: all: us...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/home/config.go
keep keep keep keep replace keep keep keep keep keep
<mask> "path" <mask> "path/filepath" <mask> "runtime" <mask> <mask> "github.com/AdguardTeam/golibs/file" <mask> "github.com/AdguardTeam/golibs/log" <mask> "golang.org/x/crypto/bcrypt" <mask> yaml "gopkg.in/yaml.v2" <mask> ) <mask> </s> Pull request: all: use renameio instead of golibs/file Merge in...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/home/upgrade.go
keep add keep keep keep keep keep
<mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "golang.org/x/crypto/bcrypt" <mask> yaml "gopkg.in/yaml.v2" <mask> ) <mask> <mask> // currentSchemaVersion is the current schema version. </s> Pull request: all: use renameio instead of golibs/file Merge in DNS/adguard-home from use-renameio to mast...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/home/upgrade.go
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> config.fileData = body <mask> confFile := config.getConfigFilename() <mask> err = file.SafeWrite(confFile, body) <mask> if err != nil { <mask> return fmt.Errorf("saving new config: %w", err) <mask> } <mask> <mask> return nil </s> Pull request: all: use renameio instead of go...
https://github.com/AdguardTeam/AdGuardHome/commit/00a61fdea0b974ced597857060798d4ec87f2e29
internal/home/upgrade.go
keep keep replace replace replace replace replace replace keep replace replace
<mask> } <mask> <mask> type ipport struct { <mask> IP string `json:"ip,omitempty"` <mask> Port int `json:"port"` <mask> Warning string `json:"warning"` <mask> } <mask> <mask> type firstRunData struct { <mask> Web ipport `json:"web"` <mask> DNS ipport ...
https://github.com/AdguardTeam/AdGuardHome/commit/00c128f0a4deff119f93d02de03fa3fc47c54ec1
control.go
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> <mask> func handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) { <mask> log.Tracef("%s %v", r.Method, r.URL) <mask> data := firstRunData{} <mask> <mask> // find out if port 80 is available -- if not, fall back to 3000 <mask> if checkPortAvailable("", 80) == nil { <mask> data.Web.Po...
https://github.com/AdguardTeam/AdGuardHome/commit/00c128f0a4deff119f93d02de03fa3fc47c54ec1
control.go
keep keep keep keep replace keep
<mask> "encryption_private_key_path": "Private key path", <mask> "encryption_certificates_source_path": "Set a certificates file path", <mask> "encryption_certificates_source_content":"Paste the certificates contents", <mask> "encryption_key_source_path": "Set a private key file", <mask> "encry...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/__locales/en.json
keep keep keep add
<mask> height: 23px; <mask> min-width: 23px; <mask> padding: 5px; <mask> } </s> + client: handle time interval for statistics </s> add import { getStatsConfig, setStatsConfig } from '../actions/stats'; </s> remove const { settings, services } = state; </s> add const { settings, services, stats...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/components/Settings/Settings.css
keep keep add keep keep keep keep keep
<mask> import { withNamespaces, Trans } from 'react-i18next'; <mask> <mask> import Services from './Services'; <mask> import Checkbox from '../ui/Checkbox'; <mask> import Loading from '../ui/Loading'; <mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../ui/Card'; <mask> </s> + client: ...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/components/Settings/index.js
keep add keep keep keep keep keep
<mask> this.props.initSettings(this.settings); <mask> this.props.getBlockedServices(); <mask> } <mask> <mask> renderSettings = (settings) => { <mask> if (Object.keys(settings).length > 0) { <mask> return Object.keys(settings).map((key) => { </s> + client: handle time...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/components/Settings/index.js
keep keep keep keep replace keep keep keep keep keep
<mask> }; <mask> <mask> render() { <mask> const { <mask> settings, services, setBlockedServices, t, <mask> } = this.props; <mask> return ( <mask> <Fragment> <mask> <PageTitle title={t('general_settings')} /> <mask> {setti...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/components/Settings/index.js
keep keep add keep keep keep keep keep keep
<mask> </div> <mask> </Card> <mask> </div> <mask> <div className="col-md-12"> <mask> <Services <mask> services={services} ...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/components/Settings/index.js
keep keep keep add keep keep keep keep
<mask> initSettings: PropTypes.func, <mask> settings: PropTypes.object, <mask> settingsList: PropTypes.object, <mask> toggleSetting: PropTypes.func, <mask> t: PropTypes.func, <mask> }; <mask> <mask> export default withNamespaces()(Settings); </s> + client: handle time interval for statisti...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/components/Settings/index.js
keep add keep keep keep keep
<mask> import { initSettings, toggleSetting } from '../actions'; <mask> import { getBlockedServices, setBlockedServices } from '../actions/services'; <mask> import Settings from '../components/Settings'; <mask> <mask> const mapStateToProps = (state) => { <mask> const { settings, services, stats } = state; <...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/containers/Settings.js
keep keep keep keep replace keep keep keep keep keep
<mask> import { getBlockedServices, setBlockedServices } from '../actions/services'; <mask> import Settings from '../components/Settings'; <mask> <mask> const mapStateToProps = (state) => { <mask> const { settings, services } = state; <mask> const props = { <mask> settings, <mask> servi...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/containers/Settings.js
keep keep keep add keep keep keep keep keep keep
<mask> const { settings, services, stats } = state; <mask> const props = { <mask> settings, <mask> services, <mask> }; <mask> return props; <mask> }; <mask> <mask> const mapDispatchToProps = { <mask> initSettings, </s> + client: handle time interval for statistics </s> re...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/containers/Settings.js
keep keep keep add keep keep keep keep keep
<mask> initSettings, <mask> toggleSetting, <mask> getBlockedServices, <mask> setBlockedServices, <mask> }; <mask> <mask> export default connect( <mask> mapStateToProps, <mask> mapDispatchToProps, </s> + client: handle time interval for statistics </s> add getStatsConfig: PropTypes...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/containers/Settings.js
keep keep add keep keep keep keep
<mask> import access from './access'; <mask> import rewrites from './rewrites'; <mask> import services from './services'; <mask> <mask> const settings = handleActions({ <mask> [actions.initSettingsRequest]: state => ({ ...state, processing: true }), <mask> [actions.initSettingsFailure]: state => ({ ...s...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/reducers/index.js
keep keep keep add keep keep keep keep keep
<mask> dnsVersion: '', <mask> clients: [], <mask> autoClients: [], <mask> topStats: [], <mask> }); <mask> <mask> const queryLogs = handleActions({ <mask> [actions.getLogsRequest]: state => ({ ...state, getLogsProcessing: true }), <mask> [actions.getLogsFailure]: state => ({ ...state, g...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/reducers/index.js
keep keep keep keep replace keep keep keep keep keep
<mask> }, <mask> [actions.downloadQueryLogRequest]: state => ({ ...state, logsDownloading: true }), <mask> [actions.downloadQueryLogFailure]: state => ({ ...state, logsDownloading: false }), <mask> [actions.downloadQueryLogSuccess]: state => ({ ...state, logsDownloading: false }), <mask> }, { getLo...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/reducers/index.js
keep add keep keep keep
<mask> rewrites, <mask> services, <mask> loadingBar: loadingBarReducer, <mask> form: formReducer, <mask> }); </s> + client: handle time interval for statistics </s> remove }, { getLogsProcessing: false, logsDownloading: false }); </s> add }, { getLogsProcessing: false, logsDownloading: fa...
https://github.com/AdguardTeam/AdGuardHome/commit/011bc3e36bb5ede69f1e459e32004adc748e1f9d
client/src/reducers/index.js
keep keep keep keep replace keep keep keep keep keep
<mask> const fs = require('fs'); <mask> const request = require('request-promise'); <mask> const twoskyConfig = require('../../.twosky.json')[0]; <mask> <mask> const { project_id: TWOSKY_PROJECT_ID, base_locale: LANGUAGE } = twoskyConfig; <mask> const LOCALES_DIR = '../../client/src/__locales'; <mask> const BAS...
https://github.com/AdguardTeam/AdGuardHome/commit/0122710750ae3c8c5039886cd27ec14c9579c85b
scripts/translations/upload.js
keep keep keep add keep keep keep keep
<mask> /** <mask> * Prepare post params <mask> */ <mask> const getRequestData = (url, projectId) => { <mask> const formData = { <mask> format: 'json', <mask> language: language, <mask> filename: BASE_FILE, </s> Pull request: scripts: imp i18n upload script Merge in DNS/adguard-ho...
https://github.com/AdguardTeam/AdGuardHome/commit/0122710750ae3c8c5039886cd27ec14c9579c85b
scripts/translations/upload.js
keep keep keep keep replace keep keep replace keep
<mask> */ <mask> const getRequestData = (url, projectId) => { <mask> const formData = { <mask> format: 'json', <mask> language: LANGUAGE, <mask> filename: BASE_FILE, <mask> project: projectId, <mask> file: fs.createReadStream(path.resolve(LOCALES_DIR, `${LANGUAGE}.js...
https://github.com/AdguardTeam/AdGuardHome/commit/0122710750ae3c8c5039886cd27ec14c9579c85b
scripts/translations/upload.js
keep keep add keep keep keep keep keep keep
<mask> file: fs.createReadStream(path.resolve(LOCALES_DIR, `${language}.json`)), <mask> }; <mask> <mask> return { <mask> url: `${url}/upload`, <mask> formData <mask> }; <mask> }; <mask> </s> Pull request: scripts: imp i18n upload script Merge in DNS/adguard-home from imp...
https://github.com/AdguardTeam/AdGuardHome/commit/0122710750ae3c8c5039886cd27ec14c9579c85b
scripts/translations/upload.js
keep keep keep keep replace keep keep keep keep keep
<mask> package rewrite <mask> <mask> import ( <mask> "fmt" <mask> "net" <mask> "strings" <mask> <mask> "github.com/miekg/dns" <mask> ) <mask> </s> Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/item.go
keep keep keep keep replace keep keep keep keep keep
<mask> } else if other == nil { <mask> return false <mask> } <mask> <mask> return rw.Domain == other.Domain && rw.Answer == other.Answer <mask> } <mask> <mask> // toRule converts rw to a filter rule. <mask> func (rw *Item) toRule() (res string) { <mask> domain := strings.ToLower(rw.Domain) </s> Pull ...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/item.go
keep add keep keep keep keep keep keep
<mask> // toRule converts rw to a filter rule. <mask> func (rw *Item) toRule() (res string) { <mask> domain := strings.ToLower(rw.Domain) <mask> <mask> dType, exception := rw.rewriteParams() <mask> dTypeKey := dns.TypeToString[dType] <mask> if exception { <mask> return fmt.Sprintf("@@||%s^$dnstype=%s,dns...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/item.go
keep keep keep keep replace replace keep keep keep replace replace keep keep keep keep
<mask> default: <mask> // Go on. <mask> } <mask> <mask> ip := net.ParseIP(rw.Answer) <mask> if ip == nil { <mask> return dns.TypeCNAME, false <mask> } <mask> <mask> ip4 := ip.To4() <mask> if ip4 != nil { <mask> dType = dns.TypeA <mask> } else { <mask> dType = dns.TypeAAAA <mask> } </s...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/item.go
keep keep add keep keep keep keep keep keep
<mask> "sync" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/urlfilter" <mask> "github.com/AdguardTeam/urlfilter/filterlist" <mask> "github.com/AdguardTeam/urlfilter/rules" <mask> "github.com/miekg/dns" <mask> "golang.org/x/exp/slices" <mask> ) </s> Pull request: 2499...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep keep add keep keep keep keep keep
<mask> "github.com/AdguardTeam/golibs/stringutil" <mask> "github.com/AdguardTeam/urlfilter" <mask> "github.com/AdguardTeam/urlfilter/filterlist" <mask> "golang.org/x/exp/slices" <mask> ) <mask> <mask> // Storage is a storage for rewrite rules. <mask> type Storage interface { </s> Pull request: 2499 rewrit...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> ) <mask> <mask> // Storage is a storage for rewrite rules. <mask> type Storage interface { <mask> // MatchRequest finds a matching rule for the specified request. <mask> MatchRequest(dReq *urlfilter.DNSRequest) (res *urlfilter.DNSResult, matched bool) <mask> <mask> // Add adds item to the storage. ...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep add keep keep keep keep keep keep
<mask> ruleList filterlist.RuleList <mask> <mask> // urlFilterID is the synthetic integer identifier for the urlfilter engine. <mask> // <mask> // TODO(a.garipov): Change the type to a string in module urlfilter and <mask> // remove this crutch. <mask> urlFilterID int <mask> } </s> Pull request: 2499 re...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> // <mask> // TODO(a.garipov): Change the type to a string in module urlfilter and <mask> // remove this crutch. <mask> urlFilterID int <mask> <mask> // rewrites stores the rewrite entries from configuration. <mask> rewrites []*Item <mask> } <mask> <mask> // NewDefaultStorage returns new rewrite...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep keep keep keep replace keep keep keep keep keep
<mask> // type check <mask> var _ Storage = (*DefaultStorage)(nil) <mask> <mask> // MatchRequest implements the [Storage] interface for *DefaultStorage. <mask> func (s *DefaultStorage) MatchRequest(dReq *urlfilter.DNSRequest) (res *urlfilter.DNSResult, matched bool) { <mask> s.mu.RLock() <mask> defer s.mu.RUn...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep keep add keep keep keep keep
<mask> <mask> // resetRules resets the filtering rules. <mask> func (s *DefaultStorage) resetRules() (err error) { <mask> var rulesText []string <mask> for _, rewrite := range s.rewrites { <mask> rulesText = append(rulesText, rewrite.toRule()) <mask> } </s> Pull request: 2499 rewrite: storage vol.2 Merge...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep keep keep keep replace keep keep keep
<mask> <mask> s.ruleList = strList <mask> s.engine = urlfilter.NewDNSEngine(rs) <mask> <mask> log.Info("filter %d: reset %d rules", s.urlFilterID, s.engine.RulesCount) <mask> <mask> return nil <mask> } </s> Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to mast...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage.go
keep keep add keep keep keep keep keep keep
<mask> package rewrite <mask> <mask> import ( <mask> "testing" <mask> <mask> "github.com/AdguardTeam/urlfilter" <mask> "github.com/AdguardTeam/urlfilter/rules" <mask> "github.com/miekg/dns" <mask> "github.com/stretchr/testify/assert" </s> Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage_test.go
keep keep add keep keep keep keep keep keep
<mask> "net" <mask> "testing" <mask> <mask> "github.com/stretchr/testify/require" <mask> ) <mask> <mask> func TestNewDefaultStorage(t *testing.T) { <mask> items := []*Item{{ <mask> Domain: "example.com", </s> Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to ...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrite/storage_test.go
keep keep keep keep replace keep keep replace
<mask> <mask> package filtering <mask> <mask> import ( <mask> "encoding/json" <mask> "fmt" <mask> "net" <mask> "net/http" </s> Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e595...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrites.go
keep replace keep replace keep keep
<mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/miekg/dns" <mask> "golang.org/x/exp/slices" </s> Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rew...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrites.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> "github.com/miekg/dns" <mask> "golang.org/x/exp/slices" <mask> ) <mask> <mask> // TODO(d.kolyshev): Rename this file to rewritehttp.go. <mask> <mask> // LegacyRewrite is a single legacy DNS rewrite record. <mask> // <mask> // Instances of *LegacyRewrite must never be nil. <mask> type LegacyRewrite ...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrites.go
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 replace replace replace replace replace repl...
<mask> } <mask> <mask> return b <mask> } <mask> <mask> type rewriteEntryJSON struct { <mask> Domain string `json:"domain"` <mask> Answer string `json:"answer"` <mask> } <mask> <mask> func (d *DNSFilter) handleRewriteList(w http.ResponseWriter, r *http.Request) { <mask> arr := []*rewriteEntryJSON{} ...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrites.go
keep keep keep keep replace keep keep keep keep keep
<mask> "github.com/stretchr/testify/require" <mask> ) <mask> <mask> // TODO(e.burkov): All the tests in this file may and should me merged together. <mask> // TODO(d.kolyshev): Move these tests to rewrite package. <mask> <mask> func TestRewrites(t *testing.T) { <mask> d, _ := newForTest(t, nil, nil) <mask>...
https://github.com/AdguardTeam/AdGuardHome/commit/01652e6ab23c46a1553cc6d8b157c5821057ee38
internal/filtering/rewrites_test.go
keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace...
<mask> <mask> // command-line arguments <mask> type options struct { <mask> verbose bool // is verbose logging enabled <mask> configFilename string // path to the config file <mask> workDir string // path to the working directory where we will store the filters data and the querylog <mask> b...
https://github.com/AdguardTeam/AdGuardHome/commit/03506df25d5c6af6daf1ba19300d2697ad241bda
home/home.go
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 replace replace replace replace replace repl...
<mask> {"glinet", "", "Run in GL-Inet compatibility mode", nil, func() { o.glinetMode = true }}, <mask> {"version", "", "Show the version and exit", nil, func() { <mask> fmt.Println(version()) <mask> os.Exit(0) <mask> }}, <mask> {"help", "", "Print this help", nil, func() { <mask> printHelp() <...
https://github.com/AdguardTeam/AdGuardHome/commit/03506df25d5c6af6daf1ba19300d2697ad241bda
home/home.go
keep keep keep keep replace keep keep keep keep keep
<mask> go 1.16 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.37.4 <mask> github.com/AdguardTeam/golibs v0.5.0 <mask> github.com/AdguardTeam/urlfilter v0.14.5 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.1.3 <mask> github.com/digineo/go-ipset/...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
go.mod
keep keep keep keep replace replace keep keep keep keep keep
<mask> github.com/AdguardTeam/dnsproxy v0.37.4/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE= <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.co...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> "net" <mask> "strconv" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "golang.org/x/net/idna" <mask> ) <mask> <mask> // IsValidHostOuterRune returns true if r is a valid initial or final rune for <mask> // a hostname label. </s> Pull request: replace ...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/addr.go
keep replace keep keep keep replace keep
<mask> func ValidateHardwareAddress(hwa net.HardwareAddr) (err error) { <mask> defer agherr.Annotate("validating hardware address %q: %w", &err, hwa) <mask> <mask> switch l := len(hwa); l { <mask> case 0: <mask> return agherr.Error("address is empty") <mask> case 6, 8, 20: </s> Pull request: replace aghe...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/addr.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> // ValidateDomainNameLabel returns an error if label is not a valid label of <mask> // a domain name. <mask> func ValidateDomainNameLabel(label string) (err error) { <mask> defer agherr.Annotate("validating label %q: %w", &err, label) <mask> <mask> l := len(label) <mask> if l > maxDomainLabel...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/addr.go
keep keep keep keep replace keep keep keep keep keep
<mask> l := len(label) <mask> if l > maxDomainLabelLen { <mask> return fmt.Errorf("label is too long, max: %d", maxDomainLabelLen) <mask> } else if l == 0 { <mask> return agherr.Error("label is empty") <mask> } <mask> <mask> if r := label[0]; !IsValidHostOuterRune(rune(r)) { <mask> return fmt.Error...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/addr.go
keep keep keep keep replace keep keep keep keep keep
<mask> // <mask> // TODO(a.garipov): After making sure that this works correctly, port this into <mask> // module golibs. <mask> func ValidateDomainName(name string) (err error) { <mask> defer agherr.Annotate("validating domain name %q: %w", &err, name) <mask> <mask> name, err = idna.ToASCII(name) <mask> if...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/addr.go
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> l := len(name) <mask> if l == 0 { <mask> return agherr.Error("domain name is empty") <mask> } else if l > maxDomainNameLen { <mask> return fmt.Errorf("too long, max: %d", maxDomainNameLen) <mask> } <mask> <mask> labels := strings.Split(name, ".") </s> Pull request: replace ...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/addr.go
keep keep keep keep replace keep keep keep keep keep
<mask> package aghnet <mask> <mask> import ( <mask> "bufio" <mask> "errors" <mask> "io" <mask> "net" <mask> "os" <mask> "path/filepath" <mask> "runtime" </s> Pull request: replace agherr with golibs' errors Merge in DNS/adguard-home from golibs-errors to master Squashed commit of the following: co...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/etchostscontainer.go
keep add keep keep keep keep
<mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/fsnotify/fsnotify" <mask> "github.com/miekg/dns" <mask> ) </s> Pull request: replace agherr with golibs' errors Merge in DNS/adguard-home from golibs-errors to master Squashed co...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/etchostscontainer.go
keep keep keep keep replace keep keep keep keep keep
<mask> if err != nil { <mask> log.Error("etchostscontainer: %s", err) <mask> return <mask> } <mask> defer f.Close() <mask> r := bufio.NewReader(f) <mask> log.Debug("etchostscontainer: loading hosts from file %s", fn) <mask> <mask> for done := false; !done; { <mask> var line string </s> Pull requ...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/etchostscontainer.go
keep keep keep keep replace keep keep keep keep keep
<mask> package aghnet <mask> <mask> import ( <mask> "encoding/json" <mask> "errors" <mask> "fmt" <mask> "net" <mask> "os" <mask> "os/exec" <mask> "runtime" </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/aghnet/net.go
keep keep keep keep replace keep keep keep keep keep
<mask> "strings" <mask> "syscall" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> // ErrNoStaticIPInfo is returned by IfaceHasStaticIP when...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/net.go
keep keep add keep keep keep keep keep keep
<mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> // ErrNoStaticIPInfo is returned by IfaceHasStaticIP when no information about <mask> // the IP being static is available. <mask> const ErrNoStaticIPInfo e...
https://github.com/AdguardTeam/AdGuardHome/commit/03a828ef5140f232ee755f62d9c3410242833b38
internal/aghnet/net.go
End of preview. Expand in Data Studio
README.md exists but content is empty.
Downloads last month
65

Collection including code-philia/CoEdPilot-line-locator