Changeset 167

Timestamp:

06/27/12 23:54:57 (12 years ago)

Author:

atzm

Message:

• multiple device support

File:

• etherws/trunk/etherws.py (modified) (4 diffs)

etherws/trunk/etherws.py

@@ -95 +95 @@
 
 class FDB(DebugMixIn):
-    def __init__(self, ageout=300, debug=False):
+    def __init__(self, ageout, debug=False):
         self._ageout = ageout
         self._debug = debug
@@ -427 +427 @@
         raise ValueError('invalid port: %s' % args.port)
 
+    if args.ageout <= 0:
+        raise ValueError('invalid ageout: %s' % args.ageout)
+
+    ioloop = tornado.ioloop.IOLoop.instance()
+    fdb = FDB(ageout=args.ageout, debug=args.debug)
+    switch = SwitchingHub(fdb, debug=args.debug)
+    taps = [TapHandler(switch, dev, debug=args.debug) for dev in args.device]
+
     handler = wrap_basic_auth(EtherWebSocketHandler,
                               load_htpasswd(args.htpasswd))
-
-    fdb = FDB(debug=args.debug)
-    switch = SwitchingHub(fdb, debug=args.debug)
-    tap = TapHandler(switch, args.device, debug=args.debug)
     app = tornado.web.Application([
         (args.path, handler, {'switch': switch, 'debug': args.debug}),
     ])
     server = tornado.httpserver.HTTPServer(app, ssl_options=ssl_options)
-
-    tap.open()
     server.listen(args.port, address=args.address)
 
-    ioloop = tornado.ioloop.IOLoop.instance()
-    ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
+    for tap in taps:
+        tap.open()
+        ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
 
     if not args.foreground:
@@ -464 +467 @@
         args.passwd = getpass.getpass()
 
-    fdb = FDB(debug=args.debug)
+    if args.ageout <= 0:
+        raise ValueError('invalid ageout: %s' % args.ageout)
+
+    ioloop = tornado.ioloop.IOLoop.instance()
+    fdb = FDB(ageout=args.ageout, debug=args.debug)
     switch = SwitchingHub(fdb, debug=args.debug)
-    tap = TapHandler(switch, args.device, debug=args.debug)
+    taps = [TapHandler(switch, dev, debug=args.debug) for dev in args.device]
+
     client = EtherWebSocketClient(switch, args.uri,
                                   args.user, args.passwd, args.debug)
-
-    tap.open()
     client.open()
-
-    ioloop = tornado.ioloop.IOLoop.instance()
-    ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
     ioloop.add_handler(client.fileno(), client, ioloop.READ)
+
+    for tap in taps:
+        tap.open()
+        ioloop.add_handler(tap.fileno(), tap, ioloop.READ)
 
     if not args.foreground:
@@ -485 +492 @@
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('--device', action='store', default='ethws%d')
+    parser.add_argument('--device', action='append', default=[])
+    parser.add_argument('--ageout', action='store', type=int, default=300)
     parser.add_argument('--foreground', action='store_true', default=False)
     parser.add_argument('--debug', action='store_true', default=False)