docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
if tlsConf.PortDNSCrypt != 0 { newconfig.DNSCryptConfig, err = newDNSCrypt(bindHost, tlsConf) if err != nil { // Don't wrap the error, because it's already // wrapped by newDNSCrypt. return dnsforward.ServerConfig{}, err } }
<mask> } <mask> } <mask> } <mask> <mask> newconfig.TLSv12Roots = Context.tlsRoots <mask> newconfig.TLSCiphers = Context.tlsCiphers <mask> newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH <mask> </s> Pull request: all: add dnscrypt support Merge in DNS/adguard-home from 1361-dnscrypt t...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1
internal/home/dns.go
return newconfig, nil } func newDNSCrypt(bindHost net.IP, tlsConf tlsConfigSettings) (dnscc dnsforward.DNSCryptConfig, err error) { if tlsConf.DNSCryptConfigFile == "" { return dnscc, agherr.Error("no dnscrypt_config_file") } f, err := os.Open(tlsConf.DNSCryptConfigFile) if err != nil { return dnscc, fmt.Err...
<mask> newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH <mask> <mask> newconfig.FilterHandler = applyAdditionalFiltering <mask> newconfig.GetCustomUpstreamByClient = Context.clients.FindUpstreams <mask> return newconfig <mask> } <mask> <mask> type dnsEncryption struct { <mask> https string...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1
internal/home/dns.go
func reconfigureDNSServer() (err error) { var newconfig dnsforward.ServerConfig newconfig, err = generateServerConfig()
<mask> <mask> return nil <mask> } <mask> <mask> func reconfigureDNSServer() error { <mask> newconfig := generateServerConfig() <mask> err := Context.dnsServer.Reconfigure(&newconfig) <mask> if err != nil { <mask> return fmt.Errorf("couldn't start forwarding DNS server: %w", err) <mask> } <mask> <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1
internal/home/dns.go
return fmt.Errorf("generating forwarding dns server config: %w", err) } err = Context.dnsServer.Reconfigure(&newconfig) if err != nil { return fmt.Errorf("starting forwarding dns server: %w", err)
<mask> func reconfigureDNSServer() error { <mask> newconfig := generateServerConfig() <mask> err := Context.dnsServer.Reconfigure(&newconfig) <mask> if err != nil { <mask> return fmt.Errorf("couldn't start forwarding DNS server: %w", err) <mask> } <mask> <mask> return nil <mask> } <mask> </s> Pull r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1
internal/home/dns.go
dispatch(dnsStatusFailure()); } }; export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST'); export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE'); export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS'); export const getDnsSettings = () =...
<mask> dispatch(getVersion()); <mask> dispatch(getTlsStatus()); <mask> } catch (error) { <mask> dispatch(addErrorToast({ error })); <mask> dispatch(initSettingsFailure()); <mask> } <mask> }; <mask> <mask> export const enableDnsRequest = createAction('ENABLE_DNS_REQUEST'...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/actions/index.js
dispatch(setUpstreamSuccess(config));
<mask> ) || []; <mask> <mask> await apiClient.setUpstream(values); <mask> dispatch(addSuccessToast('updated_upstream_dns_toast')); <mask> dispatch(setUpstreamSuccess()); <mask> } catch (error) { <mask> dispatch(addErrorToast({ error })); <mask> dispatch(setUp...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/actions/index.js
const { handleSubmit, submitting, invalid, processingSet, } = props;
<mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> const Form = (props) => { <mask> const { handleSubmit, submitting, invalid } = props; <mask> <mask> return ( <mask> <form onSubmit={handleSubmit}> <mask> <div classNa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/Form.js
disabled={processingSet}
<mask> type="text" <mask> className="form-control form-control--textarea" <mask> /> <mask> </div> <mask> <div className="form__group mb-5"> <mask> <label className="form__label form__label--with-desc" htmlFor="disallow...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/Form.js
disabled={processingSet}
<mask> name="disallowed_clients" <mask> component="textarea" <mask> type="text" <mask> className="form-control form-control--textarea" <mask> /> <mask> </div> <mask> <div className="form__group...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/Form.js
disabled={processingSet}
<mask> type="text" <mask> className="form-control form-control--textarea" <mask> /> <mask> </div> <mask> <div className="card-actions"> <mask> <div className="btn-list"> <mask> <button </s> - clie...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/Form.js
disabled={submitting || invalid || processingSet}
<mask> <div className="btn-list"> <mask> <button <mask> type="submit" <mask> className="btn btn-success btn-standard" <mask> disabled={submitting || invalid} <mask> > <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/Form.js
handleSubmit: PropTypes.func.isRequired, submitting: PropTypes.bool.isRequired, invalid: PropTypes.bool.isRequired, initialValues: PropTypes.object.isRequired, processingSet: PropTypes.bool.isRequired, t: PropTypes.func.isRequired,
<mask> ); <mask> }; <mask> <mask> Form.propTypes = { <mask> handleSubmit: PropTypes.func, <mask> submitting: PropTypes.bool, <mask> invalid: PropTypes.bool, <mask> initialValues: PropTypes.object, <mask> t: PropTypes.func, <mask> }; <mask> <mask> export default flow([withNamespaces...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/Form.js
const { processing, processingSet, ...values } = access;
<mask> <mask> render() { <mask> const { t, access } = this.props; <mask> <mask> const { <mask> processing, <mask> processingSet, <mask> ...values <mask> } = access; <mask> <mask> return ( <mask> <Card <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/index.js
processingSet={processingSet}
<mask> <Form <mask> initialValues={values} <mask> onSubmit={this.handleFormSubmit} <mask> /> <mask> </Card> <mask> ); <mask> } </s> - client: fix upstream DNS servers form Closes #1000 </s> remove check: null, ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Access/index.js
disabled={processingSetUpstream || processingTestUpstream}
<mask> className="form-control form-control--textarea" <mask> placeholder={t('upstream_dns')} <mask> /> <mask> </div> <mask> </div> <mask> <div className="col-12"> <mask> ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Upstream/Form.js
disabled={processingSetUpstream}
<mask> type="checkbox" <mask> component={renderSelectField} <mask> placeholder={t('upstream_parallel')} <mask> /> <mask> </div> <mask> </div> <mask> <div...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Upstream/Form.js
<label className="form__label form__label--with-desc" htmlFor="bootstrap_dns" >
<mask> <hr /> <mask> </div> <mask> <div className="col-12"> <mask> <div className="form__group"> <mask> <label className="form__label form__label--with-desc" htmlFor="bootstrap_dns"> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Upstream/Form.js
className="form-control form-control--textarea form-control--textarea-small"
<mask> id="bootstrap_dns" <mask> name="bootstrap_dns" <mask> component="textarea" <mask> type="text" <mask> className="form-control" <mask> placeh...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Upstream/Form.js
disabled={processingSetUpstream}
<mask> component="textarea" <mask> type="text" <mask> className="form-control form-control--textarea form-control--textarea-small" <mask> placeholder={t('bootstrap_dns')} <mask> /...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/Upstream/Form.js
this.props.getDnsSettings();
<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...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/index.js
const isDataLoading = dashboard.processingDnsSettings || access.processing || rewrites.processing; const isDataReady = !dashboard.processingDnsSettings && !access.processing && !rewrites.processing;
<mask> toggleRewritesModal, <mask> } = this.props; <mask> <mask> return ( <mask> <Fragment> <mask> <PageTitle title={t('dns_settings')} /> <mask> {isDataLoading && <Loading />} <mask> {isDataReady && ( <mask> ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/index.js
{isDataLoading && <Loading />} {isDataReady && (
<mask> <mask> return ( <mask> <Fragment> <mask> <PageTitle title={t('dns_settings')} /> <mask> {(dashboard.processing || access.processing) && <Loading />} <mask> {!dashboard.processing && !access.processing && ( <mask> <Fra...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/index.js
getDnsSettings: PropTypes.func.isRequired,
<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 ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Dns/index.js
transition: 0.3s ease-in-out background-color; } .form-control--textarea-small { min-height: 90px;
<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 '...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/components/Settings/Settings.css
import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
<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: ...
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/containers/Dns.js
getDnsSettings,
<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...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/containers/Dns.js
const settings = handleActions( { [actions.initSettingsRequest]: state => ({ ...state, processing: true }), [actions.initSettingsFailure]: state => ({ ...state, processing: false }), [actions.initSettingsSuccess]: (state, { payload }) => { const { settingsList } = payload; ...
<mask> import stats from './stats'; <mask> import queryLogs from './queryLogs'; <mask> import filtering from './filtering'; <mask> <mask> const settings = handleActions({ <mask> [actions.initSettingsRequest]: state => ({ ...state, processing: true }), <mask> [actions.initSettingsFailure]: state => ({ .....
[ "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", "ke...
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
const setting = settingsList[settingKey];
<mask> [actions.setUpstreamRequest]: state => ({ ...state, processingUpstream: true }), <mask> [actions.setUpstreamFailure]: state => ({ ...state, processingUpstream: false }), <mask> [actions.setUpstreamSuccess]: state => ({ ...state, processingUpstream: false }), <mask> <mask> [actions.testUpstr...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
const newSetting = { ...setting, enabled: !setting.enabled }; const newSettingsList = { ...settingsList, [settingKey]: newSetting }; return { ...state, settingsList: newSettingsList }; }, [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true ...
<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...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
...payload, processingSetUpstream: false, }),
<mask> http_port: httpPort, <mask> } = payload; <mask> const newState = { <mask> ...state, <mask> isCoreRunning: running, <mask> processing: false, <mask> dnsVersion: version, <mask> dnsPort, <mask> dnsAddresses...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.testUpstreamRequest]: state => ({ ...state, processingTestUpstream: true }), [actions.testUpstreamFailure]: state => ({ ...state, processingTestUpstream: false }), [actions.testUpstreamSuccess]: state => ({ ...state, processingTestUpstream: false }),
<mask> }; <mask> return newState; <mask> }, <mask> <mask> [actions.enableDnsRequest]: state => ({ ...state, processing: true }), <mask> [actions.enableDnsFailure]: state => ({ ...state, processing: false }), <mask> [actions.enableDnsSuccess]: (state) => { <mask> const ne...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
{ processing: true, processingTestUpstream: false, processingSetUpstream: false, processingDhcpStatus: false, settingsList: {},
<mask> [actions.enableDnsSuccess]: (state) => { <mask> const newState = { ...state, isCoreRunning: !state.isCoreRunning, processing: false }; <mask> return newState; <mask> }, <mask> <mask> [actions.disableDnsRequest]: state => ({ ...state, processing: true }), <mask> [actions.di...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
);
<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...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
const dashboard = handleActions( { [actions.dnsStatusRequest]: state => ({ ...state, processing: true }), [actions.dnsStatusFailure]: state => ({ ...state, processing: false }), [actions.dnsStatusSuccess]: (state, { payload }) => {
<mask> const newState = { ...state, isCoreRunning: !state.isCoreRunning, processing: false }; <mask> return newState; <mask> }, <mask> <mask> [actions.getVersionRequest]: state => ({ ...state, processingVersion: true }), <mask> [actions.getVersionFailure]: state => ({ ...state, proces...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
version, running, dns_port: dnsPort, dns_addresses: dnsAddresses, upstream_dns: upstreamDns, bootstrap_dns: bootstrapDns, all_servers: allServers, protection_enabled: protectionEnabled, ...
<mask> const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion; <mask> <mask> if (payload && versionCompare(currentVersion, payload.new_version) === -1) { <mask> const { <mask> announcement_url: announcementUrl, <mask> new_version...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
isCoreRunning: running, processing: false, dnsVersion: version, dnsPort, dnsAddresses, upstreamDns: upstreamDns.join('\n'), bootstrapDns: bootstrapDns.join('\n'), allServers, p...
<mask> } = payload; <mask> <mask> const newState = { <mask> ...state, <mask> announcementUrl, <mask> newVersion, <mask> canAutoUpdate, <mask> isUpdateAvailable: true, <mask> processingVersio...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
}, [actions.getUpdateRequest]: state => ({ ...state, processingUpdate: true }), [actions.getUpdateFailure]: state => ({ ...state, processingUpdate: false }), [actions.getUpdateSuccess]: (state) => { const newState = { ...state, processingUpdate: false };
<mask> processingVersion: false, <mask> }; <mask> return newState; <mask> }, <mask> <mask> [actions.toggleProtectionRequest]: state => ({ ...state, processingProtection: true }), <mask> [actions.toggleProtectionFailure]: state => ({ ...state, proce...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
},
<mask> isUpdateAvailable: true, <mask> processingVersion: false, <mask> }; <mask> return newState; <mask> } <mask> <mask> return { <mask> ...state, <mask> processingVersion: false, <mask> }; </s> - client...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.toggleProtectionRequest]: state => ({ ...state, processingProtection: true }), [actions.toggleProtectionFailure]: state => ({ ...state, processingProtection: false }), [actions.toggleProtectionSuccess]: (state) => { const newState = { ...state, ...
<mask> }; <mask> return newState; <mask> } <mask> <mask> return { <mask> ...state, <mask> processingVersion: false, <mask> }; <mask> }, <mask> <mask> [actions.getUpdateRequest]: state => ({ ...state, processingUpdate: true }), ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.handleUpstreamChange]: (state, { payload }) => { const { upstreamDns } = payload; return { ...state, upstreamDns }; },
<mask> processingVersion: false, <mask> }; <mask> }, <mask> <mask> [actions.getUpdateRequest]: state => ({ ...state, processingUpdate: true }), <mask> [actions.getUpdateFailure]: state => ({ ...state, processingUpdate: false }), <mask> [actions.getUpdateSuccess]: (state) => {...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.getLanguageSuccess]: (state, { payload }) => { const newState = { ...state, language: payload }; return newState; },
<mask> const newState = { ...state, processingUpdate: false }; <mask> return newState; <mask> }, <mask> <mask> [actions.toggleProtectionRequest]: state => ({ ...state, processingProtection: true }), <mask> [actions.toggleProtectionFailure]: state => ({ ...state, processingProtection: ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.getClientsRequest]: state => ({ ...state, processingClients: true }), [actions.getClientsFailure]: state => ({ ...state, processingClients: false }), [actions.getClientsSuccess]: (state, { payload }) => { const newState = { ...state, clients: ...
<mask> }; <mask> return newState; <mask> }, <mask> <mask> [actions.handleUpstreamChange]: (state, { payload }) => { <mask> const { upstreamDns } = payload; <mask> return { ...state, upstreamDns }; <mask> }, <mask> <mask> [actions.getLanguageSuccess]: (state, {...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }), [actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }), [actions.getDnsSettingsSuccess]: (state, { payload }) => { const { upstream_dns: upstreamDns,...
<mask> const { upstreamDns } = payload; <mask> return { ...state, upstreamDns }; <mask> }, <mask> <mask> [actions.getLanguageSuccess]: (state, { payload }) => { <mask> const newState = { ...state, language: payload }; <mask> return newState; <mask> }, <mask> <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
return { ...state, allServers, upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '', bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '', processingDnsSettings: false, }; },
<mask> const newState = { ...state, language: payload }; <mask> return newState; <mask> }, <mask> <mask> [actions.getClientsRequest]: state => ({ ...state, processingClients: true }), <mask> [actions.getClientsFailure]: state => ({ ...state, processingClients: false }), <mask> [a...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
{ processing: true, isCoreRunning: false, processingVersion: true, processingFiltering: true, processingClients: true, processingUpdate: false, processingDnsSettings: true, upstreamDns: '', bootstrapDns: '', allServers: false, p...
<mask> processingClients: false, <mask> }; <mask> return newState; <mask> }, <mask> }, { <mask> processing: true, <mask> isCoreRunning: false, <mask> processingVersion: true, <mask> processingFiltering: true, <mask> processingClients: true, <mask> proce...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", ...
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
const dhcp = handleActions( { [actions.getDhcpStatusRequest]: state => ({ ...state, processing: true }), [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }), [actions.getDhcpStatusSuccess]: (state, { payload }) => { const { static_leases: staticLeases, ...v...
<mask> clients: [], <mask> autoClients: [], <mask> }); <mask> <mask> const dhcp = handleActions({ <mask> [actions.getDhcpStatusRequest]: state => ({ ...state, processing: true }), <mask> [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }), <mask> [actions.getDhcpStatu...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
const newState = { ...state, staticLeases, processing: false, ...values, };
<mask> static_leases: staticLeases, <mask> ...values <mask> } = payload; <mask> <mask> const newState = { <mask> ...state, <mask> staticLeases, <mask> processing: false, <mask> ...values, <mask> }; <mask> <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
return newState; },
<mask> processing: false, <mask> ...values, <mask> }; <mask> <mask> return newState; <mask> }, <mask> <mask> [actions.getDhcpInterfacesRequest]: state => ({ ...state, processingInterfaces: true }), <mask> [actions.getDhcpInterfacesFailure]: state => ({ ...s...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.getDhcpInterfacesRequest]: state => ({ ...state, processingInterfaces: true }), [actions.getDhcpInterfacesFailure]: state => ({ ...state, processingInterfaces: false }), [actions.getDhcpInterfacesSuccess]: (state, { payload }) => { const newState = { ...state...
<mask> <mask> return newState; <mask> }, <mask> <mask> [actions.getDhcpInterfacesRequest]: state => ({ ...state, processingInterfaces: true }), <mask> [actions.getDhcpInterfacesFailure]: state => ({ ...state, processingInterfaces: false }), <mask> [actions.getDhcpInterfacesSuccess]: (st...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.findActiveDhcpRequest]: state => ({ ...state, processingStatus: true }), [actions.findActiveDhcpFailure]: state => ({ ...state, processingStatus: false }), [actions.findActiveDhcpSuccess]: (state, { payload }) => { const { other_server: otherServer, static_ip: staticIP } = p...
<mask> }; <mask> return newState; <mask> }, <mask> <mask> [actions.findActiveDhcpRequest]: state => ({ ...state, processingStatus: true }), <mask> [actions.findActiveDhcpFailure]: state => ({ ...state, processingStatus: false }), <mask> [actions.findActiveDhcpSuccess]: (state, { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
const newState = { ...state, check: { otherServer, staticIP, }, processingStatus: false, }; return newState; },
<mask> other_server: otherServer, <mask> static_ip: staticIP, <mask> } = payload; <mask> <mask> const newState = { <mask> ...state, <mask> check: { <mask> otherServer, <mask> staticIP, <mask> }, <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.toggleDhcpRequest]: state => ({ ...state, processingDhcp: true }), [actions.toggleDhcpFailure]: state => ({ ...state, processingDhcp: false }), [actions.toggleDhcpSuccess]: (state) => { const { config } = state; const newConfig = { ...config, enabled: !config.ena...
<mask> }; <mask> return newState; <mask> }, <mask> <mask> [actions.toggleDhcpRequest]: state => ({ ...state, processingDhcp: true }), <mask> [actions.toggleDhcpFailure]: state => ({ ...state, processingDhcp: false }), <mask> [actions.toggleDhcpSuccess]: (state) => { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.setDhcpConfigRequest]: state => ({ ...state, processingConfig: true }), [actions.setDhcpConfigFailure]: state => ({ ...state, processingConfig: false }), [actions.setDhcpConfigSuccess]: (state, { payload }) => { const { config } = state; const newConfig = { ...co...
<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...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.toggleLeaseModal]: (state) => { const newState = { ...state, isModalOpen: !state.isModalOpen, }; return newState; },
<mask> const newState = { ...state, config: newConfig, processingConfig: false }; <mask> return newState; <mask> }, <mask> <mask> [actions.toggleLeaseModal]: (state) => { <mask> const newState = { <mask> ...state, <mask> isModalOpen: !state.isModalOpen, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.addStaticLeaseRequest]: state => ({ ...state, processingAdding: true }), [actions.addStaticLeaseFailure]: state => ({ ...state, processingAdding: false }), [actions.addStaticLeaseSuccess]: (state, { payload }) => { const { ip, mac, hostname } = payload; const new...
<mask> }; <mask> return newState; <mask> }, <mask> <mask> [actions.addStaticLeaseRequest]: state => ({ ...state, processingAdding: true }), <mask> [actions.addStaticLeaseFailure]: state => ({ ...state, processingAdding: false }), <mask> [actions.addStaticLeaseSuccess]: (state, { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", ...
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
[actions.removeStaticLeaseRequest]: state => ({ ...state, processingDeleting: true }), [actions.removeStaticLeaseFailure]: state => ({ ...state, processingDeleting: false }), [actions.removeStaticLeaseSuccess]: (state, { payload }) => { const leaseToRemove = payload.ip; c...
<mask> }; <mask> return newState; <mask> }, <mask> <mask> [actions.removeStaticLeaseRequest]: state => ({ ...state, processingDeleting: true }), <mask> [actions.removeStaticLeaseFailure]: state => ({ ...state, processingDeleting: false }), <mask> [actions.removeStaticLeaseSuccess...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
{ processing: true, processingStatus: false, processingInterfaces: false, processingDhcp: false, processingConfig: false, processingAdding: false, processingDeleting: false, config: { enabled: false, }, check: null, ...
<mask> processingDeleting: false, <mask> }; <mask> return newState; <mask> }, <mask> }, { <mask> processing: true, <mask> processingStatus: false, <mask> processingInterfaces: false, <mask> processingDhcp: false, <mask> processingConfig: false, <mask> p...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
);
<mask> processingDeleting: false, <mask> config: { <mask> enabled: false, <mask> }, <mask> check: null, <mask> leases: [], <mask> staticLeases: [], <mask> isModalOpen: false, <mask> }); <mask> <mask> export default combineReducers({ <mask> settings, <mask> dashb...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156
client/src/reducers/index.js
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
// DNS proxy instance for internal usage // We don't Start() it and so no listen port is required. internalProxy *proxy.Proxy
<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() ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
isRunning bool
<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...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
s.dnsProxy = nil
<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...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
func (s *Server) Start() error {
<mask> FilteringConfig: FilteringConfig{BlockedResponseTTL: 3600}, <mask> } <mask> <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) <mask> } <mask> </s> Merge: * use upstream s...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
return s.startInternal()
<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) <mask> } <mask> <mask> // startInternal starts without locking <mask> func (s *Server) startInternal(config *ServerConfig) error { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
func (s *Server) startInternal() error { err := s.dnsProxy.Start() if err == nil { s.isRunning = true
<mask> return s.startInternal(config) <mask> } <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> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
return err
<mask> err := s.prepare(config) <mask> if err != nil { <mask> return err <mask> } <mask> return s.dnsProxy.Start() <mask> } <mask> <mask> // Prepare the object <mask> func (s *Server) prepare(config *ServerConfig) error { <mask> if s.dnsProxy != nil { </s> Merge: * use upstream servers directly for t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
func (s *Server) Prepare(config *ServerConfig) error {
<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...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
intlProxyConfig := proxy.Config{ CacheEnabled: true, CacheSizeBytes: 4096, Upstreams: s.conf.Upstreams, DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams, } s.internalProxy = &proxy.Proxy{Config: intlProxyConfig}
<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...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
<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> } <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
s.isRunning = false
<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...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
defer s.RUnlock() return s.isRunning
<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 - ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
err = s.startInternal()
<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 <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
err = s.Prepare(config) if err != nil { return errorx.Decorate(err, "could not reconfigure the server") } err = s.startInternal()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward.go
err := s.Start()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
_ = s.Prepare(nil)
<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...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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 ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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 ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Prepare(nil)
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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) ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Start()
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
err := s.Prepare(nil) assert.True(t, err == nil)
<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: * ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
dnsforward/dnsforward_test.go
github.com/AdguardTeam/dnsproxy v0.23.0
<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....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
go.mod
github.com/AdguardTeam/dnsproxy v0.23.0 h1:GrOUapcWjf19MF8NznZUbcYujBbl7QXapBWTFKqkJQg= github.com/AdguardTeam/dnsproxy v0.23.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
<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...
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
go.sum
clients.lock.Lock() for _, cli := range clients.list {
<mask> } <mask> <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> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/clients.go
Name: cli.Name, UseGlobalSettings: !cli.UseOwnSettings, FilteringEnabled: cli.FilteringEnabled, ParentalEnabled: cli.ParentalEnabled, SafeSearchEnabled: cli.SafeSearchEnabled, SafeBrowsingEnabled: cli.SafeBrowsingEnabled,
<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: cli.IDs, <mask> UseGlobalSettings: !cli.U...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/clients.go
<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...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/clients.go
cy.IDs = make([]string, len(cli.IDs)) copy(cy.IDs, cli.IDs) cy.BlockedServices = make([]string, len(cli.BlockedServices)) copy(cy.BlockedServices, cli.BlockedServices) cy.Upstreams = make([]string, len(cli.Upstreams)) copy(cy.Upstreams, cli.Upstreams)
<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...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/clients.go
clients.lock.Unlock()
<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...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/clients.go
<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...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/clients.go
// HTTPSServer - HTTPS Server
<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...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/config.go
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/config.go
auth *Auth // HTTP authentication module
<mask> clients clientsContainer // per-client-settings module <mask> controlLock sync.Mutex <mask> transport *http.Transport <mask> client *http.Client <mask> stats stats.Stats // statistics module <mask> queryLog querylog.QueryLog // query log module ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/config.go
<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...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/config.go
Context.clients.WriteDiskConfig(&config.Clients)
<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...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/config.go
if Context.stats != nil {
<mask> if config.auth != nil { <mask> config.Users = config.auth.GetUsers() <mask> } <mask> <mask> if config.stats != nil { <mask> sdc := stats.DiskConfig{} <mask> config.stats.WriteDiskConfig(&sdc) <mask> config.DNS.StatsInterval = sdc.Interval <mask> } <mask> </s> Merge: * use upstream server...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0a66913b4d8b5f34310a263c6399875b900d465e
home/config.go