Changeset 872:fa66f778ed74

Timestamp:

08/16/08 14:37:28 (5 months ago)

Author:

Phil <phil@secdev.org>

Message:

Extracted raw pcap file reader/writer from PcapReader/PcapWriter?

Files:

• scapy/utils.py (modified) (10 diffs)

scapy/utils.py

@@ -11 +11 @@
-from arch import *
-from error import log_runtime
+from base_classes import BasePacketList
-
-
@@ -454 +455 @@
-    return PcapReader(filename).read_all(count=count)
-
-
-
-
-
-
-
-
+
+
+
+
-
-    def __init__(self, filename):
@@ -480 +478 @@
-            raise RuntimeWarning, "Invalid pcap file (too short)"
-        vermaj,vermin,tz,sig,snaplen,linktype = struct.unpack(self.endian+"HHIIII",hdr)
-
-
-
+
+
+
+
-
-    def __iter__(self):
@@ -488 +487 @@
-
-    def next(self):
-
-
-
+
-        pkt = self.read_packet()
-        if pkt == None:
@@ -505 +502 @@
-        if len(hdr) < 16:
-            return None
-o
+wire
-        s = self.f.read(caplen)
+        return s,(sec,usec,wirelen) # caplen = len(s)
+
+
+    def dispatch(self, callback):
+        """call the specified callback routine for each packet read
+        
+        This is just a convienience function for the main loop
+        that allows for easy launching of packet processing in a 
+        thread.
+        """
+        for p in self:
+            callback(p)
+
+    def read_all(self,count=-1):
+        """return a list of all packets in the pcap file
+        """
+        res=[]
+        while count != 0:
+            count -= 1
+            p = self.read_packet()
+            if p is None:
+                break
+            res.append(p)
+        return res
+
+    def recv(self, size):
+        """ Emulate a socket
+        """
+        return self.read_packet()[0]
+
+    def fileno(self):
+        return self.f.fileno()
+
+    def close(self):
+        return self.f.close()
+
+    
+
+class PcapReader(RawPcapReader):
+    def __init__(self, filename):
+        RawPcapReader.__init__(self, filename)
+        try:
+            self.LLcls = conf.l2types[self.linktype]
+        except KeyError:
+            warning("PcapReader: unknown LL type [%i]/[%#x]. Using Raw packets" % (self.linktype,self.linktype))
+            self.LLcls = Raw
+    def read_packet(self):
+        rp = RawPcapReader.read_packet(self)
+        if rp is None:
+            return None
+        s,(sec,usec,wirelen) = rp
+        
-        try:
-            p = self.LLcls(s)
@@ -517 +566 @@
-        p.time = sec+0.000001*usec
-        return p
-
-    def dispatch(self, callback):
-        """call the specified callback routine for each packet read
-        
-        This is just a convienience function for the main loop
-        that allows for easy launching of packet processing in a 
-        thread.
-        """
-        p = self.read_packet()
-        while p != None:
-            callback(p)
-            p = self.read_packet()
-
-    def read_all(self,count=-1):
-
-
-
-
-
-
-
-
-
+
-        return PacketList(res,name = os.path.basename(self.filename))
-
-    def recv(self, size):
-        """ Emulate a socket
-        """
-        return self.read_packet()
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    """A stream PCAP writer with more control than wrpcap()"""
-    def __init__(self, filename, linktype=None, gz=False, endianness="", append=False, sync=False):
@@ -580 +599 @@
-        self.f = [open,gzip.open][gz](filename,append and "ab" or "wb", gz and 9 or bufsz)
-        
-            
-
-    def fileno(self):
-        return self.f.fileno()
@@ -587 +604 @@
-    def _write_header(self, pkt):
-        self.header_present=1
-
-        if self.linktype == None:
-            if type(pkt) is list or type(pkt) is tuple:
-                pkt = pkt[0]
-            self.linktype = conf.l2types.get(pkt.__class__,1)
-
-        if self.append:
@@ -613 +625 @@
-        if not self.header_present:
-            self._write_header(pkt)
-
-
-
-
+
+
+
+
+
+
+
-        """writes a single packet to the pcap file
-        """
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if self.gz and self.sync:
-            self.f.flush()
@@ -633 +655 @@
-        return self.f.close()
-                
+class PcapWriter(RawPcapWriter):
+    def _write_header(self, pkt):
+        if self.linktype == None:
+            if type(pkt) is list or type(pkt) is tuple or isinstance(pkt,BasePacketList):
+                pkt = pkt[0]
+            try:
+                self.linktype = conf.l2types[pkt.__class__]
+            except KeyError:
+                warning("PcapWriter: unknown LL type for %s. Using type 1 (Ethernet)" % pkt.__class__.__name__)
+                self.linktype = 1
+        RawPcapWriter._write_header(self, pkt)
+
+    def _write_packet(self, packet):        
+        sec = int(packet.time)
+        usec = int((packet.time-sec)*1000000)
+        s = str(packet)
+        caplen = len(s)
+        RawPcapWriter._write_packet(self, s, sec, usec, caplen, caplen)
+
-
-re_extract_hexcap = re.compile("^(0x[0-9a-fA-F]{2,}[ :\t]|(0x)?[0-9a-fA-F]{2,}:|(0x)?[0-9a-fA-F]{3,}[: \t]|) *(([0-9a-fA-F]{2} {,2}){,16})")