Changeset 5553

Timestamp:

02/24/10 18:59:45 (3 years ago)

Author:

nopper

Message:

Dropping inj:: cfields and fixing run_dissectors.

Files:

• pm/trunk/umit/pm/manager/auditmanager.py (modified) (4 diffs)

pm/trunk/umit/pm/manager/auditmanager.py

@@ -283 +283 @@
             'reassembled_payload' : [PM_TYPE_STR, 'Used by audits that can '
                                      'treassemble fragments of packets'],
-
-            'inj::l4proto' : [PM_TYPE_INT, 'Used to track down L4 protocol for '
-                             'injection'],
-            'inj::flags' : [PM_TYPE_INT, 'Used for injection'],
-            'inj::payload' : [PM_TYPE_STR, 'Data for injection'],
-            'inj::data' : [PM_TYPE_INSTANCE, 'General objects'],
         })
 
@@ -306 +300 @@
 
         if mpkt.l4_proto == NL_TYPE_TCP:
-            ret = NL_TYPE_TCP
+            ret = APP_LAYER_TCP
         elif mpkt.l4_proto == NL_TYPE_UDP:
-            ret = NL_TYPE_UDP
+            ret = APP_LAYER_UDP
         else:
             ret = None
@@ -550 +544 @@
             decoder, pre, post = self.get_decoder(level, type)
 
+
             if not decoder and not pre and not post:
                 return
@@ -659 +654 @@
                 break
 
-        self._conn_manager.parse(mpkt)
-
-        if mpkt.flags & MPKT_FORWARDABLE and \
-           not mpkt.flags & MPKT_FORWARDED:
-
-            manager.run_hook_point('pm::pre-forward', mpkt)
-            self._context.forward(mpkt)
+        if not mpkt.flags & MPKT_FORWARDED:
+            self._conn_manager.parse(mpkt)
+
+            if mpkt.flags & MPKT_FORWARDABLE:
+                manager.run_hook_point('pm::pre-forward', mpkt)
+                self._context.forward(mpkt)
 
         mpkt.context = None