docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep keep add keep keep keep keep | <mask>
<mask> class Dns extends Component {
<mask> componentDidMount() {
<mask> this.props.getAccessList();
<mask> this.props.getRewritesList();
<mask> }
<mask>
</s> - client: fix upstream DNS servers form
Closes #1000 </s> remove import { handleUpstreamChange, setUpstream, testUpstre... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/index.js |
keep keep add keep keep keep keep keep keep | <mask> toggleRewritesModal,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> {isDataLoading && <Loading />}
<mask> {isDataReady && (
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/index.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> {(dashboard.processing || access.processing) && <Loading />}
<mask> {!dashboard.processing && !access.processing && (
<mask> <Fra... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/index.js |
keep keep add keep keep keep keep | <mask> addRewrite: PropTypes.func.isRequired,
<mask> deleteRewrite: PropTypes.func.isRequired,
<mask> toggleRewritesModal: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Dns);
</s> - client: fix upstream DNS servers form
... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/index.js |
keep keep add keep keep keep keep keep keep | <mask>
<mask> .form-control--textarea {
<mask> min-height: 110px;
<mask> }
<mask>
<mask> .form-control--textarea-large {
<mask> min-height: 240px;
<mask> }
<mask>
</s> - client: fix upstream DNS servers form
Closes #1000 </s> remove import { handleUpstreamChange, setUpstream, testUpstream } from '... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Settings.css |
keep replace keep keep keep keep keep | <mask> import { connect } from 'react-redux';
<mask> import { handleUpstreamChange, setUpstream, testUpstream } from '../actions';
<mask> import { getAccessList, setAccessList } from '../actions/access';
<mask> import {
<mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
</s> - client: ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/containers/Dns.js |
keep keep keep add keep keep keep keep keep keep | <mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
<mask> toggleRewritesModal,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
<mask> )(Dns);
</s> - client: fix upstream DNS servers form
Closes #1000 </s> remove import... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/containers/Dns.js |
keep 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 keep keep keep keep | <mask>
<mask> const settings = handleActions({
<mask> [actions.initSettingsRequest]: state => ({ ...state, processing: true }),
<mask> [actions.initSettingsFailure]: state => ({ ...state, processing: false }),
<mask> [actions.initSettingsSuccess]: (state, { payload }) => {
<mask> const { sett... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep 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 replace replace replace replace replace keep keep keep | <mask> processingDhcpStatus: false,
<mask> settingsList: {},
<mask> });
<mask>
<mask> const dashboard = handleActions({
<mask> [actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
<mask> [actions.dnsStatusFailure]: state => ({ ...state, processing: false }),
<mask> [action... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep replace replace replace replace replace keep replace replace replace replace replace replace keep keep | <mask>
<mask> [actions.enableDnsRequest]: state => ({ ...state, processing: true }),
<mask> [actions.enableDnsFailure]: state => ({ ...state, processing: false }),
<mask> [actions.enableDnsSuccess]: (state) => {
<mask> const newState = { ...state, isCoreRunning: !state.isCoreRunning, processin... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep add keep keep keep keep keep | <mask> processingSetUpstream: false,
<mask> processingDhcpStatus: false,
<mask> settingsList: {},
<mask> },
<mask>
<mask> const dashboard = handleActions(
<mask> {
<mask> [actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
<mask> [actions.dnsS... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep replace replace replace replace replace replace keep replace replace replace keep keep keep | <mask>
<mask> [actions.getVersionRequest]: state => ({ ...state, processingVersion: true }),
<mask> [actions.getVersionFailure]: state => ({ ...state, processingVersion: false }),
<mask> [actions.getVersionSuccess]: (state, { payload }) => {
<mask> const currentVersion = state.dnsVersion === '... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> } = payload;
<mask>
<mask> const newState = {
<mask> ...state,
<mask> announcementUrl,
<mask> newVersion,
<mask> canAutoUpdate,
<mask> isUpdateAvailable: true,
<mask> processingVersio... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep add keep keep keep keep keep keep | <mask> processingVersion: false,
<mask> };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.toggleProtectionRequest]: state => ({ ...state, processingProtection: true }),
<mask> [actions.toggleProtectionFailure]: state => ({ ...state, proce... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep keep replace keep replace replace replace replace replace keep keep keep | <mask> isUpdateAvailable: true,
<mask> processingVersion: false,
<mask> };
<mask> return newState;
<mask> }
<mask>
<mask> return {
<mask> ...state,
<mask> processingVersion: false,
<mask> };
<mask> },... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep replace replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask>
<mask> [actions.getUpdateRequest]: state => ({ ...state, processingUpdate: true }),
<mask> [actions.getUpdateFailure]: state => ({ ...state, processingUpdate: false }),
<mask> [actions.getUpdateSuccess]: (state) => {
<mask> const newState = { ...state, processingUpdate: false };
<mask>... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep replace replace replace replace keep replace replace replace replace keep keep keep | <mask> return newState;
<mask> },
<mask>
<mask> [actions.handleUpstreamChange]: (state, { payload }) => {
<mask> const { upstreamDns } = payload;
<mask> return { ...state, upstreamDns };
<mask> },
<mask>
<mask> [actions.getLanguageSuccess]: (state, { payload }) => {
<... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep 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 replace replace replace replace replace keep keep keep keep | <mask> return newState;
<mask> },
<mask>
<mask> [actions.getClientsRequest]: state => ({ ...state, processingClients: true }),
<mask> [actions.getClientsFailure]: state => ({ ...state, processingClients: false }),
<mask> [actions.getClientsSuccess]: (state, { payload }) => {
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace keep keep keep | <mask> });
<mask>
<mask> const dhcp = handleActions({
<mask> [actions.getDhcpStatusRequest]: state => ({ ...state, processing: true }),
<mask> [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }),
<mask> [actions.getDhcpStatusSuccess]: (state, { payload }) => {
<mask> c... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> processing: false,
<mask> ...values,
<mask> };
<mask>
<mask> return newState;
<mask> },
<mask>
<mask> [actions.getDhcpInterfacesRequest]: state => ({ ...state, processingInterfaces: true }),
<mask> [actions.getDhcpInterfacesFailure]: state => ({ ...s... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep replace replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace keep keep keep | <mask> },
<mask>
<mask> [actions.getDhcpInterfacesRequest]: state => ({ ...state, processingInterfaces: true }),
<mask> [actions.getDhcpInterfacesFailure]: state => ({ ...state, processingInterfaces: false }),
<mask> [actions.getDhcpInterfacesSuccess]: (state, { payload }) => {
<mask> con... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep replace replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace | <mask>
<mask> const newState = {
<mask> ...state,
<mask> check: {
<mask> otherServer,
<mask> staticIP,
<mask> },
<mask> processingStatus: false,
<mask> };
<mask> return newState;
<mask> },
<mask>
<... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep keep replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace | <mask> };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.setDhcpConfigRequest]: state => ({ ...state, processingConfig: true }),
<mask> [actions.setDhcpConfigFailure]: state => ({ ...state, processingConfig: false }),
<mask> [actions.setDhcpConfigSuccess]: (state, { pay... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep 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 keep keep keep keep | <mask> return newState;
<mask> },
<mask>
<mask> [actions.addStaticLeaseRequest]: state => ({ ...state, processingAdding: true }),
<mask> [actions.addStaticLeaseFailure]: state => ({ ...state, processingAdding: false }),
<mask> [actions.addStaticLeaseSuccess]: (state, { payload }) => {
<m... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep replace replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace keep keep keep | <mask> },
<mask> }, {
<mask> processing: true,
<mask> processingStatus: false,
<mask> processingInterfaces: false,
<mask> processingDhcp: false,
<mask> processingConfig: false,
<mask> processingAdding: false,
<mask> processingDeleting: false,
<mask> config: {
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/reducers/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> package dnsforward
<mask>
<mask> import (
<mask> "crypto/tls"
<mask> "errors"
<mask> "fmt"
<mask> "net"
<mask> "net/http"
<mask> "runtime"
<mask> "strings"
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) -> Start()
+ S... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep | <mask> stats stats.Stats
<mask> access *accessCtx
<mask>
<mask> webRegistered bool
<mask> isRunning bool
<mask>
<mask> sync.RWMutex
<mask> conf ServerConfig
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) -> Start()
... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep | <mask> internalProxy *proxy.Proxy
<mask>
<mask> webRegistered bool
<mask>
<mask> sync.RWMutex
<mask> conf ServerConfig
<mask> }
<mask>
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) -> Start()
+ Server.Prepare(config *ServerCon... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep keep add keep keep keep keep keep keep | <mask> s.Lock()
<mask> s.dnsFilter = nil
<mask> s.stats = nil
<mask> s.queryLog = nil
<mask> s.Unlock()
<mask> }
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> func (s *Server) WriteDiskConfig(c *FilteringConfig) {
<mask> s.Lock()
</s> Merge: * use upstream servers directly for the inte... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep replace keep keep replace | <mask> // Start starts the DNS server
<mask> func (s *Server) Start(config *ServerConfig) error {
<mask> s.Lock()
<mask> defer s.Unlock()
<mask> return s.startInternal(config)
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) -> Start()
... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep replace replace replace replace keep replace keep keep | <mask>
<mask> // startInternal starts without locking
<mask> func (s *Server) startInternal(config *ServerConfig) error {
<mask> err := s.prepare(config)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> return s.dnsProxy.Start()
<mask> }
<mask>
</s> Merge: * use upstream servers directly for ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> return s.dnsProxy.Start()
<mask> }
<mask>
<mask> // Prepare the object
<mask> func (s *Server) prepare(config *ServerConfig) error {
<mask> if s.dnsProxy != nil {
<mask> return errors.New("DNS server is already started")
<mask> }
<mask>
<mask> if config != nil {
<mask> s.conf = *config
<mas... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep add keep keep keep keep | <mask> }
<mask>
<mask> s.access = &accessCtx{}
<mask> err = s.access.Init(s.conf.AllowedClients, s.conf.DisallowedClients, s.conf.BlockedHosts)
<mask> if err != nil {
<mask> return err
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfi... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // stopInternal stops without locking
<mask> func (s *Server) stopInternal() error {
<mask> if s.dnsProxy != nil {
<mask> err := s.dnsProxy.Stop()
<mask> s.dnsProxy = nil
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not stop the DNS server properly")
<mask> }
<mask> }
<... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // IsRunning returns true if the DNS server is running
<mask> func (s *Server) IsRunning() bool {
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) -> Start()
+ Serv... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> // IsRunning returns true if the DNS server is running
<mask> func (s *Server) IsRunning() bool {
<mask> s.RLock()
<mask> isRunning := true
<mask> if s.dnsProxy == nil {
<mask> isRunning = false
<mask> }
<mask> s.RUnlock()
<mask> return isRunning
<mask> }
<mask>
<mask> // Restart - ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> err := s.stopInternal()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not reconfigure the server")
<mask> }
<mask> err = s.startInternal(nil)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not reconfigure the server")
<mask> }
<mask>
<mask> return nil
<... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if runtime.GOOS == "windows" {
<mask> time.Sleep(1 * time.Second)
<mask> }
<mask>
<mask> err = s.startInternal(config)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "could not reconfigure the server")
<mask> }
<mask>
<mask> return nil
</s> Merge: * use upstream servers directly... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> )
<mask>
<mask> func TestServer(t *testing.T) {
<mask> s := createTestServer(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> // message over UDP
</s> Merge: * use upstream servers directly for the internal DNS reso... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func TestServerWithProtectionDisabled(t *testing.T) {
<mask> s := createTestServer(t)
<mask> s.conf.ProtectionEnabled = false
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> // message over UDP
</s> Merge: * u... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep add keep keep keep keep | <mask> }
<mask>
<mask> // Starting the server
<mask> err := s.Start()
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) -> Start()
+ Server.Prepare(config *Se... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> PrivateKeyData: keyPem,
<mask> }
<mask>
<mask> // Starting the server
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> // Add our self-signed generated config to roots
</s> Merge: * use upstream servers direct... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestServerRace(t *testing.T) {
<mask> s := createTestServer(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> // message over UDP
</s> Merge: * use upstream servers directly for the internal DNS ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestSafeSearch(t *testing.T) {
<mask> s := createTestServer(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> // Test safe search for yandex. We already know safe search ip
</s> Merge: * use upst... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestInvalidRequest(t *testing.T) {
<mask> s := createTestServer(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> // server is running, send a message
</s> Merge: * use upstream servers directly ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestBlockedRequest(t *testing.T) {
<mask> s := createTestServer(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
</s> Merge: * use upstream servers direct... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func (s *Server) startWithUpstream(u upstream.Upstream) error {
<mask> s.Lock()
<mask> defer s.Unlock()
<mask> err := s.prepare(nil)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> s.dnsProxy.Upstreams = []upstream.Upstream{u}
<mask> return s.dnsProxy.Start()
</s> Merge: * us... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func TestNullBlockedRequest(t *testing.T) {
<mask> s := createTestServer(t)
<mask> s.conf.FilteringConfig.BlockingMode = "null_ip"
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestBlockedByHosts(t *testing.T) {
<mask> s := createTestServer(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
</s> Merge: * use upstream servers direct... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestBlockedBySafeBrowsing(t *testing.T) {
<mask> s := createTestServer(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
</s> Merge: * use upstream servers... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep add keep keep keep keep keep | <mask> s.conf.UpstreamDNS = []string{"8.8.8.8:53", "8.8.4.4:53"}
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> return s
<mask> }
<mask>
<mask> func createServerTLSConfig(t *testing.T) (*tls.Config, []byte, []byte) {
<mask> privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
</s> Merge: * ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go 1.13
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.22.0
<mask> github.com/AdguardTeam/golibs v0.3.0
<mask> github.com/AdguardTeam/urlfilter v0.7.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/etcd-io/bbolt v1.3.3
<mask> github.com/go-test/deep v1.... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | go.mod |
replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.22.0 h1:8mpPu+KN0puFTHNhGy7XQ13fe3+3DGFaiwnqhNMWl+M=
<mask> github.com/AdguardTeam/dnsproxy v0.22.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
<mask> github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
<mask> github.com/AdguardTe... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | go.sum |
keep keep replace replace keep replace replace replace replace replace replace replace replace keep keep keep | <mask> // WriteDiskConfig - write configuration
<mask> func (clients *clientsContainer) WriteDiskConfig(objects *[]clientObject) {
<mask> clientsList := clients.GetList()
<mask> for _, cli := range clientsList {
<mask> cy := clientObject{
<mask> Name: cli.Name,
<mask> IDs: ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/clients.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> SafeSearchEnabled: cli.SafeSearchEnabled,
<mask> SafeBrowsingEnabled: cli.SafeBrowsingEnabled,
<mask>
<mask> UseGlobalBlockedServices: !cli.UseOwnBlockedServices,
<mask> BlockedServices: cli.BlockedServices,
<mask>
<mask> Upstreams: cli.Upstreams,
<mask> }
<mask> *objects... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/clients.go |
keep keep add keep keep keep keep keep | <mask> SafeBrowsingEnabled: cli.SafeBrowsingEnabled,
<mask> UseGlobalBlockedServices: !cli.UseOwnBlockedServices,
<mask> }
<mask> *objects = append(*objects, cy)
<mask> }
<mask> clients.lock.Unlock()
<mask> }
<mask>
</s> Merge: * use upstream servers directly for the internal DNS resolver
Clo... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/clients.go |
keep add keep keep keep keep keep keep | <mask> *objects = append(*objects, cy)
<mask> }
<mask> }
<mask>
<mask> func (clients *clientsContainer) periodicUpdate() {
<mask> for {
<mask> clients.addFromHostsFile()
<mask> clients.addFromSystemARP()
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.St... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/clients.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> time.Sleep(clientsUpdatePeriod)
<mask> }
<mask> }
<mask>
<mask> // GetList returns the pointer to clients list
<mask> func (clients *clientsContainer) GetList() map[string]*Client {
<mask> return clients.list
<mask> }
<mask>
<mask> // Exists checks if client with this IP already exists
<mask> fu... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/clients.go |
keep keep add keep keep keep keep keep | <mask> Verbose bool `yaml:"verbose"` // If true, verbose logging is enabled
<mask> }
<mask>
<mask> type HTTPSServer struct {
<mask> server *http.Server
<mask> cond *sync.Cond // reacts to config.TLS.Enabled, PortHTTPS, CertificateChain and PrivateKey
<mask> sync.Mutex // protects con... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep keep keep replace keep keep keep replace replace replace | <mask> // runningAsService flag is set to true when options are passed from the service runner
<mask> runningAsService bool
<mask> disableUpdate bool // If set, don't check for updates
<mask> appSignalChannel chan os.Signal
<mask> clients clientsContainer // per-client-settings module
<mask> con... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> // cached version.json to avoid hammering github.io for each page reload
<mask> versionCheckJSON []byte
<mask> versionCheckLastTime time.Time
<mask>
<mask> dnsctx dnsContext
<mask> dnsFilter *dnsfilter.Dnsfilter
<mask> dnsServer *dnsforward.Server
<mask> dhcpServer *dhcpd.Server
<m... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func (c *configuration) write() error {
<mask> c.Lock()
<mask> defer c.Unlock()
<mask>
<mask> config.clients.WriteDiskConfig(&config.Clients)
<mask>
<mask> if config.auth != nil {
<mask> config.Users = config.auth.GetUsers()
<mask> }
<mask>
</s> Merge: * use upstream servers directly for the... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep replace keep keep keep keep keep keep keep replace keep keep | <mask>
<mask> if config.stats != nil {
<mask> sdc := stats.DiskConfig{}
<mask> config.stats.WriteDiskConfig(&sdc)
<mask> config.DNS.StatsInterval = sdc.Interval
<mask> }
<mask>
<mask> if config.stats != nil {
<mask> sdc := stats.DiskConfig{}
<mask> config.stats.WriteDiskConfig(&sdc)
<mask> c... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep keep keep replace keep replace keep | <mask> config.stats.WriteDiskConfig(&sdc)
<mask> config.DNS.StatsInterval = sdc.Interval
<mask> }
<mask>
<mask> if config.queryLog != nil {
<mask> dc := querylog.DiskConfig{}
<mask> config.queryLog.WriteDiskConfig(&dc)
<mask> config.DNS.QueryLogEnabled = dc.Enabled
</s> Merge: * use upstream serve... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep replace keep keep keep keep keep keep keep replace keep keep | <mask> }
<mask>
<mask> if config.dnsFilter != nil {
<mask> c := dnsfilter.Config{}
<mask> config.dnsFilter.WriteDiskConfig(&c)
<mask> config.DNS.DnsfilterConf = c
<mask> }
<mask>
<mask> if config.dnsFilter != nil {
<mask> c := dnsfilter.Config{}
<mask> config.dnsFilter.WriteDiskConfig(&c)
<m... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep replace keep keep keep keep keep keep keep replace | <mask> }
<mask>
<mask> if config.dnsServer != nil {
<mask> c := dnsforward.FilteringConfig{}
<mask> config.dnsServer.WriteDiskConfig(&c)
<mask> config.DNS.FilteringConfig = c
<mask> }
<mask>
<mask> if config.dnsServer != nil {
<mask> c := dnsforward.FilteringConfig{}
<mask> config.dnsServer.W... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep keep replace keep keep keep keep keep keep keep replace | <mask> config.DNS.FilteringConfig = c
<mask> }
<mask>
<mask> if config.dhcpServer != nil {
<mask> c := dhcpd.ServerConfig{}
<mask> config.dhcpServer.WriteDiskConfig(&c)
<mask> config.DHCP = c
<mask> }
<mask>
<mask> if config.dhcpServer != nil {
<mask> c := dhcpd.ServerConfig{}
<mask> confi... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/config.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> func handleStatus(w http.ResponseWriter, r *http.Request) {
<mask> c := dnsforward.FilteringConfig{}
<mask> if config.dnsServer != nil {
<mask> config.dnsServer.WriteDiskConfig(&c)
<mask> }
<mask> data := map[string]interface{}{
<mask> "dns_addresses": getDNSAddresses(),
<mask>... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/control.go |
keep keep keep keep replace keep keep keep keep keep | <mask> httpError(w, http.StatusInternalServerError, "DNS server is not running")
<mask> return
<mask> }
<mask>
<mask> config.dnsServer.ServeHTTP(w, r)
<mask> }
<mask>
<mask> // ------------------------
<mask> // registration of handlers
<mask> // ------------------------
</s> Merge: * use upstream se... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/control.go |
keep replace replace replace replace keep keep replace keep keep keep keep | <mask>
<mask> initDNSServer()
<mask>
<mask> err = startDNSServer()
<mask> if err != nil {
<mask> config.firstRun = true
<mask> copyInstallSettings(&config, &curConfig)
<mask> httpError(w, http.StatusInternalServerError, "Couldn't start DNS server: %s", err)
<mask> return
<mask> }
<mask>
<mask... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/control_install.go |
keep keep keep keep replace keep keep keep keep keep | <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 restartHTTP {
<mask> go func() {
<mask> _ = config.httpServer.Shutdown(context.... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/control_install.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // check if port is available
<mask> // BUT: if we are already using this port, no need
<mask> alreadyRunning := false
<mask> if config.httpsServer.server != nil {
<mask> alreadyRunning = true
<mask> }
<mask> if !alreadyRunning {
<mask> err = checkPortAvailable(config.BindHost, data.Po... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/control_tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // check if port is available
<mask> // BUT: if we are already using this port, no need
<mask> alreadyRunning := false
<mask> if config.httpsServer.server != nil {
<mask> alreadyRunning = true
<mask> }
<mask> if !alreadyRunning {
<mask> err = checkPortAvailable(config.BindHost, data.Po... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/control_tls.go |
keep keep keep replace replace replace replace keep replace | <mask> if restartHTTPS {
<mask> go func() {
<mask> time.Sleep(time.Second) // TODO: could not find a way to reliably know that data was fully sent to client by https server, so we wait a bit to let response through before closing the server
<mask> config.httpsServer.cond.L.Lock()
<mask> config.httpsSer... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/control_tls.go |
keep replace keep keep keep keep replace keep keep | <mask>
<mask> err := config.dhcpServer.Init(config.DHCP)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't init DHCP server")
<mask> }
<mask>
<mask> err = config.dhcpServer.Start()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start DHCP server")
</s> Merge: ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | 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 := config.dhcpServer.Stop()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't stop DHCP server")
<mask> }
<mask>
<mask> return nil
</s> Merge: * use upstream servers directly for the internal DNS resol... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dhcp.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> type dnsContext struct {
<mask> rdns *RDNS
<mask> whois *Whois
<mask> }
<mask>
<mask> // Called by other modules when configuration is changed
<mask> func onConfigModified() {
<mask> _ = config.writ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep replace keep keep keep keep replace keep | <mask> // Please note that we must do it even if we don't start it
<mask> // so that we had access to the query log and the stats
<mask> func initDNSServer() {
<mask> baseDir := config.getDataDir()
<mask>
<mask> err := os.MkdirAll(baseDir, 0755)
<mask> if err != nil {
<mask> log.Fatalf("Cannot create DNS ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep replace keep replace keep | <mask> ConfigModified: onConfigModified,
<mask> HTTPRegister: httpRegister,
<mask> }
<mask> config.stats, err = stats.New(statsConf)
<mask> if err != nil {
<mask> log.Fatal("Couldn't initialize statistics module")
<mask> }
</s> Merge: * use upstream servers directly for the internal DNS resolver
Clo... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> MemSize: config.DNS.QueryLogMemSize,
<mask> ConfigModified: onConfigModified,
<mask> HTTPRegister: httpRegister,
<mask> }
<mask> config.queryLog = querylog.New(conf)
<mask>
<mask> filterConf := config.DNS.DnsfilterConf
<mask> bindhost := config.DNS.BindHost
<mask> if config.DNS.Bind... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep replace keep replace | <mask> filterConf.HTTPRegister = httpRegister
<mask> config.dnsFilter = dnsfilter.New(&filterConf, nil)
<mask>
<mask> config.dnsServer = dnsforward.NewServer(config.dnsFilter, config.stats, config.queryLog)
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(co... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> sessFilename := filepath.Join(baseDir, "sessions.db")
<mask> config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
<mask> config.Users = nil
<mask>
<mask> config.dnsctx.rdns = InitRDNS(&config.clients)
<mask> config.dnsctx.whois = initWhois(&config.clients)
<mask>
<ma... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep add keep keep keep keep | <mask> Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
<mask> Context.whois = initWhois(&Context.clients)
<mask>
<mask> initFiltering()
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> return Context.dnsServer != nil && Context.dnsServer.IsRunning()
</s> Merge: * use upstream servers di... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> initFiltering()
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> return config.dnsServer != nil && config.dnsServer.IsRunning()
<mask> }
<mask>
<mask> // nolint (gocyclo)
<mask> // Return TRUE if IP is within public Internet IP range
<mask> func isPublicIP(ip net.IP) bool {
</s> Merge: * use ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep replace keep keep replace | <mask> ipAddr := net.ParseIP(ip)
<mask> if !ipAddr.IsLoopback() {
<mask> config.dnsctx.rdns.Begin(ip)
<mask> }
<mask> if isPublicIP(ipAddr) {
<mask> config.dnsctx.whois.Begin(ip)
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) ->... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> config.dnsctx.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() (dnsforward.ServerConfig, error) {
<mask> newconfig := dnsforward.ServerConfig{
<mask> UDPListenAddr: &net.UDPAddr{IP: net.ParseIP(config.DNS.BindHost), Port: config.DNS.Port},
<mask> TCPListenAddr: &ne... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep keep keep replace keep | <mask> }
<mask>
<mask> newconfig.FilterHandler = applyAdditionalFiltering
<mask> newconfig.GetUpstreamsByClient = getUpstreamsByClient
<mask> return newconfig, nil
<mask> }
<mask>
<mask> func getUpstreamsByClient(clientAddr string) []string {
<mask> c, ok := config.clients.Find(clientAddr)
<mask> if !... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if len(clientAddr) == 0 {
<mask> return
<mask> }
<mask>
<mask> c, ok := config.clients.Find(clientAddr)
<mask> if !ok {
<mask> return
<mask> }
<mask>
<mask> log.Debug("Using settings for client with IP %s", clientAddr)
</s> Merge: * use upstream servers directly for the internal DNS resolv... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> enableFilters(false)
<mask>
<mask> newconfig, err := generateServerConfig()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask>
<mask> err = config.dnsServer.Start(&newconfig)
<mask> if err != nil {
<mask> ret... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep replace keep keep keep replace | <mask> const topClientsNumber = 100 // the number of clients to get
<mask> topClients := config.stats.GetTopClientsIP(topClientsNumber)
<mask> for _, ip := range topClients {
<mask> ipAddr := net.ParseIP(ip)
<mask> if !ipAddr.IsLoopback() {
<mask> config.dnsctx.rdns.Begin(ip)
</s> Merge: * use upstream... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if !ipAddr.IsLoopback() {
<mask> config.dnsctx.rdns.Begin(ip)
<mask> }
<mask> if isPublicIP(ipAddr) {
<mask> config.dnsctx.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Serve... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> func reconfigureDNSServer() error {
<mask> newconfig, err := generateServerConfig()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask> err = config.dnsServer.Reconfigure(&newconfig)
<mask> if err !... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> func stopDNSServer() error {
<mask> if !isRunning() {
<mask> return nil
<mask> }
<mask>
<mask> err := config.dnsServer.Stop()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
<mask> }
<mask>
<mask> // DN... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
<mask> }
<mask>
<mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them
<mask> config.dnsServer.Close()
<mask>
<mask> config.dnsFilter.Close()
<mask> config.dnsFilter = nil
<mask>
<mask>... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them
<mask> config.dnsServer.Close()
<mask>
<mask> config.dnsFilter.Close()
<mask> config.dnsFilter = nil
<mask>
<mask> config.stats.Close()
<mask> config.stats = nil
<mask>
<mask> config.queryLog.Clo... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> config.dnsFilter.Close()
<mask> config.dnsFilter = nil
<mask>
<mask> config.stats.Close()
<mask> config.stats = nil
<mask>
<mask> config.queryLog.Close()
<mask> config.queryLog = nil
<mask>
<mask> config.auth.Close()
</s> Merge: * use upstream servers directly for the internal DNS r... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> config.stats.Close()
<mask> config.stats = nil
<mask>
<mask> config.queryLog.Close()
<mask> config.queryLog = nil
<mask>
<mask> config.auth.Close()
<mask> config.auth = nil
<mask> return nil
<mask> }
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #121... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/dns.go |
keep keep keep keep replace keep | <mask> filters[int(filter.ID)] = filter.Path()
<mask> }
<mask> }
<mask>
<mask> _ = config.dnsFilter.SetFilters(filters, async)
<mask> }
</s> Merge: * use upstream servers directly for the internal DNS resolver
Close #1212
* Server.Start(config *ServerConfig) -> Start()
+ Server.Prepare(config *ServerCon... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "strings"
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // ----------------------------------
</s> Merge: * use upstream servers directly for the inte... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/helpers.go |
keep keep keep keep replace keep keep keep keep keep | <mask> http.Redirect(w, r, "/install.html", http.StatusSeeOther) // should not be cacheable
<mask> return
<mask> }
<mask> // enforce https?
<mask> if config.TLS.ForceHTTPS && r.TLS == nil && config.TLS.Enabled && config.TLS.PortHTTPS != 0 && config.httpsServer.server != nil {
<mask> // yes, and we ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e | home/helpers.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.