Merge pull request #28 from tfgm-bud/move-timestamp-conversion

Decoder receives datetime format timestamp rather than unix timestamp

Author: tfgm-bud

mdp/decode.py

@@ -25,11 +25,10 @@ def handle_repeating_groups(group_container, msg_version, indent, skip_fields, s
         handle_repeating_groups(group, msg_version, indent + ':', skip_fields=skip_fields, secdef=secdef)
 
 
-def decode_packet(mdp_parser, ts, data, skip_fields, print_data, pretty, secdef):
+def decode_packet(mdp_parser, timestamp, data, skip_fields, print_data, pretty, secdef):
     if print_data:
         print('data: {}'.format(binascii.b2a_hex(data)))
 
-    timestamp = datetime.fromtimestamp(ts)
     # parse the packet header: http://www.cmegroup.com/confluence/display/EPICSANDBOX/MDP+3.0+-+Binary+Packet+Header
     sequence_number = unpack_from("<i", data, offset=0)[0]
     sending_time = unpack_from("<Q", data, offset=4)[0]

scripts/mdp_decoder.py

@@ -14,6 +14,7 @@
 import mdp.decode
 import gzip
 import dpkt
+from datetime import datetime
 
 
 def process_file(pcap_filename, mdp_parser, secdef, pretty_print, print_data, skip_fields):
@@ -28,7 +29,8 @@ def process_file(pcap_filename, mdp_parser, secdef, pretty_print, print_data, sk
                 if ip.p == dpkt.ip.IP_PROTO_UDP:
                     udp = ip.data
                     try:
-                        mdp.decode.decode_packet(mdp_parser, ts, udp.data, skip_fields, print_data, pretty_print, secdef)
+                        timestamp = datetime.fromtimestamp(ts)
+                        mdp.decode.decode_packet(mdp_parser, timestamp, udp.data, skip_fields, print_data, pretty_print, secdef)
                     except Exception as e:
                         print('Error parsing packet #{} - {}'.format(packet_number, e))