Skip to content
Snippets Groups Projects
Commit e3257cd8 authored by Guillaume Valadon's avatar Guillaume Valadon
Browse files

Merged in p-l/scapy/issue-5111 (pull request #101)

Fixes the _write_header() call to make it possible to write from a generator
parents fb47d702 7574bb30
No related branches found
No related tags found
No related merge requests found
......@@ -704,11 +704,20 @@ class RawPcapWriter:
written to the dumpfile
"""
if not self.header_present:
self._write_header(pkt)
if type(pkt) is str:
if not self.header_present:
self._write_header(pkt)
self._write_packet(pkt)
else:
pkt = pkt.__iter__()
if not self.header_present:
try:
p = pkt.next()
except StopIteration:
self._write_header("")
return
self._write_header(p)
self._write_packet(p)
for p in pkt:
self._write_packet(p)
......@@ -746,8 +755,6 @@ class RawPcapWriter:
class PcapWriter(RawPcapWriter):
def _write_header(self, pkt):
if self.linktype == None:
if type(pkt) is list or type(pkt) is tuple or isinstance(pkt,BasePacketList):
pkt = pkt[0]
try:
self.linktype = conf.l2types[pkt.__class__]
except KeyError:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment