Changeset 251

Timestamp:

10/09/13 01:47:39 (11 years ago)

Author:

atzm

Message:

add netdev support

File:

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

etherws/trunk/etherws.py

@@ -372 +372 @@
 
 
+class NetdevHandler(DebugMixIn):
+    IFTYPE = 'netdev'
+    READ_SIZE = 65535
+    ETH_P_ALL = 0x0003  # from <linux/if_ether.h>
+
+    def __init__(self, ioloop, switch, dev, debug=False):
+        self._ioloop = ioloop
+        self._switch = switch
+        self._dev = dev
+        self._debug = debug
+        self._sock = None
+
+    @property
+    def target(self):
+        return self._dev
+
+    @property
+    def closed(self):
+        return not self._sock
+
+    def open(self):
+        if not self.closed:
+            raise ValueError('Already opened')
+        self._sock = socket.socket(
+            socket.PF_PACKET, socket.SOCK_RAW, socket.htons(self.ETH_P_ALL))
+        self._sock.bind((self._dev, self.ETH_P_ALL))
+        self._ioloop.add_handler(self.fileno(), self, self._ioloop.READ)
+        return self._switch.register_port(self)
+
+    def close(self):
+        if self.closed:
+            raise ValueError('I/O operation on closed netdev')
+        self._switch.unregister_port(self)
+        self._ioloop.remove_handler(self.fileno())
+        self._sock.close()
+        self._sock = None
+
+    def fileno(self):
+        if self.closed:
+            raise ValueError('I/O operation on closed netdev')
+        return self._sock.fileno()
+
+    def write_message(self, message, binary=False):
+        if self.closed:
+            raise ValueError('I/O operation on closed netdev')
+        self._sock.sendall(message)
+
+    def __call__(self, fd, events):
+        try:
+            self._switch.receive(self, EthernetFrame(self._read()))
+            return
+        except:
+            traceback.print_exc()
+        self.close()
+
+    def _read(self):
+        if self.closed:
+            raise ValueError('I/O operation on closed netdev')
+        buf = []
+        while True:
+            buf.append(self._sock.recv(self.READ_SIZE))
+            if len(buf[-1]) < self.READ_SIZE:
+                break
+        return ''.join(buf)
+
+
 class TapHandler(DebugMixIn):
     IFTYPE = 'tap'
@@ -514 +580 @@
             websocket._SSLSocketWrapper = self._ssl
 
+        # XXX: may be blocked
         try:
             self._sock = websocket.WebSocket()
@@ -560 +627 @@
     NAMESPACE = 'etherws.control'
     IFTYPES = {
+        NetdevHandler.IFTYPE:        NetdevHandler,
         TapHandler.IFTYPE:           TapHandler,
         EtherWebSocketClient.IFTYPE: EtherWebSocketClient,
@@ -672 +740 @@
         return {'entries': [self._ifstat(p) for p in self._switch.portlist
                             if isinstance(p.interface, TapHandler)]}
+
+    def _optparse_netdev(self, opt):
+        return {'debug': self._debug}
 
     def _optparse_tap(self, opt):
@@ -1063 +1134 @@
     iftype = parser_ctl_addport.add_subparsers(dest='iftype')
 
+    # --- ctl addport netdev
+    parser_ctl_addport_netdev = iftype.add_parser(NetdevHandler.IFTYPE,
+                                                  help='netdev')
+    parser_ctl_addport_netdev.add_argument('target',
+                                           help='device name to add interface')
+
     # --- ctl addport tap
     parser_ctl_addport_tap = iftype.add_parser(TapHandler.IFTYPE,