Changeset 5600

Timestamp:

06/05/10 20:15:52 (3 years ago)

Author:

kosma

Message:

Fixed L2 send (bpf) under OpenBSD.

Files:

• UMPA/branch/link-layer-integration/umit/umpa/_sockets.py (modified) (2 diffs)

UMPA/branch/link-layer-integration/umit/umpa/_sockets.py

@@ -33 +33 @@
 import sys
 import os
+from errno import EBUSY
 
 from umit.umpa.utils.exceptions import UMPAException, UMPANotPermittedException
@@ -132 +133 @@
             self._sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 2**20)
         elif _l2model == 'bpf':
-            try:
-                self._sock = open("/dev/bpf", 'w')
-            except IOError, msg:
-                raise UMPAException('cannot open /dev/bpf: ' + msg)
+            # Loop over /dev/bpf* devices, looking for a free one.
+            self._sock = None
+            suffix = 0
+            while self._sock is None:
+                try:
+                    self._sock = open('/dev/bpf'+str(suffix), 'wb')
+                except IOError, error:
+                    if error.errno == EBUSY:
+                        suffix = suffix + 1
+                    else:
+                        raise UMPAException(str(error))
 
             ioctl(self._sock, BIOCSETIF, iface)