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 |
|---|---|---|---|---|
reason, filterId, rule, status, originalAnswer, | <mask> };
<mask>
<mask> getResponseCell = ({ value: responses, original }) => {
<mask> const {
<mask> reason, filterId, rule, status,
<mask> } = original;
<mask> const { t, filtering } = this.props;
<mask> const { filters } = filtering;
<mask>
<mask> const isFiltered = this.checkFiltered(reason);
</s> + client: handle blocked by response in query log </s> remove serviceName: service_name,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8885dbf3e8f4e9f5e486031813712c88625ba64 | client/src/components/Logs/index.js |
const normalizedAnswer = originalAnswer && this.normalizeResponse(originalAnswer); | <mask> const isBlockedService = reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
<mask> const currentService = SERVICES.find(service => service.id === original.serviceName);
<mask> const serviceName = currentService && currentService.name;
<mask> let filterName = '';
<mask>
<mask> if (filterId === 0) {
<mask> filterName = t('custom_filter_rules');
<mask> } else {
</s> + client: handle blocked by response in query log </s> remove reason, filterId, rule, status,
</s> add reason, filterId, rule, status, originalAnswer, </s> remove serviceName: service_name,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8885dbf3e8f4e9f5e486031813712c88625ba64 | client/src/components/Logs/index.js |
{originalAnswer && (
<span className="logs__text">
<Trans>blocked_by_response</Trans>
</span>
)}
{!originalAnswer && (isFiltered || isBlockedService) && ( | <mask>
<mask> return (
<mask> <div className="logs__row logs__row--column">
<mask> <div className="logs__text-wrap">
<mask> {(isFiltered || isBlockedService) && (
<mask> <span className="logs__text" title={parsedFilteredReason}>
<mask> {parsedFilteredReason}
<mask> </span>
<mask> )}
<mask> {isBlockedService
</s> + client: handle blocked by response in query log </s> remove {this.renderResponseList(responses, status)}
</s> add {originalAnswer
? this.renderResponseList(normalizedAnswer, status)
: this.renderResponseList(responses, status)
} </s> remove serviceName: service_name,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8885dbf3e8f4e9f5e486031813712c88625ba64 | client/src/components/Logs/index.js |
{originalAnswer
? this.renderResponseList(normalizedAnswer, status)
: this.renderResponseList(responses, status)
} | <mask> </strong>
<mask> )}
<mask> </div>
<mask> <div className="logs__list-wrap">
<mask> {this.renderResponseList(responses, status)}
<mask> {isWhiteList && this.renderTooltip(isWhiteList, rule, filterName)}
<mask> </div>
<mask> </div>
<mask> );
<mask> };
</s> + client: handle blocked by response in query log </s> remove {(isFiltered || isBlockedService) && (
</s> add {originalAnswer && (
<span className="logs__text">
<Trans>blocked_by_response</Trans>
</span>
)}
{!originalAnswer && (isFiltered || isBlockedService) && ( </s> remove serviceName: service_name,
</s> add </s> remove reason, filterId, rule, status,
</s> add reason, filterId, rule, status, originalAnswer, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8885dbf3e8f4e9f5e486031813712c88625ba64 | client/src/components/Logs/index.js |
original_answer, | <mask> service_name,
<mask> status,
<mask> } = log;
<mask> const { host: domain, type } = question;
<mask> const responsesArray = response ? response.map((response) => {
<mask> const { value, type, ttl } = response;
</s> + client: handle blocked by response in query log </s> remove reason, filterId, rule, status,
</s> add reason, filterId, rule, status, originalAnswer, </s> remove serviceName: service_name,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8885dbf3e8f4e9f5e486031813712c88625ba64 | client/src/helpers/helpers.js |
<mask> reason,
<mask> client,
<mask> filterId,
<mask> rule,
<mask> serviceName: service_name,
<mask> status,
<mask> };
<mask> });
<mask>
<mask> export const normalizeHistory = (history, interval) => {
</s> + client: handle blocked by response in query log </s> remove reason, filterId, rule, status,
</s> add reason, filterId, rule, status, originalAnswer, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8885dbf3e8f4e9f5e486031813712c88625ba64 | client/src/helpers/helpers.js | |
serviceName: service_name,
originalAnswer: original_answer, | <mask> client,
<mask> filterId,
<mask> rule,
<mask> status,
<mask> };
<mask> });
<mask>
<mask> export const normalizeHistory = (history, interval) => {
<mask> if (interval === 1 || interval === 7) {
<mask> const hoursAgo = subHours(Date.now(), 24 * interval);
</s> + client: handle blocked by response in query log </s> remove serviceName: service_name,
</s> add </s> remove reason, filterId, rule, status,
</s> add reason, filterId, rule, status, originalAnswer, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8885dbf3e8f4e9f5e486031813712c88625ba64 | client/src/helpers/helpers.js |
RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | <mask> s.conf.DBFilePath = dbFilename
<mask>
<mask> conf := V4ServerConf{
<mask> Enabled: true,
<mask> RangeStart: "192.168.10.100",
<mask> RangeEnd: "192.168.10.200",
<mask> GatewayIP: "192.168.10.1",
<mask> SubnetMask: "255.255.255.0",
<mask> notify: testNotify,
<mask> }
<mask> s.srv4, err = v4Create(conf)
<mask> assert.True(t, err == nil)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.Nil(t, err) | <mask> SubnetMask: "255.255.255.0",
<mask> notify: testNotify,
<mask> }
<mask> s.srv4, err = v4Create(conf)
<mask> assert.True(t, err == nil)
<mask>
<mask> s.srv6, err = v6Create(V6ServerConf{})
<mask> assert.True(t, err == nil)
<mask>
<mask> l := Lease{}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove l.IP = net.ParseIP("192.168.10.100").To4()
</s> add l.IP = net.IP{192, 168, 10, 100} </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.Nil(t, err) | <mask> s.srv4, err = v4Create(conf)
<mask> assert.True(t, err == nil)
<mask>
<mask> s.srv6, err = v6Create(V6ServerConf{})
<mask> assert.True(t, err == nil)
<mask>
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.100").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> exp1 := time.Now().Add(time.Hour)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove l.IP = net.ParseIP("192.168.10.100").To4()
</s> add l.IP = net.IP{192, 168, 10, 100} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
l.IP = net.IP{192, 168, 10, 100} | <mask> s.srv6, err = v6Create(V6ServerConf{})
<mask> assert.True(t, err == nil)
<mask>
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.100").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> exp1 := time.Now().Add(time.Hour)
<mask> l.Expiry = exp1
<mask> s.srv4.(*v4Server).addLease(&l)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove l2.IP = net.ParseIP("192.168.10.101").To4()
</s> add l2.IP = net.IP{192, 168, 10, 101} </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
l2.IP = net.IP{192, 168, 10, 101} | <mask> l.Expiry = exp1
<mask> s.srv4.(*v4Server).addLease(&l)
<mask>
<mask> l2 := Lease{}
<mask> l2.IP = net.ParseIP("192.168.10.101").To4()
<mask> l2.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:bb")
<mask> s.srv4.AddStaticLease(l2)
<mask>
<mask> _ = os.Remove("leases.db")
<mask> s.dbStore()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove l.IP = net.ParseIP("192.168.10.100").To4()
</s> add l.IP = net.IP{192, 168, 10, 100} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, leaseExpireStatic, ll[0].Expiry.Unix()) | <mask> ll := s.srv4.GetLeases(LeasesAll)
<mask>
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:bb", ll[0].HWAddr.String())
<mask> assert.Equal(t, "192.168.10.101", ll[0].IP.String())
<mask> assert.Equal(t, int64(leaseExpireStatic), ll[0].Expiry.Unix())
<mask>
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ll[1].HWAddr.String())
<mask> assert.Equal(t, "192.168.10.100", ll[1].IP.String())
<mask> assert.Equal(t, exp1.Unix(), ll[1].Expiry.Unix())
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove start := net.ParseIP("192.168.10.100").To4()
stop := net.ParseIP("192.168.10.200").To4()
assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.10.99").To4()))
assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.11.100").To4()))
assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.11.201").To4()))
assert.True(t, ip4InRange(start, stop, net.ParseIP("192.168.10.100").To4()))
</s> add start := net.IP{192, 168, 10, 100}
stop := net.IP{192, 168, 10, 200}
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 10, 99}))
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 11, 100}))
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 11, 201}))
assert.True(t, ip4InRange(start, stop, net.IP{192, 168, 10, 100})) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.False(t, isValidSubnetMask([]byte{255, 255, 253, 0}))
assert.False(t, isValidSubnetMask([]byte{255, 255, 255, 1})) | <mask> func TestIsValidSubnetMask(t *testing.T) {
<mask> assert.True(t, isValidSubnetMask([]byte{255, 255, 255, 0}))
<mask> assert.True(t, isValidSubnetMask([]byte{255, 255, 254, 0}))
<mask> assert.True(t, isValidSubnetMask([]byte{255, 255, 252, 0}))
<mask> assert.True(t, !isValidSubnetMask([]byte{255, 255, 253, 0}))
<mask> assert.True(t, !isValidSubnetMask([]byte{255, 255, 255, 1}))
<mask> }
<mask>
<mask> func TestNormalizeLeases(t *testing.T) {
<mask> dynLeases := []*Lease{}
<mask> staticLeases := []*Lease{}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.Len(t, leases, 3) | <mask> staticLeases = append(staticLeases, lease)
<mask>
<mask> leases := normalizeLeases(staticLeases, dynLeases)
<mask>
<mask> assert.True(t, len(leases) == 3)
<mask> assert.True(t, bytes.Equal(leases[0].HWAddr, []byte{1, 2, 3, 4}))
<mask> assert.True(t, bytes.Equal(leases[0].IP, []byte{0, 2, 3, 4}))
<mask> assert.True(t, bytes.Equal(leases[1].HWAddr, []byte{2, 2, 3, 4}))
<mask> assert.True(t, bytes.Equal(leases[2].HWAddr, []byte{1, 2, 3, 5}))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 2, len(r.IPList))
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, 12, code) | <mask> }
<mask>
<mask> func TestOptions(t *testing.T) {
<mask> code, val := parseOptionString(" 12 hex abcdef ")
<mask> assert.Equal(t, uint8(12), code)
<mask> assert.True(t, bytes.Equal([]byte{0xab, 0xcd, 0xef}, val))
<mask>
<mask> code, _ = parseOptionString(" 12 hex abcdef1 ")
<mask> assert.Equal(t, uint8(0), code)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(123), code)
</s> add assert.EqualValues(t, 123, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, 0, code) | <mask> assert.Equal(t, uint8(12), code)
<mask> assert.True(t, bytes.Equal([]byte{0xab, 0xcd, 0xef}, val))
<mask>
<mask> code, _ = parseOptionString(" 12 hex abcdef1 ")
<mask> assert.Equal(t, uint8(0), code)
<mask>
<mask> code, val = parseOptionString("123 ip 1.2.3.4")
<mask> assert.Equal(t, uint8(123), code)
<mask> assert.Equal(t, "1.2.3.4", net.IP(string(val)).String())
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, uint8(12), code)
</s> add assert.EqualValues(t, 12, code) </s> remove assert.Equal(t, uint8(123), code)
</s> add assert.EqualValues(t, 123, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, 123, code) | <mask> code, _ = parseOptionString(" 12 hex abcdef1 ")
<mask> assert.Equal(t, uint8(0), code)
<mask>
<mask> code, val = parseOptionString("123 ip 1.2.3.4")
<mask> assert.Equal(t, uint8(123), code)
<mask> assert.Equal(t, "1.2.3.4", net.IP(string(val)).String())
<mask>
<mask> code, _ = parseOptionString("256 ip 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("-1 ip 1.1.1.1")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(12), code)
</s> add assert.EqualValues(t, 12, code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, 0, code) | <mask> assert.Equal(t, uint8(123), code)
<mask> assert.Equal(t, "1.2.3.4", net.IP(string(val)).String())
<mask>
<mask> code, _ = parseOptionString("256 ip 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("-1 ip 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 ip 1.1.1.1x")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 x 1.1.1.1")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(123), code)
</s> add assert.EqualValues(t, 123, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, 0, code) | <mask>
<mask> code, _ = parseOptionString("256 ip 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("-1 ip 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 ip 1.1.1.1x")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 x 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(123), code)
</s> add assert.EqualValues(t, 123, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, 0, code) | <mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("-1 ip 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 ip 1.1.1.1x")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 x 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(123), code)
</s> add assert.EqualValues(t, 123, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
assert.EqualValues(t, 0, code) | <mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 ip 1.1.1.1x")
<mask> assert.Equal(t, uint8(0), code)
<mask> code, _ = parseOptionString("12 x 1.1.1.1")
<mask> assert.Equal(t, uint8(0), code)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) </s> remove assert.Equal(t, uint8(123), code)
</s> add assert.EqualValues(t, 123, code) </s> remove assert.Equal(t, uint8(0), code)
</s> add assert.EqualValues(t, 0, code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcpd_test.go |
GatewayIP net.IP `json:"gateway_ip"`
SubnetMask net.IP `json:"subnet_mask"`
RangeStart net.IP `json:"range_start"`
RangeEnd net.IP `json:"range_end"` | <mask> return leases
<mask> }
<mask>
<mask> type v4ServerConfJSON struct {
<mask> GatewayIP string `json:"gateway_ip"`
<mask> SubnetMask string `json:"subnet_mask"`
<mask> RangeStart string `json:"range_start"`
<mask> RangeEnd string `json:"range_end"`
<mask> LeaseDuration uint32 `json:"lease_duration"`
<mask> }
<mask>
<mask> func v4ServerConfToJSON(c V4ServerConf) v4ServerConfJSON {
<mask> return v4ServerConfJSON{
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove GatewayIP string `json:"gateway_ip"`
</s> add GatewayIP net.IP `json:"gateway_ip"` </s> remove RangeStart string `yaml:"range_start"`
RangeEnd string `yaml:"range_end"`
</s> add RangeStart net.IP `yaml:"range_start"`
RangeEnd net.IP `yaml:"range_end"` </s> remove Addrs4 []string `json:"ipv4_addresses"`
Addrs6 []string `json:"ipv6_addresses"`
</s> add Addrs4 []net.IP `json:"ipv4_addresses"`
Addrs6 []net.IP `json:"ipv6_addresses"` </s> remove IP string `json:"ip"`
</s> add IP net.IP `json:"ip"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
GatewayIP: j.GatewayIP.To4(),
SubnetMask: j.SubnetMask.To4(),
RangeStart: j.RangeStart.To4(),
RangeEnd: j.RangeEnd.To4(), | <mask> }
<mask>
<mask> func v4JSONToServerConf(j v4ServerConfJSON) V4ServerConf {
<mask> return V4ServerConf{
<mask> GatewayIP: j.GatewayIP,
<mask> SubnetMask: j.SubnetMask,
<mask> RangeStart: j.RangeStart,
<mask> RangeEnd: j.RangeEnd,
<mask> LeaseDuration: j.LeaseDuration,
<mask> }
<mask> }
<mask>
<mask> type v6ServerConfJSON struct {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
IP net.IP `json:"ip"` | <mask> }
<mask>
<mask> type staticLeaseJSON struct {
<mask> HWAddr string `json:"mac"`
<mask> IP string `json:"ip"`
<mask> Hostname string `json:"hostname"`
<mask> }
<mask>
<mask> type dhcpServerConfigJSON struct {
<mask> Enabled bool `json:"enabled"`
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove GatewayIP string `json:"gateway_ip"`
</s> add GatewayIP net.IP `json:"gateway_ip"` </s> remove GatewayIP string `json:"gateway_ip"`
SubnetMask string `json:"subnet_mask"`
RangeStart string `json:"range_start"`
RangeEnd string `json:"range_end"`
</s> add GatewayIP net.IP `json:"gateway_ip"`
SubnetMask net.IP `json:"subnet_mask"`
RangeStart net.IP `json:"range_start"`
RangeEnd net.IP `json:"range_end"` </s> remove Addrs4 []string `json:"ipv4_addresses"`
Addrs6 []string `json:"ipv6_addresses"`
</s> add Addrs4 []net.IP `json:"ipv4_addresses"`
Addrs6 []net.IP `json:"ipv6_addresses"` </s> remove GatewayIP: j.GatewayIP,
SubnetMask: j.SubnetMask,
RangeStart: j.RangeStart,
RangeEnd: j.RangeEnd,
</s> add GatewayIP: j.GatewayIP.To4(),
SubnetMask: j.SubnetMask.To4(),
RangeStart: j.RangeStart.To4(),
RangeEnd: j.RangeEnd.To4(), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
GatewayIP net.IP `json:"gateway_ip"` | <mask> }
<mask>
<mask> type netInterfaceJSON struct {
<mask> Name string `json:"name"`
<mask> GatewayIP string `json:"gateway_ip"`
<mask> HardwareAddr string `json:"hardware_address"`
<mask> Addrs4 []string `json:"ipv4_addresses"`
<mask> Addrs6 []string `json:"ipv6_addresses"`
<mask> Flags string `json:"flags"`
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove Addrs4 []string `json:"ipv4_addresses"`
Addrs6 []string `json:"ipv6_addresses"`
</s> add Addrs4 []net.IP `json:"ipv4_addresses"`
Addrs6 []net.IP `json:"ipv6_addresses"` </s> remove GatewayIP string `json:"gateway_ip"`
SubnetMask string `json:"subnet_mask"`
RangeStart string `json:"range_start"`
RangeEnd string `json:"range_end"`
</s> add GatewayIP net.IP `json:"gateway_ip"`
SubnetMask net.IP `json:"subnet_mask"`
RangeStart net.IP `json:"range_start"`
RangeEnd net.IP `json:"range_end"` </s> remove IP string `json:"ip"`
</s> add IP net.IP `json:"ip"` </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove func updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPdhcpcdConf(ifaceName, ip string, gatewayIP, dnsIP net.IP) string { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
Addrs4 []net.IP `json:"ipv4_addresses"`
Addrs6 []net.IP `json:"ipv6_addresses"` | <mask> type netInterfaceJSON struct {
<mask> Name string `json:"name"`
<mask> GatewayIP string `json:"gateway_ip"`
<mask> HardwareAddr string `json:"hardware_address"`
<mask> Addrs4 []string `json:"ipv4_addresses"`
<mask> Addrs6 []string `json:"ipv6_addresses"`
<mask> Flags string `json:"flags"`
<mask> }
<mask>
<mask> func (s *Server) handleDHCPInterfaces(w http.ResponseWriter, r *http.Request) {
<mask> response := map[string]interface{}{}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove GatewayIP string `json:"gateway_ip"`
</s> add GatewayIP net.IP `json:"gateway_ip"` </s> remove GatewayIP string `json:"gateway_ip"`
SubnetMask string `json:"subnet_mask"`
RangeStart string `json:"range_start"`
RangeEnd string `json:"range_end"`
</s> add GatewayIP net.IP `json:"gateway_ip"`
SubnetMask net.IP `json:"subnet_mask"`
RangeStart net.IP `json:"range_start"`
RangeEnd net.IP `json:"range_end"` </s> remove IP string `json:"ip"`
</s> add IP net.IP `json:"ip"` </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove func updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPdhcpcdConf(ifaceName, ip string, gatewayIP, dnsIP net.IP) string { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP) | <mask> if ipnet.IP.IsLinkLocalUnicast() {
<mask> continue
<mask> }
<mask> if ipnet.IP.To4() != nil {
<mask> jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP.String())
<mask> } else {
<mask> jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP.String())
<mask> }
<mask> }
<mask> if len(jsonIface.Addrs4)+len(jsonIface.Addrs6) != 0 {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP.String())
</s> add jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP) </s> remove s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
</s> add s.conf.BlockingIPv4 = dc.BlockingIPv4.To4()
s.conf.BlockingIPv6 = dc.BlockingIPv6.To16() </s> remove if len(gatewayIP) != 0 {
</s> add if gatewayIP != nil { </s> remove s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
</s> add if s.conf.BlockingIPv4 == nil || s.conf.BlockingIPv6 == nil { </s> remove return
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP) | <mask> }
<mask> if ipnet.IP.To4() != nil {
<mask> jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP.String())
<mask> } else {
<mask> jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP.String())
<mask> }
<mask> }
<mask> if len(jsonIface.Addrs4)+len(jsonIface.Addrs6) != 0 {
<mask> jsonIface.GatewayIP = sysutil.GatewayIP(iface.Name)
<mask> response[iface.Name] = jsonIface
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP.String())
</s> add jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP) </s> remove s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
</s> add s.conf.BlockingIPv4 = dc.BlockingIPv4.To4()
s.conf.BlockingIPv6 = dc.BlockingIPv6.To16() </s> remove if len(gatewayIP) != 0 {
</s> add if gatewayIP != nil { </s> remove s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
</s> add if s.conf.BlockingIPv4 == nil || s.conf.BlockingIPv6 == nil { </s> remove return
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| <mask> httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
<mask> return
<mask> }
<mask>
<mask> ip := net.ParseIP(lj.IP)
<mask> if ip != nil && ip.To4() == nil {
<mask> mac, err := net.ParseMAC(lj.HWAddr)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove return
}
</s> add </s> remove return
}
</s> add </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
<mask> if ip != nil && ip.To4() == nil {
<mask> mac, err := net.ParseMAC(lj.HWAddr)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
<mask> lease := Lease{
<mask> IP: ip,
<mask> HWAddr: mac,
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return
}
</s> add </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
return | <mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
<mask> lease := Lease{
<mask> IP: ip,
<mask> HWAddr: mac,
<mask> }
<mask>
<mask> err = s.srv6.AddStaticLease(lease)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove mac, _ := net.ParseMAC(lj.HWAddr)
lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
<mask>
<mask> err = s.srv6.AddStaticLease(lease)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask> return
<mask> }
<mask>
<mask> ip, _ = parseIPv4(lj.IP)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return
</s> add </s> remove return
}
</s> add </s> remove return
}
</s> add </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask> return
<mask> }
<mask>
<mask> ip, _ = parseIPv4(lj.IP)
<mask> if ip == nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid IP")
<mask> return
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return
}
</s> add </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
</s> add </s> remove return
</s> add </s> remove return
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
<mask> }
<mask> return
<mask> }
<mask>
<mask> ip, _ = parseIPv4(lj.IP)
<mask> if ip == nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid IP")
<mask> return
<mask> }
<mask>
<mask> mac, err := net.ParseMAC(lj.HWAddr)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
<mask> lease := Lease{
<mask> IP: ip,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
</s> add </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove return
}
</s> add </s> remove return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
lease.IP = ip4
lease.Hostname = lj.Hostname | <mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
<mask> lease := Lease{
<mask> IP: ip,
<mask> HWAddr: mac,
<mask> Hostname: lj.Hostname,
<mask> }
<mask> err = s.srv4.AddStaticLease(lease)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove mac, _ := net.ParseMAC(lj.HWAddr)
lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| <mask> httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
<mask> return
<mask> }
<mask>
<mask> ip := net.ParseIP(lj.IP)
<mask> if ip != nil && ip.To4() == nil {
<mask> mac, err := net.ParseMAC(lj.HWAddr)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
<mask> if ip != nil && ip.To4() == nil {
<mask> mac, err := net.ParseMAC(lj.HWAddr)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
<mask> lease := Lease{
<mask> IP: ip,
<mask> HWAddr: mac,
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
return | <mask> httpError(r, w, http.StatusBadRequest, "invalid MAC")
<mask> return
<mask> }
<mask>
<mask> lease := Lease{
<mask> IP: ip,
<mask> HWAddr: mac,
<mask> }
<mask>
<mask> err = s.srv6.RemoveStaticLease(lease)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove mac, _ := net.ParseMAC(lj.HWAddr)
lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
<mask>
<mask> err = s.srv6.RemoveStaticLease(lease)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask> return
<mask> }
<mask>
<mask> ip, _ = parseIPv4(lj.IP)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return
</s> add </s> remove return
}
</s> add </s> remove return
}
</s> add </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask> return
<mask> }
<mask>
<mask> ip, _ = parseIPv4(lj.IP)
<mask> if ip == nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid IP")
<mask> return
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
<mask> }
<mask> return
<mask> }
<mask>
<mask> ip, _ = parseIPv4(lj.IP)
<mask> if ip == nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid IP")
<mask> return
<mask> }
<mask>
<mask> mac, _ := net.ParseMAC(lj.HWAddr)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove return
}
</s> add </s> remove return
}
</s> add </s> remove mac, _ := net.ParseMAC(lj.HWAddr)
lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go | |
lease.IP = ip4
lease.Hostname = lj.Hostname | <mask> httpError(r, w, http.StatusBadRequest, "invalid IP")
<mask> return
<mask> }
<mask>
<mask> mac, _ := net.ParseMAC(lj.HWAddr)
<mask>
<mask> lease := Lease{
<mask> IP: ip,
<mask> HWAddr: mac,
<mask> Hostname: lj.Hostname,
<mask> }
<mask> err = s.srv4.RemoveStaticLease(lease)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/dhcphttp.go |
func tryTo4(ip net.IP) (ip4 net.IP, err error) {
if ip == nil {
return nil, fmt.Errorf("%v is not an IP address", ip) | <mask> }
<mask> return operr.Timeout()
<mask> }
<mask>
<mask> func parseIPv4(text string) (net.IP, error) {
<mask> result := net.ParseIP(text)
<mask> if result == nil {
<mask> return nil, fmt.Errorf("%s is not an IP address", text)
<mask> }
<mask> if result.To4() == nil {
<mask> return nil, fmt.Errorf("%s is not an IPv4 address", text)
<mask> }
<mask> return result.To4(), nil
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove if result.To4() == nil {
return nil, fmt.Errorf("%s is not an IPv4 address", text)
</s> add ip4 = ip.To4()
if ip4 == nil {
return nil, fmt.Errorf("%v is not an IPv4 address", ip) </s> remove return result.To4(), nil
</s> add return ip4, nil </s> remove ip := ipFromAddr(d.Addr)
</s> add ip := IPStringFromAddr(d.Addr) </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil </s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/helpers.go |
ip4 = ip.To4()
if ip4 == nil {
return nil, fmt.Errorf("%v is not an IPv4 address", ip) | <mask> result := net.ParseIP(text)
<mask> if result == nil {
<mask> return nil, fmt.Errorf("%s is not an IP address", text)
<mask> }
<mask> if result.To4() == nil {
<mask> return nil, fmt.Errorf("%s is not an IPv4 address", text)
<mask> }
<mask> return result.To4(), nil
<mask> }
<mask>
<mask> // Return TRUE if subnet mask is correct (e.g. 255.255.255.0)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return result.To4(), nil
</s> add return ip4, nil </s> remove func parseIPv4(text string) (net.IP, error) {
result := net.ParseIP(text)
if result == nil {
return nil, fmt.Errorf("%s is not an IP address", text)
</s> add func tryTo4(ip net.IP) (ip4 net.IP, err error) {
if ip == nil {
return nil, fmt.Errorf("%v is not an IP address", ip) </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/helpers.go |
return ip4, nil | <mask> }
<mask> if result.To4() == nil {
<mask> return nil, fmt.Errorf("%s is not an IPv4 address", text)
<mask> }
<mask> return result.To4(), nil
<mask> }
<mask>
<mask> // Return TRUE if subnet mask is correct (e.g. 255.255.255.0)
<mask> func isValidSubnetMask(mask net.IP) bool {
<mask> var n uint32
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove if result.To4() == nil {
return nil, fmt.Errorf("%s is not an IPv4 address", text)
</s> add ip4 = ip.To4()
if ip4 == nil {
return nil, fmt.Errorf("%v is not an IPv4 address", ip) </s> remove func parseIPv4(text string) (net.IP, error) {
result := net.ParseIP(text)
if result == nil {
return nil, fmt.Errorf("%s is not an IP address", text)
</s> add func tryTo4(ip net.IP) (ip4 net.IP, err error) {
if ip == nil {
return nil, fmt.Errorf("%v is not an IP address", ip) </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove copy(s.conf.subnetMask, subnet)
</s> add copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) </s> remove s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
</s> add s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/helpers.go |
GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` | <mask> type V4ServerConf struct {
<mask> Enabled bool `yaml:"-"`
<mask> InterfaceName string `yaml:"-"`
<mask>
<mask> GatewayIP string `yaml:"gateway_ip"`
<mask> SubnetMask string `yaml:"subnet_mask"`
<mask>
<mask> // The first & the last IP address for dynamic leases
<mask> // Bytes [0..2] of the last allowed IP address must match the first IP
<mask> RangeStart string `yaml:"range_start"`
<mask> RangeEnd string `yaml:"range_end"`
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart string `yaml:"range_start"`
RangeEnd string `yaml:"range_end"`
</s> add RangeStart net.IP `yaml:"range_start"`
RangeEnd net.IP `yaml:"range_end"` </s> remove GatewayIP string `json:"gateway_ip"`
SubnetMask string `json:"subnet_mask"`
RangeStart string `json:"range_start"`
RangeEnd string `json:"range_end"`
</s> add GatewayIP net.IP `json:"gateway_ip"`
SubnetMask net.IP `json:"subnet_mask"`
RangeStart net.IP `json:"range_start"`
RangeEnd net.IP `json:"range_end"` </s> remove IP string `json:"ip"`
</s> add IP net.IP `json:"ip"` </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
BlockingIPAddrv4 net.IP `yaml:"-"`
BlockingIPAddrv6 net.IP `yaml:"-"`
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request </s> remove GatewayIP string `json:"gateway_ip"`
</s> add GatewayIP net.IP `json:"gateway_ip"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/server.go |
RangeStart net.IP `yaml:"range_start"`
RangeEnd net.IP `yaml:"range_end"` | <mask> SubnetMask string `yaml:"subnet_mask"`
<mask>
<mask> // The first & the last IP address for dynamic leases
<mask> // Bytes [0..2] of the last allowed IP address must match the first IP
<mask> RangeStart string `yaml:"range_start"`
<mask> RangeEnd string `yaml:"range_end"`
<mask>
<mask> LeaseDuration uint32 `yaml:"lease_duration"` // in seconds
<mask>
<mask> // IP conflict detector: time (ms) to wait for ICMP reply
<mask> // 0: disable
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove GatewayIP string `json:"gateway_ip"`
SubnetMask string `json:"subnet_mask"`
RangeStart string `json:"range_start"`
RangeEnd string `json:"range_end"`
</s> add GatewayIP net.IP `json:"gateway_ip"`
SubnetMask net.IP `json:"subnet_mask"`
RangeStart net.IP `json:"range_start"`
RangeEnd net.IP `json:"range_end"` </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
BlockingIPAddrv4 net.IP `yaml:"-"`
BlockingIPAddrv6 net.IP `yaml:"-"`
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request </s> remove func updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPdhcpcdConf(ifaceName, ip string, gatewayIP, dnsIP net.IP) string { </s> remove // Get IP address from net.Addr object
</s> add // IPStringFromAddr extracts IP address from net.Addr. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/server.go |
IP: net.IP{0, 0, 0, 0}, | <mask>
<mask> s.conf.dnsIPAddrs = dnsIPAddrs
<mask>
<mask> laddr := &net.UDPAddr{
<mask> IP: net.ParseIP("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
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
</s> add return </s> remove lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove mac, _ := net.ParseMAC(lj.HWAddr)
lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4.go |
s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) | <mask> return s, nil
<mask> }
<mask>
<mask> var err error
<mask> s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
<mask> if err != nil {
<mask> return s, fmt.Errorf("dhcpv4: %w", err)
<mask> }
<mask>
<mask> subnet, err := parseIPv4(s.conf.SubnetMask)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove copy(s.conf.subnetMask, subnet)
</s> add copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) </s> remove s.conf.ipStart, err = parseIPv4(conf.RangeStart)
</s> add s.conf.ipStart, err = tryTo4(conf.RangeStart) </s> remove s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
</s> add s.conf.ipEnd, err = tryTo4(conf.RangeEnd) </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4.go |
if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) | <mask> if err != nil {
<mask> return s, fmt.Errorf("dhcpv4: %w", err)
<mask> }
<mask>
<mask> subnet, err := parseIPv4(s.conf.SubnetMask)
<mask> if err != nil || !isValidSubnetMask(subnet) {
<mask> return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
<mask> }
<mask> s.conf.subnetMask = make([]byte, 4)
<mask> copy(s.conf.subnetMask, subnet)
<mask>
<mask> s.conf.ipStart, err = parseIPv4(conf.RangeStart)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove copy(s.conf.subnetMask, subnet)
</s> add copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) </s> remove s.conf.ipStart, err = parseIPv4(conf.RangeStart)
</s> add s.conf.ipStart, err = tryTo4(conf.RangeStart) </s> remove s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
</s> add s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) </s> remove s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
</s> add s.conf.ipEnd, err = tryTo4(conf.RangeEnd) </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4.go |
copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) | <mask> if err != nil || !isValidSubnetMask(subnet) {
<mask> return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
<mask> }
<mask> s.conf.subnetMask = make([]byte, 4)
<mask> copy(s.conf.subnetMask, subnet)
<mask>
<mask> s.conf.ipStart, err = parseIPv4(conf.RangeStart)
<mask> if s.conf.ipStart == nil {
<mask> return s, fmt.Errorf("dhcpv4: %w", err)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove s.conf.ipStart, err = parseIPv4(conf.RangeStart)
</s> add s.conf.ipStart, err = tryTo4(conf.RangeStart) </s> remove s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
</s> add s.conf.ipEnd, err = tryTo4(conf.RangeEnd) </s> remove s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
</s> add s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) </s> remove s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
</s> add if s.conf.BlockingIPv4 == nil || s.conf.BlockingIPv6 == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4.go |
s.conf.ipStart, err = tryTo4(conf.RangeStart) | <mask> }
<mask> s.conf.subnetMask = make([]byte, 4)
<mask> copy(s.conf.subnetMask, subnet)
<mask>
<mask> s.conf.ipStart, err = parseIPv4(conf.RangeStart)
<mask> if s.conf.ipStart == nil {
<mask> return s, fmt.Errorf("dhcpv4: %w", err)
<mask> }
<mask> if s.conf.ipStart[0] == 0 {
<mask> return s, fmt.Errorf("dhcpv4: invalid range start IP")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove copy(s.conf.subnetMask, subnet)
</s> add copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
</s> add s.conf.ipEnd, err = tryTo4(conf.RangeEnd) </s> remove s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
</s> add s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) </s> remove return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4.go |
s.conf.ipEnd, err = tryTo4(conf.RangeEnd) | <mask> if s.conf.ipStart[0] == 0 {
<mask> return s, fmt.Errorf("dhcpv4: invalid range start IP")
<mask> }
<mask>
<mask> s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
<mask> if s.conf.ipEnd == nil {
<mask> return s, fmt.Errorf("dhcpv4: %w", err)
<mask> }
<mask> if !net.IP.Equal(s.conf.ipStart[:3], s.conf.ipEnd[:3]) ||
<mask> s.conf.ipStart[3] > s.conf.ipEnd[3] {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove s.conf.ipStart, err = parseIPv4(conf.RangeStart)
</s> add s.conf.ipStart, err = tryTo4(conf.RangeStart) </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove copy(s.conf.subnetMask, subnet)
</s> add copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) </s> remove s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
</s> add s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4.go |
RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | <mask>
<mask> func TestV4StaticLeaseAddRemove(t *testing.T) {
<mask> conf := V4ServerConf{
<mask> Enabled: true,
<mask> RangeStart: "192.168.10.100",
<mask> RangeEnd: "192.168.10.200",
<mask> GatewayIP: "192.168.10.1",
<mask> SubnetMask: "255.255.255.0",
<mask> notify: notify4,
<mask> }
<mask> s, err := v4Create(conf)
<mask> assert.True(t, err == nil)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, err) | <mask> SubnetMask: "255.255.255.0",
<mask> notify: notify4,
<mask> }
<mask> s, err := v4Create(conf)
<mask> assert.True(t, err == nil)
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask>
<mask> // add static lease
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Empty(t, ls) | <mask> s, err := v4Create(conf)
<mask> assert.True(t, err == nil)
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask>
<mask> // add static lease
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
l.IP = net.IP{192, 168, 10, 150} | <mask> assert.Equal(t, 0, len(ls))
<mask>
<mask> // add static lease
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // try to add the same static lease - fail
<mask> assert.True(t, s.AddStaticLease(l) != nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, s.AddStaticLease(l)) | <mask> // add static lease
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // try to add the same static lease - fail
<mask> assert.True(t, s.AddStaticLease(l) != nil)
<mask>
<mask> // check
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.NotNil(t, s.AddStaticLease(l)) | <mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // try to add the same static lease - fail
<mask> assert.True(t, s.AddStaticLease(l) != nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "192.168.10.150", ls[0].IP.String())
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Len(t, ls, 1) | <mask> assert.True(t, s.AddStaticLease(l) != nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "192.168.10.150", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> // try to remove static lease - fail
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | <mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "192.168.10.150", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> // try to remove static lease - fail
<mask> l.IP = net.ParseIP("192.168.10.110").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) != nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove l.IP = net.ParseIP("192.168.10.110").To4()
</s> add l.IP = net.IP{192, 168, 10, 110} </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
l.IP = net.IP{192, 168, 10, 110} | <mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> // try to remove static lease - fail
<mask> l.IP = net.ParseIP("192.168.10.110").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) != nil)
<mask>
<mask> // remove static lease
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.NotNil(t, s.RemoveStaticLease(l)) | <mask>
<mask> // try to remove static lease - fail
<mask> l.IP = net.ParseIP("192.168.10.110").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) != nil)
<mask>
<mask> // remove static lease
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) == nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.110").To4()
</s> add l.IP = net.IP{192, 168, 10, 110} </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
l.IP = net.IP{192, 168, 10, 150} | <mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) != nil)
<mask>
<mask> // remove static lease
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.110").To4()
</s> add l.IP = net.IP{192, 168, 10, 110} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, s.RemoveStaticLease(l)) | <mask>
<mask> // remove static lease
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.110").To4()
</s> add l.IP = net.IP{192, 168, 10, 110} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Empty(t, ls) | <mask> assert.True(t, s.RemoveStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask> }
<mask>
<mask> func TestV4StaticLeaseAddReplaceDynamic(t *testing.T) {
<mask> conf := V4ServerConf{
<mask> Enabled: true,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | <mask>
<mask> func TestV4StaticLeaseAddReplaceDynamic(t *testing.T) {
<mask> conf := V4ServerConf{
<mask> Enabled: true,
<mask> RangeStart: "192.168.10.100",
<mask> RangeEnd: "192.168.10.200",
<mask> GatewayIP: "192.168.10.1",
<mask> SubnetMask: "255.255.255.0",
<mask> notify: notify4,
<mask> }
<mask> sIface, err := v4Create(conf)
<mask> s := sIface.(*v4Server)
<mask> assert.True(t, err == nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, err) | <mask> notify: notify4,
<mask> }
<mask> sIface, err := v4Create(conf)
<mask> s := sIface.(*v4Server)
<mask> assert.True(t, err == nil)
<mask>
<mask> // add dynamic lease
<mask> ld := Lease{}
<mask> ld.IP = net.ParseIP("192.168.10.150").To4()
<mask> ld.HWAddr, _ = net.ParseMAC("11:aa:aa:aa:aa:aa")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove ld.IP = net.ParseIP("192.168.10.150").To4()
</s> add ld.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove ld.IP = net.ParseIP("192.168.10.151").To4()
</s> add ld.IP = net.IP{192, 168, 10, 151} </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
ld.IP = net.IP{192, 168, 10, 150} | <mask> assert.True(t, err == nil)
<mask>
<mask> // add dynamic lease
<mask> ld := Lease{}
<mask> ld.IP = net.ParseIP("192.168.10.150").To4()
<mask> ld.HWAddr, _ = net.ParseMAC("11:aa:aa:aa:aa:aa")
<mask> s.addLease(&ld)
<mask>
<mask> // add dynamic lease
<mask> {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove ld.IP = net.ParseIP("192.168.10.151").To4()
</s> add ld.IP = net.IP{192, 168, 10, 151} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
ld.IP = net.IP{192, 168, 10, 151} | <mask>
<mask> // add dynamic lease
<mask> {
<mask> ld := Lease{}
<mask> ld.IP = net.ParseIP("192.168.10.151").To4()
<mask> ld.HWAddr, _ = net.ParseMAC("22:aa:aa:aa:aa:aa")
<mask> s.addLease(&ld)
<mask> }
<mask>
<mask> // add static lease with the same IP
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ld.IP = net.ParseIP("192.168.10.150").To4()
</s> add ld.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
l.IP = net.IP{192, 168, 10, 150} | <mask> }
<mask>
<mask> // add static lease with the same IP
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("33:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // add static lease with the same MAC
<mask> l = Lease{}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.152").To4()
</s> add l.IP = net.IP{192, 168, 10, 152} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, s.AddStaticLease(l)) | <mask> // add static lease with the same IP
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("33:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // add static lease with the same MAC
<mask> l = Lease{}
<mask> l.IP = net.ParseIP("192.168.10.152").To4()
<mask> l.HWAddr, _ = net.ParseMAC("22:aa:aa:aa:aa:aa")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove l.IP = net.ParseIP("192.168.10.152").To4()
</s> add l.IP = net.IP{192, 168, 10, 152} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
l.IP = net.IP{192, 168, 10, 152} | <mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // add static lease with the same MAC
<mask> l = Lease{}
<mask> l.IP = net.ParseIP("192.168.10.152").To4()
<mask> l.HWAddr, _ = net.ParseMAC("22:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls := s.GetLeases(LeasesStatic)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, s.AddStaticLease(l)) | <mask> // add static lease with the same MAC
<mask> l = Lease{}
<mask> l.IP = net.ParseIP("192.168.10.152").To4()
<mask> l.HWAddr, _ = net.ParseMAC("22:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 2, len(ls))
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.152").To4()
</s> add l.IP = net.IP{192, 168, 10, 152} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Len(t, ls, 2) | <mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 2, len(ls))
<mask>
<mask> assert.Equal(t, "192.168.10.150", ls[0].IP.String())
<mask> assert.Equal(t, "33:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | <mask> assert.Equal(t, 2, len(ls))
<mask>
<mask> assert.Equal(t, "192.168.10.150", ls[0].IP.String())
<mask> assert.Equal(t, "33:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> assert.Equal(t, "192.168.10.152", ls[1].IP.String())
<mask> assert.Equal(t, "22:aa:aa:aa:aa:aa", ls[1].HWAddr.String())
<mask> assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) | <mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> assert.Equal(t, "192.168.10.152", ls[1].IP.String())
<mask> assert.Equal(t, "22:aa:aa:aa:aa:aa", ls[1].HWAddr.String())
<mask> assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
<mask> }
<mask>
<mask> func TestV4StaticLeaseGet(t *testing.T) {
<mask> conf := V4ServerConf{
<mask> Enabled: true,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | <mask>
<mask> func TestV4StaticLeaseGet(t *testing.T) {
<mask> conf := V4ServerConf{
<mask> Enabled: true,
<mask> RangeStart: "192.168.10.100",
<mask> RangeEnd: "192.168.10.200",
<mask> GatewayIP: "192.168.10.1",
<mask> SubnetMask: "255.255.255.0",
<mask> notify: notify4,
<mask> }
<mask> sIface, err := v4Create(conf)
<mask> s := sIface.(*v4Server)
<mask> assert.True(t, err == nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} | <mask> notify: notify4,
<mask> }
<mask> sIface, err := v4Create(conf)
<mask> s := sIface.(*v4Server)
<mask> assert.True(t, err == nil)
<mask> s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
<mask>
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
l.IP = net.IP{192, 168, 10, 150} | <mask> assert.True(t, err == nil)
<mask> s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
<mask>
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // "Discover"
<mask> mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, s.AddStaticLease(l)) | <mask>
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("192.168.10.150").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // "Discover"
<mask> mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> req, _ := dhcpv4.NewDiscovery(mac)
<mask> resp, _ := dhcpv4.NewReplyFromRequest(req)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Len(t, dnsAddrs, 1) | <mask> assert.Equal(t, "255.255.255.0", net.IP(resp.SubnetMask()).String())
<mask> assert.Equal(t, s.conf.leaseTime.Seconds(), resp.IPAddressLeaseTime(-1).Seconds())
<mask>
<mask> dnsAddrs := resp.DNS()
<mask> assert.Equal(t, 1, len(dnsAddrs))
<mask> assert.Equal(t, "192.168.10.1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Len(t, ls, 1) | <mask> assert.Equal(t, "192.168.10.1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "192.168.10.150", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> }
<mask>
<mask> func TestV4DynamicLeaseGet(t *testing.T) {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, | <mask>
<mask> func TestV4DynamicLeaseGet(t *testing.T) {
<mask> conf := V4ServerConf{
<mask> Enabled: true,
<mask> RangeStart: "192.168.10.100",
<mask> RangeEnd: "192.168.10.200",
<mask> GatewayIP: "192.168.10.1",
<mask> SubnetMask: "255.255.255.0",
<mask> notify: notify4,
<mask> Options: []string{
<mask> "81 hex 303132",
<mask> "82 ip 1.2.3.4",
<mask> },
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove RangeStart: "192.168.10.100",
RangeEnd: "192.168.10.200",
GatewayIP: "192.168.10.1",
SubnetMask: "255.255.255.0",
</s> add RangeStart: net.IP{192, 168, 10, 100},
RangeEnd: net.IP{192, 168, 10, 200},
GatewayIP: net.IP{192, 168, 10, 1},
SubnetMask: net.IP{255, 255, 255, 0}, </s> remove GatewayIP: j.GatewayIP,
SubnetMask: j.SubnetMask,
RangeStart: j.RangeStart,
RangeEnd: j.RangeEnd,
</s> add GatewayIP: j.GatewayIP.To4(),
SubnetMask: j.SubnetMask.To4(),
RangeStart: j.RangeStart.To4(),
RangeEnd: j.RangeEnd.To4(), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} | <mask> },
<mask> }
<mask> sIface, err := v4Create(conf)
<mask> s := sIface.(*v4Server)
<mask> assert.True(t, err == nil)
<mask> s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
<mask>
<mask> // "Discover"
<mask> mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> req, _ := dhcpv4.NewDiscovery(mac)
<mask> resp, _ := dhcpv4.NewReplyFromRequest(req)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Len(t, dnsAddrs, 1) | <mask> assert.Equal(t, "255.255.255.0", net.IP(resp.SubnetMask()).String())
<mask> assert.Equal(t, s.conf.leaseTime.Seconds(), resp.IPAddressLeaseTime(-1).Seconds())
<mask>
<mask> dnsAddrs := resp.DNS()
<mask> assert.Equal(t, 1, len(dnsAddrs))
<mask> assert.Equal(t, "192.168.10.1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesDynamic)
<mask> assert.Equal(t, 1, len(ls))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Len(t, ls, 1) | <mask> assert.Equal(t, "192.168.10.1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesDynamic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "192.168.10.100", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask>
<mask> start := net.ParseIP("192.168.10.100").To4()
<mask> stop := net.ParseIP("192.168.10.200").To4()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove start := net.ParseIP("192.168.10.100").To4()
stop := net.ParseIP("192.168.10.200").To4()
assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.10.99").To4()))
assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.11.100").To4()))
assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.11.201").To4()))
assert.True(t, ip4InRange(start, stop, net.ParseIP("192.168.10.100").To4()))
</s> add start := net.IP{192, 168, 10, 100}
stop := net.IP{192, 168, 10, 200}
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 10, 99}))
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 11, 100}))
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 11, 201}))
assert.True(t, ip4InRange(start, stop, net.IP{192, 168, 10, 100})) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
start := net.IP{192, 168, 10, 100}
stop := net.IP{192, 168, 10, 200}
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 10, 99}))
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 11, 100}))
assert.False(t, ip4InRange(start, stop, net.IP{192, 168, 11, 201}))
assert.True(t, ip4InRange(start, stop, net.IP{192, 168, 10, 100})) | <mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "192.168.10.100", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask>
<mask> start := net.ParseIP("192.168.10.100").To4()
<mask> stop := net.ParseIP("192.168.10.200").To4()
<mask> assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.10.99").To4()))
<mask> assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.11.100").To4()))
<mask> assert.True(t, !ip4InRange(start, stop, net.ParseIP("192.168.11.201").To4()))
<mask> assert.True(t, ip4InRange(start, stop, net.ParseIP("192.168.10.100").To4()))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2")))
</s> add assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2"))) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v4_test.go |
assert.Nil(t, err) | <mask> RangeStart: "2001::1",
<mask> notify: notify6,
<mask> }
<mask> s, err := v6Create(conf)
<mask> assert.True(t, err == nil)
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask>
<mask> // add static lease
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Empty(t, ls) | <mask> s, err := v6Create(conf)
<mask> assert.True(t, err == nil)
<mask>
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask>
<mask> // add static lease
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("2001::1")
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Nil(t, s.AddStaticLease(l)) | <mask> // add static lease
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("2001::1")
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // try to add static lease - fail
<mask> assert.True(t, s.AddStaticLease(l) != nil)
<mask>
<mask> // check
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.NotNil(t, s.AddStaticLease(l)) | <mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // try to add static lease - fail
<mask> assert.True(t, s.AddStaticLease(l) != nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "2001::1", ls[0].IP.String())
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Len(t, ls, 1) | <mask> assert.True(t, s.AddStaticLease(l) != nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "2001::1", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> // try to remove static lease - fail
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | <mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "2001::1", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> // try to remove static lease - fail
<mask> l.IP = net.ParseIP("2001::2")
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) != nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove l.IP = net.ParseIP("192.168.10.110").To4()
</s> add l.IP = net.IP{192, 168, 10, 110} </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.NotNil(t, s.RemoveStaticLease(l)) | <mask>
<mask> // try to remove static lease - fail
<mask> l.IP = net.ParseIP("2001::2")
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) != nil)
<mask>
<mask> // remove static lease
<mask> l.IP = net.ParseIP("2001::1")
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) == nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.110").To4()
</s> add l.IP = net.IP{192, 168, 10, 110} </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Nil(t, s.RemoveStaticLease(l)) | <mask>
<mask> // remove static lease
<mask> l.IP = net.ParseIP("2001::1")
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.RemoveStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Empty(t, ls) | <mask> assert.True(t, s.RemoveStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls = s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 0, len(ls))
<mask> }
<mask>
<mask> func TestV6StaticLeaseAddReplaceDynamic(t *testing.T) {
<mask> conf := V6ServerConf{
<mask> Enabled: true,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove assert.Equal(t, 0, len(entries))
</s> add assert.Empty(t, entries) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Nil(t, err) | <mask> notify: notify6,
<mask> }
<mask> sIface, err := v6Create(conf)
<mask> s := sIface.(*v6Server)
<mask> assert.True(t, err == nil)
<mask>
<mask> // add dynamic lease
<mask> ld := Lease{}
<mask> ld.IP = net.ParseIP("2001::1")
<mask> ld.HWAddr, _ = net.ParseMAC("11:aa:aa:aa:aa:aa")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove ld.IP = net.ParseIP("192.168.10.150").To4()
</s> add ld.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove ld.IP = net.ParseIP("192.168.10.151").To4()
</s> add ld.IP = net.IP{192, 168, 10, 151} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Nil(t, s.AddStaticLease(l)) | <mask> // add static lease with the same IP
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("2001::1")
<mask> l.HWAddr, _ = net.ParseMAC("33:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // add static lease with the same MAC
<mask> l = Lease{}
<mask> l.IP = net.ParseIP("2001::3")
<mask> l.HWAddr, _ = net.ParseMAC("22:aa:aa:aa:aa:aa")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.152").To4()
</s> add l.IP = net.IP{192, 168, 10, 152} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.