port dns from vs1 to vs2 #4
Conversation
|
This PR depends on the following PR to vstruct2: vstruct2 PR 7 |
|
restarting the unit test builds with the newly merged vstruct2 PR... if all goes well, i'll mainline today. |
|
Unit tests still failing with merged vstruct2 PR #7. |
dissect/protos/dns.py
Outdated
|
|
||
| from __future__ import unicode_literals | ||
|
|
||
| try: |
There was a problem hiding this comment.
a construct like this probably belongs in dissect/compat.py ( rather than having a separate issue like this in every protocol module ). Additionally, we should probably have the semantics lean forward toward 3 rather than backward toward 2 ( ie, not use the name xrange ).
There was a problem hiding this comment.
moved, and tried to make it more py3-ish.
| DNS_FLAG_TRUNC = 1 << 9 | ||
| DNS_FLAG_RECUR = 1 << 8 | ||
| DNS_FLAG_AD = 1 << 5 | ||
| #DNS_FLAG_AA = 1 << 5 # authoritative answer |
There was a problem hiding this comment.
mostly curiosity... why are these commented out?
There was a problem hiding this comment.
You know, that's a good q! I am not sure, they were commented out in the original version from vs1, and I didn't see a reason to change them. Tests seem to pass with or without them, but I suspect that's because they are for some case that isn't yet covered by tests.
dissect/protos/dns.py
Outdated
| if self.vsHasField('label'): # the resize will crash if the label hasn't been set yet w/o this | ||
| self.vsGetField('label').vsResize(size) | ||
|
|
||
|
|
There was a problem hiding this comment.
extra empty line ( which totally may have been inherited from my previous DNS cruft, but lets kill it off since we're touching it... )
dissect/protos/dns.py
Outdated
| self._cache_qrs = ret | ||
| return ret | ||
|
|
||
| def _getResourceRecords(self, structure): |
There was a problem hiding this comment.
Seems like this is a top level API ( compliment of getQuestionRecords ) lets promote him by removing the _
dissect/protos/inet.py
Outdated
| def __repr__(self): | ||
| return socket.inet_ntop(socket.AF_INET, bytes(self)) | ||
|
|
||
|
|
There was a problem hiding this comment.
remove extra blank lines for style points :D
|
I could be wrong, but it appears that the tests are failing because the pip version of vstruct2 doesn't include the changes from PR#7 for vs2. |
2 participants
Copies dns.py from vs1, and makes necessary changes to run under vs2.