traffic: optimize packet init for better performance

When we run traffic_replay, we are creating millions of Packet objects.
So small change in Packet.__init__ will make big difference.

By initializing packet with converted values without parsing string, the time
cost for 3961148 calls of Packet.__init__ dcrease from 17s to 4s, according
to cProfile.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index 84a9a6ab067045a773b8ddea4e66b6f281923d5f..227477a5425c0fb6f89631cc56b59d42d7dbbf97 100644 (file)
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -138,10 +138,26 @@ class FakePacketError(Exception):
 
 class Packet(object):
     """Details of a network packet"""
-    def __init__(self, fields):
-        if isinstance(fields, str):
-            fields = fields.rstrip('\n').split('\t')
+    def __init__(self, timestamp, ip_protocol, stream_number, src, dest,
+                 protocol, opcode, desc, extra):
 
+        self.timestamp = timestamp
+        self.ip_protocol = ip_protocol
+        self.stream_number = stream_number
+        self.src = src
+        self.dest = dest
+        self.protocol = protocol
+        self.opcode = opcode
+        self.desc = desc
+        self.extra = extra
+        if self.src < self.dest:
+            self.endpoints = (self.src, self.dest)
+        else:
+            self.endpoints = (self.dest, self.src)
+
+    @classmethod
+    def from_line(self, line):
+        fields = line.rstrip('\n').split('\t')
         (timestamp,
          ip_protocol,
          stream_number,
@@ -152,23 +168,12 @@ class Packet(object):
          desc) = fields[:8]
         extra = fields[8:]
 
-        self.timestamp = float(timestamp)
-        self.ip_protocol = ip_protocol
-        try:
-            self.stream_number = int(stream_number)
-        except (ValueError, TypeError):
-            self.stream_number = None
-        self.src = int(src)
-        self.dest = int(dest)
-        self.protocol = protocol
-        self.opcode = opcode
-        self.desc = desc
-        self.extra = extra
+        timestamp = float(timestamp)
+        src = int(src)
+        dest = int(dest)
 
-        if self.src < self.dest:
-            self.endpoints = (self.src, self.dest)
-        else:
-            self.endpoints = (self.dest, self.src)
+        return Packet(timestamp, ip_protocol, stream_number, src, dest,
+                      protocol, opcode, desc, extra)
 
     def as_summary(self, time_offset=0.0):
         """Format the packet as a traffic_summary line.
@@ -196,14 +201,15 @@ class Packet(object):
         return "<Packet @%s>" % self
 
     def copy(self):
-        return self.__class__([self.timestamp,
-                               self.ip_protocol,
-                               self.stream_number,
-                               self.src,
-                               self.dest,
-                               self.protocol,
-                               self.opcode,
-                               self.desc] + self.extra)
+        return self.__class__(self.timestamp,
+                              self.ip_protocol,
+                              self.stream_number,
+                              self.src,
+                              self.dest,
+                              self.protocol,
+                              self.opcode,
+                              self.desc,
+                              self.extra)
 
     def as_packet_type(self):
         t = '%s:%s' % (self.protocol, self.opcode)
@@ -808,11 +814,9 @@ class Conversation(object):
 
         desc = OP_DESCRIPTIONS.get((protocol, opcode), '')
         ip_protocol = IP_PROTOCOLS.get(protocol, '06')
-        fields = [timestamp - self.start_time, ip_protocol,
-                  '', src, dest,
-                  protocol, opcode, desc]
-        fields.extend(extra)
-        packet = Packet(fields)
+        packet = Packet(timestamp - self.start_time, ip_protocol,
+                        '', src, dest,
+                        protocol, opcode, desc, extra)
         # XXX we're assuming the timestamp is already adjusted for
         # this conversation?
         # XXX should we adjust client balance for guessed packets?
@@ -1024,7 +1028,7 @@ def ingest_summaries(files, dns_mode='count'):
             f = open(f)
         print("Ingesting %s" % (f.name,), file=sys.stderr)
         for line in f:
-            p = Packet(line)
+            p = Packet.from_line(line)
             if p.protocol == 'dns' and dns_mode != 'include':
                 dns_counts[p.opcode] += 1
             else:

diff --git a/python/samba/tests/emulate/traffic_packet.py b/python/samba/tests/emulate/traffic_packet.py
index 61fd900896437e6245fade71439d430a80b4227e..a2c4567ed1d246a2815f6381ba9cec4a271c79d9 100644 (file)
--- a/python/samba/tests/emulate/traffic_packet.py
+++ b/python/samba/tests/emulate/traffic_packet.py
@@ -25,6 +25,7 @@ from samba.auth import system_session
 from samba.credentials import MUST_USE_KERBEROS, DONT_USE_KERBEROS
 from samba.emulate import traffic_packets as p
 from samba.emulate import traffic
+from samba.emulate.traffic import Packet
 
 from samba.samdb import SamDB
 import samba.tests
@@ -91,56 +92,58 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
         shutil.rmtree(self.tempdir)
 
     def test_packet_cldap_03(self):
-        packet = traffic.Packet("0.0\t11\t1\t2\t1\tcldap\t3\tsearchRequest\t")
+        packet = Packet.from_line(
+            "0.0\t11\t1\t2\t1\tcldap\t3\tsearchRequest\t")
         self.assertTrue(p.packet_cldap_3(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_cldap_05(self):
-        packet = traffic.Packet("0.0\t11\t1\t1\t2\tcldap\t5\tsearchResDone\t")
+        packet = Packet.from_line(
+            "0.0\t11\t1\t1\t2\tcldap\t5\tsearchResDone\t")
         self.assertFalse(p.packet_cldap_5(packet,
                                           self.conversation,
                                           self. context))
 
     def test_packet_dcerpc_00(self):
-        packet = traffic.Packet("0.0\t11\t1\t2\t1\tdcerpc\t0\tRequest\t")
+        packet = Packet.from_line("0.0\t11\t1\t2\t1\tdcerpc\t0\tRequest\t")
         self.assertFalse(p.packet_dcerpc_0(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_dcerpc_02(self):
-        packet = traffic.Packet("0.0\t11\t1\t1\t2\tdcerpc\t2\tResponse\t")
+        packet = Packet.from_line("0.0\t11\t1\t1\t2\tdcerpc\t2\tResponse\t")
         self.assertFalse(p.packet_dcerpc_2(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_dcerpc_03(self):
-        packet = traffic.Packet("0.0\t11\t1\t1\t2\tdcerpc\t3\t\t")
+        packet = Packet.from_line("0.0\t11\t1\t1\t2\tdcerpc\t3\t\t")
         self.assertFalse(p.packet_dcerpc_3(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_dcerpc_11(self):
-        packet = traffic.Packet("0.0\t11\t1\t2\t1\tdcerpc\t11\tBind\t")
+        packet = Packet.from_line("0.0\t11\t1\t2\t1\tdcerpc\t11\tBind\t")
         self.assertFalse(p.packet_dcerpc_11(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_dcerpc_13(self):
-        packet = traffic.Packet("0.0\t11\t1\t2\t1\tdcerpc\t13\t\t")
+        packet = Packet.from_line("0.0\t11\t1\t2\t1\tdcerpc\t13\t\t")
         self.assertFalse(p.packet_dcerpc_13(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_dcerpc_14(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t11\t1\t2\t1\tdcerpc\t14\tAlter_context\t")
         self.assertFalse(p.packet_dcerpc_14(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_dcerpc_15(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t11\t1\t1\t2\tdcerpc\t15\tAlter_context_resp\t")
         # Set user_creds MUST_USE_KERBEROS to suppress the warning message.
         self.context.user_creds.set_kerberos_state(MUST_USE_KERBEROS)
@@ -149,70 +152,70 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
                                             self. context))
 
     def test_packet_dcerpc_16(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t11\t1\t1\t2\tdcerpc\t16\tAUTH3\t")
         self.assertFalse(p.packet_dcerpc_16(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_dns_01(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t11\t1\t1\t2\tdns\t1\tresponse\t")
         self.assertFalse(p.packet_dns_1(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_drsuapi_00(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tdrsuapi\t0\tDsBind\t")
         self.assertTrue(p.packet_drsuapi_0(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_drsuapi_01(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tdrsuapi\t1\tDsUnBind\t")
         self.assertTrue(p.packet_drsuapi_1(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_drsuapi_02(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tdrsuapi\t2\tDsReplicaSync\t")
         self.assertFalse(p.packet_drsuapi_2(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_drsuapi_03(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tdrsuapi\t3\tDsGetNCChanges\t")
         self.assertFalse(p.packet_drsuapi_3(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_drsuapi_04(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tdrsuapi\t4\tDsReplicaUpdateRefs\t")
         self.assertFalse(p.packet_drsuapi_4(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_drsuapi_12(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tdrsuapi\t12\tDsCrackNames\t")
         self.assertTrue(p.packet_drsuapi_12(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_drsuapi_13(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tdrsuapi\t13\tDsWriteAccountSpn\t")
         self.assertTrue(p.packet_drsuapi_13(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_epm_03(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tepm\t3\tMap\t")
         self.assertFalse(p.packet_epm_3(packet,
                                         self.conversation,
@@ -222,7 +225,7 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
         """Kerberos packets are not generated, but are used as a hint to
         favour kerberos.
         """
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t11\t1\t1\t2\tkerberos\t\t\t")
         self.assertFalse(p.packet_kerberos_(packet,
                                             self.conversation,
@@ -243,14 +246,14 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
         self.credentials.set_kerberos_state(DONT_USE_KERBEROS)
 
     def test_packet_ldap(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tldap\t\t*** Unknown ***\t")
         self.assertFalse(p.packet_ldap_(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_ldap_00_sasl(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tldap\t0\tbindRequest"
             "\t\t\t\t\t3\tsasl\t1.3.6.1.5.5.2")
         self.assertTrue(p.packet_ldap_0(packet,
@@ -258,7 +261,7 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
                                         self. context))
 
     def test_packet_ldap_00_simple(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tldap\t0\tbindRequest"
             "\t\t\t\t\t0\tsimple\t")
         self.assertTrue(p.packet_ldap_0(packet,
@@ -266,21 +269,21 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
                                         self. context))
 
     def test_packet_ldap_01(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tldap\t1\tbindResponse\t")
         self.assertFalse(p.packet_ldap_1(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_ldap_02(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tldap\t2\tunbindRequest\t")
         self.assertFalse(p.packet_ldap_2(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_ldap_03(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tldap\t3\tsearchRequest"
             "\t2\tDC,DC\t\tcn\t\t\t")
         self.assertTrue(p.packet_ldap_3(packet,
@@ -288,21 +291,21 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
                                         self. context))
 
     def test_packet_ldap_04(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tldap\t4\tsearchResEntry\t")
         self.assertFalse(p.packet_ldap_4(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_ldap_05(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tldap\t5\tsearchResDone\t")
         self.assertFalse(p.packet_ldap_5(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_ldap_06(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tldap\t6\tmodifyRequest\t"
             "\t\t\t\t0\tadd")
         self.assertFalse(p.packet_ldap_6(packet,
@@ -310,420 +313,420 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
                                          self. context))
 
     def test_packet_ldap_07(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tldap\t7\tmodifyResponse\t")
         self.assertFalse(p.packet_ldap_7(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_ldap_08(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tldap\t8\taddRequest\t")
         self.assertFalse(p.packet_ldap_8(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_ldap_09(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tldap\t9\taddResponse\t")
         self.assertFalse(p.packet_ldap_9(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_ldap_16(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tldap\t16\tabandonRequest\t")
         self.assertFalse(p.packet_ldap_16(packet,
                                           self.conversation,
                                           self. context))
 
     def test_packet_lsarpc_00(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t0\tlsa_Close\t")
         self.assertFalse(p.packet_lsarpc_1(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_01(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t1\tlsa_Delete\t")
         self.assertFalse(p.packet_lsarpc_1(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_02(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t2\tlsa_EnumeratePrivileges\t")
         self.assertFalse(p.packet_lsarpc_2(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_03(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t3\tlsa_QuerySecurityObject\t")
         self.assertFalse(p.packet_lsarpc_3(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_04(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t4\tlsa_SetSecurityObject\t")
         self.assertFalse(p.packet_lsarpc_4(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_05(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t5\tlsa_ChangePassword\t")
         self.assertFalse(p.packet_lsarpc_5(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_06(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t6\tlsa_OpenPolicy\t")
         self.assertFalse(p.packet_lsarpc_6(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_14(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t14\tlsa_LookupNames\t")
         self.assertTrue(p.packet_lsarpc_14(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_15(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t15\tlsa_LookupSids\t")
         self.assertTrue(p.packet_lsarpc_15(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_39(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t39\tlsa_QueryTrustedDomainInfoBySid\t")
         self.assertTrue(p.packet_lsarpc_39(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_40(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t40\tlsa_SetTrustedDomainInfo\t")
         self.assertFalse(p.packet_lsarpc_40(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_lsarpc_43(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t43\tlsa_StorePrivateData\t")
         self.assertFalse(p.packet_lsarpc_43(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_lsarpc_44(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t44\tlsa_RetrievePrivateData\t")
         self.assertFalse(p.packet_lsarpc_44(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_lsarpc_68(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t68\tlsa_LookupNames3\t")
         self.assertFalse(p.packet_lsarpc_68(packet,
                                             self.conversation,
                                             self. context))
 
     def test_packet_lsarpc_76(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t76\tlsa_LookupSids3\t")
         self.assertTrue(p.packet_lsarpc_76(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_lsarpc_77(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tlsarpc\t77\tlsa_LookupNames4\t")
         self.assertTrue(p.packet_lsarpc_77(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_nbns_00(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tnbns\t0\tquery\t")
         self.assertTrue(p.packet_nbns_0(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_nbns_01(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t1\t2\tnbns\t1\tresponse\t")
         self.assertTrue(p.packet_nbns_0(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_rpc_netlogon_00(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t0\tNetrLogonUasLogon\t")
         self.assertFalse(p.packet_rpc_netlogon_0(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_rpc_netlogon_01(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t1\tNetrLogonUasLogoff\t")
         self.assertFalse(p.packet_rpc_netlogon_1(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_rpc_netlogon_04(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t4\tNetrServerReqChallenge\t")
         self.assertFalse(p.packet_rpc_netlogon_4(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_rpc_netlogon_14(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t14\tNetrLogonControl2\t")
         self.assertFalse(p.packet_rpc_netlogon_14(packet,
                                                   self.conversation,
                                                   self. context))
 
     def test_packet_rpc_netlogon_15(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t15\tNetrServerAuthenticate2\t")
         self.assertFalse(p.packet_rpc_netlogon_15(packet,
                                                   self.conversation,
                                                   self. context))
 
     def test_packet_rpc_netlogon_21(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t21\tNetrLogonDummyRoutine1\t")
         self.assertFalse(p.packet_rpc_netlogon_21(packet,
                                                   self.conversation,
                                                   self. context))
 
     def test_packet_rpc_netlogon_26(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t26\tNetrServerAuthenticate3\t")
         self.assertFalse(p.packet_rpc_netlogon_26(packet,
                                                   self.conversation,
                                                   self. context))
 
     def test_packet_rpc_netlogon_29(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t29\tNetrLogonGetDomainInfo\t")
         self.assertTrue(p.packet_rpc_netlogon_29(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_rpc_netlogon_30(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t30\tNetrServerPasswordSet2\t")
         self.assertTrue(p.packet_rpc_netlogon_30(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_rpc_netlogon_34(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t34\tDsrGetDcNameEx2\t")
         self.assertFalse(p.packet_rpc_netlogon_34(packet,
                                                   self.conversation,
                                                   self. context))
 
     def test_packet_rpc_netlogon_39(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t39\tNetrLogonSamLogonEx\t")
         self.assertTrue(p.packet_rpc_netlogon_39(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_rpc_netlogon_40(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t40\tDsrEnumerateDomainTrusts\t")
         self.assertTrue(p.packet_rpc_netlogon_40(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_rpc_netlogon_45(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\trpc_netlogon\t45\tNetrLogonSamLogonWithFlags\t")
         self.assertTrue(p.packet_rpc_netlogon_45(packet,
                                                  self.conversation,
                                                  self. context))
 
     def test_packet_samr_00(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t0\tConnect\t")
         self.assertTrue(p.packet_samr_0(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_samr_01(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t1\tClose\t")
         self.assertTrue(p.packet_samr_1(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_samr_03(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t3\tQuerySecurity\t")
         self.assertTrue(p.packet_samr_3(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_samr_05(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t5\tLookupDomain\t")
         self.assertTrue(p.packet_samr_5(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_samr_06(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t6\tEnumDomains\t")
         self.assertTrue(p.packet_samr_6(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_samr_07(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t7\tOpenDomain\t")
         self.assertTrue(p.packet_samr_7(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_samr_08(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t8\tQueryDomainInfo'\t")
         self.assertTrue(p.packet_samr_8(packet,
                                         self.conversation,
                                         self. context))
 
     def test_packet_samr_14(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t14\tCreateDomAlias\t")
         self.assertFalse(p.packet_samr_14(packet,
                                           self.conversation,
                                           self. context))
 
     def test_packet_samr_15(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t15\tEnumDomainAliases\t")
         self.assertTrue(p.packet_samr_15(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_16(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t16\tGetAliasMembership\t")
         self.assertTrue(p.packet_samr_16(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_17(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t17\tLookupNames\t")
         self.assertTrue(p.packet_samr_17(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_18(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t18\tLookupRids\t")
         self.assertTrue(p.packet_samr_18(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_19(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t19\tOpenGroup\t")
         self.assertTrue(p.packet_samr_19(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_25(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t25\tQueryGroupMember\t")
         self.assertTrue(p.packet_samr_25(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_34(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t34\tOpenUser\t")
         self.assertTrue(p.packet_samr_34(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_36(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t36\tQueryUserInfo\t")
         self.assertTrue(p.packet_samr_36(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_37(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t37\tSetUserInfo\t")
         self.assertFalse(p.packet_samr_37(packet,
                                           self.conversation,
                                           self. context))
 
     def test_packet_samr_39(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t39\tGetGroupsForUser\t")
         self.assertTrue(p.packet_samr_39(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_40(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t40\tQueryDisplayInfo\t")
         self.assertFalse(p.packet_samr_40(packet,
                                           self.conversation,
                                           self. context))
 
     def test_packet_samr_44(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t44\tGetUserPwInfo\t")
         self.assertFalse(p.packet_samr_44(packet,
                                           self.conversation,
                                           self. context))
 
     def test_packet_samr_57(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t57\tConnect2\t")
         self.assertTrue(p.packet_samr_57(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_64(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t64\tConnect5\t")
         self.assertTrue(p.packet_samr_64(packet,
                                          self.conversation,
                                          self. context))
 
     def test_packet_samr_68(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsamr\t68\t\t")
         self.assertFalse(p.packet_samr_68(packet,
                                           self.conversation,
                                           self. context))
 
     def test_packet_srvsvc_16(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsrvsvc\t16\tNetShareGetInfo\t")
         self.assertTrue(p.packet_srvsvc_16(packet,
                                            self.conversation,
                                            self. context))
 
     def test_packet_srvsvc_21(self):
-        packet = traffic.Packet(
+        packet = Packet.from_line(
             "0.0\t06\t1\t2\t1\tsrvsvc\t21\tNetSrvGetInfo\t")
         self.assertTrue(p.packet_srvsvc_21(packet,
                                            self.conversation,