code_before
stringlengths 16
1.81M
| edits
stringlengths 4
328k
| next_edit
stringlengths 0
76.5k
| code_after
stringlengths 3
49.9M
| label_window
sequencelengths 4
1.81k
| instruction
stringlengths 20
51.9k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|---|---|---|
}, {
processing: true,
processingTestUpstream: false,
processingSetUpstream: false,
upstream: '',
});
const dashboard = handleActions({
[actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
[actions.dnsStatusFailure]: state => ({ ...state, processing: false }),
| </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstream } = payload;
return { ...state, upstream };
},
</s> add | }, {
processing: true,
processingTestUpstream: false,
processingSetUpstream: false,
});
const dashboard = handleActions({
[actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
[actions.dnsStatusFailure]: state => ({ ...state, processing: false }), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Add list of upstream servers
Closes #344 | https://github.com/AdguardTeam/AdGuardHome/commit/2c720350006f607958540a672d2fa4cf927010bb | client/src/reducers/index.js |
|
dns_address: dnsAddress,
querylog_enabled: queryLogEnabled,
} = payload;
const newState = {
...state,
isCoreRunning: running,
processing: false,
| </s> remove upstream: '',
</s> add </s> remove const { settings } = state;
const props = { settings };
</s> add const { settings, dashboard } = state;
const props = { settings, dashboard }; </s> remove const { settings, upstream } = this.props;
</s> add const { settings } = this.props;
const { upstreamDns } = this.props.dashboard; | upstream_dns: upstreamDns, | dns_address: dnsAddress,
querylog_enabled: queryLogEnabled,
upstream_dns: upstreamDns,
} = payload;
const newState = {
...state,
isCoreRunning: running,
processing: false, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Add list of upstream servers
Closes #344 | https://github.com/AdguardTeam/AdGuardHome/commit/2c720350006f607958540a672d2fa4cf927010bb | client/src/reducers/index.js |
dnsVersion: version,
dnsPort,
dnsAddress,
queryLogEnabled,
};
return newState;
},
[actions.enableDnsRequest]: state => ({ ...state, processing: true }),
| </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstream } = payload;
return { ...state, upstream };
},
</s> add </s> remove upstream: '',
</s> add | upstreamDns: upstreamDns.join('\n'), | dnsVersion: version,
dnsPort,
dnsAddress,
queryLogEnabled,
upstreamDns: upstreamDns.join('\n'),
};
return newState;
},
[actions.enableDnsRequest]: state => ({ ...state, processing: true }), | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Add list of upstream servers
Closes #344 | https://github.com/AdguardTeam/AdGuardHome/commit/2c720350006f607958540a672d2fa4cf927010bb | client/src/reducers/index.js |
[actions.toggleFilteringSuccess]: (state) => {
const newSetting = { ...state, isFilteringEnabled: !state.isFilteringEnabled };
return newSetting;
},
}, {
processing: true,
isCoreRunning: false,
processingTopStats: true,
processingStats: true,
logStatusProcessing: false,
| </s> remove upstream: '',
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstream } = payload;
return { ...state, upstream };
},
</s> add </s> remove const { settings } = state;
const props = { settings };
</s> add const { settings, dashboard } = state;
const props = { settings, dashboard }; | [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
}, | [actions.toggleFilteringSuccess]: (state) => {
const newSetting = { ...state, isFilteringEnabled: !state.isFilteringEnabled };
return newSetting;
},
[actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
}, {
processing: true,
isCoreRunning: false,
processingTopStats: true,
processingStats: true,
logStatusProcessing: false, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Add list of upstream servers
Closes #344 | https://github.com/AdguardTeam/AdGuardHome/commit/2c720350006f607958540a672d2fa4cf927010bb | client/src/reducers/index.js |
processingVersion: true,
processingFiltering: true,
});
const queryLogs = handleActions({
[actions.getLogsRequest]: state => ({ ...state, getLogsProcessing: true }),
[actions.getLogsFailure]: state => ({ ...state, getLogsProcessing: false }),
| </s> remove upstream: '',
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstream } = payload;
return { ...state, upstream };
},
</s> add </s> remove this.props.handleUpstreamChange({ upstream: value });
</s> add this.props.handleUpstreamChange({ upstreamDns: value }); | upstreamDns: [], | processingVersion: true,
processingFiltering: true,
upstreamDns: [],
});
const queryLogs = handleActions({
[actions.getLogsRequest]: state => ({ ...state, getLogsProcessing: true }),
[actions.getLogsFailure]: state => ({ ...state, getLogsProcessing: false }), | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Add list of upstream servers
Closes #344 | https://github.com/AdguardTeam/AdGuardHome/commit/2c720350006f607958540a672d2fa4cf927010bb | client/src/reducers/index.js |
getAllStats = () => {
this.props.getStats();
this.props.getStatsHistory();
this.props.getTopStats();
}
render() {
const { dashboard } = this.props;
const dashboardProcessing =
dashboard.processing ||
| </s> remove disableDns: PropTypes.func,
</s> add | this.props.getFiltering();
}
getToggleFilteringButton = () => {
const { isFilteringEnabled } = this.props.dashboard;
const buttonText = isFilteringEnabled ? 'Disable' : 'Enable';
const buttonClass = isFilteringEnabled ? 'btn-outline-secondary' : 'btn-outline-success';
return (
<button type="button" className={`btn btn-sm mr-2 ${buttonClass}`} onClick={() => this.props.toggleFiltering(isFilteringEnabled)}>
{buttonText} protection
</button>
); | getAllStats = () => {
this.props.getStats();
this.props.getStatsHistory();
this.props.getTopStats();
this.props.getFiltering();
}
getToggleFilteringButton = () => {
const { isFilteringEnabled } = this.props.dashboard;
const buttonText = isFilteringEnabled ? 'Disable' : 'Enable';
const buttonClass = isFilteringEnabled ? 'btn-outline-secondary' : 'btn-outline-success';
return (
<button type="button" className={`btn btn-sm mr-2 ${buttonClass}`} onClick={() => this.props.toggleFiltering(isFilteringEnabled)}>
{buttonText} protection
</button>
);
}
render() {
const { dashboard } = this.props;
const dashboardProcessing =
dashboard.processing || | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Add button to the dashboard page for enable/disable filtering
Closes #333 | https://github.com/AdguardTeam/AdGuardHome/commit/2cf22898dd1418d1659340a95c94c8c9a6a7cf04 | client/src/components/Dashboard/index.js |
<PageTitle title="Dashboard">
<div className="page-title__actions">
{refreshFullButton}
</div>
</PageTitle>
{dashboardProcessing && <Loading />}
| </s> remove disableDns: PropTypes.func,
</s> add | {this.getToggleFilteringButton()} | <PageTitle title="Dashboard">
<div className="page-title__actions">
{this.getToggleFilteringButton()}
{refreshFullButton}
</div>
</PageTitle>
{dashboardProcessing && <Loading />} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Add button to the dashboard page for enable/disable filtering
Closes #333 | https://github.com/AdguardTeam/AdGuardHome/commit/2cf22898dd1418d1659340a95c94c8c9a6a7cf04 | client/src/components/Dashboard/index.js |
Dashboard.propTypes = {
getStats: PropTypes.func,
getStatsHistory: PropTypes.func,
getTopStats: PropTypes.func,
disableDns: PropTypes.func,
dashboard: PropTypes.object,
isCoreRunning: PropTypes.bool,
};
export default Dashboard;
| </s> | Dashboard.propTypes = {
getStats: PropTypes.func,
getStatsHistory: PropTypes.func,
getTopStats: PropTypes.func,
dashboard: PropTypes.object,
isCoreRunning: PropTypes.bool,
};
export default Dashboard; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Add button to the dashboard page for enable/disable filtering
Closes #333 | https://github.com/AdguardTeam/AdGuardHome/commit/2cf22898dd1418d1659340a95c94c8c9a6a7cf04 | client/src/components/Dashboard/index.js |
|
getStatsHistory: PropTypes.func,
getTopStats: PropTypes.func,
dashboard: PropTypes.object,
isCoreRunning: PropTypes.bool,
};
export default Dashboard;
| </s> remove disableDns: PropTypes.func,
</s> add | getFiltering: PropTypes.func,
toggleFiltering: PropTypes.func, | getStatsHistory: PropTypes.func,
getTopStats: PropTypes.func,
dashboard: PropTypes.object,
isCoreRunning: PropTypes.bool,
getFiltering: PropTypes.func,
toggleFiltering: PropTypes.func,
};
export default Dashboard; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | Add button to the dashboard page for enable/disable filtering
Closes #333 | https://github.com/AdguardTeam/AdGuardHome/commit/2cf22898dd1418d1659340a95c94c8c9a6a7cf04 | client/src/components/Dashboard/index.js |
}
return state;
},
}, {
processing: true,
isCoreRunning: false,
processingTopStats: true,
| </s> remove disableDns: PropTypes.func,
</s> add | [actions.getFilteringRequest]: state => ({ ...state, processingFiltering: true }),
[actions.getFilteringFailure]: state => ({ ...state, processingFiltering: false }),
[actions.getFilteringSuccess]: (state, { payload }) => {
const newState = { ...state, isFilteringEnabled: payload, processingFiltering: false };
return newState;
},
[actions.toggleFilteringSuccess]: (state) => {
const newSetting = { ...state, isFilteringEnabled: !state.isFilteringEnabled };
return newSetting;
}, | }
return state;
},
[actions.getFilteringRequest]: state => ({ ...state, processingFiltering: true }),
[actions.getFilteringFailure]: state => ({ ...state, processingFiltering: false }),
[actions.getFilteringSuccess]: (state, { payload }) => {
const newState = { ...state, isFilteringEnabled: payload, processingFiltering: false };
return newState;
},
[actions.toggleFilteringSuccess]: (state) => {
const newSetting = { ...state, isFilteringEnabled: !state.isFilteringEnabled };
return newSetting;
},
}, {
processing: true,
isCoreRunning: false,
processingTopStats: true, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Add button to the dashboard page for enable/disable filtering
Closes #333 | https://github.com/AdguardTeam/AdGuardHome/commit/2cf22898dd1418d1659340a95c94c8c9a6a7cf04 | client/src/reducers/index.js |
processingTopStats: true,
processingStats: true,
logStatusProcessing: false,
processingVersion: true,
});
const queryLogs = handleActions({
[actions.getLogsRequest]: state => ({ ...state, getLogsProcessing: true }),
| </s> remove disableDns: PropTypes.func,
</s> add | processingFiltering: true, | processingTopStats: true,
processingStats: true,
logStatusProcessing: false,
processingVersion: true,
processingFiltering: true,
});
const queryLogs = handleActions({
[actions.getLogsRequest]: state => ({ ...state, getLogsProcessing: true }), | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Add button to the dashboard page for enable/disable filtering
Closes #333 | https://github.com/AdguardTeam/AdGuardHome/commit/2cf22898dd1418d1659340a95c94c8c9a6a7cf04 | client/src/reducers/index.js |
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/AdguardTeam/AdGuardHome/internal/stats"
"github.com/AdguardTeam/AdGuardHome/internal/updater"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/version"
"github.com/AdguardTeam/golibs/log"
"gopkg.in/natefinch/lumberjack.v2"
)
| </s> remove Context.tlsRoots = util.LoadSystemRootCAs()
Context.tlsCiphers = util.InitTLSCiphers()
</s> add Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers() | "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/AdguardTeam/AdGuardHome/internal/stats"
"github.com/AdguardTeam/AdGuardHome/internal/updater"
"github.com/AdguardTeam/AdGuardHome/internal/version"
"github.com/AdguardTeam/golibs/log"
"gopkg.in/natefinch/lumberjack.v2"
)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2829 rm util
Merge in DNS/adguard-home from 2829-finally to master
Closes #2829.
Squashed commit of the following:
commit 22b287d5c2cbeced1b48747a1c4b6431c1052f12
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 18:39:54 2021 +0300
util: rm | https://github.com/AdguardTeam/AdGuardHome/commit/2d87a0458ef0425629e9f11dbb382e2ec0089ad0 | internal/home/home.go |
|
}
initConfig()
Context.tlsRoots = util.LoadSystemRootCAs()
Context.tlsCiphers = util.InitTLSCiphers()
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,
TLSClientConfig: &tls.Config{
RootCAs: Context.tlsRoots,
| </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add | Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers() | }
initConfig()
Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers()
Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers()
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,
TLSClientConfig: &tls.Config{
RootCAs: Context.tlsRoots, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2829 rm util
Merge in DNS/adguard-home from 2829-finally to master
Closes #2829.
Squashed commit of the following:
commit 22b287d5c2cbeced1b48747a1c4b6431c1052f12
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 18:39:54 2021 +0300
util: rm | https://github.com/AdguardTeam/AdGuardHome/commit/2d87a0458ef0425629e9f11dbb382e2ec0089ad0 | internal/home/home.go |
"io/ioutil"
"net/http"
"os"
"reflect"
"runtime"
"strings"
"sync"
"time"
| </s> remove Context.tlsRoots = util.LoadSystemRootCAs()
Context.tlsCiphers = util.InitTLSCiphers()
</s> add Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers() </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add | "path/filepath" | "io/ioutil"
"net/http"
"os"
"path/filepath"
"reflect"
"runtime"
"strings"
"sync"
"time"
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2829 rm util
Merge in DNS/adguard-home from 2829-finally to master
Closes #2829.
Squashed commit of the following:
commit 22b287d5c2cbeced1b48747a1c4b6431c1052f12
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 18:39:54 2021 +0300
util: rm | https://github.com/AdguardTeam/AdGuardHome/commit/2d87a0458ef0425629e9f11dbb382e2ec0089ad0 | internal/home/tls.go |
"net/http"
"os"
"path/filepath"
"reflect"
"strings"
"sync"
"time"
"github.com/AdguardTeam/golibs/log"
| </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add </s> remove Context.tlsRoots = util.LoadSystemRootCAs()
Context.tlsCiphers = util.InitTLSCiphers()
</s> add Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers() | "runtime" | "net/http"
"os"
"path/filepath"
"reflect"
"runtime"
"strings"
"sync"
"time"
"github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2829 rm util
Merge in DNS/adguard-home from 2829-finally to master
Closes #2829.
Squashed commit of the following:
commit 22b287d5c2cbeced1b48747a1c4b6431c1052f12
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 18:39:54 2021 +0300
util: rm | https://github.com/AdguardTeam/AdGuardHome/commit/2d87a0458ef0425629e9f11dbb382e2ec0089ad0 | internal/home/tls.go |
"time"
"github.com/AdguardTeam/golibs/log"
)
var tlsWebHandlersRegistered = false
// TLSMod - TLS module object
type TLSMod struct {
| </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util"
</s> add </s> remove Context.tlsRoots = util.LoadSystemRootCAs()
Context.tlsCiphers = util.InitTLSCiphers()
</s> add Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers() | "golang.org/x/sys/cpu" | "time"
"github.com/AdguardTeam/golibs/log"
"golang.org/x/sys/cpu"
)
var tlsWebHandlersRegistered = false
// TLSMod - TLS module object
type TLSMod struct { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2829 rm util
Merge in DNS/adguard-home from 2829-finally to master
Closes #2829.
Squashed commit of the following:
commit 22b287d5c2cbeced1b48747a1c4b6431c1052f12
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 18:39:54 2021 +0300
util: rm | https://github.com/AdguardTeam/AdGuardHome/commit/2d87a0458ef0425629e9f11dbb382e2ec0089ad0 | internal/home/tls.go |
go 1.18
require (
github.com/AdguardTeam/dnsproxy v0.45.3
github.com/AdguardTeam/golibs v0.10.9
github.com/AdguardTeam/urlfilter v0.16.0
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.5
github.com/digineo/go-ipset/v2 v2.2.1
| </s> remove github.com/AdguardTeam/dnsproxy v0.45.3 h1:lvJlifDIVjHFVkVcieBhXyQA357Wl+vmLxeDlaQ8DE8=
github.com/AdguardTeam/dnsproxy v0.45.3/go.mod h1:h+0r4GDvHHY2Wu6r7oqva+O37h00KofYysfzy1TEXFE=
</s> add github.com/AdguardTeam/dnsproxy v0.46.1 h1:ej9iRorG+vekaXGYB854waAiS+q8OfswYZ1MQRZolHk=
github.com/AdguardTeam/dnsproxy v0.46.1/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA= </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove github.com/lucas-clemente/quic-go v0.29.1
</s> add github.com/lucas-clemente/quic-go v0.29.2 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect | github.com/AdguardTeam/dnsproxy v0.46.1 |
go 1.18
require (
github.com/AdguardTeam/dnsproxy v0.46.1
github.com/AdguardTeam/golibs v0.10.9
github.com/AdguardTeam/urlfilter v0.16.0
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.5
github.com/digineo/go-ipset/v2 v2.2.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | go.mod |
github.com/google/renameio v1.0.1
github.com/google/uuid v1.3.0
github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84
github.com/kardianos/service v1.2.1
github.com/lucas-clemente/quic-go v0.29.1
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
github.com/mdlayher/netlink v1.6.0
// TODO(a.garipov): This package is deprecated; find a new one or use
// our own code for that. Perhaps, use gopacket.
github.com/mdlayher/raw v0.1.0
| </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE= </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect </s> remove // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
</s> add // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
| github.com/lucas-clemente/quic-go v0.29.2 | github.com/google/renameio v1.0.1
github.com/google/uuid v1.3.0
github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84
github.com/kardianos/service v1.2.1
github.com/lucas-clemente/quic-go v0.29.2
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
github.com/mdlayher/netlink v1.6.0
// TODO(a.garipov): This package is deprecated; find a new one or use
// our own code for that. Perhaps, use gopacket.
github.com/mdlayher/raw v0.1.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | go.mod |
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qpack v0.2.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
| </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/lucas-clemente/quic-go v0.29.1
</s> add github.com/lucas-clemente/quic-go v0.29.2 </s> remove github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE= </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. | github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect | github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qpack v0.2.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | go.mod |
github.com/AdguardTeam/dnsproxy v0.45.3 h1:lvJlifDIVjHFVkVcieBhXyQA357Wl+vmLxeDlaQ8DE8=
github.com/AdguardTeam/dnsproxy v0.45.3/go.mod h1:h+0r4GDvHHY2Wu6r7oqva+O37h00KofYysfzy1TEXFE=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
github.com/AdguardTeam/golibs v0.10.9 h1:F9oP2da0dQ9RQDM1lGR7LxUTfUWu8hEFOs4icwAkKM0=
github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14=
github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
| </s> remove github.com/AdguardTeam/dnsproxy v0.45.3
</s> add github.com/AdguardTeam/dnsproxy v0.46.1 </s> remove github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE= </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove github.com/lucas-clemente/quic-go v0.29.1
</s> add github.com/lucas-clemente/quic-go v0.29.2 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect | github.com/AdguardTeam/dnsproxy v0.46.1 h1:ej9iRorG+vekaXGYB854waAiS+q8OfswYZ1MQRZolHk=
github.com/AdguardTeam/dnsproxy v0.46.1/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA= | github.com/AdguardTeam/dnsproxy v0.46.1 h1:ej9iRorG+vekaXGYB854waAiS+q8OfswYZ1MQRZolHk=
github.com/AdguardTeam/dnsproxy v0.46.1/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA=
github.com/AdguardTeam/dnsproxy v0.46.1 h1:ej9iRorG+vekaXGYB854waAiS+q8OfswYZ1MQRZolHk=
github.com/AdguardTeam/dnsproxy v0.46.1/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
github.com/AdguardTeam/golibs v0.10.9 h1:F9oP2da0dQ9RQDM1lGR7LxUTfUWu8hEFOs4icwAkKM0=
github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14=
github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU= | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | go.sum |
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
| </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect </s> remove github.com/lucas-clemente/quic-go v0.29.1
</s> add github.com/lucas-clemente/quic-go v0.29.2 </s> remove github.com/AdguardTeam/dnsproxy v0.45.3 h1:lvJlifDIVjHFVkVcieBhXyQA357Wl+vmLxeDlaQ8DE8=
github.com/AdguardTeam/dnsproxy v0.45.3/go.mod h1:h+0r4GDvHHY2Wu6r7oqva+O37h00KofYysfzy1TEXFE=
</s> add github.com/AdguardTeam/dnsproxy v0.46.1 h1:ej9iRorG+vekaXGYB854waAiS+q8OfswYZ1MQRZolHk=
github.com/AdguardTeam/dnsproxy v0.46.1/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA= </s> remove require.NoError(t, err)
</s> add require.ErrorIs(t, err, closeErr) | github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE= | github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE=
github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | go.sum |
github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og=
github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
| </s> remove github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE= </s> remove github.com/lucas-clemente/quic-go v0.29.1
</s> add github.com/lucas-clemente/quic-go v0.29.2 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect </s> remove require.NoError(t, err)
</s> add require.ErrorIs(t, err, closeErr) </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() | github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= | github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og=
github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | go.sum |
// rename it to just Upstream.
type UpstreamMock struct {
OnAddress func() (addr string)
OnExchange func(req *dns.Msg) (resp *dns.Msg, err error)
}
// Address implements the [upstream.Upstream] interface for *UpstreamMock.
func (u *UpstreamMock) Address() (addr string) {
| </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. </s> remove // Address implements upstream.Upstream interface for *Upstream.
</s> add // Address implements [upstream.Upstream] interface for *Upstream. | OnClose func() (err error) | // rename it to just Upstream.
type UpstreamMock struct {
OnAddress func() (addr string)
OnExchange func(req *dns.Msg) (resp *dns.Msg, err error)
OnClose func() (err error)
}
// Address implements the [upstream.Upstream] interface for *UpstreamMock.
func (u *UpstreamMock) Address() (addr string) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/aghtest/interface.go |
"net"
"strings"
"testing"
"github.com/AdguardTeam/golibs/errors"
"github.com/miekg/dns"
"github.com/stretchr/testify/require"
)
| </s> remove require.NoError(t, err)
</s> add require.ErrorIs(t, err, closeErr) | "github.com/AdguardTeam/dnsproxy/upstream" | "net"
"strings"
"testing"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/errors"
"github.com/miekg/dns"
"github.com/stretchr/testify/require"
) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/aghtest/upstream.go |
Addr string
}
// RespondTo returns a response with answer if req has class cl, question type
// qt, and target targ.
func RespondTo(t testing.TB, req *dns.Msg, cl, qt uint16, targ, answer string) (resp *dns.Msg) {
t.Helper()
require.NotNil(t, req)
| </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. </s> remove // Address implements upstream.Upstream interface for *Upstream.
</s> add // Address implements [upstream.Upstream] interface for *Upstream. </s> remove // queries, such at client PTR resolving and updater hostname resolving.
</s> add // queries, such as public clients PTR resolving and updater hostname resolving. | var _ upstream.Upstream = (*Upstream)(nil)
| Addr string
}
var _ upstream.Upstream = (*Upstream)(nil)
// RespondTo returns a response with answer if req has class cl, question type
// qt, and target targ.
func RespondTo(t testing.TB, req *dns.Msg, cl, qt uint16, targ, answer string) (resp *dns.Msg) {
t.Helper()
require.NotNil(t, req) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/aghtest/upstream.go |
return resp
}
// Exchange implements the upstream.Upstream interface for *Upstream.
//
// TODO(a.garipov): Split further into handlers.
func (u *Upstream) Exchange(m *dns.Msg) (resp *dns.Msg, err error) {
resp = new(dns.Msg).SetReply(m)
| </s> remove // Address implements upstream.Upstream interface for *Upstream.
</s> add // Address implements [upstream.Upstream] interface for *Upstream. | // Exchange implements the [upstream.Upstream] interface for *Upstream. |
return resp
}
// Exchange implements the [upstream.Upstream] interface for *Upstream.
//
// TODO(a.garipov): Split further into handlers.
func (u *Upstream) Exchange(m *dns.Msg) (resp *dns.Msg, err error) {
resp = new(dns.Msg).SetReply(m)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/aghtest/upstream.go |
return resp, nil
}
// Address implements upstream.Upstream interface for *Upstream.
func (u *Upstream) Address() string {
return u.Addr
}
// NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
| </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. </s> remove // queries, such at client PTR resolving and updater hostname resolving.
</s> add // queries, such as public clients PTR resolving and updater hostname resolving. | // Address implements [upstream.Upstream] interface for *Upstream. |
return resp, nil
}
// Address implements [upstream.Upstream] interface for *Upstream.
func (u *Upstream) Address() string {
return u.Addr
}
// NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/aghtest/upstream.go |
}
// NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
| </s> remove // Address implements upstream.Upstream interface for *Upstream.
</s> add // Address implements [upstream.Upstream] interface for *Upstream. </s> remove // queries, such at client PTR resolving and updater hostname resolving.
</s> add // queries, such as public clients PTR resolving and updater hostname resolving. </s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
</s> remove github.com/lucas-clemente/quic-go v0.29.1
</s> add github.com/lucas-clemente/quic-go v0.29.2 | // Close implements [upstream.Upstream] interface for *Upstream.
func (u *Upstream) Close() (err error) {
return nil
}
| }
// Close implements [upstream.Upstream] interface for *Upstream.
func (u *Upstream) Close() (err error) {
return nil
}
// NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/aghtest/upstream.go |
}
}
// prepareInternalProxy initializes the DNS proxy that is used for internal DNS
// queries, such at client PTR resolving and updater hostname resolving.
func (s *Server) prepareInternalProxy() (err error) {
conf := &proxy.Config{
CacheEnabled: true,
CacheSizeBytes: 4096,
UpstreamConfig: s.conf.UpstreamConfig,
| </s> remove // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
</s> add // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
</s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
</s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove // Address implements upstream.Upstream interface for *Upstream.
</s> add // Address implements [upstream.Upstream] interface for *Upstream. | // queries, such as public clients PTR resolving and updater hostname resolving. | }
}
// prepareInternalProxy initializes the DNS proxy that is used for internal DNS
// queries, such as public clients PTR resolving and updater hostname resolving.
func (s *Server) prepareInternalProxy() (err error) {
conf := &proxy.Config{
CacheEnabled: true,
CacheSizeBytes: 4096,
UpstreamConfig: s.conf.UpstreamConfig, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/dnsforward/dnsforward.go |
return s.stopLocked()
}
// stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
if s.dnsProxy != nil {
err := s.dnsProxy.Stop()
if err != nil {
return fmt.Errorf("could not stop the DNS server properly: %w", err)
}
| </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
</s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) </s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() | // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
|
return s.stopLocked()
}
// stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
// stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
if s.dnsProxy != nil {
err := s.dnsProxy.Stop()
if err != nil {
return fmt.Errorf("could not stop the DNS server properly: %w", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/dnsforward/dnsforward.go |
// stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
if s.dnsProxy != nil {
err := s.dnsProxy.Stop()
if err != nil {
return fmt.Errorf("could not stop the DNS server properly: %w", err)
}
}
| </s> remove // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
</s> add // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
</s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
</s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() </s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) | err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() |
// stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
if s.dnsProxy != nil {
err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close()
if err != nil {
return fmt.Errorf("could not stop the DNS server properly: %w", err)
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/dnsforward/dnsforward.go |
func (s *Server) stopLocked() error {
if s.dnsProxy != nil {
err := s.dnsProxy.Stop()
if err != nil {
return fmt.Errorf("could not stop the DNS server properly: %w", err)
}
}
s.isRunning = false
return nil
| </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
</s> add // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
</s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
</s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) </s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() | errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) | func (s *Server) stopLocked() error {
if s.dnsProxy != nil {
err := s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err))
}
}
s.isRunning = false
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/dnsforward/dnsforward.go |
return fmt.Errorf("could not stop the DNS server properly: %w", err)
}
}
s.isRunning = false
return nil
}
// IsRunning returns true if the DNS server is running.
func (s *Server) IsRunning() bool {
| </s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
</s> add // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
</s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) </s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() | if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
| return fmt.Errorf("could not stop the DNS server properly: %w", err)
}
}
if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
return nil
}
// IsRunning returns true if the DNS server is running.
func (s *Server) IsRunning() bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/dnsforward/dnsforward.go |
return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err)
}
if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err}
| </s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) </s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() </s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() | defer func() { err = errors.WithDeferred(err, u.Close()) }() | return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err)
}
defer func() { err = errors.WithDeferred(err, u.Close()) }()
if err = healthCheck(u); err != nil {
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
if domains != nil {
return domainSpecificTestError{error: err} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/dnsforward/http.go |
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/netutil"
"github.com/AdguardTeam/golibs/stringutil"
)
const clientsUpdatePeriod = 10 * time.Minute
| </s> remove // update upstreams cache
c.upstreamConfig = nil
</s> add // Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
} | "golang.org/x/exp/maps"
"golang.org/x/exp/slices" | "github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/netutil"
"github.com/AdguardTeam/golibs/stringutil"
"golang.org/x/exp/maps"
"golang.org/x/exp/slices"
)
const clientsUpdatePeriod = 10 * time.Minute
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/clients.go |
}
type clientSource uint
// Client sources. The order determines the priority.
const (
| </s> remove github.com/AdguardTeam/dnsproxy v0.45.3
</s> add github.com/AdguardTeam/dnsproxy v0.46.1 </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. | // closeUpstreams closes the client-specific upstream config of c if any.
func (c *Client) closeUpstreams() (err error) {
if c.upstreamConfig != nil {
err = c.upstreamConfig.Close()
if err != nil {
return fmt.Errorf("closing upstreams of client %q: %w", c.Name, err)
}
}
return nil
}
| }
// closeUpstreams closes the client-specific upstream config of c if any.
func (c *Client) closeUpstreams() (err error) {
if c.upstreamConfig != nil {
err = c.upstreamConfig.Close()
if err != nil {
return fmt.Errorf("closing upstreams of client %q: %w", c.Name, err)
}
}
return nil
}
type clientSource uint
// Client sources. The order determines the priority.
const ( | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/clients.go |
}
// update Name index
delete(clients.list, name)
// update ID index
for _, id := range c.IDs {
delete(clients.idIndex, id)
| </s> remove // update ID index
</s> add // Update ID index. </s> remove // update Name index
</s> add // Update name index. </s> remove // update upstreams cache
c.upstreamConfig = nil
</s> add // Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
} </s> remove // Address implements upstream.Upstream interface for *Upstream.
</s> add // Address implements [upstream.Upstream] interface for *Upstream. </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. | if err := c.closeUpstreams(); err != nil {
log.Error("client container: removing client %s: %s", name, err)
}
| }
if err := c.closeUpstreams(); err != nil {
log.Error("client container: removing client %s: %s", name, err)
}
// update Name index
delete(clients.list, name)
// update ID index
for _, id := range c.IDs {
delete(clients.idIndex, id) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/clients.go |
return fmt.Errorf("another client uses the same id (%q): %q", id, c2.Name)
}
}
// update ID index
for _, id := range prev.IDs {
delete(clients.idIndex, id)
}
for _, id := range c.IDs {
clients.idIndex[id] = prev
| </s> remove // update Name index
</s> add // Update name index. </s> remove // update upstreams cache
c.upstreamConfig = nil
</s> add // Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
} </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. | // Update ID index. | return fmt.Errorf("another client uses the same id (%q): %q", id, c2.Name)
}
}
// Update ID index.
for _, id := range prev.IDs {
delete(clients.idIndex, id)
}
for _, id := range c.IDs {
clients.idIndex[id] = prev | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/clients.go |
clients.idIndex[id] = prev
}
}
// update Name index
if prev.Name != c.Name {
delete(clients.list, prev.Name)
clients.list[c.Name] = prev
}
| </s> remove // update upstreams cache
c.upstreamConfig = nil
</s> add // Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
} </s> remove // update ID index
</s> add // Update ID index. </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() | // Update name index. | clients.idIndex[id] = prev
}
}
// Update name index.
if prev.Name != c.Name {
delete(clients.list, prev.Name)
clients.list[c.Name] = prev
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/clients.go |
delete(clients.list, prev.Name)
clients.list[c.Name] = prev
}
// update upstreams cache
c.upstreamConfig = nil
*prev = *c
return nil
}
| </s> remove // update Name index
</s> add // Update name index. </s> remove // update ID index
</s> add // Update ID index. </s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
| // Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
} | delete(clients.list, prev.Name)
clients.list[c.Name] = prev
}
// Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
}
// Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
}
*prev = *c
return nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/clients.go |
return nil
}
func stopDNSServer() error {
if !isRunning() {
return nil
}
err := Context.dnsServer.Stop()
| </s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() </s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) </s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() error {
</s> add // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopLocked() (err error) {
var errs []error
</s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() | func stopDNSServer() (err error) { |
return nil
}
func stopDNSServer() (err error) {
if !isRunning() {
return nil
}
err := Context.dnsServer.Stop() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/dns.go |
if !isRunning() {
return nil
}
err := Context.dnsServer.Stop()
if err != nil {
return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
}
closeDNSServer()
| </s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) </s> remove func stopDNSServer() error {
</s> add func stopDNSServer() (err error) { </s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
| err = Context.dnsServer.Stop() | if !isRunning() {
return nil
}
err = Context.dnsServer.Stop()
if err != nil {
return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
}
closeDNSServer() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/dns.go |
}
err := Context.dnsServer.Stop()
if err != nil {
return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
}
closeDNSServer()
return nil
}
| </s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() </s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() </s> remove s.isRunning = false
</s> add if len(errs) > 0 {
return errors.List("stopping DNS server", errs...)
} else {
s.isRunning = false
}
</s> remove func stopDNSServer() error {
</s> add func stopDNSServer() (err error) { | return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) | }
err := Context.dnsServer.Stop()
if err != nil {
return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err)
}
closeDNSServer()
return nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/home/dns.go |
"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/miekg/dns"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
| </s> remove require.NoError(t, err)
</s> add require.ErrorIs(t, err, closeErr) | "github.com/AdguardTeam/golibs/errors" | "github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/errors"
"github.com/miekg/dns"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/next/dnssvc/dnssvc_test.go |
bootstrapAddr = "bootstrap.example"
upstreamAddr = "upstream.example"
)
ups := &aghtest.UpstreamMock{
OnAddress: func() (addr string) {
return upstreamAddr
| </s> remove // update upstreams cache
c.upstreamConfig = nil
</s> add // Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
} | closeErr errors.Error = "closing failed" | bootstrapAddr = "bootstrap.example"
upstreamAddr = "upstream.example"
closeErr errors.Error = "closing failed"
)
ups := &aghtest.UpstreamMock{
OnAddress: func() (addr string) {
return upstreamAddr | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/next/dnssvc/dnssvc_test.go |
resp = (&dns.Msg{}).SetReply(req)
return resp, nil
},
}
c := &dnssvc.Config{
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:0")},
| </s> remove // Exchange implements the upstream.Upstream interface for *Upstream.
</s> add // Exchange implements the [upstream.Upstream] interface for *Upstream. </s> remove // Address implements upstream.Upstream interface for *Upstream.
</s> add // Address implements [upstream.Upstream] interface for *Upstream. </s> remove // update upstreams cache
c.upstreamConfig = nil
</s> add // Update upstreams cache.
err = c.closeUpstreams()
if err != nil {
return err
} </s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) | OnClose: func() (err error) {
return closeErr
}, | resp = (&dns.Msg{}).SetReply(req)
return resp, nil
},
OnClose: func() (err error) {
return closeErr
},
}
c := &dnssvc.Config{
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:0")}, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/next/dnssvc/dnssvc_test.go |
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
defer cancel()
err = svc.Shutdown(ctx)
require.NoError(t, err)
}
| </s> remove return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
</s> add return fmt.Errorf("stopping forwarding dns server: %w", err)
}
err = Context.clients.Close()
if err != nil {
return fmt.Errorf("closing clients container: %w", err) </s> remove err := Context.dnsServer.Stop()
</s> add err = Context.dnsServer.Stop() </s> remove return fmt.Errorf("could not stop the DNS server properly: %w", err)
</s> add errs = append(errs, fmt.Errorf("could not stop local resolvers properly: %w", err)) </s> remove err := s.dnsProxy.Stop()
</s> add err = s.dnsProxy.Stop()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop primary resolvers properly: %w", err))
}
}
if s.internalProxy != nil && s.internalProxy.UpstreamConfig != nil {
err = s.internalProxy.UpstreamConfig.Close()
if err != nil {
errs = append(errs, fmt.Errorf("could not stop internal resolvers properly: %w", err))
}
}
if s.localResolvers != nil && s.localResolvers.UpstreamConfig != nil {
err = s.localResolvers.UpstreamConfig.Close() | require.ErrorIs(t, err, closeErr) | ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
defer cancel()
err = svc.Shutdown(ctx)
require.ErrorIs(t, err, closeErr)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | Pull request: 5044 Close upstreams
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044.
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <[email protected]>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <[email protected]>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/2de42284a5f8cf8f75f77059ba13f09b26a5ee6d | internal/next/dnssvc/dnssvc_test.go |
github.com/gobuffalo/packr v1.30.1
github.com/gobuffalo/packr/v2 v2.8.1 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/renameio v1.0.1-0.20210406141108-81588dbe0453
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
github.com/kardianos/service v1.2.0
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/lucas-clemente/quic-go v0.20.1
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
| </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
</s> add </s> remove github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
</s> add </s> remove github.com/u-root/u-root v7.0.0+incompatible
</s> add </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add </s> remove github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
</s> add | github.com/gobuffalo/packr v1.30.1
github.com/gobuffalo/packr/v2 v2.8.1 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/renameio v1.0.1-0.20210406141108-81588dbe0453
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
github.com/kardianos/service v1.2.0
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/lucas-clemente/quic-go v0.20.1
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.mod |
|
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
github.com/kardianos/service v1.2.0
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/lucas-clemente/quic-go v0.20.1
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
github.com/miekg/dns v1.1.40
github.com/rogpeppe/go-internal v1.7.0 // indirect
github.com/satori/go.uuid v1.2.0
| </s> remove github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
</s> add </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
</s> add </s> remove github.com/u-root/u-root v7.0.0+incompatible
</s> add </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add | github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
github.com/kardianos/service v1.2.0
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/lucas-clemente/quic-go v0.20.1
github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
github.com/miekg/dns v1.1.40
github.com/rogpeppe/go-internal v1.7.0 // indirect
github.com/satori/go.uuid v1.2.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.mod |
|
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/lucas-clemente/quic-go v0.20.1
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
github.com/miekg/dns v1.1.40
github.com/rogpeppe/go-internal v1.7.0 // indirect
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cobra v1.1.3 // indirect
| </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
</s> add </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
</s> add </s> remove github.com/u-root/u-root v7.0.0+incompatible
</s> add </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add | github.com/karrick/godirwalk v1.16.1 // indirect
github.com/lucas-clemente/quic-go v0.20.1
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/netlink v1.4.0
github.com/miekg/dns v1.1.40
github.com/rogpeppe/go-internal v1.7.0 // indirect
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cobra v1.1.3 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.mod |
|
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cobra v1.1.3 // indirect
github.com/stretchr/testify v1.7.0
github.com/ti-mo/netfilter v0.4.0
github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44
| </s> remove github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
</s> add </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
</s> add </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add | github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cobra v1.1.3 // indirect
github.com/stretchr/testify v1.7.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.mod |
|
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
github.com/AdguardTeam/dnsproxy v0.37.1 h1:vULyF1+xSI7vV99m8GD2hmOuCQrpu87awyeSe5qtFbA=
github.com/AdguardTeam/dnsproxy v0.37.1/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U=
| </s> remove github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add </s> remove google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
</s> add </s> remove google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
</s> add | github.com/AdguardTeam/dhcp v0.0.0-20210420175708-50b0efd52063 h1:RBsQppxEJEqHApY6WDBkM2H0UG5wt57RcT0El2WGdp8=
github.com/AdguardTeam/dhcp v0.0.0-20210420175708-50b0efd52063/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= | dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
github.com/AdguardTeam/dhcp v0.0.0-20210420175708-50b0efd52063 h1:RBsQppxEJEqHApY6WDBkM2H0UG5wt57RcT0El2WGdp8=
github.com/AdguardTeam/dhcp v0.0.0-20210420175708-50b0efd52063/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
github.com/AdguardTeam/dnsproxy v0.37.1 h1:vULyF1+xSI7vV99m8GD2hmOuCQrpu87awyeSe5qtFbA=
github.com/AdguardTeam/dnsproxy v0.37.1/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
github.com/AdguardTeam/dnsproxy v0.37.1 h1:vULyF1+xSI7vV99m8GD2hmOuCQrpu87awyeSe5qtFbA=
github.com/AdguardTeam/dnsproxy v0.37.1/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U=
github.com/AdguardTeam/golibs v0.4.5/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.14.4 h1:lrS7lrfxVCFh4TFB6nwPp5UE4n1XNvv3zUetduD9mZw=
| </s> remove github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ=
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add </s> remove google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
</s> add | github.com/AdguardTeam/dnsproxy v0.37.1 h1:vULyF1+xSI7vV99m8GD2hmOuCQrpu87awyeSe5qtFbA=
github.com/AdguardTeam/dnsproxy v0.37.1/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U=
github.com/AdguardTeam/golibs v0.4.5/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.14.4 h1:lrS7lrfxVCFh4TFB6nwPp5UE4n1XNvv3zUetduD9mZw= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
| </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add </s> remove github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
</s> add </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add | github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw=
github.com/gobuffalo/packr/v2 v2.8.1 h1:tkQpju6i3EtMXJ9uoF5GT6kB+LMTimDWD8Xvbz6zDVA=
github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
| </s> remove github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
</s> add </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add </s> remove google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
</s> add | github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw=
github.com/gobuffalo/packr/v2 v2.8.1 h1:tkQpju6i3EtMXJ9uoF5GT6kB+LMTimDWD8Xvbz6zDVA=
github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
| </s> remove github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add </s> remove google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
</s> add </s> remove google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
</s> add | github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
| </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
</s> add </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
</s> add </s> remove github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ=
</s> add | github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
| </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
</s> add </s> remove github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
</s> add </s> remove github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ=
</s> add | github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
| </s> remove google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add | google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
| </s> remove google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add | google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | go.sum |
|
"os"
"runtime"
"time"
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
"github.com/insomniacslk/dhcp/dhcpv6"
"github.com/insomniacslk/dhcp/dhcpv6/nclient6"
"github.com/insomniacslk/dhcp/iana"
| </s> remove google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
</s> add </s> remove google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
</s> add </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add | "os"
"runtime"
"time"
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
"github.com/insomniacslk/dhcp/dhcpv6"
"github.com/insomniacslk/dhcp/dhcpv6/nclient6"
"github.com/insomniacslk/dhcp/iana" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | internal/dhcpd/checkother.go |
|
"time"
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
"github.com/insomniacslk/dhcp/dhcpv6"
"github.com/insomniacslk/dhcp/dhcpv6/nclient6"
"github.com/insomniacslk/dhcp/iana"
)
| </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
</s> add </s> remove google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
</s> add </s> remove google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
</s> add </s> remove github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
</s> add </s> remove github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add | "github.com/insomniacslk/dhcp/dhcpv4/nclient4" | "time"
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
"github.com/insomniacslk/dhcp/dhcpv4/nclient4"
"github.com/insomniacslk/dhcp/dhcpv6"
"github.com/insomniacslk/dhcp/dhcpv6/nclient6"
"github.com/insomniacslk/dhcp/iana"
) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master
Closes #2606.
Squashed commit of the following:
commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:22:56 2021 +0300
nclient4: rm
commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 13:19:11 2021 +0300
all: clear changes
commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <[email protected]>
Date: Wed Apr 21 12:58:48 2021 +0300
Merge branch 'master' into 2606-rm-nclient4
commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <[email protected]>
Date: Mon Apr 19 18:53:04 2021 +0300
dhcpd: subst nclient4 with fork | https://github.com/AdguardTeam/AdGuardHome/commit/2e4e1973d990e2deec5a6b91c4ddc31f49136a6a | internal/dhcpd/checkother.go |
SetOnLeaseChanged(onLeaseChanged OnLeaseChangedT)
}
// Create - create object
func Create(config ServerConfig) *Server {
s := &Server{}
s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
| </s> remove s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
s.conf.ConfigModified = config.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
</s> add s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename) </s> remove if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
</s> add if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove if !(ra.raAllowSlaac || ra.raSlaacOnly) {
</s> add if !(ra.raAllowSLAAC || ra.raSLAACOnly) { | func Create(conf ServerConfig) *Server { | SetOnLeaseChanged(onLeaseChanged OnLeaseChangedT)
}
// Create - create object
func Create(conf ServerConfig) *Server {
s := &Server{}
s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcpd.go |
// Create - create object
func Create(config ServerConfig) *Server {
s := &Server{}
s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
s.conf.ConfigModified = config.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
if !webHandlersRegistered && s.conf.HTTPRegister != nil {
if runtime.GOOS == "windows" {
// Our DHCP server doesn't work on Windows yet, so
// signal that to the front with an HTTP 501.
| </s> remove func Create(config ServerConfig) *Server {
</s> add func Create(conf ServerConfig) *Server { </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify </s> remove if s.conf.RaSlaacOnly {
</s> add if s.conf.RASLAACOnly { </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName | s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename) | // Create - create object
func Create(config ServerConfig) *Server {
s := &Server{}
s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
if !webHandlersRegistered && s.conf.HTTPRegister != nil {
if runtime.GOOS == "windows" {
// Our DHCP server doesn't work on Windows yet, so
// signal that to the front with an HTTP 501. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcpd.go |
webHandlersRegistered = true
}
var err4, err6 error
v4conf := config.Conf4
v4conf.Enabled = s.conf.Enabled
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
}
v4conf.InterfaceName = s.conf.InterfaceName
| </s> remove if js.Exists("v4") {
v4conf := v4JSONToServerConf(newconfig.V4)
v4conf.Enabled = newconfig.Enabled
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
</s> add if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false </s> remove if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
</s> add if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue | v4conf := conf.Conf4 | webHandlersRegistered = true
}
var err4, err6 error
v4conf := conf.Conf4
v4conf.Enabled = s.conf.Enabled
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
}
v4conf.InterfaceName = s.conf.InterfaceName | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcpd.go |
v4conf.InterfaceName = s.conf.InterfaceName
v4conf.notify = s.onNotify
s.srv4, err4 = v4Create(v4conf)
v6conf := config.Conf6
v6conf.Enabled = s.conf.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
}
v6conf.InterfaceName = s.conf.InterfaceName
| </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify </s> remove v4conf := config.Conf4
</s> add v4conf := conf.Conf4 </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) | v6conf := conf.Conf6 | v4conf.InterfaceName = s.conf.InterfaceName
v4conf.notify = s.onNotify
s.srv4, err4 = v4Create(v4conf)
v6conf := conf.Conf6
v6conf.Enabled = s.conf.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
}
v6conf.InterfaceName = s.conf.InterfaceName | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcpd.go |
}
if s.conf.Enabled && !v4conf.Enabled && !v6conf.Enabled {
log.Error("Can't enable DHCP server because neither DHCPv4 nor DHCPv6 servers are configured")
return nil
}
| </s> remove if newconfig.Enabled && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest, "dhcpv4 or dhcpv6 configuration must be complete")
</s> add if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest,
"dhcpv4 or dhcpv6 configuration must be complete") </s> remove if s.conf.RaSlaacOnly {
</s> add if s.conf.RASLAACOnly { </s> remove s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
s.conf.ConfigModified = config.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
</s> add s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename) </s> remove js, err := jsonutil.DecodeObject(&newconfig, r.Body)
</s> add err := json.NewDecoder(r.Body).Decode(&conf) </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName | s.conf.Conf4 = conf.Conf4
s.conf.Conf6 = conf.Conf6
| }
s.conf.Conf4 = conf.Conf4
s.conf.Conf6 = conf.Conf6
if s.conf.Enabled && !v4conf.Enabled && !v6conf.Enabled {
log.Error("Can't enable DHCP server because neither DHCPv4 nor DHCPv6 servers are configured")
return nil
}
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcpd.go |
"strings"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/golibs/jsonutil"
"github.com/AdguardTeam/golibs/log"
)
func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
text := fmt.Sprintf(format, args...)
| </s> remove type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
</s> add </s> remove newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
</s> add conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName </s> remove code, err = s.enableDHCP(newconfig.InterfaceName)
</s> add code, err = s.enableDHCP(conf.InterfaceName) </s> remove func Create(config ServerConfig) *Server {
</s> add func Create(conf ServerConfig) *Server { | "strings"
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/golibs/log"
)
func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
text := fmt.Sprintf(format, args...) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
|
RangeEnd net.IP `json:"range_end"`
LeaseDuration uint32 `json:"lease_duration"`
}
func v4JSONToServerConf(j v4ServerConfJSON) V4ServerConf {
return V4ServerConf{
GatewayIP: j.GatewayIP,
SubnetMask: j.SubnetMask,
RangeStart: j.RangeStart,
RangeEnd: j.RangeEnd,
| </s> remove func v6JSONToServerConf(j v6ServerConfJSON) V6ServerConf {
</s> add func v6JSONToServerConf(j *v6ServerConfJSON) V6ServerConf {
if j == nil {
return V6ServerConf{}
}
</s> remove RaSlaacOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RaAllowSlaac bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
</s> add RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags </s> remove type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
</s> add </s> remove if !(ra.raAllowSlaac || ra.raSlaacOnly) {
</s> add if !(ra.raAllowSLAAC || ra.raSLAACOnly) { </s> remove func Create(config ServerConfig) *Server {
</s> add func Create(conf ServerConfig) *Server { | func v4JSONToServerConf(j *v4ServerConfJSON) V4ServerConf {
if j == nil {
return V4ServerConf{}
}
| RangeEnd net.IP `json:"range_end"`
LeaseDuration uint32 `json:"lease_duration"`
}
func v4JSONToServerConf(j *v4ServerConfJSON) V4ServerConf {
if j == nil {
return V4ServerConf{}
}
return V4ServerConf{
GatewayIP: j.GatewayIP,
SubnetMask: j.SubnetMask,
RangeStart: j.RangeStart,
RangeEnd: j.RangeEnd, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
RangeStart net.IP `json:"range_start"`
LeaseDuration uint32 `json:"lease_duration"`
}
func v6JSONToServerConf(j v6ServerConfJSON) V6ServerConf {
return V6ServerConf{
RangeStart: j.RangeStart,
LeaseDuration: j.LeaseDuration,
}
}
| </s> remove func v4JSONToServerConf(j v4ServerConfJSON) V4ServerConf {
</s> add func v4JSONToServerConf(j *v4ServerConfJSON) V4ServerConf {
if j == nil {
return V4ServerConf{}
}
</s> remove RaSlaacOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RaAllowSlaac bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
</s> add RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags </s> remove type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
</s> add </s> remove if errors.Is(err, os.ErrNotExist) {
continue
}
</s> add </s> remove if newconfig.Enabled && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest, "dhcpv4 or dhcpv6 configuration must be complete")
</s> add if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest,
"dhcpv4 or dhcpv6 configuration must be complete") | func v6JSONToServerConf(j *v6ServerConfJSON) V6ServerConf {
if j == nil {
return V6ServerConf{}
}
| RangeStart net.IP `json:"range_start"`
LeaseDuration uint32 `json:"lease_duration"`
}
func v6JSONToServerConf(j *v6ServerConfJSON) V6ServerConf {
if j == nil {
return V6ServerConf{}
}
return V6ServerConf{
RangeStart: j.RangeStart,
LeaseDuration: j.LeaseDuration,
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
return
}
}
type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
func (s *Server) enableDHCP(ifaceName string) (code int, err error) {
var hasStaticIP bool
hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
if err != nil {
return http.StatusInternalServerError, fmt.Errorf("checking static ip: %w", err)
| </s> remove newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
</s> add conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName </s> remove code, err = s.enableDHCP(newconfig.InterfaceName)
</s> add code, err = s.enableDHCP(conf.InterfaceName) </s> remove fileReadCloser, err := aghio.LimitReadCloser(f, maxConfigFileSize)
</s> add var fileReadCloser io.ReadCloser
fileReadCloser, err = aghio.LimitReadCloser(f, maxConfigFileSize) | return
}
}
func (s *Server) enableDHCP(ifaceName string) (code int, err error) {
var hasStaticIP bool
hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
if err != nil {
return http.StatusInternalServerError, fmt.Errorf("checking static ip: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
|
}
func (s *Server) handleDHCPSetConfig(w http.ResponseWriter, r *http.Request) {
conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName
err := json.NewDecoder(r.Body).Decode(&conf)
| </s> remove newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
</s> add conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName </s> remove js, err := jsonutil.DecodeObject(&newconfig, r.Body)
</s> add err := json.NewDecoder(r.Body).Decode(&conf) </s> remove type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
</s> add </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName </s> remove if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
</s> add if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue | type dhcpServerConfigJSON struct {
V4 *v4ServerConfJSON `json:"v4"`
V6 *v6ServerConfJSON `json:"v6"`
InterfaceName string `json:"interface_name"`
Enabled nullBool `json:"enabled"`
}
| }
type dhcpServerConfigJSON struct {
V4 *v4ServerConfJSON `json:"v4"`
V6 *v6ServerConfJSON `json:"v6"`
InterfaceName string `json:"interface_name"`
Enabled nullBool `json:"enabled"`
}
func (s *Server) handleDHCPSetConfig(w http.ResponseWriter, r *http.Request) {
conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName
err := json.NewDecoder(r.Body).Decode(&conf) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
return 0, nil
}
func (s *Server) handleDHCPSetConfig(w http.ResponseWriter, r *http.Request) {
newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
js, err := jsonutil.DecodeObject(&newconfig, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
| </s> remove js, err := jsonutil.DecodeObject(&newconfig, r.Body)
</s> add err := json.NewDecoder(r.Body).Decode(&conf) </s> remove httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"failed to parse new dhcp config json: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) | conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName | return 0, nil
}
func (s *Server) handleDHCPSetConfig(w http.ResponseWriter, r *http.Request) {
conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName
conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName
conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName
js, err := jsonutil.DecodeObject(&newconfig, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
js, err := jsonutil.DecodeObject(&newconfig, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
return
}
| </s> remove newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
</s> add conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName </s> remove httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"failed to parse new dhcp config json: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) | err := json.NewDecoder(r.Body).Decode(&conf) | newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
err := json.NewDecoder(r.Body).Decode(&conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
newconfig.InterfaceName = s.conf.InterfaceName
js, err := jsonutil.DecodeObject(&newconfig, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
return
}
var s4 DHCPServer
| </s> remove js, err := jsonutil.DecodeObject(&newconfig, r.Body)
</s> add err := json.NewDecoder(r.Body).Decode(&conf) </s> remove newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
</s> add conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) | httpError(r, w, http.StatusBadRequest,
"failed to parse new dhcp config json: %s", err) | newconfig.InterfaceName = s.conf.InterfaceName
js, err := jsonutil.DecodeObject(&newconfig, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"failed to parse new dhcp config json: %s", err)
return
}
var s4 DHCPServer | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if js.Exists("v4") {
v4conf := v4JSONToServerConf(newconfig.V4)
v4conf.Enabled = newconfig.Enabled
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
}
v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
| </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName </s> remove v4conf := config.Conf4
</s> add v4conf := conf.Conf4 </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify | if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false | var s6 DHCPServer
v4Enabled := false
v6Enabled := false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false
}
v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
}
v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
| </s> remove if js.Exists("v4") {
v4conf := v4JSONToServerConf(newconfig.V4)
v4conf.Enabled = newconfig.Enabled
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
</s> add if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false </s> remove v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
</s> add v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout </s> remove v4conf := config.Conf4
</s> add v4conf := conf.Conf4 </s> remove s4, err = v4Create(v4conf)
</s> add s4, err = v4Create(v4Conf) </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 | v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName | if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
}
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
v4conf.InterfaceName = newconfig.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
s4, err = v4Create(v4conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
| </s> remove s4, err = v4Create(v4conf)
</s> add s4, err = v4Create(v4Conf) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) | v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout | v4conf.InterfaceName = newconfig.InterfaceName
c4 := V4ServerConf{}
s.srv4.WriteDiskConfig4(&c4)
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout
s4, err = v4Create(v4conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
s.srv4.WriteDiskConfig4(&c4)
v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
s4, err = v4Create(v4conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
return
}
| </s> remove v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
</s> add v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) | s4, err = v4Create(v4Conf) | s.srv4.WriteDiskConfig4(&c4)
v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
s4, err = v4Create(v4Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
v4conf.ICMPTimeout = c4.ICMPTimeout
s4, err = v4Create(v4conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
return
}
}
| </s> remove s4, err = v4Create(v4conf)
</s> add s4, err = v4Create(v4Conf) </s> remove v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
</s> add v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) </s> remove code, err = s.enableDHCP(newconfig.InterfaceName)
</s> add code, err = s.enableDHCP(conf.InterfaceName) | httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) | v4conf.ICMPTimeout = c4.ICMPTimeout
s4, err = v4Create(v4conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err)
return
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
return
}
}
if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
}
v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
| </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) </s> remove if js.Exists("v4") {
v4conf := v4JSONToServerConf(newconfig.V4)
v4conf.Enabled = newconfig.Enabled
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
</s> add if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false </s> remove if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
</s> add if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue | if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false | return
}
}
if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false
}
v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
}
v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
s6, err = v6Create(v6conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
| </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) | // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify | if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
}
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
// Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify
s6, err = v6Create(v6conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
s6, err = v6Create(v6conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
return
}
| </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove s4, err = v4Create(v4conf)
</s> add s4, err = v4Create(v4Conf) | s6, err = v6Create(v6Conf) | v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
s6, err = v6Create(v6Conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
v6conf.notify = s.onNotify
s6, err = v6Create(v6conf)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
return
}
}
| </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify </s> remove s4, err = v4Create(v4conf)
</s> add s4, err = v4Create(v4Conf) </s> remove v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
</s> add v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout | httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) | v6conf.notify = s.onNotify
s6, err = v6Create(v6conf)
if err != nil {
httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err)
return
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
return
}
}
if newconfig.Enabled && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest, "dhcpv4 or dhcpv6 configuration must be complete")
return
}
s.Stop()
| </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
</s> add if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue </s> remove s6, err = v6Create(v6conf)
</s> add s6, err = v6Create(v6Conf) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) | if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest,
"dhcpv4 or dhcpv6 configuration must be complete") | return
}
}
if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest,
"dhcpv4 or dhcpv6 configuration must be complete")
if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest,
"dhcpv4 or dhcpv6 configuration must be complete")
return
}
s.Stop() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
}
s.Stop()
if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
}
if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
}
| </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false </s> remove js, err := jsonutil.DecodeObject(&newconfig, r.Body)
</s> add err := json.NewDecoder(r.Body).Decode(&conf) </s> remove if newconfig.Enabled && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest, "dhcpv4 or dhcpv6 configuration must be complete")
</s> add if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest,
"dhcpv4 or dhcpv6 configuration must be complete") </s> remove v4conf := config.Conf4
</s> add v4conf := conf.Conf4 | if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue | }
s.Stop()
if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue
if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue
}
if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
}
if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
}
if s4 != nil {
s.srv4 = s4
}
| </s> remove if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
</s> add if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false </s> remove httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"failed to parse new dhcp config json: %s", err) </s> remove if js.Exists("v4") {
v4conf := v4JSONToServerConf(newconfig.V4)
v4conf.Enabled = newconfig.Enabled
if len(v4conf.RangeStart) == 0 {
v4conf.Enabled = false
</s> add if conf.V4 != nil {
v4Conf := v4JSONToServerConf(conf.V4)
v4Conf.Enabled = conf.Enabled == nbTrue
if len(v4Conf.RangeStart) == 0 {
v4Conf.Enabled = false </s> remove newconfig := dhcpServerConfigJSON{}
newconfig.Enabled = s.conf.Enabled
newconfig.InterfaceName = s.conf.InterfaceName
</s> add conf := dhcpServerConfigJSON{}
conf.Enabled = boolToNullBool(s.conf.Enabled)
conf.InterfaceName = s.conf.InterfaceName | if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName | if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
}
if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName
if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName
}
if s4 != nil {
s.srv4 = s4
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
s.dbLoad()
if s.conf.Enabled {
var code int
code, err = s.enableDHCP(newconfig.InterfaceName)
if err != nil {
httpError(r, w, code, "enabling dhcp: %s", err)
return
}
| </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "Failed to parse new DHCP config json: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"failed to parse new dhcp config json: %s", err) </s> remove s4, err = v4Create(v4conf)
</s> add s4, err = v4Create(v4Conf) | code, err = s.enableDHCP(conf.InterfaceName) | s.dbLoad()
if s.conf.Enabled {
var code int
code, err = s.enableDHCP(conf.InterfaceName)
if err != nil {
httpError(r, w, code, "enabling dhcp: %s", err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/dhcphttp.go |
"golang.org/x/net/ipv6"
)
type raCtx struct {
raAllowSlaac bool // send RA packets without MO flags
raSlaacOnly bool // send RA packets with MO flags
ipAddr net.IP // source IP address (link-local-unicast)
dnsIPAddr net.IP // IP address for DNS Server option
prefixIPAddr net.IP // IP address for Prefix option
ifaceName string
iface *net.Interface
| </s> remove RaSlaacOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RaAllowSlaac bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
</s> add RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags </s> remove if !(ra.raAllowSlaac || ra.raSlaacOnly) {
</s> add if !(ra.raAllowSLAAC || ra.raSLAACOnly) { </s> remove managedAddressConfiguration: !ra.raSlaacOnly,
otherConfiguration: !ra.raSlaacOnly,
</s> add managedAddressConfiguration: !ra.raSLAACOnly,
otherConfiguration: !ra.raSLAACOnly, </s> remove type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
</s> add </s> remove s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
s.conf.ConfigModified = config.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
</s> add s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename) | raAllowSLAAC bool // send RA packets without MO flags
raSLAACOnly bool // send RA packets with MO flags | "golang.org/x/net/ipv6"
)
type raCtx struct {
raAllowSLAAC bool // send RA packets without MO flags
raSLAACOnly bool // send RA packets with MO flags
raAllowSLAAC bool // send RA packets without MO flags
raSLAACOnly bool // send RA packets with MO flags
ipAddr net.IP // source IP address (link-local-unicast)
dnsIPAddr net.IP // IP address for DNS Server option
prefixIPAddr net.IP // IP address for Prefix option
ifaceName string
iface *net.Interface | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/routeradv.go |
// Init - initialize RA module
func (ra *raCtx) Init() error {
ra.stop.Store(0)
ra.conn = nil
if !(ra.raAllowSlaac || ra.raSlaacOnly) {
return nil
}
log.Debug("dhcpv6 ra: source IP address: %s DNS IP address: %s",
ra.ipAddr, ra.dnsIPAddr)
| </s> remove managedAddressConfiguration: !ra.raSlaacOnly,
otherConfiguration: !ra.raSlaacOnly,
</s> add managedAddressConfiguration: !ra.raSLAACOnly,
otherConfiguration: !ra.raSLAACOnly, </s> remove raAllowSlaac bool // send RA packets without MO flags
raSlaacOnly bool // send RA packets with MO flags
</s> add raAllowSLAAC bool // send RA packets without MO flags
raSLAACOnly bool // send RA packets with MO flags </s> remove if s.conf.RaSlaacOnly {
</s> add if s.conf.RASLAACOnly { </s> remove func Create(config ServerConfig) *Server {
</s> add func Create(conf ServerConfig) *Server { </s> remove s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
s.conf.ConfigModified = config.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
</s> add s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename) | if !(ra.raAllowSLAAC || ra.raSLAACOnly) { | // Init - initialize RA module
func (ra *raCtx) Init() error {
ra.stop.Store(0)
ra.conn = nil
if !(ra.raAllowSLAAC || ra.raSLAACOnly) {
return nil
}
log.Debug("dhcpv6 ra: source IP address: %s DNS IP address: %s",
ra.ipAddr, ra.dnsIPAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/routeradv.go |
log.Debug("dhcpv6 ra: source IP address: %s DNS IP address: %s",
ra.ipAddr, ra.dnsIPAddr)
params := icmpv6RA{
managedAddressConfiguration: !ra.raSlaacOnly,
otherConfiguration: !ra.raSlaacOnly,
mtu: uint32(ra.iface.MTU),
prefixLen: 64,
recursiveDNSServer: ra.dnsIPAddr,
sourceLinkLayerAddress: ra.iface.HardwareAddr,
}
| </s> remove if !(ra.raAllowSlaac || ra.raSlaacOnly) {
</s> add if !(ra.raAllowSLAAC || ra.raSLAACOnly) { </s> remove raAllowSlaac bool // send RA packets without MO flags
raSlaacOnly bool // send RA packets with MO flags
</s> add raAllowSLAAC bool // send RA packets without MO flags
raSLAACOnly bool // send RA packets with MO flags </s> remove RaSlaacOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RaAllowSlaac bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
</s> add RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv4 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv4 configuration: %s", err) </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) | managedAddressConfiguration: !ra.raSLAACOnly,
otherConfiguration: !ra.raSLAACOnly, | log.Debug("dhcpv6 ra: source IP address: %s DNS IP address: %s",
ra.ipAddr, ra.dnsIPAddr)
params := icmpv6RA{
managedAddressConfiguration: !ra.raSLAACOnly,
otherConfiguration: !ra.raSLAACOnly,
managedAddressConfiguration: !ra.raSLAACOnly,
otherConfiguration: !ra.raSLAACOnly,
mtu: uint32(ra.iface.MTU),
prefixLen: 64,
recursiveDNSServer: ra.dnsIPAddr,
sourceLinkLayerAddress: ra.iface.HardwareAddr,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/routeradv.go |
RangeStart net.IP `yaml:"range_start"`
LeaseDuration uint32 `yaml:"lease_duration" json:"lease_duration"` // in seconds
RaSlaacOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RaAllowSlaac bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
ipStart net.IP // starting IP address for dynamic leases
leaseTime time.Duration // the time during which a dynamic lease is considered valid
dnsIPAddrs []net.IP // IPv6 addresses to return to DHCP clients as DNS server addresses
| </s> remove raAllowSlaac bool // send RA packets without MO flags
raSlaacOnly bool // send RA packets with MO flags
</s> add raAllowSLAAC bool // send RA packets without MO flags
raSLAACOnly bool // send RA packets with MO flags </s> remove if s.conf.RaSlaacOnly {
</s> add if s.conf.RASLAACOnly { </s> remove s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
s.conf.ConfigModified = config.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
</s> add s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename) </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify </s> remove if !(ra.raAllowSlaac || ra.raSlaacOnly) {
</s> add if !(ra.raAllowSLAAC || ra.raSLAACOnly) { | RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags | RangeStart net.IP `yaml:"range_start"`
LeaseDuration uint32 `yaml:"lease_duration" json:"lease_duration"` // in seconds
RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
ipStart net.IP // starting IP address for dynamic leases
leaseTime time.Duration // the time during which a dynamic lease is considered valid
dnsIPAddrs []net.IP // IPv6 addresses to return to DHCP clients as DNS server addresses
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/server.go |
break
}
}
s.ra.raAllowSlaac = s.conf.RaAllowSlaac
s.ra.raSlaacOnly = s.conf.RaSlaacOnly
s.ra.dnsIPAddr = s.ra.ipAddr
s.ra.prefixIPAddr = s.conf.ipStart
s.ra.ifaceName = s.conf.InterfaceName
s.ra.iface = iface
s.ra.packetSendPeriod = 1 * time.Second
| </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove v4conf := config.Conf4
</s> add v4conf := conf.Conf4 </s> remove if js.Exists("enabled") {
s.conf.Enabled = newconfig.Enabled
</s> add if conf.Enabled != nbNull {
s.conf.Enabled = conf.Enabled == nbTrue </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName | s.ra.raAllowSLAAC = s.conf.RAAllowSLAAC
s.ra.raSLAACOnly = s.conf.RASLAACOnly | break
}
}
s.ra.raAllowSLAAC = s.conf.RAAllowSLAAC
s.ra.raSLAACOnly = s.conf.RASLAACOnly
s.ra.raAllowSLAAC = s.conf.RAAllowSLAAC
s.ra.raSLAACOnly = s.conf.RASLAACOnly
s.ra.dnsIPAddr = s.ra.ipAddr
s.ra.prefixIPAddr = s.conf.ipStart
s.ra.ifaceName = s.conf.InterfaceName
s.ra.iface = iface
s.ra.packetSendPeriod = 1 * time.Second | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/v6.go |
return err
}
// don't initialize DHCPv6 server if we must force the clients to use SLAAC
if s.conf.RaSlaacOnly {
log.Debug("DHCPv6: not starting DHCPv6 server due to ra_slaac_only=true")
return nil
}
log.Debug("dhcpv6: listening...")
| </s> remove RaSlaacOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RaAllowSlaac bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags
</s> add RASLAACOnly bool `yaml:"ra_slaac_only" json:"-"` // send ICMPv6.RA packets without MO flags
RAAllowSLAAC bool `yaml:"ra_allow_slaac" json:"-"` // send ICMPv6.RA packets with MO flags </s> remove v6Enabled = v6conf.Enabled
v6conf.InterfaceName = newconfig.InterfaceName
v6conf.notify = s.onNotify
</s> add // Don't overwrite the RA/SLAAC settings from the config file.
//
// TODO(a.garipov): Perhaps include them into the request to
// allow changing them from the HTTP API?
v6Conf.RASLAACOnly = s.conf.Conf6.RASLAACOnly
v6Conf.RAAllowSLAAC = s.conf.Conf6.RAAllowSLAAC
v6Enabled = v6Conf.Enabled
v6Conf.InterfaceName = conf.InterfaceName
v6Conf.notify = s.onNotify </s> remove s.conf.Enabled = config.Enabled
s.conf.InterfaceName = config.InterfaceName
s.conf.HTTPRegister = config.HTTPRegister
s.conf.ConfigModified = config.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
</s> add s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename) </s> remove if newconfig.Enabled && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest, "dhcpv4 or dhcpv6 configuration must be complete")
</s> add if conf.Enabled == nbTrue && !v4Enabled && !v6Enabled {
httpError(r, w, http.StatusBadRequest,
"dhcpv4 or dhcpv6 configuration must be complete") | if s.conf.RASLAACOnly { | return err
}
// don't initialize DHCPv6 server if we must force the clients to use SLAAC
if s.conf.RASLAACOnly {
log.Debug("DHCPv6: not starting DHCPv6 server due to ra_slaac_only=true")
return nil
}
log.Debug("dhcpv6: listening...") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/dhcpd/v6.go |
checker: ifacesStaticConfig,
filePath: "/etc/network/interfaces",
}} {
f, err = os.Open(check.filePath)
if errors.Is(err, os.ErrNotExist) {
continue
}
if err != nil {
return false, err
}
defer f.Close()
| </s> remove fileReadCloser, err := aghio.LimitReadCloser(f, maxConfigFileSize)
</s> add var fileReadCloser io.ReadCloser
fileReadCloser, err = aghio.LimitReadCloser(f, maxConfigFileSize) </s> remove if js.Exists("interface_name") {
s.conf.InterfaceName = newconfig.InterfaceName
</s> add if conf.InterfaceName != "" {
s.conf.InterfaceName = conf.InterfaceName </s> remove code, err = s.enableDHCP(newconfig.InterfaceName)
</s> add code, err = s.enableDHCP(conf.InterfaceName) </s> remove if js.Exists("v6") {
v6conf := v6JSONToServerConf(newconfig.V6)
v6conf.Enabled = newconfig.Enabled
if len(v6conf.RangeStart) == 0 {
v6conf.Enabled = false
</s> add if conf.V6 != nil {
v6Conf := v6JSONToServerConf(conf.V6)
v6Conf.Enabled = conf.Enabled == nbTrue
if len(v6Conf.RangeStart) == 0 {
v6Conf.Enabled = false | checker: ifacesStaticConfig,
filePath: "/etc/network/interfaces",
}} {
f, err = os.Open(check.filePath)
if err != nil {
return false, err
}
defer f.Close()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/sysutil/net_linux.go |
|
f, err = os.Open(check.filePath)
if err != nil {
return false, err
}
defer f.Close()
var fileReadCloser io.ReadCloser
| </s> remove fileReadCloser, err := aghio.LimitReadCloser(f, maxConfigFileSize)
</s> add var fileReadCloser io.ReadCloser
fileReadCloser, err = aghio.LimitReadCloser(f, maxConfigFileSize) </s> remove if errors.Is(err, os.ErrNotExist) {
continue
}
</s> add </s> remove code, err = s.enableDHCP(newconfig.InterfaceName)
</s> add code, err = s.enableDHCP(conf.InterfaceName) </s> remove type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
</s> add </s> remove s4, err = v4Create(v4conf)
</s> add s4, err = v4Create(v4Conf) | if errors.Is(err, os.ErrNotExist) {
err = nil
continue
}
| f, err = os.Open(check.filePath)
if err != nil {
if errors.Is(err, os.ErrNotExist) {
err = nil
continue
}
return false, err
}
defer f.Close()
var fileReadCloser io.ReadCloser | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/sysutil/net_linux.go |
return false, err
}
defer f.Close()
fileReadCloser, err := aghio.LimitReadCloser(f, maxConfigFileSize)
if err != nil {
return false, err
}
defer fileReadCloser.Close()
| </s> remove if errors.Is(err, os.ErrNotExist) {
continue
}
</s> add </s> remove code, err = s.enableDHCP(newconfig.InterfaceName)
</s> add code, err = s.enableDHCP(conf.InterfaceName) </s> remove type dhcpServerConfigJSON struct {
Enabled bool `json:"enabled"`
InterfaceName string `json:"interface_name"`
V4 v4ServerConfJSON `json:"v4"`
V6 v6ServerConfJSON `json:"v6"`
}
</s> add </s> remove httpError(r, w, http.StatusBadRequest, "invalid dhcpv6 configuration: %s", err)
</s> add httpError(r, w, http.StatusBadRequest,
"invalid dhcpv6 configuration: %s", err) | var fileReadCloser io.ReadCloser
fileReadCloser, err = aghio.LimitReadCloser(f, maxConfigFileSize) | return false, err
}
defer f.Close()
var fileReadCloser io.ReadCloser
fileReadCloser, err = aghio.LimitReadCloser(f, maxConfigFileSize)
if err != nil {
return false, err
}
defer fileReadCloser.Close()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | internal/sysutil/net_linux.go |
, "MX"
, "PTR"
, "QUIC"
, "SDNS"
, "SLAAC"
, "SVCB"
]
dot_import_whitelist = []
http_status_code_whitelist = []
| </s> remove s.ra.raAllowSlaac = s.conf.RaAllowSlaac
s.ra.raSlaacOnly = s.conf.RaSlaacOnly
</s> add s.ra.raAllowSLAAC = s.conf.RAAllowSLAAC
s.ra.raSLAACOnly = s.conf.RASLAACOnly </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
</s> add v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout | , "RA" | , "MX"
, "PTR"
, "QUIC"
, "RA"
, "SDNS"
, "SLAAC"
, "SVCB"
]
dot_import_whitelist = []
http_status_code_whitelist = [] | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | staticcheck.conf |
, "RA"
, "SDNS"
, "SVCB"
]
dot_import_whitelist = []
http_status_code_whitelist = []
| </s> remove s.ra.raAllowSlaac = s.conf.RaAllowSlaac
s.ra.raSlaacOnly = s.conf.RaSlaacOnly
</s> add s.ra.raAllowSLAAC = s.conf.RAAllowSLAAC
s.ra.raSLAACOnly = s.conf.RASLAACOnly </s> remove v4Enabled = v4conf.Enabled
v4conf.InterfaceName = newconfig.InterfaceName
</s> add v4Enabled = v4Conf.Enabled
v4Conf.InterfaceName = conf.InterfaceName </s> remove v6conf := config.Conf6
</s> add v6conf := conf.Conf6 </s> remove v4conf.notify = c4.notify
v4conf.ICMPTimeout = c4.ICMPTimeout
</s> add v4Conf.notify = c4.notify
v4Conf.ICMPTimeout = c4.ICMPTimeout | , "SLAAC" | , "RA"
, "SDNS"
, "SLAAC"
, "SVCB"
]
dot_import_whitelist = []
http_status_code_whitelist = [] | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: dhcpd: do not override ra-slaac settings
Merge in DNS/adguard-home from 2653-ra-slaac to master
Updates #2653.
Squashed commit of the following:
commit f261413a58dc813e37cc848606ed490b8c0ac9f3
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:37:13 2021 +0300
all: doc changes, rm debug
commit 4a8c6e4897579493c1ca242fb8f0f440c3b51a74
Author: Ainar Garipov <[email protected]>
Date: Thu Feb 11 20:11:46 2021 +0300
dhcpd: do not override ra-slaac settings | https://github.com/AdguardTeam/AdGuardHome/commit/2eb21ef40901e893069e9e4b6fa902d759d510b5 | staticcheck.conf |
// resolving PTR queries for local addresses.
LocalPTRResolvers []string
// ResolveClients signals if the RDNS should resolve clients' addresses.
ResolveClients bool
// UsePrivateRDNS defines if the PTR requests for unknown addresses from
| </s> remove // processRecursion checks the incoming request and halts it's handling if s
// have tried to resolve it recently.
</s> add // processRecursion checks the incoming request and halts its handling by
// answering NXDOMAIN if s has tried to resolve it recently. </s> remove // unreversedReqIP stores an IP address obtained from PTR request if it
// parsed successfully and belongs to one of locally-served IP ranges as per
// RFC 6303.
</s> add // unreversedReqIP stores an IP address obtained from a PTR request if it
// was parsed successfully and belongs to one of the locally served IP
// ranges. It is also filled with unmapped version of the address if it's
// within DNS64 prefixes. | // DNS64Prefixes is a slice of NAT64 prefixes to be used for DNS64.
DNS64Prefixes []string
| // resolving PTR queries for local addresses.
LocalPTRResolvers []string
// DNS64Prefixes is a slice of NAT64 prefixes to be used for DNS64.
DNS64Prefixes []string
// ResolveClients signals if the RDNS should resolve clients' addresses.
ResolveClients bool
// UsePrivateRDNS defines if the PTR requests for unknown addresses from | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 5117-dns64
Merge in DNS/adguard-home from 5117-dns64 to master
Updates #5117.
Squashed commit of the following:
commit 757d689134b85bdac9a6f5e43249866ec09ab7e3
Author: Eugene Burkov <[email protected]>
Date: Mon Jan 23 19:06:18 2023 +0300
all: imp fmt
commit b7a73c68c0b40bd3bda520c045c8110975c1827a
Author: Eugene Burkov <[email protected]>
Date: Mon Jan 23 17:49:21 2023 +0300
all: rm unused, imp code
commit 548feb6bd27b9774a9453d0570d37cdf557d4c3a
Merge: de3e84b5 54a141ab
Author: Eugene Burkov <[email protected]>
Date: Mon Jan 23 14:08:12 2023 +0300
Merge branch 'master' into 5117-dns64
commit de3e84b52b8dbff70df3ca0ac3315c3d33576334
Author: Eugene Burkov <[email protected]>
Date: Mon Jan 23 12:04:48 2023 +0300
dnsforward: imp code
commit a580e92119e3dbadc8b1a6572dbecc679f69db40
Author: Eugene Burkov <[email protected]>
Date: Fri Jan 20 18:24:33 2023 +0400
dnsforward: try again
commit 67b7a365194939fe15e4907a3dc2fee44b019d08
Author: Eugene Burkov <[email protected]>
Date: Fri Jan 20 18:08:23 2023 +0400
dnsforward: fix test on linux
commit ca83e4178a3383e326bf528d209d8766fb3c60d3
Author: Eugene Burkov <[email protected]>
Date: Fri Jan 20 17:37:48 2023 +0400
dnsforward: imp naming
commit c4e477c7a12af4966cbcd4e5f003a72966dc5d61
Merge: 42aa42a8 6e803375
Author: Eugene Burkov <[email protected]>
Date: Fri Jan 20 17:30:03 2023 +0400
Merge branch 'master' into 5117-dns64
commit 42aa42a8149b6bb42eb0da6e88ede4b5065bbf2f
Author: Eugene Burkov <[email protected]>
Date: Fri Jan 20 17:26:54 2023 +0400
dnsforward: imp test
commit 4e91c675703f1453456ef9eea08157009ce6237a
Author: Eugene Burkov <[email protected]>
Date: Wed Jan 18 12:32:55 2023 +0400
dnsforward: imp code, docs, add test
commit 766ef757f61e7a555b8151b4783fa7aba5f566f7
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 17 16:36:35 2023 +0400
dnsforward: imp docs
commit 6825f372389988597d1879cf66342c410f3cfd47
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 17 14:33:33 2023 +0400
internal: imp code, docs
commit 1215316a338496b5bea2b20d697c7451bfbcc84b
Author: Eugene Burkov <[email protected]>
Date: Fri Jan 13 21:24:50 2023 +0400
all: add dns64 support | https://github.com/AdguardTeam/AdGuardHome/commit/2ecf2a4c42fbd7ea61573d35271ee65f335c7c4f | internal/dnsforward/config.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.