commit 958f3b9e93b6110735fab508e5868526e40e61fb
author Dan Talayco <dtalayco@snowcrash.dbd.mogulmouse.net> Fri Mar 12 21:58:57 2010 -0800
committer Dan Talayco <dtalayco@snowcrash.dbd.mogulmouse.net> Fri Mar 12 21:58:57 2010 -0800
tree a83c2728a07f2a88bb7088dc8be8d33b571f0e1a
parent 6f223c841534e682d00f40f6341230f4264beb71

Clean up scapy references

src/python/oftest/parse.py

diff --git a/src/python/oftest/parse.py b/src/python/oftest/parse.py
index c26fc5f..c8d9ad9 100644
--- a/src/python/oftest/parse.py
+++ b/src/python/oftest/parse.py
@@ -10,10 +10,10 @@
 from action_list import action_list
 from cstruct import *
 try:
-    from scapy.all import *
+    import scapy.all as scapy
 except:
     try:
-        from scapy import *
+        import scapy as scapy
     except:
         sys.exit("Need to install scapy for packet parsing")
 
@@ -221,22 +221,22 @@
 
 def packet_type_classify(ether):
     try:
-        dot1q = ether[Dot1Q]
+        dot1q = ether[scapy.Dot1Q]
     except:
         dot1q = None
 
     try:
-        ip = ether[IP]
+        ip = ether[scapy.IP]
     except:
         ip = None
 
     try:
-        tcp = ether[TCP]
+        tcp = ether[scapy.TCP]
     except:
         tcp = None
 
     try:
-        udp = ether[UDP]
+        udp = ether[scapy.UDP]
     except:
         udp = None
 
@@ -266,7 +266,7 @@
         return None
 
     if type(packet) == type(""):
-        ether = scapy.all.Ether(packet)
+        ether = scapy.Ether(packet)
     else:
         ether = packet