Commit 6a27e9c1 authored by Greg Rutz's avatar Greg Rutz

Begin updates to controller

parent 588241f5
[Routes]
prefix=/test
prefix=ccnx:/ipoc
[Connections]
# Maps Access Point wireless MAC addresses to their corresponding
# pre-configured connection symbolic name in Metis
# Maps ethernet MAC addresses for wired links to their corresponding
# connection MAC address at the next hop Metis daemon
#
# Note: Must use '-' character to separate MAC octets
#
# AP-MAC=Connection
C0-C1-C0-D8-6B-AB=conn1
FC-8F-C4-09-77-42=conn2
# LocalMAC=NextHopMAC
8C-AE-4C-FD-CE-0E=8C-AE-4C-FD-CE-0D
80-1F-02-AC-E2-9F=4C-EB-42-98-15-ED
......@@ -108,7 +108,7 @@ def metis_connect(ni):
if current_conn:
print "Removing routes"
for prefix in ["lci:" + x for x in routes]:
for prefix in routes:
metis_ctrl_execute(metis_ctrl_base + metis_remove_route + [current_conn] + [prefix])
check_bssid = bssid.lower().replace(":","-")
......@@ -120,7 +120,7 @@ def metis_connect(ni):
metis_ctrl_execute(metis_ctrl_base + metis_add_connection + [current_conn] + [bssid] + ["wlan0"])
print "Adding new routes..."
for prefix in ["lci:" + x for x in routes]:
for prefix in routes:
metis_ctrl_execute(metis_ctrl_base + metis_add_route + [current_conn] + [prefix] + ["1"])
else:
current_conn = None
......@@ -198,8 +198,12 @@ for d in devices:
network_ifs[d] = ni;
print "<<%s>>" % ni.get_prop('Interface')
print " path: %s" % d
print " type: %s" % device_types[device_type]
print " path: %s" % d
print " name: %s" % ni.get_prop('Interface')
print " type: %s" % device_types[device_type]
print " addr: %s" % ni.get_prop('HwAddress')
print " permaddr: %s" % ni.get_prop('PermHwAddress')
print " state: %s" % device_state[ni.get_prop('State')]
print ""
match = bus.add_signal_receiver(device_state_change_cb,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment