d3babe1252d05f07e58a6602b47e1a09bbd56af5,networkml/parsers/pcap/reader.py,,packetizer,#Any#,67

Before Change

    // Read get the pcap info with tcpdump
    FNULL = open(os.devnull, "w")
    proc = subprocess.Popen(
        ["tshark", "-n", "-T", "json", "-x", "-r", path, "-o", "tcp.desegment_tcp_streams:false"],
        stdout=subprocess.PIPE,
        stderr=FNULL
    )
    packet_dict = OrderedDict()
    buf = ""
    for line in proc.stdout:
        line = line.decode("utf-8")
        if not line.startswith(" "):
            continue
        if line.startswith("  ,"):
            continue
        buf += line
        if line.startswith("  }"):
            parse_buf(buf)
            buf = ""
    return packet_dict


def sessionizer(path, duration=None, threshold_time=None):

After Change

    """

    packet_dict = OrderedDict()
    with pyshark.FileCapture(path, use_json=True, include_raw=True,
            custom_parameters={"-o": "tcp.desegment_tcp_streams:false"}) as cap:
        for packet in cap:
            data = packet.get_raw_packet()
            head = parse_packet_head(packet)
            if head is not None:
                packet_dict[head] = binascii.hexlify(data).decode("utf-8")
    return packet_dict


def sessionizer(path, duration=None, threshold_time=None):

Instances