Skip to content
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

Jump to bottom

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

Open
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 2 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
5 changes: 5 additions & 0 deletions dpkt/pcap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ class Writer(object):
"""

def __init__(self, fileobj, snaplen=1500, linktype=DLT_EN10MB, nano=False):
if fileobj.mode != 'wb':
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a check for Windows, same as below?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops! yes, thanks for catching

raise ValueError('PCAP file NOT in binary mode (wb)')
self.__f = fileobj
self._precision = 9 if nano else 6
magic = TCPDUMP_MAGIC_NANO if nano else TCPDUMP_MAGIC
Expand Down Expand Up @@ -240,6 +242,9 @@ class Reader(object):

def __init__(self, fileobj):
self.name = getattr(fileobj, 'name', '<%s>' % fileobj.__class__.__name__)
if sys.platform.startswith('win'):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So do we want to just check 'rb' mode for all platforms?

if fileobj.mode != 'rb':
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

both mode checks feel a bit too restrictive (but make complete sense at the same time..). I personally would go with smth like if 'b' not in fileobj.mode

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noticed that i did not account for append modes, your suggestion takes care of that too.

raise ValueError('PCAP file (%s) not opened in binary mode (rb)'%self.name)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pep8

... (rb)' % self.name)
         ^ ^ spaces

self.__f = fileobj
buf = self.__f.read(FileHdr.__hdr_len__)
self.__fh = FileHdr(buf)
Expand Down