afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update to setparams check to avoid python3 errors, and fix to ipprefix

Browse source
This commit is contained in:
bharnden 2019-06-02 22:53:39 -07:00
parent 40176e861d
commit db9d13aff8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/nodes/interface.py
View file

@ -141,8 +141,11 @@ class CoreInterface(object):
:return: True if parameter changed, False otherwise :return: True if parameter changed, False otherwise
""" """
# treat None and 0 as unchanged values # treat None and 0 as unchanged values
if value is None or value <= 0:
return False
current_value = self._params.get(key) current_value = self._params.get(key)
if value is None or current_value == value or current_value <= 0 and value <= 0: if current_value is not None and current_value == value:
return False return False
self._params[key] = value self._params[key] = value

2
daemon/core/nodes/ipaddress.py
View file

@ -236,7 +236,7 @@ class IpPrefix(object):
self.prefixlen = int(tmp[1]) self.prefixlen = int(tmp[1])
else: else:
self.prefixlen = self.addrlen self.prefixlen = self.addrlen
self.prefix = socket.inet_pton(self.af, tmp[0]).decode("ISO-8859-1") self.prefix = socket.inet_pton(self.af, tmp[0])
if self.addrlen > self.prefixlen: if self.addrlen > self.prefixlen:
addrbits = self.addrlen - self.prefixlen addrbits = self.addrlen - self.prefixlen
netmask = ((1 << self.prefixlen) - 1) << addrbits netmask = ((1 << self.prefixlen) - 1) << addrbits