Changeset 3500

Timestamp:

08/17/08 13:20:57 (5 years ago)

Author:

nopper

Message:

rewriting UMPA backend

Location:

branch/PacketManipulator

Files:

• PM/Backend/Scapy/packet.py (modified) (1 diff)
• PM/Backend/UMPA (added)
• PM/Backend/UMPA/__init__.py (moved) (moved from branch/PacketManipulator/PM/Backend/UMPA.py) (7 diffs)
• PM/Gui/Core/FallbackPaned.py (modified) (1 diff)
• PM/Gui/Tabs/ProtocolSelectorTab.py (modified) (1 diff)
• PM/PacketManipulator (modified) (2 diffs)
• PacketManipulator (modified) (1 diff)

branch/PacketManipulator/PM/Backend/Scapy/packet.py

@@ -48 +48 @@
     def summary(self):
         return self.root.summary()
-        ret = ""
-        for r in self.root:
-            ret += self.root._elt2sum(r)
-        return ret
 
     def get_time(self):

branch/PacketManipulator/PM/Backend/UMPA/__init__.py

@@ -23 +23 @@
 from umpa import protocols
 from umpa.packets import Packet
-from umpa.protocols import Protocol
+from umpa.protocols._protocols import Protocol
 from umpa.protocols._fields import *
 
@@ -62 +62 @@
     return glob
 
+gprotos = load_gprotocols()
+
+###############################################################################
+# Protocols functions
+###############################################################################
 def get_protocols():
-    """
-    @return a list of type [(Protocol, name)]
-    """
     return gprotos
+
+def get_proto_class_name(protok):
+    return protok.__name__
+
+def get_proto_name(proto_inst):
+    return get_proto_class_name(proto_inst.__class__)
 
 def get_proto(proto_name):
@@ -80 +88 @@
     return None
 
-def get_proto_class_name(protok):
-    return protok.__name__
-
-def get_proto_name(proto_inst):
-    return get_proto_class_name(proto_inst.__class__)
-
-# Fields section
+def get_proto_layer(proto):
+    return proto.layer
+
+def get_proto_fields(proto_inst):
+    return proto_inst.get_fields()
+
+###############################################################################
+# Packet functions
+###############################################################################
+
+def get_packet_protos(packet):
+    for proto in packet.root.protos:
+        yield proto
+
+def get_packet_raw(metapack):
+    return metapack.root.get_raw()
+
+###############################################################################
+# Fields functions
+###############################################################################
+
+def get_field_desc(field):
+    return field.__doc__
 
 def get_field_name(field):
@@ -119 +143 @@
     return field.bits
 
-def get_field_offset(proto, field):
+def get_field_offset(packet, proto, field):
     return proto.get_offset(field)
 
@@ -128 +152 @@
     return [(v, k) for (k, v) in field.enumerable.items()]
 
+def is_field_autofilled(field):
+    return field.auto
+
+###############################################################################
+# Flag fields functions
+###############################################################################
+
+def set_keyflag_value(proto, flag, key, value):
+    return flag.get()[key].set(value)
+
 def get_keyflag_value(proto, flag, key):
     return flag.get()[key].get()
-
-def set_keyflag_value(proto, flag, key, value):
-    return flag.get()[key].set(value)
-
-def is_field_autofilled(field):
-    return field.auto
-
-def get_field_desc(field):
-    return field.__doc__
 
 def get_flag_keys(flag_inst):
@@ -144 +169 @@
         yield key
 
-def get_field_key(proto_inst, field_inst):
-    for key in proto_inst.__class__.get_fields_keys():
-        if field_inst == getattr(proto_inst, key, None):
-            return key
-
-    return None
-
-def get_proto_fields(proto_inst):
-    return proto_inst.get_fields()
-
-def get_packet_protos(packet):
-    for proto in packet.root.protos:
-        yield proto
-
-def get_proto_layer(proto):
-    return proto.layer
-
-def get_packet_raw(metapack):
-    return metapack.root.get_raw()
-
-# Checking stuff
+###############################################################################
+# Checking functions
+###############################################################################
 
 def is_field(field):
@@ -178 +185 @@
     return isinstance(obj, klass)
 
-
 class MetaPacket:
     def __init__(self, proto=None):
-        self.root = Packet(proto)
-
-    def include(self, proto):
-        self.root.include(proto)
-
-from Backend import VirtualIFace
+        self.root = Packet(proto, strict=False)
+
+    def insert(self, proto, layer):
+        # Only append for the moment
+        if layer == -1:
+            self.root.include(proto.root.protos[0])
+            return True
+
+        return False
+
+    def get_protocol_str(self):
+        return get_proto_name(self.root)
+
+    def summary(self):
+        # We need to ask for a method here
+        return "%s packet" % self.get_protocol_str()
+
+    def get_time(self):
+        # We need to ask for a method here
+        return "N/A"
+
+    def get_dest(self):
+        # We need to ask for a method here
+        return "N/A"
+
+    def get_source(self):
+        # We need to ask for a method here
+        return "N/A"
+
+###############################################################################
+# Functions used by dialogs but not defined
+###############################################################################
 
 def find_all_devs():
-    "@return a list of avaiable devices to sniff from"
     return []
-
-
-gprotos = load_gprotocols()
 
 PMField = Field

branch/PacketManipulator/PM/Gui/Core/FallbackPaned.py

@@ -72 +72 @@
         label.show_all()
 
-        print "Adding widget", widget, "to", pos
+        #print "Adding widget", widget, "to", pos
 
         if pos == gtk.POS_RIGHT or pos == gtk.POS_LEFT:

branch/PacketManipulator/PM/Gui/Tabs/ProtocolSelectorTab.py

@@ -48 +48 @@
                      self.__on_sort_ascending,
                      self.__on_sort_layer)
-        
-        for stock, cb in zip(stocks, callbacks):
-            action = gtk.Action('', '', '', stock)
+
+        tooltips = (_('Sort descending'),
+                    _('Sort ascending'),
+                    _('Sort by layer'))
+        
+        for tooltip, stock, cb in zip(tooltips, stocks, callbacks):
+            action = gtk.Action(None, None, tooltip, stock)
             item = action.create_tool_item()
             item.connect('clicked', cb)

branch/PacketManipulator/PM/PacketManipulator

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+import os
+import sys
+import signal
+
 try:
+    if os.getenv('PM_DEVELOPMENT', False):
+        raise ImportError
+
     import psyco
     psyco.profile()
@@ -26 +33 @@
 except ImportError:
     print "No psyco no party! :("
-
-import os
-import sys
-import signal
 
 # used by exception hook

branch/PacketManipulator/PacketManipulator

@@ -22 +22 @@
 
 # Probably this won't work on win32
+os.putenv('PM_DEVELOPMENT', '1')
 os.putenv('PYTHONPATH', '%s%s%s' % (os.getcwd(), os.pathsep, os.getenv('PYTHONPATH', '')))
 os.system('PM/PacketManipulator')