Skip to content

Commit 90d5003

Browse files
authored
Merge pull request #746 from rjaletzki/patch-1
fix: ignore comments when parsing pdml
2 parents 16fa4a5 + 301c44b commit 90d5003

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/pyshark/tshark/output_parser/tshark_xml.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ def _packet_from_psml_packet(psml_packet, structure):
9090

9191

9292
def _packet_from_pdml_packet(pdml_packet):
93-
layers = [XmlLayer(proto) for proto in pdml_packet.proto]
94-
geninfo, frame, layers = layers[0], layers[1], layers[2:]
93+
geninfo = XmlLayer(pdml_packet.xpath('.//proto[@name="geninfo"]')[0])
94+
frame = XmlLayer(pdml_packet.xpath('.//proto[@name="frame"]')[0])
95+
layers = [XmlLayer(proto) for proto in pdml_packet.proto if proto.attrib['name'] not in ('geninfo', 'frame', 'pkt_comment')]
9596
return Packet(layers=layers, frame_info=frame, number=geninfo.get_field_value('num'),
9697
length=geninfo.get_field_value('len'), sniff_time=geninfo.get_field_value('timestamp', raw=True),
9798
captured_length=geninfo.get_field_value('caplen'),

0 commit comments

Comments
 (0)