aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2018-06-07 18:40:18 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2018-06-07 18:40:18 +0200
commitb1354ee6dfc5d77b631348356fb823d1c1a85e02 (patch)
treeee49c39117c0a62f7ad0f0e02443ce5a6e929ba0
parent1f08ae1059c4878d96608c7ef3217732963058d4 (diff)
downloadrumba-b1354ee6dfc5d77b631348356fb823d1c1a85e02.tar.gz
rumba-b1354ee6dfc5d77b631348356fb823d1c1a85e02.zip
prototypes: Register in IPCP instead of layer
This will register the name in a specific IPCP instead of the whole layer, since this gives unexpected behaviour with the local testbed otherwise.
-rw-r--r--rumba/prototypes/ouroboros.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py
index 022c931..643754f 100644
--- a/rumba/prototypes/ouroboros.py
+++ b/rumba/prototypes/ouroboros.py
@@ -65,9 +65,12 @@ class OurServer(sb.Server):
# Build register command
r_cmd = 'irm r n %s ' % (self.id,)
if len(self.difs) == 0:
- r_cmd += ' '.join('layer %s' % (layer.name,) for layer in node.difs)
+ r_cmd += ' '.join('ipcp %s' % (ipcp.name,) for ipcp in node.ipcps)
else:
- r_cmd += ' '.join('layer %s' % (layer.name,) for layer in self.difs)
+ for dif in self.difs:
+ for ipcp in node.ipcps:
+ if ipcp.dif is dif:
+ r_cmd += 'ipcp %s' % (ipcp.name,)
r_cmd += ' && '
# Add register command