From 29011ea451f6638728ed167d8df1daa6cce6c202 Mon Sep 17 00:00:00 2001
From: Phil <phil@secdev.org>
Date: Sun, 31 Aug 2008 00:33:01 +0200
Subject: [PATCH] Moved tethereal() to sendrecv.py and renamed it tshark()
---
scapy/sendrecv.py | 4 ++++
scapy/utils.py | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py
index 0a516e18..3b8a101c 100644
--- a/scapy/sendrecv.py
+++ b/scapy/sendrecv.py
@@ -566,4 +566,8 @@ L2socket: use the provided L2socket
s.close()
return plist.PacketList(lst,"Sniffed")
+@conf.commands.register
+def tshark(*args,**kargs):
+ """Sniff packets and print them calling pkt.show(), a bit like text wireshark"""
+ sniff(prn=lambda x: x.display(),*args,**kargs)
diff --git a/scapy/utils.py b/scapy/utils.py
index ff463a44..c19bf724 100644
--- a/scapy/utils.py
+++ b/scapy/utils.py
@@ -804,7 +804,3 @@ def make_lined_table(*args, **kargs):
def make_tex_table(*args, **kargs):
__make_table(lambda l: "%s", lambda l: "& %s", "\\\\", seplinefunc=lambda a,x:"\\hline", *args, **kargs)
-
-def tethereal(*args,**kargs):
- sniff(prn=lambda x: x.display(),*args,**kargs)
-
--
GitLab