neale
/
netarch
mirror of https://github.com/dirtbags/netarch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix HtmlSession

This commit is contained in:
Neale Pickett 2018-07-18 13:25:24 -06:00
parent 2c8405045a
commit 0180c9caf0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netarch/ip.py
View File

@ -8,6 +8,7 @@ import socket
import warnings import warnings
import heapq import heapq
import time import time
import io
try: try:
import pcap import pcap
except ImportError: except ImportError:
@ -564,12 +565,16 @@ class Packet:
if self.parts: if self.parts:
dl = len(self.parts[-1]) dl = len(self.parts[-1])
p = [] p = []
xp = []
for x in self.parts[:-1]: for x in self.parts[:-1]:
if x == dl: if x == dl:
p.append('%3d!' % x) p.append('%3d!' % x)
xp.append('%3x!' % x)
else: else:
p.append('%3d' % x) p.append('%3d' % x)
print(' parts: (%s) +%d(0x%x) octets' % (','.join(p), dl, dl)) xp.append('%3x' % x)
print(' parts: (%s) +%d octets' % (','.join(p), dl))
print(' 0xparts: (%s) +%x octets' % (','.join(xp), dl))
keys = sorted(self.params) keys = sorted(self.params)
for k in keys: for k in keys:
@ -721,7 +726,9 @@ class Session:
class HtmlSession(Session): class HtmlSession(Session):
def __init__(self, frame): def __init__(self, frame):
Session.__init__(self, frame) Session.__init__(self, frame)
self.sessfd = self.open_out('session.html') fd = self.open_out('session.html')
fbuf = io.BufferedWriter(fd, 1024)
self.sessfd = io.TextIOWrapper(fbuf, encoding="utf-8")
self.sessfd.write('''<?xml version="1.0" encoding="UTF-8"?> self.sessfd.write('''<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

3
netarch/trilobytes.py
View File

@ -125,6 +125,9 @@ class TriloBytes:
return '<TriloBytes missing %d of %d>' % (self.missing(), len(self)) return '<TriloBytes missing %d of %d>' % (self.missing(), len(self))
def decode(self, codec):
return bytes(self).decode(codec)
def missing(self): def missing(self):
""" """
>>> TriloBytes(b'abc').missing() >>> TriloBytes(b'abc').missing()