Skip to content

port dns from vs1 to vs2 #4

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
AKOU0 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

port dns from vs1 to vs2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2b3a76
port dns from vs1 to vs2
AKOU0 Jul 13, 2017
9537a68
mods for change requests for PR #4
AKOU0 Jul 27, 2017
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: 3 additions & 1 deletion dissect/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Isolate 2.7 compatibility filth.
'''
import sys
from __future__ import unicode_literals

major = sys.version_info.major
minor = sys.version_info.minor
Expand All @@ -15,8 +16,9 @@ def iterbytes(byts):
for c in byts:
yield ord(c)

range = xrange

else:

def iterbytes(byts):
return iter(byts)

2 changes: 1 addition & 1 deletion dissect/formats/inet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def __init__(self):

def _onSetEtype(self):
# append vlan tags if needed
if etype == ethp.vlan:
if self.etype == ethp.vlan:
self.vtag = uint16()
self.vvlan = uint16()

Expand Down
Loading