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

use hex value for short session ID used in naming interfaces

Browse source 
use interface names "vethOOOOO.ii.ss" and "vethOOOOO.iipss" for veth pairs

(where OOOOO = object id, ii = interface index, ss = hex short session ID)

fixes bug #260 virtual interface names too long
(Boeing r1894)
This commit is contained in:
ahrenholz 2014-10-28 21:18:16 +00:00
parent 96dd48e3c3
commit 503713f0bc
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/core/netns/vnode.py
View file

@ -167,9 +167,9 @@ class SimpleLxcNode(PyCoreNode):
if ifname is None:
ifname = "eth%d" % ifindex
sessionid = self.session.shortsessionid()
name = "veth%s.%s.1.%s" % (self.objid, ifindex, sessionid)
name = "veth%s.%sp%s" % (self.objid, ifindex, sessionid)
localname = "veth%s.%s.%s" % (self.objid, ifindex, sessionid)
if len(ifname) > 16:
if len(localname) >= 16:
raise ValueError, "interface local name '%s' to long" % \
localname
ifclass = VEth

3
daemon/core/session.py
View file

@ -689,7 +689,8 @@ class Session(object):
''' Return a shorter version of the session ID, appropriate for
interface names, where length may be limited.
'''
return (self.sessionid >> 8) ^ (self.sessionid & ((1 << 8) - 1))
ssid = (self.sessionid >> 8) ^ (self.sessionid & ((1 << 8) - 1))
return "%x" % ssid
def sendnodeemuid(self, handler, nodenum):
''' Send back node messages to the GUI for node messages that had