okay. let's give this a shot.
This commit is contained in:
@@ -143,30 +143,6 @@ class TunnelBroker(object):
|
||||
ipr.close()
|
||||
raise e
|
||||
for assignment in self.tun.assignments:
|
||||
for a in assignment.iface_addrs:
|
||||
# The interface-specific ":1" addrs.
|
||||
# Try to remove first in case it's already assigned.
|
||||
try:
|
||||
ipr.addr('del',
|
||||
index = assignment.iface_idx,
|
||||
address = a.str,
|
||||
mask = a.prefix,
|
||||
family = socket.AF_INET6)
|
||||
logger.debug('Removed {0} with prefix {1} from {2}.'.format(a.str, a.prefixlen, assignment.iface))
|
||||
except Exception as e:
|
||||
pass
|
||||
try:
|
||||
ipr.addr('add',
|
||||
index = assignment.iface_idx,
|
||||
address = a.str,
|
||||
mask = a.prefix,
|
||||
family = socket.AF_INET6)
|
||||
logger.debug('Added {0} with prefix {1} to {2}.'.format(a.str, a.prefix, assignment.iface))
|
||||
except Exception as e:
|
||||
logger.error(('Could not add address {0} on {1}: '
|
||||
'{2}').format(a.str, assignment.iface, e))
|
||||
ipr.close()
|
||||
raise e
|
||||
# The SLAAC prefixes.
|
||||
for b in assignment.iface_blocks:
|
||||
# Try to remove first in case it's already assigned.
|
||||
|
||||
Reference in New Issue
Block a user