(netflow/parse) time....

src/opnsense/scripts/netflow/lib/parse.py

@@ -93,14 +93,14 @@ def parse_flow(recv_stamp):
             flow_record = dict()
             if flow.has_field(flowd.FIELD_RECV_TIME):
                 # receive timestamp
-                flow_record['recv'] = flow.recv_sec + flow.recv_usec / 1000.0
+                flow_record['recv'] = flow.recv_sec
                 if flow_record['recv'] <= recv_stamp:
                     # do not parse next flow archive (oldest reached)
                     parse_done = True
                     continue
                 if flow.has_field(flowd.FIELD_FLOW_TIMES):
                     # calculate flow start, end, duration in ms
-                    flow_record['flow_end'] = (flow.recv_sec - flow.flow_finish / 1000.0 + flow.sys_uptime_ms/1000.0)
+                    flow_record['flow_end'] = flow.recv_sec - (flow.sys_uptime_ms - flow.flow_finish) / 1000.0
                     flow_record['duration_ms'] = (flow.flow_finish - flow.flow_start)
                     flow_record['flow_start'] = flow_record['flow_end'] - flow_record['duration_ms'] / 1000.0
                     # handle source data