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

fixed issue with wlan objects from previous sessions lingering in EbtablesQueue and causing the daemon to hang.

Browse source
This commit is contained in:
Rod A Santiago 2016-04-19 14:10:03 -07:00
parent 76bf200f41
commit 5895ba2d20
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/core/netns/vnet.py
View file

@ -1,6 +1,6 @@
# #
# CORE # CORE
# Copyright (c)2010-2012 the Boeing Company. # Copyright (c)2010-2016 the Boeing Company.
# See the LICENSE file included in this distribution. # See the LICENSE file included in this distribution.
# #
# authors: Tom Goff <thomas.goff@boeing.com> # authors: Tom Goff <thomas.goff@boeing.com>
@ -110,6 +110,17 @@ class EbtablesQueue(object):
while self.doupdateloop: while self.doupdateloop:
self.updatelock.acquire() self.updatelock.acquire()
for wlan in self.updates: for wlan in self.updates:
'''
Check if wlan is from a previously closed session. Because of the
rate limiting scheme employed here, this may happen if a new session
is started soon after closing a previous session.
'''
try:
wlan.session
except:
# Just mark as updated to remove from self.updates.
self.updated(wlan)
continue
if self.lastupdate(wlan) > self.rate: if self.lastupdate(wlan) > self.rate:
self.buildcmds(wlan) self.buildcmds(wlan)
#print "ebtables commit %d rules" % len(self.cmds) #print "ebtables commit %d rules" % len(self.cmds)