Changeset 899:733193ef0717

Timestamp:

08/31/08 00:34:17 (4 months ago)

Author:

Phil <phil@secdev.org>

Message:

Improved temp file management

Files:

• scapy/config.py (modified) (1 diff)
• scapy/main.py (modified) (5 diffs)
• scapy/utils.py (modified) (4 diffs)

scapy/config.py

@@ -269 +269 @@
-    stats_classic_protocols = []
-    stats_dot11_protocols = []
+    temp_files = []
-    netcache = NetCache()
-    load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs", "hsrp", "ip6", "ir", "isakmp", "l2tp",

scapy/main.py

@@ -7 +7 @@
-from __future__ import generators
-import os,sys
+import __builtin__
-from error import *
-__builtin__
+utils
-    
-
@@ -73 +74 @@
-        fname = conf.session
-        if not fname:
-os.tempnam("","scapy"
+utils.get_temp_file(keep=True
-            log_interactive.info("Use [%s] as session file" % fname)
-    if session is None:
@@ -121 +122 @@
-##### Main #####
-################
+
+def scapy_delete_temp_files():
+    for f in conf.temp_files:
+        try:
+            os.unlink(f)
+        except:
+            pass
-
-def scapy_write_history_file(readline):
@@ -129 +137 @@
-            try:
-                warning("Could not write history to [%s]\n\t (%s)" % (conf.histfile,e))
-os.tempnam("","scapy"
+utils.get_temp_file(keep=True
-                readline.write_history_file(tmp)
-                warning("Wrote history to [%s]" % tmp)
@@ -287 +295 @@
-        atexit.register(scapy_write_history_file,readline)
-    
+    atexit.register(scapy_delete_temp_files)
-    sys.ps1 = ColorPrompt()
-    code.interact(banner = the_banner % (conf.version), local=session)

scapy/utils.py

@@ -5 +5 @@
-
-import os,sys,socket,types
-from config import conf
-from data import MTU
-import random,time
-import gzip,zlib,cPickle
-import re,struct,array
+
+import warnings
+warnings.filterwarnings("ignore","tempnam",RuntimeWarning, __name__)
+
+from config import conf
+from data import MTU
-from error import log_runtime,log_loading,log_interactive
-from base_classes import BasePacketList
@@ -17 +21 @@
-## Tools ##
-###########
+
+def get_temp_file(keep=False):
+    f = os.tempnam("","scapy")
+    if not keep:
+        conf.temp_files.append(f)
+    return f
-
-def sane_color(x):
@@ -683 +693 @@
-def wireshark(pktlist):
-    """Run wireshark on a list of packets"""
-os.tempnam("scapy"
+get_temp_file(
-    wrpcap(f, pktlist)
-    os.spawnlp(os.P_NOWAIT, conf.prog.wireshark, conf.prog.wireshark, "-r", f)
@@ -690 +700 @@
-def hexedit(x):
-    x = str(x)
-os.tempnam("scapy"
+get_temp_file(
-    open(f,"w").write(x)
-    os.spawnlp(os.P_WAIT, conf.prog.hexedit, conf.prog.hexedit, f)