Changeset 3332

Timestamp:

08/04/08 18:30:41 (5 years ago)

Author:

nopper

Message:

Backend independent

Location:

branch/PacketManipulator

Files:

• Backend/UMPA.py (modified) (3 diffs)
• Tabs/PropertyTab.py (modified) (3 diffs)
• widgets/PropertyGrid.py (modified) (15 diffs)

branch/PacketManipulator/Backend/UMPA.py

@@ -116 +116 @@
     return str(ret)
 
+def get_field_size(proto, field):
+    return field.bits
+
+def get_field_offset(proto, field):
+    return proto.get_offset(field)
+
+def get_field_enumeration_s2i(field):
+    return field.enumerable.items()
+
+def get_field_enumeration_i2s(field):
+    return [(v, k) for (k, v) in field.enumerable.items()]
+
 def get_keyflag_value(proto, flag, key):
     return flag.get()[key].get()
@@ -151 +163 @@
 def get_packet_raw(metapack):
     return metapack.root.get_raw()
+
+# Checking stuff
+
+def is_field(field):
+    return isinstance(field, Field)
+
+def is_flags(field):
+    return isinstance(field, Flags)
+
+def is_proto(proto):
+    return isinstance(proto, Protocol)
+
+def implements(obj, klass):
+    return isinstance(obj, klass)
+
 
 class MetaPacket:
@@ -174 +201 @@
         yield i
 
+
 gprotos = load_gprotocols()
 
 PMField = Field
 PMFlagsField = Flags
+
+PMBitField          = BitField
+PMIPField           = IPv4AddrField
+PMByteField         = None
+PMShortField        = None
+PMLEShortField      = None
+PMIntField          = IntField
+PMSignedIntField    = None
+PMLEIntField        = None
+PMLESignedIntField  = None
+PMLongField         = None
+PMLELongField       = None
+PMStrField          = None
+PMLenField          = None
+PMRDLenField        = None
+PMFieldLenField     = None
+PMBCDFloatField     = None
+PMEnumField         = EnumField

branch/PacketManipulator/Tabs/PropertyTab.py

@@ -20 +20 @@
 
 import gtk
+import Backend
+
 from views import UmitView
 from widgets.PropertyGrid import PropertyGrid
@@ -61 +63 @@
             
             proto = page.proto_hierarchy.get_active_protocol()
-            print proto
             
             self.grid.populate(proto)
@@ -91 +92 @@
 
         if page:
-            page.hexview.select_block(proto.get_offset(field) / 8, max(field.bits / 8, 1))
+            start  = Backend.get_field_offset(proto, field)
+            length = Backend.get_field_size(proto, field)
+
+            page.hexview.select_block(start / 8, max(length / 8, 1))

branch/PacketManipulator/widgets/PropertyGrid.py

@@ -86 +86 @@
     def create_widgets(self):
         # Manage the None type
-        if not self.value:
-            self.value = 0
+
+        value = self.value
+
+        if value is None:
+            value = 0
 
         self.calc_bounds()
-        self.adj = gtk.Adjustment(self.value, self.min, self.max, 1, 2)
+        self.adj = gtk.Adjustment(value, self.min, self.max, 1, 2)
         self.spin = gtk.SpinButton(self.adj, digits=self.digits)
 
@@ -103 +106 @@
     def calc_bounds(self):
         # Unsigned int / Int? :(
-        if self.field.bits:
+        if Backend.get_field_size(self.protocol, self.field) != None:
             self.min = 0
-            self.max = (2 ** self.field.bits) - 1 # (2 ^ n) - 1
+            self.max = (2 ** Backend.get_field_size(self.protocol, self.field)) - 1 # (2 ^ n) - 1
             self.digits = 0
-        elif isinstance(self.value, int):
+        else:
             import sys
             print "Hei man we are falling back to sys.maxint for", self.field
@@ -179 +182 @@
         self.combo.set_attributes(txt, text=1)
 
-        self.odict = [(v, k) for k, v in self.field.enumerable.items()]
+        self.odict = Backend.get_field_enumeration_i2s(self.field)
         self.odict.sort()
 
@@ -200 +203 @@
         self.store.append([self.icon, _("Set manually"), -1])
 
-        self.int_editor = IntEditor(self.field)
+        self.int_editor = IntEditor((self.protocol, self.field))
         
         self.undo_btn = MiniButton(stock=gtk.STOCK_UNDO)
@@ -267 +270 @@
     def __on_changed(self, entry):
         self.value = self.entry.get_text()
+
+def get_editor(field):
+    "@return the corresponding editor class for field or None"
+
+    assert Backend.is_field(field)
+
+    # MACField
+    # IPField
+
+    # We use a list because order is important here
+    table = [#(Backend.PMMACField, MACEditor),
+             (Backend.PMStrField, StrEditor),
+             (Backend.PMIPField, IPv4Editor),
+             (Backend.PMEnumField, EnumEditor),
+             (Backend.PMByteField, IntEditor),
+             (Backend.PMShortField, IntEditor),
+             (Backend.PMLEShortField, IntEditor),
+             (Backend.PMIntField, IntEditor),
+             (Backend.PMSignedIntField, IntEditor),
+             (Backend.PMLEIntField, IntEditor),
+             (Backend.PMLESignedIntField, IntEditor),
+             (Backend.PMLongField, IntEditor),
+             (Backend.PMLELongField, IntEditor),
+             (Backend.PMLenField, IntEditor),
+             (Backend.PMRDLenField, IntEditor),
+             (Backend.PMFieldLenField, IntEditor),
+             (Backend.PMBCDFloatField, IntEditor),
+             (Backend.PMBitField, IntEditor),
+    ]
+
+    for it in table:
+        if it[0] != None and Backend.implements(field, it[0]):
+            return it[1]
 
 class HackEntry(gtk.Entry):
@@ -530 +566 @@
 
         proto, field = self.__get_parent_field(model, iter)
+
+        print proto, field
         
         if not proto or not field or \
-            not isinstance(field, Backend.PMField):
-            #or not isinstance(proto, base.Protocol):
+           not Backend.is_field(field) or \
+           not Backend.is_proto(proto):
+
             return (None, None)
 
@@ -539 +578 @@
 
     def __on_selection_changed(self, selection):
-        return
         model, iter = selection.get_selected()
 
@@ -568 +606 @@
         field = model.get_value(iter, 1)
 
-        if not field or not isinstance(field, Backend.PMField):
+        if not Backend.is_field(field):
             return
 
@@ -618 +656 @@
         obj = model.get_value(iter, 1)
 
-        if isinstance(obj, Backend.PMFlagsField):
+        if Backend.is_flags(obj):
             cell.set_property('cell-background-gdk',
                               self.style.mid[gtk.STATE_NORMAL])
@@ -631 +669 @@
 
         # If we are a field or a string (a sub field of flags)
-        elif isinstance(obj, Backend.PMField) or \
-             isinstance(obj, str):
-
-            cell.field = obj
+        elif Backend.is_field(obj) or isinstance(obj, str):
+
+            cell.field = None
             cell.set_property('editable', True)
             cell.set_property('cell-background-gdk', None)
 
+            # We have a standard field
+
             protocol = self.__get_parent_protocol(model, iter)
 
@@ -647 +686 @@
 
                 cell.set_property('markup', '<tt>%s</tt>' % value)
+                cell.editor = get_editor(obj)
+
+                if cell.editor:
+                    cell.field = (protocol, obj)
                 
                 return
 
+            # We have a subkey of Flags
             
             proto, flags = self.__get_parent_flags_field(model, iter)
@@ -658 +702 @@
                 
                 return
-
-            if obj.bits == 1:
-                cell.editor = BitEditor
-            elif issubclass(obj.__class__, base.EnumField):
-                cell.editor = EnumEditor
-            elif issubclass(obj.__class__, base.IPv4AddrField):
-                cell.editor = IPv4Editor
-            elif issubclass(obj.__class__, base.IntField):
-                cell.editor = IntEditor
-            else:
-                cell.field = None
             
         else:
@@ -684 +717 @@
             proto = model.get_value(model.iter_parent(iter), 0)
 
-            if isinstance(obj, str) or \
-               isinstance(obj, Backend.PMField):
-
-                if isinstance(obj, Backend.PMFlagsField):
+            if Backend.is_field(obj):
+
+                if Backend.is_flags(obj):
                     color = self.style.mid[gtk.STATE_NORMAL]
                 else:
                     color = None
                 
-                if isinstance(obj, Backend.PMField):
-                    if Backend.is_field_autofilled(obj):
-                        markup = '<i>%s</i>' % Backend.get_field_name(obj)
-                    else:
-                        markup = '<b>%s</b>' % Backend.get_field_name(obj)
+                if Backend.is_field_autofilled(obj):
+                    markup = '<i>%s</i>' % Backend.get_field_name(obj)
                 else:
-                    markup = '<b>%s</b>' % obj
+                    markup = '<b>%s</b>' % Backend.get_field_name(obj)
+
+            elif isinstance(obj, str):
+                color = None
+                markup = '<b>%s</b>' % obj
         else:
             markup = '<b>%s</b>' % Backend.get_proto_name(obj)
@@ -711 +744 @@
         icon, color = None, self.style.mid[gtk.STATE_NORMAL]
         
-        if isinstance(obj, str) or isinstance(obj, Backend.PMField):
-
-            if isinstance(obj, Backend.PMFlagsField):
+        if Backend.is_field(obj):
+
+            if Backend.is_flags(obj):
                 color = self.style.mid[gtk.STATE_NORMAL]
             else:
                 color = None
 
-            if isinstance(obj, Backend.PMField):
-                if Backend.is_field_autofilled(obj):
-                    icon = self.icon_locked
+            if Backend.is_field_autofilled(obj):
+                icon = self.icon_locked
+
+        elif isinstance(obj, str):
+            color = None
         
         cell.set_property('cell-background-gdk', color)
@@ -740 +775 @@
             flag_iter = self.store.append(root_iter, [None, field])
 
-            if isinstance(field, Backend.PMFlagsField):
+            if Backend.is_flags(field):
                 for flag in Backend.get_flag_keys(field):
                     self.store.append(flag_iter, [None, flag])