docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
</div>; | <mask> }}
<mask> />
<mask> </div>
<mask> </div>
<mask> );
<mask>
<mask> Cell.propTypes = {
<mask> value: PropTypes.number.isRequired,
<mask> percent: PropTypes.number.isRequired,
<mask> color: PropTypes.string.isRequired,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> </s> remove dnsQueries: PropTypes.number.isRequired,
blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired,
replacedSafesearch: PropTypes.number.isRequired,
avgProcessingTime: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired,
interval: PropTypes.number.isRequired,
t: PropTypes.func.isRequired,
</s> add refreshButton: propTypes.node.isRequired,
subtitle: propTypes.string.isRequired, </s> remove />
</s> add /> </s> remove );
};
</s> add ); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/ui/Cell.js |
search: PropTypes.string,
onSearchRedirect: PropTypes.func, | <mask> value: PropTypes.number.isRequired,
<mask> percent: PropTypes.number.isRequired,
<mask> color: PropTypes.string.isRequired,
<mask> };
<mask>
<mask> export default Cell;
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove );
</s> add </div>; </s> remove dnsQueries: PropTypes.number.isRequired,
blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired,
replacedSafesearch: PropTypes.number.isRequired,
avgProcessingTime: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired,
interval: PropTypes.number.isRequired,
t: PropTypes.func.isRequired,
</s> add refreshButton: propTypes.node.isRequired,
subtitle: propTypes.string.isRequired, </s> remove export default withTranslation()(Counters);
</s> add export default Counters; </s> remove setLogsFilter,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/ui/Cell.js |
getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, | <mask> import { connect } from 'react-redux';
<mask> import { getFilteringStatus, setRules } from '../actions/filtering';
<mask> import {
<mask> getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
<mask> } from '../actions/queryLogs';
<mask> import Logs from '../components/Logs';
<mask> import { addSuccessToast } from '../actions/toasts';
<mask>
<mask> const mapStateToProps = (state) => {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { getLogsConfig } from '../../actions/queryLogs';
</s> add import {
getLogsConfig,
refreshFilteredLogs,
resetFilteredLogs,
setFilteredLogs,
} from '../../actions/queryLogs'; </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
</s> add import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/containers/Logs.js |
<mask> getFilteringStatus,
<mask> setRules,
<mask> addSuccessToast,
<mask> setLogsPagination,
<mask> setLogsFilter,
<mask> setLogsPage,
<mask> toggleDetailedLogs,
<mask> };
<mask>
<mask> export default connect(
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
</s> add getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, </s> remove setLogsFilter,
</s> add </s> remove const [t] = useTranslation();
</s> add const { t } = useTranslation(); </s> remove export default withTranslation()(Counters);
</s> add export default Counters; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/containers/Logs.js | |
export const RESPONSE_FILTER_QUERIES = Object.values(RESPONSE_FILTER).reduce((acc, { query }) => {
acc[query] = query;
return acc;
}, {});
| <mask> };
<mask>
<mask> export const FILTERED_STATUS_TO_META_MAP = {
<mask> [FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: {
<mask> label: RESPONSE_FILTER.ALLOWED.label,
<mask> color: 'green',
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/helpers/constants.js |
import queryString from 'query-string'; | <mask> import axios from 'axios';
<mask> import i18n from 'i18next';
<mask> import uniqBy from 'lodash/uniqBy';
<mask> import ipaddr from 'ipaddr.js';
<mask> import versionCompare from './versionCompare';
<mask> import { getTrackerData } from './trackers/trackers';
<mask>
<mask> import {
<mask> CHECK_TIMEOUT,
<mask> DEFAULT_DATE_FORMAT_OPTIONS,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers'; </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/helpers/helpers.js |
/**
* @param {string} search
* @param {string} [response_status]
* @returns {string}
*/
export const getLogsUrlParams = (search, response_status) => `?${queryString.stringify({
search,
response_status,
})}`;
| <mask> return acc;
<mask> }, {});
<mask>
<mask>
<mask> export const processContent = (content) => (Array.isArray(content)
<mask> ? content.filter(([, value]) => value)
<mask> .flat() : content);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const INITIAL_REQUEST = true;
const INITIAL_REQUEST_DATA = ['', TABLE_FIRST_PAGE, INITIAL_REQUEST];
</s> add </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; </s> remove const isActivePage = Object.values(URLS).some((item) => item === pathname);
</s> add const isActivePage = Object.values(URLS)
.some((item) => item === pathname); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/helpers/helpers.js |
[actions.setFilteredLogsRequest]: (state) => ({ ...state, processingGetLogs: true }),
[actions.setFilteredLogsFailure]: (state) => ({ ...state, processingGetLogs: false }), | <mask> ...state,
<mask> page: payload,
<mask> }),
<mask>
<mask> [actions.setLogsFilterRequest]: (state) => ({ ...state, processingGetLogs: true }),
<mask> [actions.setLogsFilterFailure]: (state) => ({ ...state, processingGetLogs: false }),
<mask> [actions.toggleDetailedLogs]: (state, { payload }) => ({
<mask> ...state,
<mask> isDetailed: payload,
<mask> }),
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove [actions.setLogsFilterSuccess]: (state, { payload }) => {
</s> add [actions.setFilteredLogsSuccess]: (state, { payload }) => { </s> remove const Filters = ({ filter, refreshLogs, setIsLoading }) => {
const dispatch = useDispatch();
const onSubmit = async (values) => {
setIsLoading(true);
await dispatch(setLogsFilter(values));
setIsLoading(false);
};
return (
</s> add const Filters = ({ filter, refreshLogs, setIsLoading }) => ( </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove );
};
</s> add ); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/reducers/queryLogs.js |
[actions.setFilteredLogsSuccess]: (state, { payload }) => { | <mask> ...state,
<mask> isDetailed: payload,
<mask> }),
<mask>
<mask> [actions.setLogsFilterSuccess]: (state, { payload }) => {
<mask> const { logs, oldest, filter } = payload;
<mask> const pageSize = TABLE_DEFAULT_PAGE_SIZE;
<mask> const page = 0;
<mask>
<mask> const pages = Math.ceil(logs.length / pageSize);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove [actions.setLogsFilterRequest]: (state) => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: (state) => ({ ...state, processingGetLogs: false }),
</s> add [actions.setFilteredLogsRequest]: (state) => ({ ...state, processingGetLogs: true }),
[actions.setFilteredLogsFailure]: (state) => ({ ...state, processingGetLogs: false }), </s> remove logs, oldest, older_than, filter, ...values,
</s> add logs,
oldest,
older_than,
filter,
...values, </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/reducers/queryLogs.js |
[actions.setLogsFilterRequest]: (state, { payload }) => {
const { filter } = payload;
return { ...state, filter };
},
| <mask> processingGetLogs: false,
<mask> };
<mask> },
<mask>
<mask> [actions.getLogsRequest]: (state) => ({ ...state, processingGetLogs: true }),
<mask> [actions.getLogsFailure]: (state) => ({ ...state, processingGetLogs: false }),
<mask> [actions.getLogsSuccess]: (state, { payload }) => {
<mask> const {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove [actions.setLogsFilterRequest]: (state) => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: (state) => ({ ...state, processingGetLogs: false }),
</s> add [actions.setFilteredLogsRequest]: (state) => ({ ...state, processingGetLogs: true }),
[actions.setFilteredLogsFailure]: (state) => ({ ...state, processingGetLogs: false }), </s> remove [actions.setLogsFilterSuccess]: (state, { payload }) => {
</s> add [actions.setFilteredLogsSuccess]: (state, { payload }) => { </s> remove );
};
</s> add ); </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove const Filters = ({ filter, refreshLogs, setIsLoading }) => {
const dispatch = useDispatch();
const onSubmit = async (values) => {
setIsLoading(true);
await dispatch(setLogsFilter(values));
setIsLoading(false);
};
return (
</s> add const Filters = ({ filter, refreshLogs, setIsLoading }) => ( | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/reducers/queryLogs.js |
github.com/google/gopacket v1.1.19 | <mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
<mask> github.com/google/go-cmp v0.5.5
<mask> github.com/google/renameio v1.0.1
<mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.21.1
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf // indirect
</s> add github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | go.mod |
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 | <mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.21.1
<mask> github.com/mdlayher/netlink v1.4.0
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/stretchr/objx v0.1.1 // indirect
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf // indirect
</s> add github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | go.mod |
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf | <mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.21.1
<mask> github.com/mdlayher/netlink v1.4.0
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf // indirect
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/stretchr/objx v0.1.1 // indirect
<mask> github.com/stretchr/testify v1.7.0
<mask> github.com/ti-mo/netfilter v0.4.0
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | go.mod |
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= | <mask> github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
<mask> github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
<mask> github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
<mask> github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
<mask> github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
<mask> github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | go.sum |
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= | <mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove b.Reset()
peer = nil
</s> add s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
}) </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | go.sum |
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= | <mask> golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove b.Reset()
peer = nil
</s> add s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
}) </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | go.sum |
<mask> package dhcpd
<mask>
<mask> import (
<mask> "net"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> )
<mask>
<mask> // broadcast sends resp to the broadcast address specific for network interface.
<mask> func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
<mask> // peer is expected to be of type *net.UDPConn as the server4.NewServer
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
respData := resp.ToBytes()
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove var unicast bool
if giaddr := req.GatewayIPAddr; giaddr != nil && !giaddr.IsUnspecified() {
</s> add switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified(): | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd.go | |
func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { | <mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> )
<mask>
<mask> // broadcast sends resp to the broadcast address specific for network interface.
<mask> func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
<mask> // peer is expected to be of type *net.UDPConn as the server4.NewServer
<mask> // initializes it.
<mask> udpPeer, ok := peer.(*net.UDPAddr)
<mask> if !ok {
<mask> log.Error("dhcpv4: peer is of unexpected type %T", peer)
<mask>
<mask> return
<mask> }
<mask>
<mask> // Despite the fact that server4.NewIPv4UDPConn explicitly sets socket
<mask> // options to allow broadcasting, it also binds the connection to a
<mask> // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
<mask> // errors while writing to the addresses that belong to another
<mask> // interface. So, use the broadcast address specific for the binded
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
respData := resp.ToBytes()
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd.go |
// specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP | <mask> }
<mask>
<mask> // Despite the fact that server4.NewIPv4UDPConn explicitly sets socket
<mask> // options to allow broadcasting, it also binds the connection to a
<mask> // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
<mask> // errors while writing to the addresses that belong to another
<mask> // interface. So, use the broadcast address specific for the binded
<mask> // interface.
<mask> udpPeer.IP = s.conf.broadcastIP
<mask>
<mask> log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
<mask>
<mask> if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
<mask> log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove udpPeer.IP = s.conf.broadcastIP
</s> add peer.IP = c.bcastIP </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd.go |
return c.udpConn.WriteTo(respData, peer) | <mask> udpPeer.IP = s.conf.broadcastIP
<mask>
<mask> log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
<mask>
<mask> if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
<mask> log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove udpPeer.IP = s.conf.broadcastIP
</s> add peer.IP = c.bcastIP </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd.go |
<mask> "bytes"
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove "bytes"
</s> add </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd_test.go | |
func TestDHCPConn_Broadcast(t *testing.T) { | <mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestV4Server_Send_broadcast(t *testing.T) {
<mask> b := &bytes.Buffer{}
<mask> var peer *net.UDPAddr
<mask>
<mask> conn := &fakePacketConn{
<mask> writeTo: func(p []byte, addr net.Addr) (n int, err error) {
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_unicast(t *testing.T) {
b := &bytes.Buffer{}
var peer *net.UDPAddr
conn := &fakePacketConn{
writeTo: func(p []byte, addr net.Addr) (n int, err error) {
udpPeer, ok := addr.(*net.UDPAddr)
require.True(t, ok)
peer = cloneUDPAddr(udpPeer)
n, err = b.Write(p)
require.NoError(t, err)
</s> add func TestV4Server_Send(t *testing.T) {
s := &v4Server{} </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd_test.go |
udpConn := &fakePacketConn{ | <mask> func TestV4Server_Send_broadcast(t *testing.T) {
<mask> b := &bytes.Buffer{}
<mask> var peer *net.UDPAddr
<mask>
<mask> conn := &fakePacketConn{
<mask> writeTo: func(p []byte, addr net.Addr) (n int, err error) {
<mask> udpPeer, ok := addr.(*net.UDPAddr)
<mask> require.True(t, ok)
<mask>
<mask> peer = cloneUDPAddr(udpPeer)
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_unicast(t *testing.T) {
b := &bytes.Buffer{}
var peer *net.UDPAddr
conn := &fakePacketConn{
writeTo: func(p []byte, addr net.Addr) (n int, err error) {
udpPeer, ok := addr.(*net.UDPAddr)
require.True(t, ok)
peer = cloneUDPAddr(udpPeer)
n, err = b.Write(p)
require.NoError(t, err)
</s> add func TestV4Server_Send(t *testing.T) {
s := &v4Server{} </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd_test.go |
conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} | <mask>
<mask> return n, nil
<mask> },
<mask> }
<mask>
<mask> defaultPeer := &net.UDPAddr{
<mask> IP: net.IP{1, 2, 3, 4},
<mask> // Use neither client nor server port.
<mask> Port: 1234,
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove IP: net.IP{1, 2, 3, 4},
// Use neither client nor server port.
Port: 1234,
</s> add IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort, </s> remove return n, nil
},
}
</s> add var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
) </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove defaultResp := &dhcpv4.DHCPv4{
OpCode: dhcpv4.OpcodeBootReply,
}
s := &v4Server{}
</s> add defaultResp := &dhcpv4.DHCPv4{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd_test.go |
respData := (&dhcpv4.DHCPv4{}).ToBytes() | <mask> IP: net.IP{1, 2, 3, 4},
<mask> // Use neither client nor server port.
<mask> Port: 1234,
<mask> }
<mask> s := &v4Server{
<mask> conf: V4ServerConf{
<mask> broadcastIP: net.IP{1, 2, 3, 255},
<mask> },
<mask> }
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> req *dhcpv4.DHCPv4
<mask> resp *dhcpv4.DHCPv4
<mask> }{{
<mask> name: "nak",
<mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: netutil.IPv4Zero(),
<mask> },
<mask> resp: &dhcpv4.DHCPv4{
<mask> Options: dhcpv4.OptionsFromList(
<mask> dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
<mask> ),
<mask> },
<mask> }, {
<mask> name: "fully_unspecified",
<mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: netutil.IPv4Zero(),
<mask> ClientIPAddr: netutil.IPv4Zero(),
<mask> },
<mask> resp: &dhcpv4.DHCPv4{
<mask> Options: dhcpv4.OptionsFromList(
<mask> dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
<mask> ),
<mask> },
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
<mask> assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove name: "known_client",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: net.IP{2, 3, 4, 5},
</s> add name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
), </s> remove name string
req *dhcpv4.DHCPv4
wantPeer net.Addr
</s> add want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string </s> remove wantPeer: &net.UDPAddr{
IP: net.IP{2, 3, 4, 5},
</s> add want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd_test.go |
_, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) | <mask> ),
<mask> },
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
<mask> assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
<mask> assert.Equal(t, &net.UDPAddr{
<mask> IP: s.conf.broadcastIP,
<mask> Port: defaultPeer.Port,
<mask> Zone: defaultPeer.Zone,
<mask> }, peer)
<mask> })
<mask>
<mask> b.Reset()
<mask> peer = nil
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} </s> remove b.Reset()
peer = nil
}
</s> add assert.EqualValues(t, respData, b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peer) </s> remove b.Reset()
peer = nil
</s> add s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
}) </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove // The same response is written twice.
respData := tc.resp.ToBytes()
assert.EqualValues(t, append(respData, respData...), b.Bytes())
</s> add // The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd_test.go |
assert.EqualValues(t, respData, b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peer) | <mask> Zone: defaultPeer.Zone,
<mask> }, peer)
<mask> })
<mask>
<mask> b.Reset()
<mask> peer = nil
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove b.Reset()
peer = nil
</s> add s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
}) </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} </s> remove assert.Equal(t, &net.UDPAddr{
IP: defaultPeer.IP,
Port: defaultPeer.Port,
}, peers[0])
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
}, peers[1])
})
b.Reset()
peers = nil
}
</s> add assert.Equal(t, cloneUDPAddr(defaultPeer), peers[0])
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peers[1]) </s> remove func cloneUDPAddr(a *net.UDPAddr) (copy *net.UDPAddr) {
</s> add func cloneUDPAddr(a *net.UDPAddr) (clone *net.UDPAddr) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_bsd_test.go |
<mask> package dhcpd
<mask>
<mask> import (
<mask> "net"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> )
<mask>
<mask> // broadcast sends resp to the broadcast address specific for network interface.
<mask> func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
<mask> respData := resp.ToBytes()
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
respData := resp.ToBytes()
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove "bytes"
</s> add </s> remove var unicast bool
if giaddr := req.GatewayIPAddr; giaddr != nil && !giaddr.IsUnspecified() {
</s> add switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified(): | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others.go | |
func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { | <mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> )
<mask>
<mask> // broadcast sends resp to the broadcast address specific for network interface.
<mask> func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
<mask> respData := resp.ToBytes()
<mask>
<mask> log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
<mask>
<mask> // This write to 0xffffffff reverts some behavior changes made in
<mask> // https://github.com/AdguardTeam/AdGuardHome/issues/3289. The DHCP
<mask> // server should broadcast the message to 0xffffffff but it's
<mask> // inconsistent with the actual mental model of DHCP implementation
<mask> // which requires the network interface selection to bind to.
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP </s> remove udpPeer.IP = s.conf.broadcastIP
</s> add peer.IP = c.bcastIP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others.go |
if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err | <mask> // See https://github.com/AdguardTeam/AdGuardHome/issues/3480 and
<mask> // https://github.com/AdguardTeam/AdGuardHome/issues/3366.
<mask> //
<mask> // See also https://github.com/AdguardTeam/AdGuardHome/issues/3539.
<mask> if _, err := conn.WriteTo(respData, peer); err != nil {
<mask> log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
<mask> }
<mask>
<mask> // peer is expected to be of type *net.UDPConn as the server4.NewServer
<mask> // initializes it.
<mask> udpPeer, ok := peer.(*net.UDPAddr)
<mask> if !ok {
<mask> log.Error("dhcpv4: peer is of unexpected type %T", peer)
<mask>
<mask> return
<mask> }
<mask>
<mask> // Broadcast the message one more time using the interface-specific
<mask> // broadcast address.
<mask> udpPeer.IP = s.conf.broadcastIP
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove udpPeer.IP = s.conf.broadcastIP
</s> add peer.IP = c.bcastIP </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others.go |
peer.IP = c.bcastIP | <mask> }
<mask>
<mask> // Broadcast the message one more time using the interface-specific
<mask> // broadcast address.
<mask> udpPeer.IP = s.conf.broadcastIP
<mask>
<mask> log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
<mask>
<mask> if _, err := conn.WriteTo(respData, peer); err != nil {
<mask> log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others.go |
return c.udpConn.WriteTo(respData, peer) | <mask> // Broadcast the message one more time using the interface-specific
<mask> // broadcast address.
<mask> udpPeer.IP = s.conf.broadcastIP
<mask>
<mask> log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
<mask>
<mask> if _, err := conn.WriteTo(respData, peer); err != nil {
<mask> log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove udpPeer.IP = s.conf.broadcastIP
</s> add peer.IP = c.bcastIP </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others.go |
<mask> "bytes"
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go | |
func TestDHCPConn_Broadcast(t *testing.T) { | <mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestV4Server_Send_broadcast(t *testing.T) {
<mask> b := &bytes.Buffer{}
<mask> var peers []*net.UDPAddr
<mask>
<mask> conn := &fakePacketConn{
<mask> writeTo: func(p []byte, addr net.Addr) (n int, err error) {
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_unicast(t *testing.T) {
b := &bytes.Buffer{}
var peer *net.UDPAddr
conn := &fakePacketConn{
writeTo: func(p []byte, addr net.Addr) (n int, err error) {
udpPeer, ok := addr.(*net.UDPAddr)
require.True(t, ok)
peer = cloneUDPAddr(udpPeer)
n, err = b.Write(p)
require.NoError(t, err)
</s> add func TestV4Server_Send(t *testing.T) {
s := &v4Server{} </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
udpConn := &fakePacketConn{ | <mask> func TestV4Server_Send_broadcast(t *testing.T) {
<mask> b := &bytes.Buffer{}
<mask> var peers []*net.UDPAddr
<mask>
<mask> conn := &fakePacketConn{
<mask> writeTo: func(p []byte, addr net.Addr) (n int, err error) {
<mask> udpPeer, ok := addr.(*net.UDPAddr)
<mask> require.True(t, ok)
<mask>
<mask> peers = append(peers, cloneUDPAddr(udpPeer))
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove func TestV4Server_Send_unicast(t *testing.T) {
b := &bytes.Buffer{}
var peer *net.UDPAddr
conn := &fakePacketConn{
writeTo: func(p []byte, addr net.Addr) (n int, err error) {
udpPeer, ok := addr.(*net.UDPAddr)
require.True(t, ok)
peer = cloneUDPAddr(udpPeer)
n, err = b.Write(p)
require.NoError(t, err)
</s> add func TestV4Server_Send(t *testing.T) {
s := &v4Server{} </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} | <mask>
<mask> return n, nil
<mask> },
<mask> }
<mask>
<mask> defaultPeer := &net.UDPAddr{
<mask> IP: net.IP{1, 2, 3, 4},
<mask> // Use neither client nor server port.
<mask> Port: 1234,
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
respData := (&dhcpv4.DHCPv4{}).ToBytes() | <mask> IP: net.IP{1, 2, 3, 4},
<mask> // Use neither client nor server port.
<mask> Port: 1234,
<mask> }
<mask> s := &v4Server{
<mask> conf: V4ServerConf{
<mask> broadcastIP: net.IP{1, 2, 3, 255},
<mask> },
<mask> }
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> req *dhcpv4.DHCPv4
<mask> resp *dhcpv4.DHCPv4
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove defaultResp := &dhcpv4.DHCPv4{
OpCode: dhcpv4.OpcodeBootReply,
}
s := &v4Server{}
</s> add defaultResp := &dhcpv4.DHCPv4{} </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove IP: net.IP{1, 2, 3, 4},
// Use neither client nor server port.
Port: 1234,
</s> add IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
_, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) | <mask> broadcastIP: net.IP{1, 2, 3, 255},
<mask> },
<mask> }
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> req *dhcpv4.DHCPv4
<mask> resp *dhcpv4.DHCPv4
<mask> }{{
<mask> name: "nak",
<mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: netutil.IPv4Zero(),
<mask> },
<mask> resp: &dhcpv4.DHCPv4{
<mask> Options: dhcpv4.OptionsFromList(
<mask> dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
<mask> ),
<mask> },
<mask> }, {
<mask> name: "fully_unspecified",
<mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: netutil.IPv4Zero(),
<mask> ClientIPAddr: netutil.IPv4Zero(),
<mask> },
<mask> resp: &dhcpv4.DHCPv4{
<mask> Options: dhcpv4.OptionsFromList(
<mask> dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
<mask> ),
<mask> },
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
<mask>
<mask> // The same response is written twice.
<mask> respData := tc.resp.ToBytes()
<mask> assert.EqualValues(t, append(respData, respData...), b.Bytes())
<mask>
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove name: "known_client",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: net.IP{2, 3, 4, 5},
</s> add name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
), </s> remove // The same response is written twice.
respData := tc.resp.ToBytes()
assert.EqualValues(t, append(respData, respData...), b.Bytes())
</s> add // The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) </s> remove name string
req *dhcpv4.DHCPv4
wantPeer net.Addr
</s> add want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string </s> remove wantPeer: &net.UDPAddr{
IP: net.IP{2, 3, 4, 5},
</s> add want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
// The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
<mask>
<mask> // The same response is written twice.
<mask> respData := tc.resp.ToBytes()
<mask> assert.EqualValues(t, append(respData, respData...), b.Bytes())
<mask>
<mask> require.Len(t, peers, 2)
<mask>
<mask> assert.Equal(t, &net.UDPAddr{
<mask> IP: defaultPeer.IP,
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove require.Len(t, peers, 2)
</s> add require.Len(t, peers, 2) </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} </s> remove assert.Equal(t, &net.UDPAddr{
IP: defaultPeer.IP,
Port: defaultPeer.Port,
}, peers[0])
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
}, peers[1])
})
b.Reset()
peers = nil
}
</s> add assert.Equal(t, cloneUDPAddr(defaultPeer), peers[0])
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peers[1]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
require.Len(t, peers, 2) | <mask> // The same response is written twice.
<mask> respData := tc.resp.ToBytes()
<mask> assert.EqualValues(t, append(respData, respData...), b.Bytes())
<mask>
<mask> require.Len(t, peers, 2)
<mask>
<mask> assert.Equal(t, &net.UDPAddr{
<mask> IP: defaultPeer.IP,
<mask> Port: defaultPeer.Port,
<mask> }, peers[0])
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove // The same response is written twice.
respData := tc.resp.ToBytes()
assert.EqualValues(t, append(respData, respData...), b.Bytes())
</s> add // The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) </s> remove assert.Equal(t, &net.UDPAddr{
IP: defaultPeer.IP,
Port: defaultPeer.Port,
}, peers[0])
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
}, peers[1])
})
b.Reset()
peers = nil
}
</s> add assert.Equal(t, cloneUDPAddr(defaultPeer), peers[0])
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peers[1]) </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove b.Reset()
peer = nil
}
</s> add assert.EqualValues(t, respData, b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peer) </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
assert.Equal(t, cloneUDPAddr(defaultPeer), peers[0])
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peers[1]) | <mask> assert.EqualValues(t, append(respData, respData...), b.Bytes())
<mask>
<mask> require.Len(t, peers, 2)
<mask>
<mask> assert.Equal(t, &net.UDPAddr{
<mask> IP: defaultPeer.IP,
<mask> Port: defaultPeer.Port,
<mask> }, peers[0])
<mask> assert.Equal(t, &net.UDPAddr{
<mask> IP: s.conf.broadcastIP,
<mask> Port: defaultPeer.Port,
<mask> }, peers[1])
<mask> })
<mask>
<mask> b.Reset()
<mask> peers = nil
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove require.Len(t, peers, 2)
</s> add require.Len(t, peers, 2) </s> remove b.Reset()
peer = nil
}
</s> add assert.EqualValues(t, respData, b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peer) </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove // The same response is written twice.
respData := tc.resp.ToBytes()
assert.EqualValues(t, append(respData, respData...), b.Bytes())
</s> add // The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) </s> remove b.Reset()
peer = nil
</s> add s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/broadcast_others_test.go |
func cloneUDPAddr(a *net.UDPAddr) (clone *net.UDPAddr) { | <mask> assert.Equal(t, leases[2].HWAddr, dynLeases[1].HWAddr)
<mask> }
<mask>
<mask> // cloneUDPAddr returns a deep copy of a.
<mask> func cloneUDPAddr(a *net.UDPAddr) (copy *net.UDPAddr) {
<mask> return &net.UDPAddr{
<mask> IP: netutil.CloneIP(a.IP),
<mask> Port: a.Port,
<mask> Zone: a.Zone,
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove b.Reset()
peer = nil
}
</s> add assert.EqualValues(t, respData, b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peer) </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
respData := resp.ToBytes()
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove assert.Equal(t, &net.UDPAddr{
IP: defaultPeer.IP,
Port: defaultPeer.Port,
}, peers[0])
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
}, peers[1])
})
b.Reset()
peers = nil
}
</s> add assert.Equal(t, cloneUDPAddr(defaultPeer), peers[0])
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peers[1]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/dhcpd_test.go |
dhcpv4.OptionRouterSolicitationAddress.Code(): netutil.IPv4allrouter(),
dhcpv4.OptionBroadcastAddress.Code(): netutil.IPv4bcast(), | <mask> dhcpv4.OptionMaskSupplier.Code(): []byte{0},
<mask> dhcpv4.OptionPerformRouterDiscovery.Code(): []byte{1},
<mask> // The all-routers address is preferred wherever possible, see
<mask> // https://datatracker.ietf.org/doc/html/rfc1256#section-5.1.
<mask> dhcpv4.OptionRouterSolicitationAddress.Code(): net.IPv4allrouter.To4(),
<mask> dhcpv4.OptionBroadcastAddress.Code(): net.IPv4bcast.To4(),
<mask>
<mask> // Link-Layer Per Interface
<mask>
<mask> dhcpv4.OptionTrailerEncapsulation.Code(): []byte{0},
<mask> dhcpv4.OptionEthernetEncapsulation.Code(): []byte{0},
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove // The same response is written twice.
respData := tc.resp.ToBytes()
assert.EqualValues(t, append(respData, respData...), b.Bytes())
</s> add // The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) </s> remove require.Len(t, peers, 2)
</s> add require.Len(t, peers, 2) </s> remove unicast = true
}
// TODO(e.burkov): Unicast the message to the actual link-layer address
// of the client if broadcast bit is not set. Perhaps, use custom
// connection when creating the server.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/3443.
if !unicast {
s.broadcast(peer, conn, resp)
return
</s> add case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: raw.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast. </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/options_unix.go |
"github.com/mdlayher/raw" | <mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
<mask> )
<mask>
<mask> // v4Server is a DHCPv4 server.
<mask> //
<mask> // TODO(a.garipov): Think about unifying this and v6Server.
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
}
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { </s> remove unicast = true
}
// TODO(e.burkov): Unicast the message to the actual link-layer address
// of the client if broadcast bit is not set. Perhaps, use custom
// connection when creating the server.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/3443.
if !unicast {
s.broadcast(peer, conn, resp)
return
</s> add case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: raw.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast. </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove unicast = true
} else if mtype := resp.MessageType(); mtype == dhcpv4.MessageTypeNak {
</s> add if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the
// relay agent broadcasted it to the client, because the
// client may not have a correct network address or
// subnet mask, and the client may not be answering ARP
// requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak: | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified(): | <mask> // to RFC-2131.
<mask> //
<mask> // See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
<mask> func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
<mask> var unicast bool
<mask> if giaddr := req.GatewayIPAddr; giaddr != nil && !giaddr.IsUnspecified() {
<mask> // Send any return messages to the server port on the BOOTP
<mask> // relay agent whose address appears in giaddr.
<mask> peer = &net.UDPAddr{
<mask> IP: giaddr,
<mask> Port: dhcpv4.ServerPort,
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove unicast = true
} else if mtype := resp.MessageType(); mtype == dhcpv4.MessageTypeNak {
</s> add if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the
// relay agent broadcasted it to the client, because the
// client may not have a correct network address or
// subnet mask, and the client may not be answering ARP
// requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak: </s> remove } else if ciaddr := req.ClientIPAddr; ciaddr != nil && !ciaddr.IsUnspecified() {
</s> add case ciaddr != nil && !ciaddr.IsUnspecified(): </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove func (s *v4Server) broadcast(peer net.Addr, conn net.PacketConn, resp *dhcpv4.DHCPv4) {
respData := resp.ToBytes()
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add func (c *dhcpConn) broadcast(respData []byte, peer *net.UDPAddr) (n int, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the
// relay agent broadcasted it to the client, because the
// client may not have a correct network address or
// subnet mask, and the client may not be answering ARP
// requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak: | <mask> peer = &net.UDPAddr{
<mask> IP: giaddr,
<mask> Port: dhcpv4.ServerPort,
<mask> }
<mask> unicast = true
<mask> } else if mtype := resp.MessageType(); mtype == dhcpv4.MessageTypeNak {
<mask> // Broadcast any DHCPNAK messages to 0xffffffff.
<mask> } else if ciaddr := req.ClientIPAddr; ciaddr != nil && !ciaddr.IsUnspecified() {
<mask> // Unicast DHCPOFFER and DHCPACK messages to the address in
<mask> // ciaddr.
<mask> peer = &net.UDPAddr{
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove } else if ciaddr := req.ClientIPAddr; ciaddr != nil && !ciaddr.IsUnspecified() {
</s> add case ciaddr != nil && !ciaddr.IsUnspecified(): </s> remove var unicast bool
if giaddr := req.GatewayIPAddr; giaddr != nil && !giaddr.IsUnspecified() {
</s> add switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified(): </s> remove unicast = true
}
// TODO(e.burkov): Unicast the message to the actual link-layer address
// of the client if broadcast bit is not set. Perhaps, use custom
// connection when creating the server.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/3443.
if !unicast {
s.broadcast(peer, conn, resp)
return
</s> add case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: raw.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast. </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
case ciaddr != nil && !ciaddr.IsUnspecified(): | <mask> }
<mask> unicast = true
<mask> } else if mtype := resp.MessageType(); mtype == dhcpv4.MessageTypeNak {
<mask> // Broadcast any DHCPNAK messages to 0xffffffff.
<mask> } else if ciaddr := req.ClientIPAddr; ciaddr != nil && !ciaddr.IsUnspecified() {
<mask> // Unicast DHCPOFFER and DHCPACK messages to the address in
<mask> // ciaddr.
<mask> peer = &net.UDPAddr{
<mask> IP: ciaddr,
<mask> Port: dhcpv4.ClientPort,
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove unicast = true
} else if mtype := resp.MessageType(); mtype == dhcpv4.MessageTypeNak {
</s> add if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the
// relay agent broadcasted it to the client, because the
// client may not have a correct network address or
// subnet mask, and the client may not be answering ARP
// requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak: </s> remove unicast = true
}
// TODO(e.burkov): Unicast the message to the actual link-layer address
// of the client if broadcast bit is not set. Perhaps, use custom
// connection when creating the server.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/3443.
if !unicast {
s.broadcast(peer, conn, resp)
return
</s> add case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: raw.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast. </s> remove var unicast bool
if giaddr := req.GatewayIPAddr; giaddr != nil && !giaddr.IsUnspecified() {
</s> add switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified(): </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: raw.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast. | <mask> peer = &net.UDPAddr{
<mask> IP: ciaddr,
<mask> Port: dhcpv4.ClientPort,
<mask> }
<mask> unicast = true
<mask> }
<mask>
<mask> // TODO(e.burkov): Unicast the message to the actual link-layer address
<mask> // of the client if broadcast bit is not set. Perhaps, use custom
<mask> // connection when creating the server.
<mask> //
<mask> // See https://github.com/AdguardTeam/AdGuardHome/issues/3443.
<mask>
<mask> if !unicast {
<mask> s.broadcast(peer, conn, resp)
<mask>
<mask> return
<mask> }
<mask>
<mask> log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
<mask>
<mask> _, err := conn.WriteTo(resp.ToBytes(), peer)
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove unicast = true
} else if mtype := resp.MessageType(); mtype == dhcpv4.MessageTypeNak {
</s> add if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the
// relay agent broadcasted it to the client, because the
// client may not have a correct network address or
// subnet mask, and the client may not be answering ARP
// requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak: </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP </s> remove udpPeer.IP = s.conf.broadcastIP
</s> add peer.IP = c.bcastIP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { | <mask> return
<mask> }
<mask>
<mask> log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
<mask>
<mask> _, err := conn.WriteTo(resp.ToBytes(), peer)
<mask> if err != nil {
<mask> log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
<mask> }
<mask> }
<mask>
<mask> // Start starts the IPv4 DHCP server.
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove udpPeer.IP = s.conf.broadcastIP
</s> add peer.IP = c.bcastIP </s> remove // specific interface. On FreeBSD and OpenBSD conn.WriteTo causes
// errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the binded
// interface.
udpPeer.IP = s.conf.broadcastIP
log.Debug("dhcpv4: sending to %s: %s", peer, resp.Summary())
</s> add // specific interface. On FreeBSD and OpenBSD net.UDPConn.WriteTo
// causes errors while writing to the addresses that belong to another
// interface. So, use the broadcast address specific for the interface
// bound.
peer.IP = c.bcastIP </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
var c net.PacketConn
if c, err = s.newDHCPConn(iface); err != nil {
return err | <mask> }
<mask>
<mask> s.conf.dnsIPAddrs = dnsIPAddrs
<mask>
<mask> laddr := &net.UDPAddr{
<mask> IP: net.IP{0, 0, 0, 0},
<mask> Port: dhcpv4.ServerPort,
<mask> }
<mask> s.srv, err = server4.NewServer(iface.Name, laddr, s.packetHandler, server4.WithDebugLogger())
<mask> if err != nil {
<mask> return err
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove s.srv, err = server4.NewServer(iface.Name, laddr, s.packetHandler, server4.WithDebugLogger())
</s> add s.srv, err = server4.NewServer(
iface.Name,
nil,
s.packetHandler,
server4.WithConn(c),
server4.WithDebugLogger(),
) </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
s.srv, err = server4.NewServer(
iface.Name,
nil,
s.packetHandler,
server4.WithConn(c),
server4.WithDebugLogger(),
) | <mask> laddr := &net.UDPAddr{
<mask> IP: net.IP{0, 0, 0, 0},
<mask> Port: dhcpv4.ServerPort,
<mask> }
<mask> s.srv, err = server4.NewServer(iface.Name, laddr, s.packetHandler, server4.WithDebugLogger())
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> log.Info("dhcpv4: listening")
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove laddr := &net.UDPAddr{
IP: net.IP{0, 0, 0, 0},
Port: dhcpv4.ServerPort,
</s> add var c net.PacketConn
if c, err = s.newDHCPConn(iface); err != nil {
return err </s> remove
_, err := conn.WriteTo(resp.ToBytes(), peer)
if err != nil {
</s> add if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil { </s> remove if _, err := conn.WriteTo(resp.ToBytes(), peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
</s> add return c.udpConn.WriteTo(respData, peer) </s> remove if _, err := conn.WriteTo(respData, peer); err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
// peer is expected to be of type *net.UDPConn as the server4.NewServer
// initializes it.
udpPeer, ok := peer.(*net.UDPAddr)
if !ok {
log.Error("dhcpv4: peer is of unexpected type %T", peer)
return
</s> add if n, err = c.udpConn.WriteTo(respData, peer); err != nil {
return n, err </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4.go |
<mask>
<mask> package dhcpd
<mask>
<mask> import (
<mask> "bytes"
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go | |
<mask> "bytes"
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go | |
"github.com/mdlayher/raw" | <mask>
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func notify4(flags uint32) {
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
func TestV4Server_Send(t *testing.T) {
s := &v4Server{} | <mask> func (fc *fakePacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
<mask> return fc.writeTo(p, addr)
<mask> }
<mask>
<mask> func TestV4Server_Send_unicast(t *testing.T) {
<mask> b := &bytes.Buffer{}
<mask> var peer *net.UDPAddr
<mask>
<mask> conn := &fakePacketConn{
<mask> writeTo: func(p []byte, addr net.Addr) (n int, err error) {
<mask> udpPeer, ok := addr.(*net.UDPAddr)
<mask> require.True(t, ok)
<mask>
<mask> peer = cloneUDPAddr(udpPeer)
<mask>
<mask> n, err = b.Write(p)
<mask> require.NoError(t, err)
<mask>
<mask> return n, nil
<mask> },
<mask> }
<mask>
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
) | <mask>
<mask> n, err = b.Write(p)
<mask> require.NoError(t, err)
<mask>
<mask> return n, nil
<mask> },
<mask> }
<mask>
<mask> defaultPeer := &net.UDPAddr{
<mask> IP: net.IP{1, 2, 3, 4},
<mask> // Use neither client nor server port.
<mask> Port: 1234,
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove IP: net.IP{1, 2, 3, 4},
// Use neither client nor server port.
Port: 1234,
</s> add IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort, </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove defaultResp := &dhcpv4.DHCPv4{
OpCode: dhcpv4.OpcodeBootReply,
}
s := &v4Server{}
</s> add defaultResp := &dhcpv4.DHCPv4{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort, | <mask> },
<mask> }
<mask>
<mask> defaultPeer := &net.UDPAddr{
<mask> IP: net.IP{1, 2, 3, 4},
<mask> // Use neither client nor server port.
<mask> Port: 1234,
<mask> }
<mask> defaultResp := &dhcpv4.DHCPv4{
<mask> OpCode: dhcpv4.OpcodeBootReply,
<mask> }
<mask> s := &v4Server{}
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove defaultResp := &dhcpv4.DHCPv4{
OpCode: dhcpv4.OpcodeBootReply,
}
s := &v4Server{}
</s> add defaultResp := &dhcpv4.DHCPv4{} </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove return n, nil
},
}
</s> add var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
defaultResp := &dhcpv4.DHCPv4{} | <mask> IP: net.IP{1, 2, 3, 4},
<mask> // Use neither client nor server port.
<mask> Port: 1234,
<mask> }
<mask> defaultResp := &dhcpv4.DHCPv4{
<mask> OpCode: dhcpv4.OpcodeBootReply,
<mask> }
<mask> s := &v4Server{}
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> req *dhcpv4.DHCPv4
<mask> wantPeer net.Addr
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove IP: net.IP{1, 2, 3, 4},
// Use neither client nor server port.
Port: 1234,
</s> add IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort, </s> remove name string
req *dhcpv4.DHCPv4
wantPeer net.Addr
</s> add want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove
</s> add conn := &dhcpConn{
udpConn: udpConn,
bcastIP: net.IP{1, 2, 3, 255},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string | <mask> }
<mask> s := &v4Server{}
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> req *dhcpv4.DHCPv4
<mask> wantPeer net.Addr
<mask> }{{
<mask> name: "relay_agent",
<mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: defaultPeer.IP,
<mask> },
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove name: "relay_agent",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: defaultPeer.IP,
},
wantPeer: &net.UDPAddr{
IP: defaultPeer.IP,
</s> add name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP, </s> remove defaultResp := &dhcpv4.DHCPv4{
OpCode: dhcpv4.OpcodeBootReply,
}
s := &v4Server{}
</s> add defaultResp := &dhcpv4.DHCPv4{} </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP, | <mask> name string
<mask> req *dhcpv4.DHCPv4
<mask> wantPeer net.Addr
<mask> }{{
<mask> name: "relay_agent",
<mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: defaultPeer.IP,
<mask> },
<mask> wantPeer: &net.UDPAddr{
<mask> IP: defaultPeer.IP,
<mask> Port: dhcpv4.ServerPort,
<mask> },
<mask> }, {
<mask> name: "known_client",
<mask> req: &dhcpv4.DHCPv4{
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove name string
req *dhcpv4.DHCPv4
wantPeer net.Addr
</s> add want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string </s> remove name: "known_client",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: net.IP{2, 3, 4, 5},
</s> add name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
), </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove wantPeer: &net.UDPAddr{
IP: net.IP{2, 3, 4, 5},
</s> add want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
), | <mask> IP: defaultPeer.IP,
<mask> Port: dhcpv4.ServerPort,
<mask> },
<mask> }, {
<mask> name: "known_client",
<mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: netutil.IPv4Zero(),
<mask> ClientIPAddr: net.IP{2, 3, 4, 5},
<mask> },
<mask> wantPeer: &net.UDPAddr{
<mask> IP: net.IP{2, 3, 4, 5},
<mask> Port: dhcpv4.ClientPort,
<mask> },
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove wantPeer: &net.UDPAddr{
IP: net.IP{2, 3, 4, 5},
</s> add want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP, </s> remove name: "relay_agent",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: defaultPeer.IP,
},
wantPeer: &net.UDPAddr{
IP: defaultPeer.IP,
</s> add name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP, </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove return n, nil
},
}
</s> add var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP, | <mask> req: &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: netutil.IPv4Zero(),
<mask> ClientIPAddr: net.IP{2, 3, 4, 5},
<mask> },
<mask> wantPeer: &net.UDPAddr{
<mask> IP: net.IP{2, 3, 4, 5},
<mask> Port: dhcpv4.ClientPort,
<mask> },
<mask> }}
<mask>
<mask> for _, tc := range testCases {
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove name: "known_client",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: net.IP{2, 3, 4, 5},
</s> add name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
), </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove name: "relay_agent",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: defaultPeer.IP,
},
wantPeer: &net.UDPAddr{
IP: defaultPeer.IP,
</s> add name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
}, {
name: "chaddr",
req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
want: &dhcpUnicastAddr{
Addr: raw.Addr{HardwareAddr: knownMAC},
yiaddr: knownIP,
},
}, {
name: "who_are_you",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{},
want: defaultPeer, | <mask> Port: dhcpv4.ClientPort,
<mask> },
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> conn := &fakePacketConn{
<mask> writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove func TestV4Server_Send_broadcast(t *testing.T) {
</s> add func TestDHCPConn_Broadcast(t *testing.T) { </s> remove conn := &fakePacketConn{
</s> add udpConn := &fakePacketConn{ | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} | <mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s.send(defaultPeer, conn, tc.req, defaultResp)
<mask> assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
<mask> assert.Equal(t, tc.wantPeer, peer)
<mask> })
<mask>
<mask> b.Reset()
<mask> peer = nil
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove b.Reset()
peer = nil
</s> add s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
}) </s> remove // The same response is written twice.
respData := tc.resp.ToBytes()
assert.EqualValues(t, append(respData, respData...), b.Bytes())
</s> add // The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) </s> remove testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove s := &v4Server{
conf: V4ServerConf{
broadcastIP: net.IP{1, 2, 3, 255},
},
}
testCases := []struct {
name string
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
}{{
name: "nak",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
}, {
name: "fully_unspecified",
req: &dhcpv4.DHCPv4{
GatewayIPAddr: netutil.IPv4Zero(),
ClientIPAddr: netutil.IPv4Zero(),
},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeOffer),
),
},
}}
</s> add respData := (&dhcpv4.DHCPv4{}).ToBytes() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
}) | <mask> assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
<mask> assert.Equal(t, tc.wantPeer, peer)
<mask> })
<mask>
<mask> b.Reset()
<mask> peer = nil
<mask> }
<mask> }
</s> Pull request: 3443 dhcp broadcast vol.2
Merge in DNS/adguard-home from 3443-dhcp-broadcast-vol.2 to master
Closes #3443.
Squashed commit of the following:
commit a85af89cb43f2489126fe3c12366fc034e89f59d
Merge: 72eb3a88 a4e07827
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:08:19 2021 +0300
Merge branch 'master' into 3443-dhcp-broadcast-vol.2
commit 72eb3a8853540b06ee1096decf50e836b539fe45
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 18:03:19 2021 +0300
dhcpd: imp code readability
commit 2d1fbc40d04a4125855d6be9f02e09d15430150d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 30 14:16:59 2021 +0300
dhcpd: imp tests
commit 889fad3084ad2b81edfc12100e2ce29d323227ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 29 20:09:25 2021 +0300
dhcpd: imp code, docs
commit 1fd6b2346ff66e033bceaa169aed751be5822ca8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 23 16:08:18 2021 +0300
dhcpd: unicast to mac address </s> remove s.send(defaultPeer, conn, tc.req, defaultResp)
assert.EqualValues(t, defaultResp.ToBytes(), b.Bytes())
assert.Equal(t, tc.wantPeer, peer)
})
</s> add conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
} </s> remove b.Reset()
peer = nil
}
</s> add assert.EqualValues(t, respData, b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peer) </s> remove for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
assert.EqualValues(t, tc.resp.ToBytes(), b.Bytes())
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
Zone: defaultPeer.Zone,
}, peer)
})
</s> add _, _ = conn.broadcast(respData, cloneUDPAddr(defaultPeer)) </s> remove assert.Equal(t, &net.UDPAddr{
IP: defaultPeer.IP,
Port: defaultPeer.Port,
}, peers[0])
assert.Equal(t, &net.UDPAddr{
IP: s.conf.broadcastIP,
Port: defaultPeer.Port,
}, peers[1])
})
b.Reset()
peers = nil
}
</s> add assert.Equal(t, cloneUDPAddr(defaultPeer), peers[0])
assert.Equal(t, &net.UDPAddr{
IP: conn.bcastIP,
Port: defaultPeer.Port,
}, peers[1]) </s> remove // The same response is written twice.
respData := tc.resp.ToBytes()
assert.EqualValues(t, append(respData, respData...), b.Bytes())
</s> add // The same response is written twice but for different peers.
assert.EqualValues(t, append(respData, respData...), b.Bytes()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da86620288256df7b0c51b0b413ded2a09aae940 | internal/dhcpd/v4_test.go |
func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
| <mask> }
<mask>
<mask> // Add a filter
<mask> // Return FALSE if a filter with this URL exists
<mask> func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
<mask> d.filtersMu.Lock()
<mask> defer d.filtersMu.Unlock()
<mask>
<mask> // Check for duplicates
<mask> if d.filterExistsLocked(flt.URL) {
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove // Check for duplicates
</s> add // Check for duplicates. </s> remove return false
</s> add return errFilterExists </s> remove return true
</s> add return nil </s> remove aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", fj.URL)
</s> add err = errFilterExists
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", fj.URL, err) </s> remove // Perform upgrade on a filter and update LastUpdated value
func (d *DNSFilter) update(filter *FilterYAML) (bool, error) {
b, err := d.updateIntl(filter)
</s> add // update refreshes filter's content and a/mtimes of it's file.
func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {
b, err = d.updateIntl(filter) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
// Check for duplicates. | <mask> func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
<mask> d.filtersMu.Lock()
<mask> defer d.filtersMu.Unlock()
<mask>
<mask> // Check for duplicates
<mask> if d.filterExistsLocked(flt.URL) {
<mask> return false
<mask> }
<mask>
<mask> if flt.white {
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
</s> remove return false
</s> add return errFilterExists </s> remove }}
</s> add } </s> remove type Resp struct {
Updated int `json:"updated"`
}
resp := Resp{}
</s> add </s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
return errFilterExists | <mask> defer d.filtersMu.Unlock()
<mask>
<mask> // Check for duplicates
<mask> if d.filterExistsLocked(flt.URL) {
<mask> return false
<mask> }
<mask>
<mask> if flt.white {
<mask> d.WhitelistFilters = append(d.WhitelistFilters, flt)
<mask> } else {
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove // Check for duplicates
</s> add // Check for duplicates. </s> remove return true
</s> add return nil </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
</s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() </s> remove aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", fj.URL)
</s> add err = errFilterExists
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", fj.URL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
return nil | <mask> d.WhitelistFilters = append(d.WhitelistFilters, flt)
<mask> } else {
<mask> d.Filters = append(d.Filters, flt)
<mask> }
<mask> return true
<mask> }
<mask>
<mask> // Load filters from the disk
<mask> // And if any filter has zero ID, assign a new one
<mask> func (d *DNSFilter) loadFilters(array []FilterYAML) {
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove return false
</s> add return errFilterExists </s> remove }}
</s> add } </s> remove d.filtersMu.Lock()
filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters
}
</s> add </s> remove filters := []Filter{{
</s> add filters := make([]Filter, 1, len(d.Filters)+len(d.WhitelistFilters)+1)
filters[0] = Filter{ </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
// TODO(e.burkov): Improve this inexhaustible source of races. | <mask> }
<mask> }
<mask> }
<mask>
<mask> func assignUniqueFilterID() int64 {
<mask> value := nextFilterID
<mask> nextFilterID++
<mask> return value
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove // Perform upgrade on a filter and update LastUpdated value
func (d *DNSFilter) update(filter *FilterYAML) (bool, error) {
b, err := d.updateIntl(filter)
</s> add // update refreshes filter's content and a/mtimes of it's file.
func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {
b, err = d.updateIntl(filter) </s> remove return true
</s> add return nil </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove return false
</s> add return errFilterExists </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
d.filtersMu.Lock()
defer d.filtersMu.Unlock()
| <mask>
<mask> updateCount := 0
<mask> for i := range updateFilters {
<mask> uf := &updateFilters[i]
<mask> updated := updateFlags[i]
<mask>
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove d.filtersMu.Lock()
</s> add </s> remove }}
</s> add } </s> remove filters := []Filter{{
</s> add filters := make([]Filter, 1, len(d.Filters)+len(d.WhitelistFilters)+1)
filters[0] = Filter{ </s> remove d.filtersMu.Lock()
filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters
}
</s> add </s> remove continue
</s> add filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
<mask> for i := range updateFilters {
<mask> uf := &updateFilters[i]
<mask> updated := updateFlags[i]
<mask>
<mask> d.filtersMu.Lock()
<mask> for k := range *filters {
<mask> f := &(*filters)[k]
<mask> if f.ID != uf.ID || f.URL != uf.URL {
<mask> continue
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() </s> remove d.filtersMu.Lock()
filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters
}
</s> add </s> remove continue
</s> add filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters </s> remove }}
</s> add } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go | |
log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) | <mask> if !updated {
<mask> continue
<mask> }
<mask>
<mask> log.Info("Updated filter #%d. Rules: %d -> %d",
<mask> f.ID, f.RulesCount, uf.RulesCount)
<mask> f.Name = uf.Name
<mask> f.RulesCount = uf.RulesCount
<mask> f.checksum = uf.checksum
<mask> updateCount++
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove d.filtersMu.Unlock()
</s> add </s> remove _ = os.Remove(uf.Path(d.DataDir) + ".old")
</s> add p := uf.Path(d.DataDir)
err := os.Remove(p + ".old")
if err != nil {
log.Debug("filtering: removing old filter file %q: %s", p, err)
} </s> remove rc = resp.Body
</s> add r = resp.Body </s> remove deleted = flt
path := flt.Path(d.DataDir)
err = os.Rename(path, path+".old")
</s> add delIdx := slices.IndexFunc(*filters, func(flt FilterYAML) bool {
return flt.URL == req.URL
})
if delIdx == -1 {
log.Error("deleting filter with url %q: %s", req.URL, errFilterNotExist)
return
}
deleted = (*filters)[delIdx]
p := deleted.Path(d.DataDir)
err = os.Rename(p, p+".old") </s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
<mask> f.RulesCount = uf.RulesCount
<mask> f.checksum = uf.checksum
<mask> updateCount++
<mask> }
<mask> d.filtersMu.Unlock()
<mask> }
<mask>
<mask> return updateCount, updateFilters, updateFlags, false
<mask> }
<mask>
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove log.Info("Updated filter #%d. Rules: %d -> %d",
f.ID, f.RulesCount, uf.RulesCount)
</s> add log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) </s> remove return false
</s> add return errFilterExists </s> remove log.Debug("filtering: update finished")
</s> add log.Debug("filtering: update finished: %d lists updated", updNum) </s> remove log.Error("deleting filter %q: %s", path, err)
</s> add log.Error("deleting filter %d: renaming file %q: %s", deleted.ID, p, err)
return </s> remove }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go | |
p := uf.Path(d.DataDir)
err := os.Remove(p + ".old")
if err != nil {
log.Debug("filtering: removing old filter file %q: %s", p, err)
} | <mask> updated := toUpd[i]
<mask> if !updated {
<mask> continue
<mask> }
<mask> _ = os.Remove(uf.Path(d.DataDir) + ".old")
<mask> }
<mask> }
<mask>
<mask> log.Debug("filtering: update finished")
<mask>
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove log.Debug("filtering: update finished")
</s> add log.Debug("filtering: update finished: %d lists updated", updNum) </s> remove log.Info("Updated filter #%d. Rules: %d -> %d",
f.ID, f.RulesCount, uf.RulesCount)
</s> add log.Info("Updated filter #%d. Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount) </s> remove d.filtersMu.Lock()
</s> add </s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() </s> remove deleted = flt
path := flt.Path(d.DataDir)
err = os.Rename(path, path+".old")
</s> add delIdx := slices.IndexFunc(*filters, func(flt FilterYAML) bool {
return flt.URL == req.URL
})
if delIdx == -1 {
log.Error("deleting filter with url %q: %s", req.URL, errFilterNotExist)
return
}
deleted = (*filters)[delIdx]
p := deleted.Path(d.DataDir)
err = os.Rename(p, p+".old") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
log.Debug("filtering: update finished: %d lists updated", updNum) | <mask> _ = os.Remove(uf.Path(d.DataDir) + ".old")
<mask> }
<mask> }
<mask>
<mask> log.Debug("filtering: update finished")
<mask>
<mask> return updNum, false
<mask> }
<mask>
<mask> // isPrintableText returns true if data is printable UTF-8 text with CR, LF, TAB
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove _ = os.Remove(uf.Path(d.DataDir) + ".old")
</s> add p := uf.Path(d.DataDir)
err := os.Remove(p + ".old")
if err != nil {
log.Debug("filtering: removing old filter file %q: %s", p, err)
} </s> remove if !d.filterAdd(filt) {
aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL)
</s> add err = d.filterAdd(filt)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", filt.URL, err) </s> remove return false
</s> add return errFilterExists </s> remove d.filtersMu.Unlock()
</s> add </s> remove return true
</s> add return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
// rules, number of bytes written, checksum, and title of the parsed list. dst
// must not be nil. | <mask> return 0, nil, nil
<mask> }
<mask>
<mask> // parseFilter copies filter's content from src to dst and returns the number of
<mask> // rules, name, number of bytes written, checksum, and title of the parsed list.
<mask> // dst must not be nil.
<mask> func (d *DNSFilter) parseFilter(
<mask> src io.Reader,
<mask> dst io.Writer,
<mask> ) (rulesNum, written int, checksum uint32, title string, err error) {
<mask> scanner := bufio.NewScanner(src)
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove // Perform upgrade on a filter and update LastUpdated value
func (d *DNSFilter) update(filter *FilterYAML) (bool, error) {
b, err := d.updateIntl(filter)
</s> add // update refreshes filter's content and a/mtimes of it's file.
func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {
b, err = d.updateIntl(filter) </s> remove log.Printf("saving filter %d contents to: %s", flt.ID, flt.Path(d.DataDir))
</s> add fltPath := flt.Path(d.DataDir)
log.Printf("saving contents of filter #%d into %s", flt.ID, fltPath) </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) </s> remove return true
</s> add return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
// update refreshes filter's content and a/mtimes of it's file.
func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {
b, err = d.updateIntl(filter) | <mask>
<mask> return strings.HasPrefix(line, "<html") || strings.HasPrefix(line, "<!doctype")
<mask> }
<mask>
<mask> // Perform upgrade on a filter and update LastUpdated value
<mask> func (d *DNSFilter) update(filter *FilterYAML) (bool, error) {
<mask> b, err := d.updateIntl(filter)
<mask> filter.LastUpdated = time.Now()
<mask> if !b {
<mask> e := os.Chtimes(filter.Path(d.DataDir), filter.LastUpdated, filter.LastUpdated)
<mask> if e != nil {
<mask> log.Error("os.Chtimes(): %v", e)
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove e := os.Chtimes(filter.Path(d.DataDir), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
</s> add chErr := os.Chtimes(
filter.Path(d.DataDir),
filter.LastUpdated,
filter.LastUpdated,
)
if chErr != nil {
log.Error("os.Chtimes(): %v", chErr) </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
</s> remove return true
</s> add return nil </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove type Resp struct {
Updated int `json:"updated"`
}
resp := Resp{}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
chErr := os.Chtimes(
filter.Path(d.DataDir),
filter.LastUpdated,
filter.LastUpdated,
)
if chErr != nil {
log.Error("os.Chtimes(): %v", chErr) | <mask> func (d *DNSFilter) update(filter *FilterYAML) (bool, error) {
<mask> b, err := d.updateIntl(filter)
<mask> filter.LastUpdated = time.Now()
<mask> if !b {
<mask> e := os.Chtimes(filter.Path(d.DataDir), filter.LastUpdated, filter.LastUpdated)
<mask> if e != nil {
<mask> log.Error("os.Chtimes(): %v", e)
<mask> }
<mask> }
<mask>
<mask> return b, err
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove // Perform upgrade on a filter and update LastUpdated value
func (d *DNSFilter) update(filter *FilterYAML) (bool, error) {
b, err := d.updateIntl(filter)
</s> add // update refreshes filter's content and a/mtimes of it's file.
func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {
b, err = d.updateIntl(filter) </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove type Resp struct {
Updated int `json:"updated"`
}
resp := Resp{}
</s> add </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
fltPath := flt.Path(d.DataDir)
log.Printf("saving contents of filter #%d into %s", flt.ID, fltPath) | <mask>
<mask> return os.Remove(tmpFileName)
<mask> }
<mask>
<mask> log.Printf("saving filter %d contents to: %s", flt.ID, flt.Path(d.DataDir))
<mask>
<mask> // Don't use renamio or maybe packages, since those will require loading the
<mask> // whole filter content to the memory on Windows.
<mask> err = os.Rename(tmpFileName, flt.Path(d.DataDir))
<mask> if err != nil {
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove err = os.Rename(tmpFileName, flt.Path(d.DataDir))
</s> add err = os.Rename(tmpFileName, fltPath) </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove err = errors.WithDeferred(err, d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs))
if ok && err == nil {
</s> add finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
if ok && finErr == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
err = os.Rename(tmpFileName, fltPath) | <mask> log.Printf("saving filter %d contents to: %s", flt.ID, flt.Path(d.DataDir))
<mask>
<mask> // Don't use renamio or maybe packages, since those will require loading the
<mask> // whole filter content to the memory on Windows.
<mask> err = os.Rename(tmpFileName, flt.Path(d.DataDir))
<mask> if err != nil {
<mask> return errors.WithDeferred(err, os.Remove(tmpFileName))
<mask> }
<mask>
<mask> flt.Name, flt.checksum, flt.RulesCount = aghalg.Coalesce(flt.Name, name), cs, rnum
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove log.Printf("saving filter %d contents to: %s", flt.ID, flt.Path(d.DataDir))
</s> add fltPath := flt.Path(d.DataDir)
log.Printf("saving contents of filter #%d into %s", flt.ID, fltPath) </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove err = errors.WithDeferred(err, d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs))
if ok && err == nil {
</s> add finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
if ok && finErr == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
if ok && finErr == nil { | <mask> if err != nil {
<mask> return false, err
<mask> }
<mask> defer func() {
<mask> err = errors.WithDeferred(err, d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs))
<mask> if ok && err == nil {
<mask> log.Printf("updated filter %d: %d bytes, %d rules", flt.ID, n, rnum)
<mask> }
<mask> }()
<mask>
<mask> // Change the default 0o600 permission to something more acceptable by end
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
return | <mask> defer func() {
<mask> finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
<mask> if ok && finErr == nil {
<mask> log.Printf("updated filter %d: %d bytes, %d rules", flt.ID, n, rnum)
<mask> }
<mask>
<mask> err = errors.WithDeferred(err, finErr)
<mask> }()
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove err = errors.WithDeferred(err, d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs))
if ok && err == nil {
</s> add finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
if ok && finErr == nil { </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
err = errors.WithDeferred(err, finErr) | <mask> log.Printf("updated filter %d: %d bytes, %d rules", flt.ID, n, rnum)
<mask>
<mask> return
<mask> }
<mask> }()
<mask>
<mask> // Change the default 0o600 permission to something more acceptable by end
<mask> // users.
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove err = errors.WithDeferred(err, d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs))
if ok && err == nil {
</s> add finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
if ok && finErr == nil { </s> remove log.Printf("saving filter %d contents to: %s", flt.ID, flt.Path(d.DataDir))
</s> add fltPath := flt.Path(d.DataDir)
log.Printf("saving contents of filter #%d into %s", flt.ID, fltPath) </s> remove err = os.Rename(tmpFileName, flt.Path(d.DataDir))
</s> add err = os.Rename(tmpFileName, fltPath) </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
var r io.Reader | <mask> if err = tmpFile.Chmod(0o644); err != nil {
<mask> return false, fmt.Errorf("changing file mode: %w", err)
<mask> }
<mask>
<mask> var rc io.ReadCloser
<mask> if !filepath.IsAbs(flt.URL) {
<mask> var resp *http.Response
<mask> resp, err = d.HTTPClient.Get(flt.URL)
<mask> if err != nil {
<mask> log.Printf("requesting filter from %s, skip: %s", flt.URL, err)
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) </s> remove rc = resp.Body
</s> add r = resp.Body </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove log.Error("deleting filter %q: %s", path, err)
</s> add log.Error("deleting filter %d: renaming file %q: %s", deleted.ID, p, err)
return </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
r = resp.Body | <mask>
<mask> return false, fmt.Errorf("got status code %d, want %d", resp.StatusCode, http.StatusOK)
<mask> }
<mask>
<mask> rc = resp.Body
<mask> } else {
<mask> rc, err = os.Open(flt.URL)
<mask> if err != nil {
<mask> return false, fmt.Errorf("open file: %w", err)
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove var rc io.ReadCloser
</s> add var r io.Reader </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove url, err := url.ParseRequestURI(urlStr)
</s> add u, err := url.ParseRequestURI(urlStr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
var f *os.File
f, err = os.Open(flt.URL) | <mask> }
<mask>
<mask> rc = resp.Body
<mask> } else {
<mask> rc, err = os.Open(flt.URL)
<mask> if err != nil {
<mask> return false, fmt.Errorf("open file: %w", err)
<mask> }
<mask> defer func() { err = errors.WithDeferred(err, rc.Close()) }()
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove rc = resp.Body
</s> add r = resp.Body </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove var rc io.ReadCloser
</s> add var r io.Reader </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f | <mask> rc, err = os.Open(flt.URL)
<mask> if err != nil {
<mask> return false, fmt.Errorf("open file: %w", err)
<mask> }
<mask> defer func() { err = errors.WithDeferred(err, rc.Close()) }()
<mask> }
<mask>
<mask> rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
<mask>
<mask> return cs != flt.checksum && err == nil, err
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) </s> remove rc = resp.Body
</s> add r = resp.Body </s> remove err = errors.WithDeferred(err, d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs))
if ok && err == nil {
</s> add finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
if ok && finErr == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
rnum, n, cs, name, err = d.parseFilter(r, tmpFile) | <mask> }
<mask> defer func() { err = errors.WithDeferred(err, rc.Close()) }()
<mask> }
<mask>
<mask> rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
<mask>
<mask> return cs != flt.checksum && err == nil, err
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove err = errors.WithDeferred(err, d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs))
if ok && err == nil {
</s> add finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
if ok && finErr == nil { </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) </s> remove err = os.Rename(tmpFileName, flt.Path(d.DataDir))
</s> add err = os.Rename(tmpFileName, fltPath) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
filters := make([]Filter, 1, len(d.Filters)+len(d.WhitelistFilters)+1)
filters[0] = Filter{ | <mask> d.enableFiltersLocked(async)
<mask> }
<mask>
<mask> func (d *DNSFilter) enableFiltersLocked(async bool) {
<mask> filters := []Filter{{
<mask> ID: CustomListID,
<mask> Data: []byte(strings.Join(d.UserRules, "\n")),
<mask> }}
<mask>
<mask> for _, filter := range d.Filters {
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove }}
</s> add } </s> remove return true
</s> add return nil </s> remove d.filtersMu.Lock()
filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters
}
</s> add </s> remove continue
</s> add filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters </s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
} | <mask> func (d *DNSFilter) enableFiltersLocked(async bool) {
<mask> filters := []Filter{{
<mask> ID: CustomListID,
<mask> Data: []byte(strings.Join(d.UserRules, "\n")),
<mask> }}
<mask>
<mask> for _, filter := range d.Filters {
<mask> if !filter.Enabled {
<mask> continue
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove filters := []Filter{{
</s> add filters := make([]Filter, 1, len(d.Filters)+len(d.WhitelistFilters)+1)
filters[0] = Filter{ </s> remove continue
</s> add filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters </s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() </s> remove return true
</s> add return nil </s> remove d.filtersMu.Lock()
filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/filter.go |
"golang.org/x/exp/slices" | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // validateFilterURL validates the filter list URL or file name.
<mask> func validateFilterURL(urlStr string) (err error) {
<mask> defer func() { err = errors.Annotate(err, "checking filter: %w") }()
<mask>
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
</s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove rnum, n, cs, name, err = d.parseFilter(rc, tmpFile)
</s> add rnum, n, cs, name, err = d.parseFilter(r, tmpFile) </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
defer func() { err = errors.Annotate(err, "checking filter: %w") }()
| <mask> // validateFilterURL validates the filter list URL or file name.
<mask> func validateFilterURL(urlStr string) (err error) {
<mask> if filepath.IsAbs(urlStr) {
<mask> _, err = os.Stat(urlStr)
<mask> if err != nil {
<mask> // Don't wrap the error since it's informative enough as is.
<mask> return err
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove return fmt.Errorf("checking filter url: %w", err)
}
if s := url.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return fmt.Errorf("checking filter url: invalid scheme %q", s)
</s> add // Don't wrap the error since it's informative enough as is.
return err
} else if s := u.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return &url.Error{
Op: "Check scheme",
URL: urlStr,
Err: fmt.Errorf("only %v allowed", []string{aghhttp.SchemeHTTP, aghhttp.SchemeHTTPS}),
} </s> remove err = os.Rename(tmpFileName, flt.Path(d.DataDir))
</s> add err = os.Rename(tmpFileName, fltPath) </s> remove log.Printf("saving filter %d contents to: %s", flt.ID, flt.Path(d.DataDir))
</s> add fltPath := flt.Path(d.DataDir)
log.Printf("saving contents of filter #%d into %s", flt.ID, fltPath) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
// Don't wrap the error since it's informative enough as is.
return err | <mask> func validateFilterURL(urlStr string) (err error) {
<mask> if filepath.IsAbs(urlStr) {
<mask> _, err = os.Stat(urlStr)
<mask> if err != nil {
<mask> return fmt.Errorf("checking filter file: %w", err)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove url, err := url.ParseRequestURI(urlStr)
</s> add u, err := url.ParseRequestURI(urlStr) </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) </s> remove rc = resp.Body
</s> add r = resp.Body </s> remove return fmt.Errorf("checking filter url: %w", err)
}
if s := url.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return fmt.Errorf("checking filter url: invalid scheme %q", s)
</s> add // Don't wrap the error since it's informative enough as is.
return err
} else if s := u.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return &url.Error{
Op: "Check scheme",
URL: urlStr,
Err: fmt.Errorf("only %v allowed", []string{aghhttp.SchemeHTTP, aghhttp.SchemeHTTPS}),
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
u, err := url.ParseRequestURI(urlStr) | <mask>
<mask> return nil
<mask> }
<mask>
<mask> url, err := url.ParseRequestURI(urlStr)
<mask> if err != nil {
<mask> return fmt.Errorf("checking filter url: %w", err)
<mask> }
<mask>
<mask> if s := url.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove return fmt.Errorf("checking filter url: %w", err)
}
if s := url.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return fmt.Errorf("checking filter url: invalid scheme %q", s)
</s> add // Don't wrap the error since it's informative enough as is.
return err
} else if s := u.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return &url.Error{
Op: "Check scheme",
URL: urlStr,
Err: fmt.Errorf("only %v allowed", []string{aghhttp.SchemeHTTP, aghhttp.SchemeHTTPS}),
} </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove var rc io.ReadCloser
</s> add var r io.Reader </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove rc, err = os.Open(flt.URL)
</s> add var f *os.File
f, err = os.Open(flt.URL) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
// Don't wrap the error since it's informative enough as is.
return err
} else if s := u.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return &url.Error{
Op: "Check scheme",
URL: urlStr,
Err: fmt.Errorf("only %v allowed", []string{aghhttp.SchemeHTTP, aghhttp.SchemeHTTPS}),
} | <mask> }
<mask>
<mask> url, err := url.ParseRequestURI(urlStr)
<mask> if err != nil {
<mask> return fmt.Errorf("checking filter url: %w", err)
<mask> }
<mask>
<mask> if s := url.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
<mask> return fmt.Errorf("checking filter url: invalid scheme %q", s)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove url, err := url.ParseRequestURI(urlStr)
</s> add u, err := url.ParseRequestURI(urlStr) </s> remove return fmt.Errorf("checking filter file: %w", err)
</s> add // Don't wrap the error since it's informative enough as is.
return err </s> remove var rc io.ReadCloser
</s> add var r io.Reader </s> remove defer func() { err = errors.WithDeferred(err, rc.Close()) }()
</s> add defer func() { err = errors.WithDeferred(err, f.Close()) }()
r = f </s> remove rc = resp.Body
</s> add r = resp.Body | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
err = errFilterExists
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", fj.URL, err) | <mask> }
<mask>
<mask> // Check for duplicates
<mask> if d.filterExists(fj.URL) {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", fj.URL)
<mask>
<mask> return
<mask> }
<mask>
<mask> // Set necessary properties
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove if !d.filterAdd(filt) {
aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL)
</s> add err = d.filterAdd(filt)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", filt.URL, err) </s> remove // Check for duplicates
</s> add // Check for duplicates. </s> remove "Filter at the url %s is invalid (maybe it points to blank page?)",
</s> add "Filter with URL %q is invalid (maybe it points to blank page?)", </s> remove return false
</s> add return errFilterExists </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
"Filter with URL %q is invalid (maybe it points to blank page?)", | <mask> aghhttp.Error(
<mask> r,
<mask> w,
<mask> http.StatusBadRequest,
<mask> "Filter at the url %s is invalid (maybe it points to blank page?)",
<mask> filt.URL,
<mask> )
<mask>
<mask> return
<mask> }
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove if !d.filterAdd(filt) {
aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL)
</s> add err = d.filterAdd(filt)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", filt.URL, err) </s> remove aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", fj.URL)
</s> add err = errFilterExists
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", fj.URL, err) </s> remove return fmt.Errorf("checking filter url: %w", err)
}
if s := url.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return fmt.Errorf("checking filter url: invalid scheme %q", s)
</s> add // Don't wrap the error since it's informative enough as is.
return err
} else if s := u.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
return &url.Error{
Op: "Check scheme",
URL: urlStr,
Err: fmt.Errorf("only %v allowed", []string{aghhttp.SchemeHTTP, aghhttp.SchemeHTTPS}),
} </s> remove // rules, name, number of bytes written, checksum, and title of the parsed list.
// dst must not be nil.
</s> add // rules, number of bytes written, checksum, and title of the parsed list. dst
// must not be nil. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
err = d.filterAdd(filt)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", filt.URL, err) | <mask> }
<mask>
<mask> // URL is assumed valid so append it to filters, update config, write new
<mask> // file and reload it to engines.
<mask> if !d.filterAdd(filt) {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL)
<mask>
<mask> return
<mask> }
<mask>
<mask> d.ConfigModified()
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove aghhttp.Error(r, w, http.StatusBadRequest, "Filter URL already added -- %s", fj.URL)
</s> add err = errFilterExists
aghhttp.Error(r, w, http.StatusBadRequest, "Filter with URL %q: %s", fj.URL, err) </s> remove "Filter at the url %s is invalid (maybe it points to blank page?)",
</s> add "Filter with URL %q is invalid (maybe it points to blank page?)", </s> remove log.Debug("filtering: update finished")
</s> add log.Debug("filtering: update finished: %d lists updated", updNum) </s> remove _ = os.Remove(uf.Path(d.DataDir) + ".old")
</s> add p := uf.Path(d.DataDir)
err := os.Remove(p + ".old")
if err != nil {
log.Debug("filtering: removing old filter file %q: %s", p, err)
} </s> remove func (d *DNSFilter) filterAdd(flt FilterYAML) bool {
</s> add func (d *DNSFilter) filterAdd(flt FilterYAML) (err error) {
// Defer annotating to unlock sooner.
defer func() { err = errors.Annotate(err, "adding filter: %w") }()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
<mask>
<mask> return
<mask> }
<mask>
<mask> d.filtersMu.Lock()
<mask> filters := &d.Filters
<mask> if req.Whitelist {
<mask> filters = &d.WhitelistFilters
<mask> }
<mask>
<mask> var deleted FilterYAML
<mask> var newFilters []FilterYAML
<mask> for _, flt := range *filters {
<mask> if flt.URL != req.URL {
<mask> newFilters = append(newFilters, flt)
</s> Pull request 1790: 5624-fix-filter-add
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624.
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly </s> remove var newFilters []FilterYAML
for _, flt := range *filters {
if flt.URL != req.URL {
newFilters = append(newFilters, flt)
</s> add func() {
d.filtersMu.Lock()
defer d.filtersMu.Unlock() </s> remove continue
</s> add filters := &d.Filters
if req.Whitelist {
filters = &d.WhitelistFilters </s> remove log.Error("deleting filter %q: %s", path, err)
</s> add log.Error("deleting filter %d: renaming file %q: %s", deleted.ID, p, err)
return </s> remove deleted = flt
path := flt.Path(d.DataDir)
err = os.Rename(path, path+".old")
</s> add delIdx := slices.IndexFunc(*filters, func(flt FilterYAML) bool {
return flt.URL == req.URL
})
if delIdx == -1 {
log.Error("deleting filter with url %q: %s", req.URL, errFilterNotExist)
return
}
deleted = (*filters)[delIdx]
p := deleted.Path(d.DataDir)
err = os.Rename(p, p+".old") </s> remove }}
</s> add } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da9008aba345ee6792470ff3a3b7588482ee1e4d | internal/filtering/http.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.