Changeset 3666

Timestamp:

08/29/08 13:21:54 (5 years ago)

Author:

nopper

Message:

indent fixes and fixing a bug in sniff perspective while running as non-root user

Location:

branch/PacketManipulator/PM

Files:

• Backend/Scapy/serialize.py (modified) (7 diffs)
• Gui/Tabs/OperationsTab.py (modified) (1 diff)

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

@@ -158 +158 @@
         output = open(fname, 'w')
 
+        self.depth_idx = 0
         self.writer = XMLGenerator(output, 'utf-8')
+
         self.writer.startDocument()
-        self.writer.startElementNS((None, 'PMScapySequence'),
-                                          'PMScapySequence', {})
-        self.writer.characters('\n')
+        self.startElementNS((None, 'PMScapySequence'),
+                                   'PMScapySequence', {})
 
         self.current_node = None
@@ -172 +173 @@
         self.current_node = None
 
-        self.writer.endElementNS((None, 'PMScapySequence'),
-                                        'PMScapySequence')
-        self.writer.characters('\n')
+        self.endElementNS((None, 'PMScapySequence'),
+                                 'PMScapySequence')
 
         self.writer.endDocument()
         output.close()
 
+    def writeSpaces(self, prepend='', append=''):
+        idx = max(self.depth_idx - 1, 0)
+        txt = '%s%s%s' % (prepend, '  ' * idx, append)
+
+        if txt:
+            self.writer.characters(txt)
+
+    def startElementNS(self, name, qname, attrs, indent=True):
+        if indent:
+            self.writer.characters('\n')
+
+        self.depth_idx += 1
+
+        self.writeSpaces()
+        self.writer.startElementNS(name, qname, attrs)
+
+    def endElementNS(self, name, qname, indent=True):
+        if indent:
+            self.writeSpaces('\n')
+
+        self.writer.endElementNS(name, qname)
+
+        self.depth_idx -= 1
+
     def write_node(self, node):
-        spaces = ' ' * (self.current_node.get_depth() + 1)
-
-        self.writer.characters(spaces)
         self.start_xml_node(node.get_data())
 
@@ -189 +210 @@
             self.write_node(child_node)
 
-        self.writer.characters(spaces)
         self.end_xml_node()
-        self.writer.characters('\n')
 
     def start_xml_node(self, seq_packet):
@@ -204 +223 @@
 
         attrs = AttributesNSImpl(attr_vals, attr_qnames)
-        self.writer.startElementNS((None, 'SequencePacket'),
-                                          'SequencePacket', attrs)
+        self.startElementNS((None, 'SequencePacket'),
+                                   'SequencePacket', attrs)
 
         self.start_xml_packet(seq_packet.packet)
 
     def end_xml_node(self):
-        self.writer.endElementNS((None, 'SequencePacket'),
-                                        'SequencePacket')
+        self.endElementNS((None, 'SequencePacket'),
+                                 'SequencePacket')
 
     def start_xml_packet(self, metapacket):
@@ -217 +236 @@
         protocols.reverse()
 
-        self.writer.characters('\n')
-        spaces = ' ' * (self.current_node.get_depth() + 4)
-
         for proto in protocols:
-            self.writer.characters(' ' * (self.current_node.get_depth() + 2))
-
             attr_vals = {(None, u'id') : Backend.get_proto_name(proto),
                          (None, u'time') : "%.6f" % proto.time}
@@ -228 +242 @@
 
             attrs = AttributesNSImpl(attr_vals, attr_qnames)
-            self.writer.startElementNS((None, 'proto'), 'proto', attrs)
-
-            self.writer.characters('\n')
+            self.startElementNS((None, 'proto'), 'proto', attrs)
+
 
             for field in Backend.get_proto_fields(proto):
@@ -239 +252 @@
                 attr_qnames = {(None, u'id') : u'id'}
 
+                self.writer.characters('\n')
+
                 attrs = AttributesNSImpl(attr_vals, attr_qnames)
-
-                self.writer.characters(spaces)
-                self.writer.startElementNS((None, 'field'), 'field', attrs)
-
+                self.startElementNS((None, 'field'), 'field', attrs, False)
                 self.writer.characters(str(value))
-
-                self.writer.endElementNS((None, 'field'), 'field')
-                self.writer.characters('\n')
+                self.endElementNS((None, 'field'), 'field', False)
 
         for idx in xrange(len(protocols)):
-            self.writer.characters(spaces)
-            self.writer.endElementNS((None, 'proto'), 'proto')
-            self.writer.characters('\n')
+            self.endElementNS((None, 'proto'), 'proto')
 
 if __name__ == "__main__":

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

@@ -140 +140 @@
         if ret and self.session:
             self.session.sniff_page.clear()
-            self.session.sniff_page.reload()
+
+        self.session.sniff_page.reload()
 
         return ret