Changeset 135

Timestamp:

05/13/12 06:20:17 (13 years ago)

Author:

atzm

Message:

• fixed, tap locking

File:

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

etherws/trunk/etherws.py

@@ -64 +64 @@
         self._debug = debug
         self._tap = pytun.TunTapDevice(dev, pytun.IFF_TAP | pytun.IFF_NO_PI)
-        self._tap.up()
+        self._tap_lock = threading.Lock()
 
         self._clients = []
         self._clients_lock = threading.Lock()
+
+        try:
+            self._tap_lock.acquire()
+            self._tap.up()
+        finally:
+            self._tap_lock.release()
 
     def register_client(self, client):
@@ -98 +104 @@
         if caller is not self:
             clients.remove(caller)
-            self._tap.write(message)
+            try:
+                self._tap_lock.acquire()
+                self._tap.write(message)
+            finally:
+                self._tap_lock.release()
 
         message = base64.b64encode(message)
@@ -107 +117 @@
     def run(self):
         epoll = select.epoll()
-        epoll.register(self._tap.fileno(), select.EPOLLIN)
+
+        try:
+            self._tap_lock.acquire()
+            epoll.register(self._tap.fileno(), select.EPOLLIN)
+        finally:
+            self._tap_lock.release()
 
         while True:
             evts = epoll.poll(1)
             for fileno, evt in evts:
-                self.write(self, self._tap.read(self._tap.mtu))
+                try:
+                    self._tap_lock.acquire()
+                    data = self._tap.read(self._tap.mtu)
+                finally:
+                    self._tap_lock.release()
+                self.write(self, data)