casa-mp-base

--- ./pcap.pyx.orig 2011-10-01 22:35:33.141146678 -0400

+++ ./pcap.pyx  2011-10-01 22:35:39.416147272 -0400

@@ -1,7 +1,7 @@

 #

 # pcap.pyx

 #

-# $Id: pcap.pyx,v 1.20 2005/10/16 23:00:11 dugsong Exp $

+# $Id: pcap.pyx 101 2010-07-16 08:20:16Z kosma@kosma.pl $

 """packet capture library

@@ -17,9 +17,11 @@

 __version__ = '1.1'

 import sys

+import struct

 cdef extern from "Python.h":

     object PyBuffer_FromMemory(char *s, int len)

+    int    PyObject_AsCharBuffer(object obj, char **buffer, int *buffer_len)

     int    PyGILState_Ensure()

     void   PyGILState_Release(int gil)

     void   Py_BEGIN_ALLOW_THREADS()

@@ -42,6 +44,10 @@

         unsigned int caplen

     ctypedef struct pcap_t:

         int __xxx

+    ctypedef struct pcap_if_t # hack for win32

+    ctypedef struct pcap_if_t:

+        pcap_if_t *next

+        char *name

 ctypedef void (*pcap_handler)(void *arg, pcap_pkthdr *hdr, char *pkt)

@@ -62,6 +68,13 @@

     char   *pcap_geterr(pcap_t *p)

     void    pcap_close(pcap_t *p)

     int     bpf_filter(bpf_insn *insns, char *buf, int len, int caplen)

+    int     pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf)

+    void    pcap_freealldevs(pcap_if_t *alldevs)

+    int     pcap_lookupnet(char *device,

+                           unsigned int *netp,

+                           unsigned int *maskp,

+                           char *errbuf)

+    int     pcap_sendpacket(pcap_t *p, char *buf, int size)

 cdef extern from "pcap_ex.h":

     # XXX - hrr, sync with libdnet and libevent

@@ -134,16 +147,18 @@

             raise IOError, 'bad filter'

     def filter(self, buf):

         """Return boolean match for buf against our filter."""

+        cdef char *p

         cdef int n

-        n = len(buf)

-        if bpf_filter(self.fcode.bf_insns, buf, n, n) == 0:

+        if PyObject_AsCharBuffer(buf, &p, &n) < 0:

+            raise TypeError

+        if bpf_filter(self.fcode.bf_insns, p, n, n) == 0:

             return False

         return True

     def __dealloc__(self):

         pcap_freecode(&self.fcode)