dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13345 from yuwata/network-fix-preferred-lifetime-zero-13341

Browse Source 
network: fix PreferredLifetime=0
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2019-08-19 09:59:16 +02:00
committed by GitHub
parent adfafd88b2 e4783b548a
commit 165df4dcda
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/networkd-address.c
View File

@@ -978,10 +978,7 @@ int config_parse_address_scope(const char *unit,
bool address_is_ready(const Address *a) {
assert(a);
if (a->family == AF_INET6)
return !(a->flags & IFA_F_TENTATIVE);
else
return !(a->flags & (IFA_F_TENTATIVE | IFA_F_DEPRECATED));
return !(a->flags & IFA_F_TENTATIVE);
}
int address_section_verify(Address *address) {

6
test/test-network/conf/25-address-preferred-lifetime-zero-ipv6.network → test/test-network/conf/25-address-preferred-lifetime-zero.network
View File

@@ -6,6 +6,9 @@ Name=dummy98
Address=hogehoge
Address=foofoo
[Route]
Gateway=20.20.20.1
[Address]
Address=10.2.3.4/16
PreferredLifetime=0
@@ -14,6 +17,9 @@ Scope=link
[Address]
Address=2001:0db8:0:f101::1/64
[Address]
Address=20.20.20.100/24
[Address]
# this section must be ignored
Peer=hoge

11
test/test-network/systemd-networkd-tests.py
View File

@@ -1412,7 +1412,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
'24-keep-configuration-static.network',
'24-search-domain.network',
'25-address-link-section.network',
'25-address-preferred-lifetime-zero-ipv6.network',
'25-address-preferred-lifetime-zero.network',
'25-address-static.network',
'25-bind-carrier.network',
'25-bond-active-backup-slave.netdev',
@@ -1493,17 +1493,20 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertRegex(output, 'inet6 fd[0-9a-f:]*1/64 scope global')
def test_address_preferred_lifetime_zero_ipv6(self):
copy_unit_to_networkd_unit_path('25-address-preferred-lifetime-zero-ipv6.network', '12-dummy.netdev')
copy_unit_to_networkd_unit_path('25-address-preferred-lifetime-zero.network', '12-dummy.netdev')
start_networkd(5)
self.check_link_exists('dummy98')
self.check_operstate('dummy98', 'routable', setup_state='configuring')
self.wait_online(['dummy98:routable'])
output = check_output('ip address show dummy98')
print(output)
self.assertRegex(output, 'inet 10.2.3.4/16 brd 10.2.255.255 scope link deprecated dummy98')
self.assertRegex(output, 'inet6 2001:db8:0:f101::1/64 scope global')
output = check_output('ip route show dev dummy98')
print(output)
self.assertRegex(output, 'default via 20.20.20.1 proto static')
def test_configure_without_carrier(self):
copy_unit_to_networkd_unit_path('configure-without-carrier.network', '11-dummy.netdev')
start_networkd()