Changeset 5721

Timestamp:

07/07/10 18:23:55 (3 years ago)

Author:

kosma

Message:

UMPAPcapException: modify utils.libpcap to use UMPAPcapException

Location:

umpa/branches/link-layer-integration/umit/umpa/utils/libpcap

Files:

• __init__.py (modified) (2 diffs)
• wrappers/pypcap.py (modified) (8 diffs)

umpa/branches/link-layer-integration/umit/umpa/utils/libpcap/__init__.py

@@ -23 +23 @@
 
 from umit.umpa import config
-from umit.umpa.utils.exceptions import UMPASniffingException
+from umit.umpa.utils.exceptions import UMPAPcapException
 
 # detect the installed pypcap bindings if not specified by the user
@@ -48 +48 @@
         lpcap = __import__(modulepath, fromlist=[None])
     except ImportError, err:
-        raise UMPASniffingException("missing/broken libpcap's wrapper '%s': %s" \
+        raise UMPAPcapException("missing/broken libpcap's wrapper '%s': %s" \
                 % (config['libpcap'], str(err)) )
     lpcap._backend = config['libpcap']
     del modulepath
 else:
-    raise UMPASniffingException("unsupported/unknown libpcap's wrapper")
+    raise UMPAPcapException("unsupported/unknown libpcap's wrapper")

umpa/branches/link-layer-integration/umit/umpa/utils/libpcap/wrappers/pypcap.py

@@ -23 +23 @@
 
 from umit.umpa.utils.libpcap.wrappers._abstract import *
-from umit.umpa.utils.exceptions import UMPASniffingException
+from umit.umpa.utils.exceptions import UMPAPcapException
 
 # see umit.umpa.utils.libpcap.wrappers._abstract for docstrings
 
 if not hasattr(pcap, 'pcap'):
-    raise UMPASniffingException("the installed libpcap library doesn't look like pypcap")
+    raise UMPAPcapException("the installed libpcap library doesn't look like pypcap")
 
 def lookupdev():
@@ -34 +34 @@
         result = pcap.lookupdev()
     except OSError, msg:
-        raise UMPASniffingException(msg)
+        raise UMPAPcapException(msg)
     return result
 
@@ -41 +41 @@
         result = pcap.findalldevs()
     except OSError, msg:
-        raise UMPASniffingException(msg)
+        raise UMPAPcapException(msg)
     return result
 
@@ -59 +59 @@
                                                 self.to_ms, immediate=immediate)
         except OSError, msg:
-            raise UMPASniffingException(msg)
+            raise UMPAPcapException(msg)
 
     def __iter__(self):
@@ -83 +83 @@
             self._pcap.sendpacket(buf) == 0
         except OSError, msg:
-            raise UMPASniffingException(msg)
+            raise UMPAPcapException(msg)
 
         return len(buf)
@@ -116 +116 @@
             self._dump.open(self._pcap, self.fname)
         except OSError, msg:
-            raise UMPASniffingException(msg)
+            raise UMPAPcapException(msg)
 
     def dump(self):
         if not self._dump:
-            raise UMPASniffingException("not dump file is opened."
+            raise UMPAPcapException("not dump file is opened. "
                                         "use open() first.")
         self._dump.dump()
@@ -126 +126 @@
     def flush(self):
         if not self._dump:
-            raise UMPASniffingException("not dump file is opened."
+            raise UMPAPcapException("not dump file is opened. "
                                         "use open() first.")
         self._dump.flush()
@@ -132 +132 @@
     def close(self):
         if not self._dump:
-            raise UMPASniffingException("not dump file is opened."
+            raise UMPAPcapException("not dump file is opened. "
                                         "use open() first.")
         self._dump.close()