Skip to content

On windows, check if the file is opened in binary mode #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kbandla wants to merge 4 commits into
base: master
Choose a base branch
from
Open

On windows, check if the file is opened in binary mode #369

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
162ad76
On windows, check if the file is opened in binary mode
Jun 1, 2017
fad3d74
Fix typo for pcap.Writer
Jun 1, 2017
bdc5027
Expand checks to all OS
kbandla Mar 22, 2022
5402e2f
Merge branch 'master' into pcap_binary_mode
brifordwylie Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dpkt/pcap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ class Writer(object):
__le = sys.byteorder == 'little'

def __init__(self, fileobj, snaplen=1500, linktype=DLT_EN10MB, nano=False):
if 'b' not in fileobj.mode:
raise ValueError('PCAP file NOT in binary mode (wb)')
self.__f = fileobj
self._precision = 9 if nano else 6
self._precision_multiplier = 10**self._precision
Expand Down Expand Up @@ -274,6 +276,8 @@ class Reader(object):
"""
def __init__(self, fileobj):
self.name = getattr(fileobj, 'name', '<%s>' % fileobj.__class__.__name__)
if 'b' not in fileobj.mode:
raise ValueError('PCAP file (%s) not opened in binary mode (rb)' % self.name)
self.__f = fileobj
buf = self.__f.read(FileHdr.__hdr_len__)
self.__fh = FileHdr(buf)
Expand Down