Skip to content

Feature Request - Show host information on packet diff screen #14

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
AlanFoster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature Request - Show host information on packet diff screen #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion smbcmp/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,26 @@ def smb_summaries(pcap):
cmd += ['-r', pcap, TSHARK_FILTER_FLAG, '!browser && (smb||smb2)']
out = subprocess.check_output(cmd).decode('utf-8')
pkts = {}

ip_map = {
'192.168.123.22': 'A',
'192.168.123.1': 'Relay',
'192.168.123.4': 'C'
};

for line in out.split('\n'):
m = re.match(r'''\s*(\d+).+?SMB2?\s*\d+\s*(.+)''', line)
ips = re.match(r'''.* (\d+\.\d+\.\d+\.\d+) → (\d+\.\d+\.\d+\.\d+).*''', line)

@AlanFoster AlanFoster Jan 15, 2022

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

This was just a proof of concept; I believe it might be better to use the xml output of tshark -T pdml -r ../smb.pcapng '!browser && (smb||smb2)' to gather the required fields ip.src_host / ip.dst_host - potentially with alias support in smbcmp itself for matching arbitrary src/dst ips/hostnames to user defined hostnames

ip_info = ""

if ips:
ip_1 = ip_map.get(ips.group(1), ips.group(1))
ip_2 = ip_map.get(ips.group(2), ips.group(2))
ip_info = ip_1 + " -> " + ip_2 + ": "

if m:
pkts[int(m.group(1))] = m.group(2)
pkts[int(m.group(1))] = ip_info + m.group(2)

return pkts


Expand Down