Changeset 47de0aa

Timestamp:

06/29/06 21:07:50 (14 years ago)

Author:

Daniel Lawson <dlawson@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

2553732

Parents:

66caf4b

Message:

• Cosmetic changes to trace_help() output
• inclusion of some m4 handlers to deal with swig and python, lifted from ​http://autoconf-archive.cryp.to/. These are GPLd, which needs to be taken into account if libtrace licensing changes!
• updated the swig bindings for python. Mostly api compliant now. Still possibly a memory leak to do with displaying ip addresses - I haven't touched this particular part of the code yet.

Files:

• Makefile.am (modified) (1 diff)
• bootstrap.sh (modified) (1 diff)
• configure.in (modified) (5 diffs)
• lib/trace.c (modified) (1 diff)
• m4/ac_pkg_swig.m4 (added)
• m4/ac_python_devel.m4 (added)
• swig/Makefile (deleted)
• swig/Makefile.am (added)
• swig/libtrace.i (modified) (6 diffs)
• swig/libtrace_wrap.c (modified) (228 diffs)
• swig/python/check.py (modified) (3 diffs)
• swig/python/libtrace.py (deleted)

Makefile.am

@@ -1 +1 @@
 LIBPACKETDUMP_DIR = libpacketdump
 TOOLS_DIR = tools
-SUBDIRS = lib docs $(LIBPACKETDUMP_DIR) $(TOOLS_DIR)
+if LIBTRACE_SWIG
+SWIG_DIR = swig
+endif
+SUBDIRS = lib docs $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) $(SWIG_DIR)
 
+ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = 1.5
 

bootstrap.sh

@@ -2 +2 @@
 
 set -x
-aclocal-1.9 || 
-        aclocal 
+aclocal-1.9 -I m4 || 
+        aclocal  -I m4
 libtoolize --force --copy
 autoheader

configure.in

@@ -22 +22 @@
         tools/tracemerge/Makefile tools/tracereport/Makefile 
         tools/tracertstats/Makefile tools/tracesplit/Makefile 
-        tools/tracestats/Makefile docs/libtrace.doxygen lib/libtrace.h])
+        tools/tracestats/Makefile 
+        docs/libtrace.doxygen 
+        lib/libtrace.h
+        swig/Makefile])
 dnl GNU C library
 dnl AC_GNU_SOURCE
@@ -46 +49 @@
 AC_HEADER_TIME
 AC_SYS_LARGEFILE
+
+AC_PROG_LIBTOOL
+AM_PATH_PYTHON(2.3)
+AC_PROG_SWIG(1.3.21)
+SWIG_PYTHON
 
 # Checks for library functions.
@@ -209 +217 @@
 AC_CHECK_LIB(z, gzopen)
 
+libtrace_swig=false;
+if test -n $SWIG; then
+        libtrace_swig=true;
+fi
+libtrace_python=false;
+if test -n "$PYTHON"; then
+        libtrace_python=true;
+fi
+
 AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
 AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag2_4" = true])
@@ -214 +231 @@
 AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
 AM_CONDITIONAL([LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
+AM_CONDITIONAL([LIBTRACE_SWIG], [test "$libtrace_swig" = true])
+#AM_CONDITIONAL([HAVE_PYTHON], [test "$libtrace_python" = true])
 
 # Check for miscellaneous programs
@@ -257 +276 @@
 reportopt "Building man pages/documentation" $libtrace_doxygen
 
+if test x"$libtrace_swig" = xtrue; then
+        if test x"$libtrace_python"; then
+                AC_MSG_NOTICE([Building swig bindings for: python])
+        fi
+else
+        AC_MSG_NOTICE([Building swig bindings for: Nothing])
+fi

lib/trace.c

@@ -245 +245 @@
         struct libtrace_format_t *tmp;
         trace_init();
-        printf("libtrace %s\n",PACKAGE_VERSION);
+        printf("libtrace %s\n\n",PACKAGE_VERSION);
+        printf("Following this are a list of the format modules supported in this build of libtrace\n\n");
         for(tmp=formats_list;tmp;tmp=tmp->next) {
                 if (tmp->help)

swig/libtrace.i

@@ -147 +147 @@
 %extend libtrace_packet_t {
         libtrace_packet_t() { 
-                struct libtrace_packet_t *packet = malloc(sizeof(struct libtrace_packet_t));
+                struct libtrace_packet_t *packet = trace_create_packet();
                 return packet;
                 }
-        ~libtrace_packet_t() { free(self);}
+        ~libtrace_packet_t() { 
+                trace_destroy_packet(self);
+                }
+        libtrace_packet_t *trace_copy_packet() {
+                return trace_copy_packet(self);
+        }
+        void *trace_get_link() {
+                return trace_get_link(self);
+        }
+        void *trace_get_transport(uint8_t *proto, uint32_t *remaining) {
+                return trace_get_transport(self, proto, remaining);
+        }
         struct libtrace_ip *trace_get_ip() {
                 return trace_get_ip(self);
@@ -163 +174 @@
                 return trace_get_icmp(self);
         }
-        void *trace_get_link() {
-                return trace_get_link(self);
+        char *trace_get_destination_mac() {
+                return trace_ether_ntoa(trace_get_destination_mac(self),0);
+        }
+        char *trace_get_source_mac() {
+                return trace_ether_ntoa(trace_get_source_mac(self),0);
+        }
+        char *trace_ether_ntoa(uint8_t *mac) {
+                return trace_ether_ntoa(mac, 0);
+        }
+        uint16_t trace_get_source_port() {
+                return trace_get_source_port(self);
+        }
+        uint16_t trace_get_destination_port() {
+                return trace_get_destination_port(self);
         }
         double trace_get_seconds() {
@@ -178 +201 @@
                 return trace_get_capture_length(self);
         }
+        size_t trace_set_capture_length(size_t size) {
+                return trace_set_capture_length(self,size);
+        }
         int trace_get_wire_lenth() {
                 return trace_get_wire_length(self);
         }
+        int trace_get_framing_length() {
+                return trace_get_framing_length(self);
+        }
         libtrace_linktype_t trace_get_link_type() {
                 return trace_get_link_type(self);
@@ -190 +219 @@
                 return trace_set_direction(self,direction);
         }
-        int trace_bpf_filter(struct libtrace_filter_t *filter) {
-                return trace_bpf_filter(filter,self);
+        int trace_apply_filter(struct libtrace_filter_t *filter) {
+                return trace_apply_filter(filter,self);
         }
         uint8_t trace_get_server_port(uint8_t protocol, uint16_t source,
@@ -205 +234 @@
 %extend libtrace_filter_t {
         libtrace_filter_t(char *filterstring) { 
-                return trace_bpf_setfilter(filterstring); 
+                return trace_create_filter(filterstring); 
         };
-        int trace_bpf_filter(struct libtrace_packet_t *packet) {
-                return trace_bpf_filter(self,packet);
+        ~libtrace_filter_t() {
+                trace_destroy_filter(self);
+        };
+        int trace_apply_filter(struct libtrace_packet_t *packet) {
+                return trace_apply_filter(self,packet);
         }
 };
@@ -221 +253 @@
                 return trace_read_packet(self,packet);
         }
+        int trace_start() {
+                return trace_start(self);
+        }
+        int trace_pause() {
+                return trace_pause(self);
+        }
+        void trace_help() {
+                trace_help();
+        }
+        int trace_config(trace_option_t option, void *value) {
+                return trace_config(self, option, value); 
+        }
+        libtrace_err_t trace_get_err() {
+                return trace_get_err(self);
+        }
+        bool trace_is_err() {
+                return trace_is_err(self);
+        }
 }; 
 
+%rename (OutputTrace) libtrace_out_t;
+struct libtrace_out_t {};
+
+%extend libtrace_out_t {
+        libtrace_out_t(char *uri) { return trace_create_output(uri); };
+        ~libtrace_t() { trace_destroy_output(self); }
+        int trace_start_output() {
+                return trace_start_output(self);
+        }
+        int trace_config_output(trace_option_output_t option, void *value) {
+                return trace_config_output(self, option, value);
+        }
+        libtrace_err_t trace_get_err_output() {
+                return trace_get_err_output(self);
+        }
+        bool trace_is_err_output() {
+                return trace_is_err_output(self);
+        }
+        int trace_write_packet(libtrace_packet_t *packet) {
+                return trace_write_packet(self, packet);
+        }
+};
+

swig/libtrace_wrap.c

@@ -1 +1 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.22
+ * Version 1.3.27
  * 
  * This file is not intended to be easily readable and contains a number of 
@@ -10 +10 @@
 
 #define SWIGPYTHON
-
-#include "Python.h"
-
-/*************************************************************** -*- c -*-
- * python/precommon.swg
+/***********************************************************************
  *
- * Rename all exported symbols from common.swg, to avoid symbol
- * clashes if multiple interpreters are included
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
  *
  ************************************************************************/
 
-#define SWIG_TypeRegister    SWIG_Python_TypeRegister
-#define SWIG_TypeCheck       SWIG_Python_TypeCheck
-#define SWIG_TypeCast        SWIG_Python_TypeCast
-#define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
-#define SWIG_TypeName        SWIG_Python_TypeName
-#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
-#define SWIG_TypeQuery       SWIG_Python_TypeQuery
-#define SWIG_TypeClientData  SWIG_Python_TypeClientData
-#define SWIG_PackData        SWIG_Python_PackData 
-#define SWIG_UnpackData      SWIG_Python_UnpackData 
-
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+#  if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#    define SWIGTEMPLATEDISAMBIGUATOR template
+#  else
+#    define SWIGTEMPLATEDISAMBIGUATOR 
+#  endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__) || defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((unused)) 
+# else
+#   define SWIGUNUSED 
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods for Windows DLLs */
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   define SWIGEXPORT
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif 
+#endif
+
+
+
+#include <Python.h>
 
 /***********************************************************************
- * common.swg
+ * swigrun.swg
  *
- *     This file contains generic SWIG runtime support for pointer
- *     type checking as well as a few commonly used macros to control
- *     external linkage.
+ *     This file contains generic CAPI SWIG runtime support for pointer
+ *     type checking.
  *
- * Author : David Beazley (beazley@cs.uchicago.edu)
- *
- * Copyright (c) 1999-2000, The University of Chicago
- * 
- * This file may be freely redistributed without license or fee provided
- * this copyright message remains intact.
  ************************************************************************/
 
+/* This should only be incremented when either the layout of swig_type_info changes,
+   or for whatever reason, the runtime changes incompatibly */
+#define SWIG_RUNTIME_VERSION "2"
+
+/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
+#ifdef SWIG_TYPE_TABLE
+# define SWIG_QUOTE_STRING(x) #x
+# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
+# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+#else
+# define SWIG_TYPE_TABLE_NAME
+#endif
+
+/*
+  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
+  creating a static or dynamic library from the swig runtime code.
+  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  
+  But only do this if is strictly necessary, ie, if you have problems
+  with your compiler or so.
+*/
+
+#ifndef SWIGRUNTIME
+# define SWIGRUNTIME SWIGINTERN
+#endif
+
+#ifndef SWIGRUNTIMEINLINE
+# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
+#endif
+
 #include <string.h>
-
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  if defined(_MSC_VER) || defined(__GNUC__)
-#    if defined(STATIC_LINKED)
-#      define SWIGEXPORT(a) a
-#      define SWIGIMPORT(a) extern a
-#    else
-#      define SWIGEXPORT(a) __declspec(dllexport) a
-#      define SWIGIMPORT(a) extern a
-#    endif
-#  else
-#    if defined(__BORLANDC__)
-#      define SWIGEXPORT(a) a _export
-#      define SWIGIMPORT(a) a _export
-#    else
-#      define SWIGEXPORT(a) a
-#      define SWIGIMPORT(a) a
-#    endif
-#  endif
-#else
-#  define SWIGEXPORT(a) a
-#  define SWIGIMPORT(a) a
-#endif
-
-#ifdef SWIG_GLOBAL
-#  define SWIGRUNTIME(a) SWIGEXPORT(a)
-#else
-#  define SWIGRUNTIME(a) static a
-#endif
 
 #ifdef __cplusplus
@@ -86 +127 @@
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
+/* Structure to store inforomation on one type */
 typedef struct swig_type_info {
-  const char             *name;
-  swig_converter_func     converter;
-  const char             *str;
-  void                   *clientdata;
-  swig_dycast_func        dcast;
-  struct swig_type_info  *next;
-  struct swig_type_info  *prev;
+  const char             *name;                 /* mangled name of this type */
+  const char             *str;                  /* human readable name of this type */
+  swig_dycast_func        dcast;                /* dynamic cast function down a hierarchy */
+  struct swig_cast_info  *cast;                 /* linked list of types that can cast into this type */
+  void                   *clientdata;           /* language specific type data */
 } swig_type_info;
 
-#ifdef SWIG_NOINCLUDE
-
-SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *);
-SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
-SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
-SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
-SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
-SWIGIMPORT(const char *)     SWIG_TypePrettyName(const swig_type_info *);
-SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
-SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
-SWIGIMPORT(char *)           SWIG_PackData(char *, void *, int);
-SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
-
-#else
-
-static swig_type_info *swig_type_list = 0;
-static swig_type_info **swig_type_list_handle = &swig_type_list;
-
-/* Register a type mapping with the type-checking */
-SWIGRUNTIME(swig_type_info *)
-SWIG_TypeRegister(swig_type_info *ti) {
-  swig_type_info *tc, *head, *ret, *next;
-  /* Check to see if this type has already been registered */
-  tc = *swig_type_list_handle;
-  while (tc) {
-    if (strcmp(tc->name, ti->name) == 0) {
-      /* Already exists in the table.  Just add additional types to the list */
-      if (tc->clientdata) ti->clientdata = tc->clientdata;
-      head = tc;
-      next = tc->next;
-      goto l1;
-    }
-    tc = tc->prev;
-  }
-  head = ti;
-  next = 0;
-
-  /* Place in list */
-  ti->prev = *swig_type_list_handle;
-  *swig_type_list_handle = ti;
-
-  /* Build linked lists */
-  l1:
-  ret = head;
-  tc = ti + 1;
-  /* Patch up the rest of the links */
-  while (tc->name) {
-    head->next = tc;
-    tc->prev = head;
-    head = tc;
-    tc++;
-  }
-  if (next) next->prev = head;
-  head->next = next;
-  return ret;
-}
-
-/* Check the typename */
-SWIGRUNTIME(swig_type_info *) 
-SWIG_TypeCheck(char *c, swig_type_info *ty) {
-  swig_type_info *s;
-  if (!ty) return 0;        /* Void pointer */
-  s = ty->next;             /* First element always just a name */
-  do {
-    if (strcmp(s->name,c) == 0) {
-      if (s == ty->next) return s;
-      /* Move s to the top of the linked list */
-      s->prev->next = s->next;
-      if (s->next) {
-        s->next->prev = s->prev;
-      }
-      /* Insert s as second element in the list */
-      s->next = ty->next;
-      if (ty->next) ty->next->prev = s;
-      ty->next = s;
-      s->prev = ty;
-      return s;
-    }
-    s = s->next;
-  } while (s && (s != ty->next));
-  return 0;
-}
-
-/* Cast a pointer up an inheritance hierarchy */
-SWIGRUNTIME(void *) 
-SWIG_TypeCast(swig_type_info *ty, void *ptr) {
-  if ((!ty) || (!ty->converter)) return ptr;
-  return (*ty->converter)(ptr);
-}
-
-/* Dynamic pointer casting. Down an inheritance hierarchy */
-SWIGRUNTIME(swig_type_info *) 
+/* Structure to store a type and conversion function used for casting */
+typedef struct swig_cast_info {
+  swig_type_info         *type;                 /* pointer to type that is equivalent to this type */
+  swig_converter_func     converter;            /* function to cast the void pointers */
+  struct swig_cast_info  *next;                 /* pointer to next cast in linked list */
+  struct swig_cast_info  *prev;                 /* pointer to the previous cast */
+} swig_cast_info;
+
+/* Structure used to store module information
+ * Each module generates one structure like this, and the runtime collects
+ * all of these structures and stores them in a circularly linked list.*/
+typedef struct swig_module_info {
+  swig_type_info         **types;               /* Array of pointers to swig_type_info structures that are in this module */
+  size_t                 size;                  /* Number of types in this module */
+  struct swig_module_info *next;                /* Pointer to next element in circularly linked list */
+  swig_type_info         **type_initial;        /* Array of initially generated type structures */
+  swig_cast_info         **cast_initial;        /* Array of initially generated casting structures */
+  void                    *clientdata;          /* Language specific module data */
+} swig_module_info;
+
+
+/* 
+  Compare two type names skipping the space characters, therefore
+  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
+
+  Return 0 when the two name types are equivalent, as in
+  strncmp, but skipping ' '.
+*/
+SWIGRUNTIME int
+SWIG_TypeNameComp(const char *f1, const char *l1,
+                  const char *f2, const char *l2) {
+  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
+    while ((*f1 == ' ') && (f1 != l1)) ++f1;
+    while ((*f2 == ' ') && (f2 != l2)) ++f2;
+    if (*f1 != *f2) return (int)(*f1 - *f2);
+  }
+  return (l1 - f1) - (l2 - f2);
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if not equal, 1 if equal
+*/
+SWIGRUNTIME int
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+*/
+SWIGRUNTIME int
+SWIG_TypeCompare(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+
+/* think of this as a c++ template<> or a scheme macro */
+#define SWIG_TypeCheck_Template(comparison, ty)         \
+  if (ty) {                                             \
+    swig_cast_info *iter = ty->cast;                    \
+    while (iter) {                                      \
+      if (comparison) {                                 \
+        if (iter == ty->cast) return iter;              \
+        /* Move iter to the top of the linked list */   \
+        iter->prev->next = iter->next;                  \
+        if (iter->next)                                 \
+          iter->next->prev = iter->prev;                \
+        iter->next = ty->cast;                          \
+        iter->prev = 0;                                 \
+        if (ty->cast) ty->cast->prev = iter;            \
+        ty->cast = iter;                                \
+        return iter;                                    \
+      }                                                 \
+      iter = iter->next;                                \
+    }                                                   \
+  }                                                     \
+  return 0
+
+/*
+  Check the typename
+*/
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheck(const char *c, swig_type_info *ty) {
+  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+}
+
+/* Same as previous function, except strcmp is replaced with a pointer comparison */
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
+  SWIG_TypeCheck_Template(iter->type == from, into);
+}
+
+/*
+  Cast a pointer up an inheritance hierarchy
+*/
+SWIGRUNTIMEINLINE void *
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+}
+
+/* 
+   Dynamic pointer casting. Down an inheritance hierarchy
+*/
+SWIGRUNTIME swig_type_info *
 SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
   swig_type_info *lastty = ty;
@@ -198 +272 @@
 }
 
-/* Return the name associated with this type */
-SWIGRUNTIME(const char *)
+/*
+  Return the name associated with this type
+*/
+SWIGRUNTIMEINLINE const char *
 SWIG_TypeName(const swig_type_info *ty) {
   return ty->name;
 }
 
-/* Return the pretty name associated with this type,
-   that is an unmangled type name in a form presentable to the user.
+/*
+  Return the pretty name associated with this type,
+  that is an unmangled type name in a form presentable to the user.
 */
-SWIGRUNTIME(const char *)
+SWIGRUNTIME const char *
 SWIG_TypePrettyName(const swig_type_info *type) {
   /* The "str" field contains the equivalent pretty names of the
@@ -225 +302 @@
 
 /* 
-   Compare two type names skipping the space characters, therefore
-   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
-
-   Return 0 when the two name types are equivalent, as in
-   strncmp, but skipping ' '.
+   Set the clientdata field for a type
 */
-static int
-SWIG_TypeNameComp(const char *f1, const char *l1,
-                  const char *f2, const char *l2) {
-  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
-    while ((*f1 == ' ') && (f1 != l1)) ++f1;
-    while ((*f2 == ' ') && (f2 != l2)) ++f2;
-    if (*f1 != *f2) return *f1 - *f2;
-  }
-  return (l1 - f1) - (l2 - f2);
+SWIGRUNTIME void
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+  swig_cast_info *cast = ti->cast;
+  /* if (ti->clientdata == clientdata) return; */
+  ti->clientdata = clientdata;
+  
+  while (cast) {
+    if (!cast->converter) {
+      swig_type_info *tc = cast->type;
+      if (!tc->clientdata) {
+        SWIG_TypeClientData(tc, clientdata);
+      }
+    }    
+    cast = cast->next;
+  }
 }
 
 /*
-  Check type equivalence in a name list like <name1>|<name2>|...
+  Search for a swig_type_info structure only by mangled name
+  Search is a O(log #types)
+  
+  We start searching at module start, and finish searching when start == end.  
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
 */
-static int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = SWIG_TypeNameComp(nb, ne, tb, te) == 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
-}
+SWIGRUNTIME swig_type_info *
+SWIG_MangledTypeQueryModule(swig_module_info *start, 
+                            swig_module_info *end, 
+                            const char *name) {
+  swig_module_info *iter = start;
+  do {
+    if (iter->size) {
+      register size_t l = 0;
+      register size_t r = iter->size - 1;
+      do {
+        /* since l+r >= 0, we can (>> 1) instead (/ 2) */
+        register size_t i = (l + r) >> 1; 
+        const char *iname = iter->types[i]->name;
+        if (iname) {
+          register int compare = strcmp(name, iname);
+          if (compare == 0) {       
+            return iter->types[i];
+          } else if (compare < 0) {
+            if (i) {
+              r = i - 1;
+            } else {
+              break;
+            }
+          } else if (compare > 0) {
+            l = i + 1;
+          }
+        } else {
+          break; /* should never happen */
+        }
+      } while (l <= r);
+    }
+    iter = iter->next;
+  } while (iter != end);
+  return 0;
+}
+
+/*
+  Search for a swig_type_info structure for either a mangled name or a human readable name.
+  It first searches the mangled names of the types, which is a O(log #types)
+  If a type is not found it then searches the human readable names, which is O(#types).
   
-
-/* Search for a swig_type_info structure */
-SWIGRUNTIME(swig_type_info *)
-SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = *swig_type_list_handle;
-  while (ty) {
-    if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
-    if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
-    ty = ty->prev;
-  }
+  We start searching at module start, and finish searching when start == end.  
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeQueryModule(swig_module_info *start, 
+                     swig_module_info *end, 
+                     const char *name) {
+  /* STEP 1: Search the name field using binary search */
+  swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
+  if (ret) {
+    return ret;
+  } else {
+    /* STEP 2: If the type hasn't been found, do a complete search
+       of the str field (the human readable name) */
+    swig_module_info *iter = start;
+    do {
+      register size_t i = 0;
+      for (; i < iter->size; ++i) {
+        if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
+          return iter->types[i];
+      }
+      iter = iter->next;
+    } while (iter != end);
+  }
+  
+  /* neither found a match */
   return 0;
 }
 
-/* Set the clientdata field for a type */
-SWIGRUNTIME(void)
-SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
-  swig_type_info *tc, *equiv;
-  if (ti->clientdata == clientdata) return;
-  ti->clientdata = clientdata;
-  equiv = ti->next;
-  while (equiv) {
-    if (!equiv->converter) {
-      tc = *swig_type_list_handle;
-      while (tc) {
-        if ((strcmp(tc->name, equiv->name) == 0))
-          SWIG_TypeClientData(tc,clientdata);
-        tc = tc->prev;
-      }
-    }
-    equiv = equiv->next;
-  }
-}
-
-/* Pack binary data into a string */
-SWIGRUNTIME(char *)
-SWIG_PackData(char *c, void *ptr, int sz) {
-  static char hex[17] = "0123456789abcdef";
-  unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu =  u + sz;
-  register unsigned char uu;
+
+/* 
+   Pack binary data into a string
+*/
+SWIGRUNTIME char *
+SWIG_PackData(char *c, void *ptr, size_t sz) {
+  static const char hex[17] = "0123456789abcdef";
+  register const unsigned char *u = (unsigned char *) ptr;
+  register const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    uu = *u;
+    register unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
@@ -308 +417 @@
 }
 
-/* Unpack binary data from a string */
-SWIGRUNTIME(char *)
-SWIG_UnpackData(char *c, void *ptr, int sz) {
-  register unsigned char uu = 0;
-  register int d;
-  unsigned char *u = (unsigned char *) ptr;
-  const unsigned char *eu =  u + sz;
+/* 
+   Unpack binary data from a string
+*/
+SWIGRUNTIME const char *
+SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
+  register unsigned char *u = (unsigned char *) ptr;
+  register const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    d = *(c++);
+    register char d = *(c++);
+    register unsigned char uu = 0;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
+    else 
+      return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
@@ -326 +438 @@
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
+    else 
+      return (char *) 0;
     *u = uu;
   }
@@ -331 +445 @@
 }
 
-#endif
+/* 
+   Pack 'void *' into a string buffer.
+*/
+SWIGRUNTIME char *
+SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
+  char *r = buff;
+  if ((2*sizeof(void *) + 2) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,&ptr,sizeof(void *));
+  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
+  strcpy(r,name);
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      *ptr = (void *) 0;
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sizeof(void *));
+}
+
+SWIGRUNTIME char *
+SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
+  char *r = buff;
+  size_t lname = (name ? strlen(name) : 0);
+  if ((2*sz + 2 + lname) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,ptr,sz);
+  if (lname) {
+    strncpy(r,name,lname+1);
+  } else {
+    *r = 0;
+  }
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      memset(ptr,0,sz);
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sz);
+}
 
 #ifdef __cplusplus
 }
 #endif
+
+/* -----------------------------------------------------------------------------
+ * SWIG API. Portion that goes into the runtime
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* -----------------------------------------------------------------------------
+ * for internal method declarations
+ * ----------------------------------------------------------------------------- */
+
+#ifndef SWIGINTERN
+#  define SWIGINTERN static SWIGUNUSED
+#endif
+
+#ifndef SWIGINTERNINLINE
+#  define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/*
+  Exception handling in wrappers
+*/
+#define SWIG_fail                goto fail
+#define SWIG_arg_fail(arg)       SWIG_Python_ArgFail(arg)
+#define SWIG_append_errmsg(msg)   SWIG_Python_AddErrMesg(msg,0)
+#define SWIG_preppend_errmsg(msg) SWIG_Python_AddErrMesg(msg,1)
+#define SWIG_type_error(type,obj) SWIG_Python_TypeError(type,obj)
+#define SWIG_null_ref(type)       SWIG_Python_NullRef(type)
+
+/*
+  Contract support
+*/
+#define SWIG_contract_assert(expr, msg) \
+ if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
+
+/* -----------------------------------------------------------------------------
+ * Constant declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Constant Types */
+#define SWIG_PY_INT     1
+#define SWIG_PY_FLOAT   2
+#define SWIG_PY_STRING  3
+#define SWIG_PY_POINTER 4
+#define SWIG_PY_BINARY  5
+
+/* Constant information structure */
+typedef struct swig_const_info {
+    int type;
+    char *name;
+    long lvalue;
+    double dvalue;
+    void   *pvalue;
+    swig_type_info **ptype;
+} swig_const_info;
+
+
+/* -----------------------------------------------------------------------------
+ * Alloc. memory flags
+ * ----------------------------------------------------------------------------- */
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
+
+#ifdef __cplusplus
+}
+#endif
+
 
 /***********************************************************************
@@ -347 +584 @@
  ************************************************************************/
 
+/* Common SWIG API */
+#define SWIG_ConvertPtr(obj, pp, type, flags)    SWIG_Python_ConvertPtr(obj, pp, type, flags)
+#define SWIG_NewPointerObj(p, type, flags)       SWIG_Python_NewPointerObj(p, type, flags)
+#define SWIG_MustGetPtr(p, type, argnum, flags)  SWIG_Python_MustGetPtr(p, type, argnum, flags)
+ 
+
+/* Python-specific SWIG API */
+#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags)   SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
+#define SWIG_NewPackedObj(ptr, sz, type)              SWIG_Python_NewPackedObj(ptr, sz, type)
+
+/* Runtime API */
+#define SWIG_GetModule(clientdata) SWIG_Python_GetModule()
+#define SWIG_SetModule(clientdata, pointer) SWIG_Python_SetModule(pointer)
+
+/* -----------------------------------------------------------------------------
+ * Pointer declarations
+ * ----------------------------------------------------------------------------- */
+/*
+  Use SWIG_NO_COBJECT_TYPES to force the use of strings to represent
+  C/C++ pointers in the python side. Very useful for debugging, but
+  not always safe.
+*/
+#if !defined(SWIG_NO_COBJECT_TYPES) && !defined(SWIG_COBJECT_TYPES)
+#  define SWIG_COBJECT_TYPES
+#endif
+
+/* Flags for pointer conversion */
+#define SWIG_POINTER_EXCEPTION     0x1
+#define SWIG_POINTER_DISOWN        0x2
+
+
+/* Add PyOS_snprintf for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+#define PyOS_snprintf snprintf
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define SWIG_PY_INT     1
-#define SWIG_PY_FLOAT   2
-#define SWIG_PY_STRING  3
-#define SWIG_PY_POINTER 4
-#define SWIG_PY_BINARY  5
-
-/* Flags for pointer conversion */
-
-#define SWIG_POINTER_EXCEPTION     0x1
-#define SWIG_POINTER_DISOWN        0x2
-
-/* Exception handling in wrappers */
-#define SWIG_fail   goto fail
-
-/* Constant information structure */
-typedef struct swig_const_info {
-    int type;
-    char *name;
-    long lvalue;
-    double dvalue;
-    void   *pvalue;
-    swig_type_info **ptype;
-} swig_const_info;
-
-/* Common SWIG API */
-#define SWIG_ConvertPtr(obj, pp, type, flags) \
-  SWIG_Python_ConvertPtr(obj, pp, type, flags)
-#define SWIG_NewPointerObj(p, type, flags) \
-  SWIG_Python_NewPointerObj(p, type, flags)
-#define SWIG_MustGetPtr(p, type, argnum, flags) \
-  SWIG_Python_MustGetPtr(p, type, argnum, flags)
- 
-/* Python-specific SWIG API */
-#define SWIG_newvarlink() \
-  SWIG_Python_newvarlink()
-#define SWIG_addvarlink(p, name, get_attr, set_attr) \
-  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
-#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
-  SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
-#define SWIG_NewPackedObj(ptr, sz, type) \
-  SWIG_Python_NewPackedObj(ptr, sz, type)
-#define SWIG_InstallConstants(d, constants) \
-  SWIG_Python_InstallConstants(d, constants)
-
-typedef double (*py_objasdbl_conv)(PyObject *obj);
-
-#ifdef SWIG_NOINCLUDE
-
-SWIGIMPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
-SWIGIMPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
-SWIGIMPORT(void *)            SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
-SWIGIMPORT(PyObject *)        SWIG_Python_newvarlink(void);
-SWIGIMPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
-SWIGIMPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
-SWIGIMPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
-SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
-
+/* -----------------------------------------------------------------------------
+ * Create a new pointer string 
+ * ----------------------------------------------------------------------------- */
+#ifndef SWIG_BUFFER_SIZE
+#define SWIG_BUFFER_SIZE 1024
+#endif
+
+/* A crude PyString_FromFormat implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+static PyObject *
+PyString_FromFormat(const char *fmt, ...) {
+  va_list ap;
+  char buf[SWIG_BUFFER_SIZE * 2];
+  int res;
+  va_start(ap, fmt);
+  res = vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return (res < 0 || res >= sizeof(buf)) ? 0 : PyString_FromString(buf);
+}
+#endif
+
+#if PY_VERSION_HEX < 0x01060000
+#define PyObject_Del(op) PyMem_DEL((op))
+#endif
+
+#if defined(SWIG_COBJECT_TYPES)
+#if !defined(SWIG_COBJECT_PYTHON)
+/* -----------------------------------------------------------------------------
+ * Implements a simple Swig Object type, and use it instead of PyCObject
+ * ----------------------------------------------------------------------------- */
+
+typedef struct {
+  PyObject_HEAD
+  void *ptr;
+  const char *desc;
+} PySwigObject;
+
+/* Declarations for objects of type PySwigObject */
+
+SWIGRUNTIME int
+PySwigObject_print(PySwigObject *v, FILE *fp, int flags)
+{
+  char result[SWIG_BUFFER_SIZE];
+  flags = flags;
+  if (SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result))) {
+    fputs("<Swig Object at ", fp); fputs(result, fp); fputs(">", fp);
+    return 0; 
+  } else {
+    return 1; 
+  }
+}
+  
+SWIGRUNTIME PyObject *
+PySwigObject_repr(PySwigObject *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ?
+    PyString_FromFormat("<Swig Object at %s>", result) : 0;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_str(PySwigObject *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ?
+    PyString_FromString(result) : 0;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_long(PySwigObject *v)
+{
+  return PyLong_FromVoidPtr(v->ptr);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_format(const char* fmt, PySwigObject *v)
+{
+  PyObject *res = NULL;
+  PyObject *args = PyTuple_New(1);
+  if (args && (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0)) {
+    PyObject *ofmt = PyString_FromString(fmt);
+    if (ofmt) {
+      res = PyString_Format(ofmt,args);
+      Py_DECREF(ofmt);
+    }
+    Py_DECREF(args);
+  }  
+  return res;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_oct(PySwigObject *v)
+{
+  return PySwigObject_format("%o",v);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_hex(PySwigObject *v)
+{
+  return PySwigObject_format("%x",v);
+}
+
+SWIGRUNTIME int
+PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+{
+  int c = strcmp(v->desc, w->desc);
+  if (c) {
+    return (c > 0) ? 1 : -1;
+  } else {
+    void *i = v->ptr;
+    void *j = w->ptr;
+    return (i < j) ? -1 : ((i > j) ? 1 : 0);
+  }
+}
+
+SWIGRUNTIME void
+PySwigObject_dealloc(PySwigObject *self)
+{
+  PyObject_Del(self);
+}
+
+SWIGRUNTIME PyTypeObject*
+PySwigObject_type(void) {
+  static char pyswigobject_type__doc__[] = 
+    "Swig object carries a C/C++ instance pointer";
+  
+  static PyNumberMethods PySwigObject_as_number = {
+    (binaryfunc)0, /*nb_add*/
+    (binaryfunc)0, /*nb_subtract*/
+    (binaryfunc)0, /*nb_multiply*/
+    (binaryfunc)0, /*nb_divide*/
+    (binaryfunc)0, /*nb_remainder*/
+    (binaryfunc)0, /*nb_divmod*/
+    (ternaryfunc)0,/*nb_power*/
+    (unaryfunc)0,  /*nb_negative*/
+    (unaryfunc)0,  /*nb_positive*/
+    (unaryfunc)0,  /*nb_absolute*/
+    (inquiry)0,    /*nb_nonzero*/
+    0,             /*nb_invert*/
+    0,             /*nb_lshift*/
+    0,             /*nb_rshift*/
+    0,             /*nb_and*/
+    0,             /*nb_xor*/
+    0,             /*nb_or*/
+    (coercion)0,   /*nb_coerce*/
+    (unaryfunc)PySwigObject_long, /*nb_int*/
+    (unaryfunc)PySwigObject_long, /*nb_long*/
+    (unaryfunc)0,                 /*nb_float*/
+    (unaryfunc)PySwigObject_oct,  /*nb_oct*/
+    (unaryfunc)PySwigObject_hex,  /*nb_hex*/
+#if PY_VERSION_HEX >= 0x02020000
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
+#elif PY_VERSION_HEX >= 0x02000000
+    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
+#endif
+  };
+
+  static PyTypeObject pyswigobject_type
+#if !defined(__cplusplus)
+  ;  
+  static int type_init = 0;
+  if (!type_init) {
+    PyTypeObject tmp
+#endif
+    = {
+    PyObject_HEAD_INIT(&PyType_Type)
+    0,                                  /*ob_size*/
+    (char *)"PySwigObject",             /*tp_name*/
+    sizeof(PySwigObject),               /*tp_basicsize*/
+    0,                                  /*tp_itemsize*/
+    /* methods */
+    (destructor)PySwigObject_dealloc,   /*tp_dealloc*/
+    (printfunc)PySwigObject_print,      /*tp_print*/
+    (getattrfunc)0,                     /*tp_getattr*/
+    (setattrfunc)0,                     /*tp_setattr*/
+    (cmpfunc)PySwigObject_compare,      /*tp_compare*/
+    (reprfunc)PySwigObject_repr,        /*tp_repr*/
+    &PySwigObject_as_number,            /*tp_as_number*/
+    0,                                  /*tp_as_sequence*/
+    0,                                  /*tp_as_mapping*/
+    (hashfunc)0,                        /*tp_hash*/
+    (ternaryfunc)0,                     /*tp_call*/
+    (reprfunc)PySwigObject_str,         /*tp_str*/
+    /* Space for future expansion */
+    0,0,0,0,
+    pyswigobject_type__doc__,           /* Documentation string */
+#if PY_VERSION_HEX >= 0x02000000
+    0,                                  /* tp_traverse */
+    0,                                  /* tp_clear */
+#endif
+#if PY_VERSION_HEX >= 0x02010000
+    0,                                  /* tp_richcompare */
+    0,                                  /* tp_weaklistoffset */
+#endif
+#if PY_VERSION_HEX >= 0x02020000
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+    0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+    0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+    };
+#if !defined(__cplusplus)
+    pyswigobject_type = tmp;
+    type_init = 1;
+  }
+#endif
+  return &pyswigobject_type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_FromVoidPtrAndDesc(void *ptr, const char *desc)
+{
+  PySwigObject *self = PyObject_NEW(PySwigObject, PySwigObject_type());
+  if (self) {
+    self->ptr = ptr;
+    self->desc = desc;
+  }
+  return (PyObject *)self;
+}
+
+SWIGRUNTIMEINLINE void *
+PySwigObject_AsVoidPtr(PyObject *self)
+{
+  return ((PySwigObject *)self)->ptr;
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigObject_GetDesc(PyObject *self)
+{
+  return ((PySwigObject *)self)->desc;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigObject_Check(PyObject *op) {
+  return ((op)->ob_type == PySwigObject_type()) 
+    || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+}
+
+/* -----------------------------------------------------------------------------
+ * Implements a simple Swig Packed type, and use it instead of string
+ * ----------------------------------------------------------------------------- */
+
+typedef struct {
+  PyObject_HEAD
+  void *pack;
+  const char *desc;
+  size_t size;
+} PySwigPacked;
+
+SWIGRUNTIME int
+PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags)
+{
+  char result[SWIG_BUFFER_SIZE];
+  flags = flags;
+  fputs("<Swig Packed ", fp); 
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    fputs("at ", fp); 
+    fputs(result, fp); 
+  }
+  fputs(v->desc,fp); 
+  fputs(">", fp);
+  return 0; 
+}
+  
+SWIGRUNTIME PyObject *
+PySwigPacked_repr(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    return PyString_FromFormat("<Swig Packed at %s%s>", result, v->desc);
+  } else {
+    return PyString_FromFormat("<Swig Packed %s>", v->desc);
+  }  
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_str(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
+    return PyString_FromFormat("%s%s", result, v->desc);
+  } else {
+    return PyString_FromString(v->desc);
+  }  
+}
+
+SWIGRUNTIME int
+PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
+{
+  int c = strcmp(v->desc, w->desc);
+  if (c) {
+    return (c > 0) ? 1 : -1;
+  } else {
+    size_t i = v->size;
+    size_t j = w->size;
+    int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
+    return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+  }
+}
+
+SWIGRUNTIME void
+PySwigPacked_dealloc(PySwigPacked *self)
+{
+  free(self->pack);
+  PyObject_Del(self);
+}
+
+SWIGRUNTIME PyTypeObject*
+PySwigPacked_type(void) {
+  static char pyswigpacked_type__doc__[] = 
+    "Swig object carries a C/C++ instance pointer";
+  static PyTypeObject pyswigpacked_type
+#if !defined(__cplusplus)
+  ;
+  static int type_init = 0;  
+  if (!type_init) {
+    PyTypeObject tmp
+#endif
+    = {
+    PyObject_HEAD_INIT(&PyType_Type)
+    0,                                  /*ob_size*/
+    (char *)"PySwigPacked",             /*tp_name*/
+    sizeof(PySwigPacked),               /*tp_basicsize*/
+    0,                                  /*tp_itemsize*/
+    /* methods */
+    (destructor)PySwigPacked_dealloc,   /*tp_dealloc*/
+    (printfunc)PySwigPacked_print,      /*tp_print*/
+    (getattrfunc)0,                     /*tp_getattr*/
+    (setattrfunc)0,                     /*tp_setattr*/
+    (cmpfunc)PySwigPacked_compare,      /*tp_compare*/
+    (reprfunc)PySwigPacked_repr,        /*tp_repr*/
+    0,                                  /*tp_as_number*/
+    0,                                  /*tp_as_sequence*/
+    0,                                  /*tp_as_mapping*/
+    (hashfunc)0,                        /*tp_hash*/
+    (ternaryfunc)0,                     /*tp_call*/
+    (reprfunc)PySwigPacked_str,         /*tp_str*/
+    /* Space for future expansion */
+    0,0,0,0,
+    pyswigpacked_type__doc__,           /* Documentation string */
+#if PY_VERSION_HEX >= 0x02000000
+    0,                                  /* tp_traverse */
+    0,                                  /* tp_clear */
+#endif
+#if PY_VERSION_HEX >= 0x02010000
+    0,                                  /* tp_richcompare */
+    0,                                  /* tp_weaklistoffset */
+#endif
+#if PY_VERSION_HEX >= 0x02020000         
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+    0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+    0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+    };
+#if !defined(__cplusplus)
+    pyswigpacked_type = tmp;
+    type_init = 1;
+  }
+#endif
+  return &pyswigpacked_type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_FromDataAndDesc(void *ptr, size_t size, const char *desc)
+{
+  PySwigPacked *self = PyObject_NEW(PySwigPacked, PySwigPacked_type());
+  if (self == NULL) {
+    return NULL;
+  } else {
+    void *pack = malloc(size);
+    if (pack) {
+      memcpy(pack, ptr, size);
+      self->pack = pack;
+      self->desc = desc;
+      self->size = size;
+      return (PyObject *) self;
+    }
+    return NULL;
+  }
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+{
+  PySwigPacked *self = (PySwigPacked *)obj;
+  if (self->size != size) return 0;
+  memcpy(ptr, self->pack, size);
+  return self->desc;
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigPacked_GetDesc(PyObject *self)
+{
+  return ((PySwigPacked *)self)->desc;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigPacked_Check(PyObject *op) {
+  return ((op)->ob_type == PySwigPacked_type()) 
+    || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0);
+}
 
 #else
-
-
 /* -----------------------------------------------------------------------------
- * global variable support code.
+ * Use the old Python PyCObject instead of PySwigObject
  * ----------------------------------------------------------------------------- */
 
-typedef struct swig_globalvar {   
-  char       *name;                  /* Name of global variable */
-  PyObject *(*get_attr)(void);       /* Return the current value */
-  int       (*set_attr)(PyObject *); /* Set the value */
-  struct swig_globalvar *next;
-} swig_globalvar;
-
-typedef struct swig_varlinkobject {
-  PyObject_HEAD
-  swig_globalvar *vars;
-} swig_varlinkobject;
-
-static PyObject *
-swig_varlink_repr(swig_varlinkobject *v) {
-  v = v;
-  return PyString_FromString("<Global variables>");
-}
-
-static int
-swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) {
-  swig_globalvar  *var;
-  flags = flags;
-  fprintf(fp,"Global variables { ");
-  for (var = v->vars; var; var=var->next) {
-    fprintf(fp,"%s", var->name);
-    if (var->next) fprintf(fp,", ");
-  }
-  fprintf(fp," }\n");
-  return 0;
-}
-
-static PyObject *
-swig_varlink_getattr(swig_varlinkobject *v, char *n) {
-  swig_globalvar *var = v->vars;
-  while (var) {
-    if (strcmp(var->name,n) == 0) {
-      return (*var->get_attr)();
-    }
-    var = var->next;
-  }
-  PyErr_SetString(PyExc_NameError,"Unknown C global variable");
-  return NULL;
-}
-
-static int
-swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
-  swig_globalvar *var = v->vars;
-  while (var) {
-    if (strcmp(var->name,n) == 0) {
-      return (*var->set_attr)(p);
-    }
-    var = var->next;
-  }
-  PyErr_SetString(PyExc_NameError,"Unknown C global variable");
-  return 1;
-}
-
-statichere PyTypeObject varlinktype = {
-  PyObject_HEAD_INIT(0)              
-  0,                                  /* Number of items in variable part (ob_size) */
-  (char *)"swigvarlink",              /* Type name (tp_name) */
-  sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
-  0,                                  /* Itemsize (tp_itemsize) */
-  0,                                  /* Deallocator (tp_dealloc) */ 
-  (printfunc) swig_varlink_print,     /* Print (tp_print) */
-  (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
-  (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
-  0,                                  /* tp_compare */
-  (reprfunc) swig_varlink_repr,       /* tp_repr */
-  0,                                  /* tp_as_number */
-  0,                                  /* tp_as_sequence */
-  0,                                  /* tp_as_mapping */
-  0,                                  /* tp_hash */
-  0,                                  /* tp_call */
-  0,                                  /* tp_str */
-  0,                                  /* tp_getattro */
-  0,                                  /* tp_setattro */
-  0,                                  /* tp_as_buffer */
-  0,                                  /* tp_flags */
-  0,                                  /* tp_doc */
-  0,                                  /* tp_traverse */
-  0,                                  /* tp_clear */
-  0,                                  /* tp_richcompare */
-  0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-  0,                                  /* tp_iter */
-  0,                                  /* tp_iternext */
-  0,                                  /* tp_methods */
-  0,                                  /* tp_members */
-  0,                                  /* tp_getset */
-  0,                                  /* tp_base */
-  0,                                  /* tp_dict */
-  0,                                  /* tp_descr_get */
-  0,                                  /* tp_descr_set */
-  0,                                  /* tp_dictoffset */
-  0,                                  /* tp_init */
-  0,                                  /* tp_alloc */
-  0,                                  /* tp_new */
-  0,                                  /* tp_free */
-  0,                                  /* tp_is_gc */
-  0,                                  /* tp_bases */
-  0,                                  /* tp_mro */
-  0,                                  /* tp_cache */
-  0,                                  /* tp_subclasses */
-  0,                                  /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030200
-  0,                                  /* tp_del */
-#endif
-#ifdef COUNT_ALLOCS
-  /* these must be last */
-  0,                                  /* tp_alloc */
-  0,                                  /* tp_free */
-  0,                                  /* tp_maxalloc */
-  0,                                  /*  tp_next */
-#endif
-};
-
-/* Create a variable linking object for use later */
-SWIGRUNTIME(PyObject *)
-SWIG_Python_newvarlink(void) {
-  swig_varlinkobject *result = 0;
-  result = PyMem_NEW(swig_varlinkobject,1);
-  varlinktype.ob_type = &PyType_Type;    /* Patch varlinktype into a PyType */
-  result->ob_type = &varlinktype;
-  result->vars = 0;
-  result->ob_refcnt = 0;
-  Py_XINCREF((PyObject *) result);
-  return ((PyObject*) result);
-}
-
-SWIGRUNTIME(void)
-SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
-  swig_varlinkobject *v;
-  swig_globalvar *gv;
-  v= (swig_varlinkobject *) p;
-  gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
-  gv->name = (char *) malloc(strlen(name)+1);
-  strcpy(gv->name,name);
-  gv->get_attr = get_attr;
-  gv->set_attr = set_attr;
-  gv->next = v->vars;
-  v->vars = gv;
-}
+#define PySwigObject_GetDesc(obj)                  PyCObject_GetDesc(obj)
+#define PySwigObject_Check(obj)            PyCObject_Check(obj)
+#define PySwigObject_AsVoidPtr(obj)        PyCObject_AsVoidPtr(obj)
+#define PySwigObject_FromVoidPtrAndDesc(p, d)  PyCObject_FromVoidPtrAndDesc(p, d, NULL)
+
+#endif
+
+#endif
+
+/* -----------------------------------------------------------------------------
+ * errors manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIME void
+SWIG_Python_TypeError(const char *type, PyObject *obj)
+{
+  if (type) {
+#if defined(SWIG_COBJECT_TYPES)
+    if (obj && PySwigObject_Check(obj)) {
+      const char *otype = (const char *) PySwigObject_GetDesc(obj);
+      if (otype) {
+        PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received",
+                     type, otype);
+        return;
+      }
+    } else 
+#endif      
+    {
+      const char *otype = (obj ? obj->ob_type->tp_name : 0); 
+      if (otype) {
+        PyObject *str = PyObject_Str(obj);
+        const char *cstr = str ? PyString_AsString(str) : 0;
+        if (cstr) {
+          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
+                       type, otype, cstr);
+        } else {
+          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
+                       type, otype);
+        }
+        Py_XDECREF(str);
+        return;
+      }
+    }   
+    PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
+  } else {
+    PyErr_Format(PyExc_TypeError, "unexpected type is received");
+  }
+}
+
+SWIGRUNTIMEINLINE void
+SWIG_Python_NullRef(const char *type)
+{
+  if (type) {
+    PyErr_Format(PyExc_TypeError, "null reference of type '%s' was received",type);
+  } else {
+    PyErr_Format(PyExc_TypeError, "null reference was received");
+  }
+}
+
+SWIGRUNTIME int
+SWIG_Python_AddErrMesg(const char* mesg, int infront)
+{
+  if (PyErr_Occurred()) {
+    PyObject *type = 0;
+    PyObject *value = 0;
+    PyObject *traceback = 0;
+    PyErr_Fetch(&type, &value, &traceback);
+    if (value) {
+      PyObject *old_str = PyObject_Str(value);
+      Py_XINCREF(type);
+      PyErr_Clear();
+      if (infront) {
+        PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str));
+      } else {
+        PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+      }
+      Py_DECREF(old_str);
+    }
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+SWIGRUNTIME int
+SWIG_Python_ArgFail(int argnum)
+{
+  if (PyErr_Occurred()) {
+    /* add information about failing argument */
+    char mesg[256];
+    PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum);
+    return SWIG_Python_AddErrMesg(mesg, 1);
+  } else {
+    return 0;
+  }
+}
+
+
+/* -----------------------------------------------------------------------------
+ * pointers/data manipulation
+ * ----------------------------------------------------------------------------- */
 
 /* Convert a pointer value */
-SWIGRUNTIME(int)
+SWIGRUNTIME int
 SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) {
-  swig_type_info *tc;
-  char  *c = 0;
+  swig_cast_info *tc;
+  const char *c = 0;
   static PyObject *SWIG_this = 0;
   int    newref = 0;
   PyObject  *pyobj = 0;
-
+  void *vptr;
+  
   if (!obj) return 0;
   if (obj == Py_None) {
@@ -575 +1155 @@
     return 0;
   }
+
 #ifdef SWIG_COBJECT_TYPES
-  if (!(PyCObject_Check(obj))) {
+  if (!(PySwigObject_Check(obj))) {
     if (!SWIG_this)
       SWIG_this = PyString_FromString("this");
@@ -583 +1164 @@
     newref = 1;
     if (!obj) goto type_error;
-    if (!PyCObject_Check(obj)) {
+    if (!PySwigObject_Check(obj)) {
       Py_DECREF(obj);
       goto type_error;
     }
   }  
-  *ptr = PyCObject_AsVoidPtr(obj);
-  c = (char *) PyCObject_GetDesc(obj);
-  if (newref) Py_DECREF(obj);
-  goto cobject;
+  vptr = PySwigObject_AsVoidPtr(obj);
+  c = (const char *) PySwigObject_GetDesc(obj);
+  if (newref) { Py_DECREF(obj); }
+  goto type_check;
 #else
   if (!(PyString_Check(obj))) {
@@ -605 +1186 @@
     }
   } 
-  c = PyString_AS_STRING(obj);
+  c = PyString_AsString(obj);
   /* Pointer values must start with leading underscore */
-  if (*c != '_') {
-    *ptr = (void *) 0;
-    if (strcmp(c,"NULL") == 0) {
-      if (newref) { Py_DECREF(obj); }
-      return 0;
-    } else {
-      if (newref) { Py_DECREF(obj); }
-      goto type_error;
-    }
-  }
-  c++;
-  c = SWIG_UnpackData(c,ptr,sizeof(void *));
+  c = SWIG_UnpackVoidPtr(c, &vptr, ty->name);
   if (newref) { Py_DECREF(obj); }
-#endif
-
-#ifdef SWIG_COBJECT_TYPES
-cobject:
-#endif
-
+  if (!c) goto type_error;
+#endif
+
+type_check:
   if (ty) {
     tc = SWIG_TypeCheck(c,ty);
     if (!tc) goto type_error;
-    *ptr = SWIG_TypeCast(tc,(void*) *ptr);
-  }
-
+    *ptr = SWIG_TypeCast(tc,vptr);
+  } else {
+    *ptr = vptr;
+  }
   if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) {
     PyObject_SetAttrString(pyobj,(char*)"thisown",Py_False);
+  }
+  return 0;
+
+type_error:
+  PyErr_Clear();
+  if (pyobj && !obj) {    
+    obj = pyobj;
+    if (PyCFunction_Check(obj)) {
+      /* here we get the method pointer for callbacks */
+      char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+      c = doc ? strstr(doc, "swig_ptr: ") : 0;
+      if (c) {
+        c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0;
+        if (!c) goto type_error;
+        goto type_check;
+      }
+    }
+  }
+  if (flags & SWIG_POINTER_EXCEPTION) {
+    if (ty) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+    } else {
+      SWIG_Python_TypeError("C/C++ pointer", obj);
+    }
+  }
+  return -1;
+}
+
+/* Convert a pointer value, signal an exception on a type mismatch */
+SWIGRUNTIME void *
+SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
+  void *result;
+  if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
+    PyErr_Clear();
+    if (flags & SWIG_POINTER_EXCEPTION) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+      SWIG_Python_ArgFail(argnum);
+    }
+  }
+  return result;
+}
+
+/* Convert a packed value value */
+SWIGRUNTIME int
+SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty, int flags) {
+  swig_cast_info *tc;
+  const char *c = 0;
+
+#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON)
+  c = PySwigPacked_UnpackData(obj, ptr, sz);
+#else
+  if ((!obj) || (!PyString_Check(obj))) goto type_error;
+  c = PyString_AsString(obj);
+  /* Pointer values must start with leading underscore */
+  c = SWIG_UnpackDataName(c, ptr, sz, ty->name);
+#endif
+  if (!c) goto type_error;
+  if (ty) {
+    tc = SWIG_TypeCheck(c,ty);
+    if (!tc) goto type_error;
   }
   return 0;
@@ -640 +1269 @@
   PyErr_Clear();
   if (flags & SWIG_POINTER_EXCEPTION) {
-    if (ty && c) {
-      PyErr_Format(PyExc_TypeError, 
-                   "Type error. Got %s, expected %s",
-                   c, ty->name);
+    if (ty) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
     } else {
-      PyErr_SetString(PyExc_TypeError,"Expected a pointer");
+      SWIG_Python_TypeError("C/C++ packed data", obj);
     }
   }
   return -1;
-}
-
-/* Convert a pointer value, signal an exception on a type mismatch */
-SWIGRUNTIME(void *)
-SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
-  void *result;
-  SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION);
-  return result;
-}
-
-/* Convert a packed value value */
-SWIGRUNTIME(int)
-SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, int sz, swig_type_info *ty, int flags) {
-  swig_type_info *tc;
-  char  *c = 0;
-
-  if ((!obj) || (!PyString_Check(obj))) goto type_error;
-  c = PyString_AS_STRING(obj);
-  /* Pointer values must start with leading underscore */
-  if (*c != '_') goto type_error;
-  c++;
-  c = SWIG_UnpackData(c,ptr,sz);
-  if (ty) {
-    tc = SWIG_TypeCheck(c,ty);
-    if (!tc) goto type_error;
-  }
-  return 0;
-
-type_error:
-
-  if (flags) {
-    if (ty && c) {
-      PyErr_Format(PyExc_TypeError, 
-                   "Type error. Got %s, expected %s",
-                   c, ty->name);
-    } else {
-      PyErr_SetString(PyExc_TypeError,"Expected a pointer");
-    }
-  }
-  return -1;
-}
-
-/* Create a new pointer object */
-SWIGRUNTIME(PyObject *)
+}  
+
+/* Create a new array object */
+SWIGRUNTIME PyObject *
 SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int own) {
-  PyObject *robj;
+  PyObject *robj = 0;
+  if (!type) {
+    if (!PyErr_Occurred()) {
+      PyErr_Format(PyExc_TypeError, "Swig: null type passed to NewPointerObj");
+    }
+    return robj;
+  }
   if (!ptr) {
     Py_INCREF(Py_None);
@@ -700 +1293 @@
   }
 #ifdef SWIG_COBJECT_TYPES
-  robj = PyCObject_FromVoidPtrAndDesc((void *) ptr, (char *) type->name, NULL);
+  robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)type->name);
 #else
   {
-    char result[1024];
-    char *r = result;
-    *(r++) = '_';
-    r = SWIG_PackData(r,&ptr,sizeof(void *));
-    strcpy(r,type->name);
-    robj = PyString_FromString(result);
+    char result[SWIG_BUFFER_SIZE];
+    robj = SWIG_PackVoidPtr(result, ptr, type->name, sizeof(result)) ?
+      PyString_FromString(result) : 0;
   }
 #endif
@@ -728 +1318 @@
 }
 
-SWIGRUNTIME(PyObject *)
-SWIG_Python_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
-  char result[1024];
-  char *r = result;
-  if ((2*sz + 1 + strlen(type->name)) > 1000) return 0;
-  *(r++) = '_';
-  r = SWIG_PackData(r,ptr,sz);
-  strcpy(r,type->name);
-  return PyString_FromString(result);
-}
-
-/* Install Constants */
-SWIGRUNTIME(void)
-SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
-  int i;
-  PyObject *obj;
-  for (i = 0; constants[i].type; i++) {
-    switch(constants[i].type) {
-    case SWIG_PY_INT:
-      obj = PyInt_FromLong(constants[i].lvalue);
-      break;
-    case SWIG_PY_FLOAT:
-      obj = PyFloat_FromDouble(constants[i].dvalue);
-      break;
-    case SWIG_PY_STRING:
-      if (constants[i].pvalue) {
-        obj = PyString_FromString((char *) constants[i].pvalue);
-      } else {
-        Py_INCREF(Py_None);
-        obj = Py_None;
-      }
-      break;
-    case SWIG_PY_POINTER:
-      obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
-      break;
-    case SWIG_PY_BINARY:
-      obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
-      break;
-    default:
-      obj = 0;
-      break;
-    }
-    if (obj) {
-      PyDict_SetItemString(d,constants[i].name,obj);
-      Py_DECREF(obj);
-    }
-  }
-}
-
-#endif
-
-/* Contract support */
-
-#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
+SWIGRUNTIME PyObject *
+SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
+  PyObject *robj = 0;
+  if (!ptr) {
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+#if defined(SWIG_COBJECT_TYPES) && !defined(SWIG_COBJECT_PYTHON)
+  robj = PySwigPacked_FromDataAndDesc((void *) ptr, sz, (char *)type->name);
+#else
+  {
+    char result[SWIG_BUFFER_SIZE];
+    robj = SWIG_PackDataName(result, ptr, sz, type->name, sizeof(result)) ?
+      PyString_FromString(result) : 0;
+  }
+#endif
+  return robj;
+}
+
+/* -----------------------------------------------------------------------------*
+ *  Get type list 
+ * -----------------------------------------------------------------------------*/
+
+#ifdef SWIG_LINK_RUNTIME
+void *SWIG_ReturnGlobalTypeList(void *);
+#endif
+
+SWIGRUNTIME swig_module_info *
+SWIG_Python_GetModule(void) {
+  static void *type_pointer = (void *)0;
+  /* first check if module already created */
+  if (!type_pointer) {
+#ifdef SWIG_LINK_RUNTIME
+    type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
+#else
+    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+                                    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      type_pointer = (void *)0;
+    }
+#endif
+  }
+  return (swig_module_info *) type_pointer;
+}
+
+#if PY_MAJOR_VERSION < 2
+/* PyModule_AddObject function was introduced in Python 2.0.  The following function
+is copied out of Python/modsupport.c in python version 2.3.4 */
+SWIGINTERN int
+PyModule_AddObject(PyObject *m, char *name, PyObject *o)
+{
+  PyObject *dict;
+  if (!PyModule_Check(m)) {
+    PyErr_SetString(PyExc_TypeError,
+                    "PyModule_AddObject() needs module as first arg");
+    return -1;
+  }
+  if (!o) {
+    PyErr_SetString(PyExc_TypeError,
+                    "PyModule_AddObject() needs non-NULL value");
+    return -1;
+  }
+  
+  dict = PyModule_GetDict(m);
+  if (dict == NULL) {
+    /* Internal error -- modules must have a dict! */
+    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
+                 PyModule_GetName(m));
+    return -1;
+  }
+  if (PyDict_SetItemString(dict, name, o))
+    return -1;
+  Py_DECREF(o);
+  return 0;
+}
+#endif
+
+SWIGRUNTIME void
+SWIG_Python_SetModule(swig_module_info *swig_module) {
+  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
+
+  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+                                   swig_empty_runtime_method_table);
+  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, NULL);
+  if (pointer && module) {
+    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+  }
+}
 
 #ifdef __cplusplus
@@ -790 +1415 @@
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define  SWIGTYPE_p_libtrace_t swig_types[0] 
-#define  SWIGTYPE_p_libtrace_udp swig_types[1] 
-#define  SWIGTYPE_p_libtrace_ip swig_types[2] 
-#define  SWIGTYPE_p_libtrace_icmp_un_echo swig_types[3] 
-#define  SWIGTYPE_p_libtrace_icmp_un swig_types[4] 
-#define  SWIGTYPE_p_uint64_t swig_types[5] 
-#define  SWIGTYPE_p_void swig_types[6] 
-#define  SWIGTYPE_p_libtrace_packet_t swig_types[7] 
-#define  SWIGTYPE_p_char swig_types[8] 
-#define  SWIGTYPE_p_libtrace_icmp_un_frag swig_types[9] 
-#define  SWIGTYPE_p_libtrace_filter_t swig_types[10] 
-#define  SWIGTYPE_p_timeval swig_types[11] 
-#define  SWIGTYPE_p_libtrace_icmp swig_types[12] 
-#define  SWIGTYPE_p_int8_t swig_types[13] 
-#define  SWIGTYPE_p_in_addr swig_types[14] 
-#define  SWIGTYPE_p_libtrace_tcp swig_types[15] 
-#define  SWIGTYPE_p_libtrace_linktype_t swig_types[16] 
-static swig_type_info *swig_types[18];
+#define SWIGTYPE_p_char swig_types[0]
+#define SWIGTYPE_p_in_addr swig_types[1]
+#define SWIGTYPE_p_int8_t swig_types[2]
+#define SWIGTYPE_p_libtrace_err_t swig_types[3]
+#define SWIGTYPE_p_libtrace_filter_t swig_types[4]
+#define SWIGTYPE_p_libtrace_icmp swig_types[5]
+#define SWIGTYPE_p_libtrace_icmp_un swig_types[6]
+#define SWIGTYPE_p_libtrace_icmp_un_echo swig_types[7]
+#define SWIGTYPE_p_libtrace_icmp_un_frag swig_types[8]
+#define SWIGTYPE_p_libtrace_ip swig_types[9]
+#define SWIGTYPE_p_libtrace_linktype_t swig_types[10]
+#define SWIGTYPE_p_libtrace_out_t swig_types[11]
+#define SWIGTYPE_p_libtrace_packet_t swig_types[12]
+#define SWIGTYPE_p_libtrace_t swig_types[13]
+#define SWIGTYPE_p_libtrace_tcp swig_types[14]
+#define SWIGTYPE_p_libtrace_udp swig_types[15]
+#define SWIGTYPE_p_timeval swig_types[16]
+#define SWIGTYPE_p_trace_option_output_t swig_types[17]
+#define SWIGTYPE_p_trace_option_t swig_types[18]
+#define SWIGTYPE_p_uint64_t swig_types[19]
+#define SWIGTYPE_p_unsigned_char swig_types[20]
+#define SWIGTYPE_p_unsigned_int swig_types[21]
+#define SWIGTYPE_p_unsigned_short swig_types[22]
+#define SWIGTYPE_p_void swig_types[23]
+#define SWIGTYPE_ptrdiff_t swig_types[24]
+#define SWIGTYPE_size_t swig_types[25]
+static swig_type_info *swig_types[27];
+static swig_module_info swig_module = {swig_types, 26, 0, 0, 0, 0};
+#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
+#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 /* -------- TYPES TABLE (END) -------- */
@@ -819 +1456 @@
 #define SWIG_name    "_libtrace"
 
-/* Auxiliar swig  macros that appear in the header */
-
-#define SWIG_OLDOBJ  1
-#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
-#define SWIG_PYSTR   SWIG_NEWOBJ + 1
-
-#ifdef __cplusplus
-#define SWIGSTATICINLINE(a) static inline a
-#define SWIGSTATIC(a) static a
-#define swig_new_array(size,Type) (new Type[(size)])
-#define swig_delete(cptr) delete cptr
-#define swig_delete_array(cptr) delete[] cptr
-#define swig_const_cast(a,Type) const_cast<Type >(a)
-#define swig_static_cast(a,Type) static_cast<Type >(a)
-#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
-#define swig_new_copy(ptr,Type) (new Type(*ptr))
-#define swig_numeric_cast(a,Type) static_cast<Type >(a)
-
-#else /* C case */
-
-#define SWIGSTATICINLINE(a) static a
-#define SWIGSTATIC(a) static a
-#define swig_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
-#define swig_delete(cptr) free((char*)cptr)
-#define swig_delete_array(cptr) free((char*)cptr)
-#define swig_const_cast(a,Type) (Type)(a)
-#define swig_static_cast(a,Type) (Type)(a)
-#define swig_reinterpret_cast(a,Type) (Type)(a)
-#define swig_numeric_cast(a,Type) (Type)(a)
-#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
-
-#endif /* __cplusplus */
-
-
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_signed_SS_char PyInt_FromLong
-/*@@*/
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_unsigned_SS_char PyInt_FromLong
-/*@@*/
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_short PyInt_FromLong
-/*@@*/
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_unsigned_SS_short PyInt_FromLong
-/*@@*/
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_int PyInt_FromLong
-/*@@*/
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_long PyInt_FromLong
-/*@@*/
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_float PyFloat_FromDouble
-/*@@*/
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
-#define SWIG_From_double PyFloat_FromDouble
-/*@@*/
-
-
 #include <arpa/inet.h>
 #include "libtrace.h"
@@ -889 +1466 @@
 
 
-SWIGSTATICINLINE(int)
+SWIGINTERN int
   SWIG_CheckLongInRange(long value, long min_value, long max_value,
                         const char *errmsg)
@@ -912 +1489 @@
 
 
-SWIGSTATICINLINE(int)
+SWIGINTERN int
   SWIG_AsVal_long(PyObject * obj, long* val)
 {
-  if (PyInt_Check(obj)) {
-    if (val) *val = PyInt_AS_LONG(obj);
-    return 1;
-  }
   if (PyLong_Check(obj)) {
     long v = PyLong_AsLong(obj);
@@ -929 +1502 @@
     }
   }
+  if (PyInt_Check(obj)) {
+    if (val) *val = PyInt_AsLong(obj);
+    return 1;
+  }
   if (val) {
-    PyErr_SetString(PyExc_TypeError, "a long is expected");
+    SWIG_type_error("long", obj);
   }
   return 0;
@@ -937 +1514 @@
 
 #if INT_MAX != LONG_MAX
-SWIGSTATICINLINE(int)
+SWIGINTERN int
   SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  const char* errmsg = val ? "int" : 0;
+  const char* errmsg = val ? "int" : (char*)0;
   long v;
   if (SWIG_AsVal_long(obj, &v)) {
     if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
-      if (val) *val = swig_numeric_cast(v, int);
+      if (val) *val = (int)(v);
       return 1;
     } else {
@@ -953 +1530 @@
   }
   if (val) {
-    PyErr_SetString(PyExc_TypeError, "an int is expected");
+    SWIG_type_error(errmsg, obj);
   }
   return 0;    
 }
 #else
-SWIGSTATICINLINE(int)
+SWIGINTERNINLINE int
   SWIG_AsVal_int(PyObject *obj, int *val)
 {
@@ -966 +1543 @@
 
 
-SWIGSTATICINLINE(int)
+SWIGINTERNINLINE int
 SWIG_As_int(PyObject* obj)
 {
@@ -972 +1549 @@
   if (!SWIG_AsVal_int(obj, &v)) {
     /*
-      this is needed to make valgrind/purify happier.  the other
-      solution is throw an exception, but since this code should work
-      with plain C ....
+      this is needed to make valgrind/purify happier. 
      */
     memset((void*)&v, 0, sizeof(int));
@@ -982 +1557 @@
 
   
-SWIGSTATICINLINE(int)
+SWIGINTERNINLINE int
 SWIG_Check_int(PyObject* obj)
 {
@@ -989 +1564 @@
 
 
-SWIGSTATICINLINE(int)
+  /*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+
+
+SWIGINTERNINLINE int
   SWIG_CheckUnsignedLongInRange(unsigned long value,
                                 unsigned long max_value,
@@ -997 +1577 @@
     if (errmsg) {
       PyErr_Format(PyExc_OverflowError,
-                   "value %ld is greater than '%s' minimum %ld",
+                   "value %lu is greater than '%s' minimum %lu",
                    value, errmsg, max_value);
     }
@@ -1006 +1586 @@
 
 
-SWIGSTATICINLINE(int)
-  SWIG_AsVal_unsigned_SS_long(PyObject * obj, unsigned long *val) 
+SWIGINTERN int
+  SWIG_AsVal_unsigned_SS_long(PyObject *obj, unsigned long *val) 
 {
-  if (PyInt_Check(obj)) {
-    long v = PyInt_AS_LONG(obj);
-    if (v >= 0) {
-      if (val) *val = v;
-      return 1;
-    }   
-  }
   if (PyLong_Check(obj)) {
     unsigned long v = PyLong_AsUnsignedLong(obj);
@@ -1026 +1599 @@
     }
   } 
+  if (PyInt_Check(obj)) {
+    long v = PyInt_AsLong(obj);
+    if (v >= 0) {
+      if (val) *val = v;
+      return 1;
+    }   
+  }
   if (val) {
-    PyErr_SetString(PyExc_TypeError, "an unsigned long is expected");
+    SWIG_type_error("unsigned long", obj);
   }
   return 0;
@@ -1034 +1614 @@
 
 #if UINT_MAX != ULONG_MAX
-SWIGSTATICINLINE(int)
+SWIGINTERN int
   SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
 { 
-  const char* errmsg = val ? "unsigned int" : 0;
+  const char* errmsg = val ? "unsigned int" : (char*)0;
   unsigned long v;
   if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
     if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) {
-      if (val) *val = swig_numeric_cast(v, unsigned int);
+      if (val) *val = (unsigned int)(v);
       return 1;
     }
@@ -1048 +1628 @@
   }
   if (val) {
-    PyErr_SetString(PyExc_TypeError, "an unsigned int is expected");
+    SWIG_type_error(errmsg, obj);
   }
   return 0;    
 }
 #else
-SWIGSTATICINLINE(unsigned int)
+SWIGINTERNINLINE unsigned int
   SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
 {
@@ -1061 +1641 @@
 
 
-SWIGSTATICINLINE(unsigned int)
+SWIGINTERNINLINE unsigned int
 SWIG_As_unsigned_SS_int(PyObject* obj)
 {
@@ -1067 +1647 @@
   if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) {
     /*
-      this is needed to make valgrind/purify happier.  the other
-      solution is throw an exception, but since this code should work
-      with plain C ....
+      this is needed to make valgrind/purify happier. 
      */
     memset((void*)&v, 0, sizeof(unsigned int));
@@ -1077 +1655 @@
 
   
-SWIGSTATICINLINE(int)
+SWIGINTERNINLINE int
 SWIG_Check_unsigned_SS_int(PyObject* obj)
 {
@@ -1084 +1662 @@
 
 
-SWIGSTATICINLINE(PyObject* )
+  /*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+
+
+SWIGINTERNINLINE PyObject* 
   SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(value,long)); 
+    : PyInt_FromLong((long)(value)); 
 }
 
 
 #if UINT_MAX < LONG_MAX
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
+/*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/
 #define SWIG_From_unsigned_SS_int SWIG_From_long
 /*@@*/
 #else
-/*@/usr/share/swig1.3/python/pymacros.swg,63,SWIG_define@*/
+/*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/
 #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long
 /*@@*/
@@ -1104 +1687 @@
 
 
-SWIGSTATICINLINE(int)
+SWIGINTERN int
   SWIG_AsVal_unsigned_SS_char(PyObject *obj, unsigned char *val)
 { 
-  const char* errmsg = val ? "unsigned char" : 0;
+  const char* errmsg = val ? "unsigned char" : (char*)0;
   unsigned long v;
   if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
     if (SWIG_CheckUnsignedLongInRange(v, UCHAR_MAX,errmsg)) {
-      if (val) *val = swig_numeric_cast(v, unsigned char);
+      if (val) *val = (unsigned char)(v);
       return 1;
     } else {
@@ -1120 +1703 @@
   }
   if (val) {
-    PyErr_SetString(PyExc_TypeError, "an unsigned char is expected");
+    SWIG_type_error(errmsg, obj);
   }
   return 0;
@@ -1126 +1709 @@
 
 
-SWIGSTATICINLINE(unsigned char)
+SWIGINTERNINLINE unsigned char
 SWIG_As_unsigned_SS_char(PyObject* obj)
 {
@@ -1132 +1715 @@
   if (!SWIG_AsVal_unsigned_SS_char(obj, &v)) {
     /*
-      this is needed to make valgrind/purify happier.  the other
-      solution is throw an exception, but since this code should work
-      with plain C ....
+      this is needed to make valgrind/purify happier. 
      */
     memset((void*)&v, 0, sizeof(unsigned char));
@@ -1142 +1723 @@
 
   
-SWIGSTATICINLINE(int)
+SWIGINTERNINLINE int
 SWIG_Check_unsigned_SS_char(PyObject* obj)
 {
@@ -1149 +1730 @@
 
 
-SWIGSTATICINLINE(PyObject *)
+  /*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+
+
+  /*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+
+
+SWIGINTERN PyObject *
 SWIG_FromCharPtr(const char* cptr)
 { 
@@ -1155 +1746 @@
     size_t size = strlen(cptr);
     if (size > INT_MAX) {
-      return SWIG_NewPointerObj(swig_const_cast(cptr,char*), 
+      return SWIG_NewPointerObj((char*)(cptr), 
                                 SWIG_TypeQuery("char *"), 0);
     } else {
@@ -1192 +1783 @@
 
 
-SWIGSTATICINLINE(int)
+SWIGINTERN int
   SWIG_AsVal_unsigned_SS_short(PyObject *obj, unsigned short *val)
 { 
-  const char* errmsg = val ? "unsigned short" : 0;
+  const char* errmsg = val ? "unsigned short" : (char*)0;
   unsigned long v;
   if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
     if (SWIG_CheckUnsignedLongInRange(v, USHRT_MAX, errmsg)) {
-      if (val) *val = swig_numeric_cast(v, unsigned short);
+      if (val) *val = (unsigned short)(v);
       return 1;
     } else {
@@ -1208 +1799 @@
   }
   if (val) {
-    PyErr_SetString(PyExc_TypeError, "an unsigned short is expected");
+    SWIG_type_error(errmsg, obj);
   }
   return 0;
@@ -1214 +1805 @@
 
 
-SWIGSTATICINLINE(unsigned short)
+SWIGINTERNINLINE unsigned short
 SWIG_As_unsigned_SS_short(PyObject* obj)
 {
@@ -1220 +1811 @@
   if (!SWIG_AsVal_unsigned_SS_short(obj, &v)) {
     /*
-      this is needed to make valgrind/purify happier.  the other
-      solution is throw an exception, but since this code should work
-      with plain C ....
+      this is needed to make valgrind/purify happier. 
      */
     memset((void*)&v, 0, sizeof(unsigned short));
@@ -1230 +1819 @@
 
   
-SWIGSTATICINLINE(int)
+SWIGINTERNINLINE int
 SWIG_Check_unsigned_SS_short(PyObject* obj)
 {
@@ -1280 +1869 @@
 
 
-struct libtrace_packet_t *new_libtrace_packet_t(){ 
-                struct libtrace_packet_t *packet = malloc(sizeof(struct libtrace_packet_t));
+static struct libtrace_packet_t *new_libtrace_packet_t(){ 
+                struct libtrace_packet_t *packet = trace_create_packet();
                 return packet;
                 }
-void delete_libtrace_packet_t(struct libtrace_packet_t *self){ free(self);}
-struct libtrace_ip *libtrace_packet_t_trace_get_ip(struct libtrace_packet_t *self){
+static void delete_libtrace_packet_t(struct libtrace_packet_t *self){ 
+                trace_destroy_packet(self);
+                }
+static libtrace_packet_t *libtrace_packet_t_trace_copy_packet(struct libtrace_packet_t *self){
+                return trace_copy_packet(self);
+        }
+static void *libtrace_packet_t_trace_get_link(struct libtrace_packet_t *self){
+                return trace_get_link(self);
+        }
+static void *libtrace_packet_t_trace_get_transport(struct libtrace_packet_t *self,uint8_t *proto,uint32_t *remaining){
+                return trace_get_transport(self, proto, remaining);
+        }
+static struct libtrace_ip *libtrace_packet_t_trace_get_ip(struct libtrace_packet_t *self){
                 return trace_get_ip(self);
         }
-struct libtrace_tcp *libtrace_packet_t_trace_get_tcp(struct libtrace_packet_t *self){
+static struct libtrace_tcp *libtrace_packet_t_trace_get_tcp(struct libtrace_packet_t *self){
                 return trace_get_tcp(self);
         }
-struct libtrace_udp *libtrace_packet_t_trace_get_udp(struct libtrace_packet_t *self){
+static struct libtrace_udp *libtrace_packet_t_trace_get_udp(struct libtrace_packet_t *self){
                 return trace_get_udp(self);
         }
-struct libtrace_icmp *libtrace_packet_t_trace_get_icmp(struct libtrace_packet_t *self){
+static struct libtrace_icmp *libtrace_packet_t_trace_get_icmp(struct libtrace_packet_t *self){
                 return trace_get_icmp(self);
         }
-void *libtrace_packet_t_trace_get_link(struct libtrace_packet_t *self){
-                return trace_get_link(self);
+static char *libtrace_packet_t_trace_get_destination_mac(struct libtrace_packet_t *self){
+                return trace_ether_ntoa(trace_get_destination_mac(self),0);
         }
-double libtrace_packet_t_trace_get_seconds(struct libtrace_packet_t *self){
+static char *libtrace_packet_t_trace_get_source_mac(struct libtrace_packet_t *self){
+                return trace_ether_ntoa(trace_get_source_mac(self),0);
+        }
+static char *libtrace_packet_t_trace_ether_ntoa(struct libtrace_packet_t *self,uint8_t *mac){
+                return trace_ether_ntoa(mac, 0);
+        }
+static uint16_t libtrace_packet_t_trace_get_source_port(struct libtrace_packet_t *self){
+                return trace_get_source_port(self);
+        }
+static uint16_t libtrace_packet_t_trace_get_destination_port(struct libtrace_packet_t *self){
+                return trace_get_destination_port(self);
+        }
+static double libtrace_packet_t_trace_get_seconds(struct libtrace_packet_t *self){
                 return trace_get_seconds(self);
         }
-uint64_t libtrace_packet_t_trace_get_erf_timestamp(struct libtrace_packet_t *self){
+
+  /*@/usr/share/swig1.3/python/pymacros.swg,72,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
+
+static uint64_t libtrace_packet_t_trace_get_erf_timestamp(struct libtrace_packet_t *self){
                 return trace_get_erf_timestamp(self);
         }
-struct timeval libtrace_packet_t_trace_get_timeval(struct libtrace_packet_t *self){
+static struct timeval libtrace_packet_t_trace_get_timeval(struct libtrace_packet_t *self){
                 return trace_get_timeval(self);
         }
-int libtrace_packet_t_trace_get_capture_length(struct libtrace_packet_t *self){
+static int libtrace_packet_t_trace_get_capture_length(struct libtrace_packet_t *self){
                 return trace_get_capture_length(self);
         }
-int libtrace_packet_t_trace_get_wire_lenth(struct libtrace_packet_t *self){
+
+SWIGINTERNINLINE unsigned long
+SWIG_As_unsigned_SS_long(PyObject* obj)
+{
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier. 
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
+  }
+  return v;
+}
+
+  
+SWIGINTERNINLINE int
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
+}
+
+static size_t libtrace_packet_t_trace_set_capture_length(struct libtrace_packet_t *self,size_t size){
+                return trace_set_capture_length(self,size);
+        }
+static int libtrace_packet_t_trace_get_wire_lenth(struct libtrace_packet_t *self){
                 return trace_get_wire_length(self);
         }
-libtrace_linktype_t libtrace_packet_t_trace_get_link_type(struct libtrace_packet_t *self){
+static int libtrace_packet_t_trace_get_framing_length(struct libtrace_packet_t *self){
+                return trace_get_framing_length(self);
+        }
+static libtrace_linktype_t libtrace_packet_t_trace_get_link_type(struct libtrace_packet_t *self){
                 return trace_get_link_type(self);
         }
-int8_t libtrace_packet_t_trace_get_direction(struct libtrace_packet_t *self){
+static int8_t libtrace_packet_t_trace_get_direction(struct libtrace_packet_t *self){
                 return trace_get_direction(self);
         }
-int8_t libtrace_packet_t_trace_set_direction(struct libtrace_packet_t *self,int8_t direction){
+static int8_t libtrace_packet_t_trace_set_direction(struct libtrace_packet_t *self,int8_t direction){
                 return trace_set_direction(self,direction);
         }
-int libtrace_packet_t_trace_bpf_filter(struct libtrace_packet_t *self,struct libtrace_filter_t *filter){
-                return trace_bpf_filter(filter,self);
+static int libtrace_packet_t_trace_apply_filter(struct libtrace_packet_t *self,struct libtrace_filter_t *filter){
+                return trace_apply_filter(filter,self);
         }
-uint8_t libtrace_packet_t_trace_get_server_port(struct libtrace_packet_t *self,uint8_t protocol,uint16_t source,uint16_t dest){
+static uint8_t libtrace_packet_t_trace_get_server_port(struct libtrace_packet_t *self,uint8_t protocol,uint16_t source,uint16_t dest){
                 return trace_get_server_port(protocol,source,dest);
         }
 
 /* returns SWIG_OLDOBJ if the input is a raw char*, SWIG_PYSTR if is a PyString */
-SWIGSTATIC(int)
+SWIGINTERN int
 SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize)
 {
@@ -1343 +1987 @@
     return SWIG_OLDOBJ;
   } else {
+    PyErr_Clear();
     if (PyString_Check(obj)) {
       if (cptr) {
@@ -1354 +1999 @@
   }
   if (cptr) {
-    PyErr_SetString(PyExc_TypeError, "a string is expected");
+    SWIG_type_error("char *", obj);
   }
   return 0;
@@ -1360 +2005 @@
 
 
-SWIGSTATICINLINE(int)
+SWIGINTERNINLINE int
 SWIG_AsCharPtr(PyObject *obj, char **val)
 {
-  char* cptr = 0;
-  if (SWIG_AsCharPtrAndSize(obj, &cptr, (size_t*)(0))) {
-    if (val) *val = cptr;
+  if (SWIG_AsCharPtrAndSize(obj, val, (size_t*)(0))) {
     return 1;
   }
   if (val) {
-    PyErr_SetString(PyExc_TypeError, "a char* is expected");
+    PyErr_Clear();
+    SWIG_type_error("char *", obj);
   }
   return 0;
 }
 
-struct libtrace_filter_t *new_libtrace_filter_t(char *filterstring){ 
-                return trace_bpf_setfilter(filterstring); 
+static struct libtrace_filter_t *new_libtrace_filter_t(char *filterstring){ 
+                return trace_create_filter(filterstring); 
         }
-int libtrace_filter_t_trace_bpf_filter(struct libtrace_filter_t *self,struct libtrace_packet_t *packet){
-                return trace_bpf_filter(self,packet);
+static void delete_libtrace_filter_t(struct libtrace_filter_t *self){
+                trace_destroy_filter(self);
         }
-struct libtrace_t *new_libtrace_t(char *uri){ return trace_create(uri); }
-void delete_libtrace_t(struct libtrace_t *self){ trace_destroy(self); }
-int libtrace_t_trace_read_packet(struct libtrace_t *self,struct libtrace_packet_t *packet){ 
+static int libtrace_filter_t_trace_apply_filter(struct libtrace_filter_t *self,struct libtrace_packet_t *packet){
+                return trace_apply_filter(self,packet);
+        }
+static struct libtrace_t *new_libtrace_t(char *uri){ return trace_create(uri); }
+static void delete_libtrace_t(struct libtrace_t *self){ trace_destroy(self); }
+static int libtrace_t_trace_read_packet(struct libtrace_t *self,struct libtrace_packet_t *packet){ 
                 return trace_read_packet(self,packet);
+        }
+static int libtrace_t_trace_start(struct libtrace_t *self){
+                return trace_start(self);
+        }
+static int libtrace_t_trace_pause(struct libtrace_t *self){
+                return trace_pause(self);
+        }
+static void libtrace_t_trace_help(struct libtrace_t *self){
+                trace_help();
+        }
+static int libtrace_t_trace_config(struct libtrace_t *self,trace_option_t option,void *value){
+                return trace_config(self, option, value); 
+        }
+static libtrace_err_t libtrace_t_trace_get_err(struct libtrace_t *self){
+                return trace_get_err(self);
+        }
+static bool libtrace_t_trace_is_err(struct libtrace_t *self){
+                return trace_is_err(self);
+        }
+
+SWIGINTERNINLINE PyObject*
+  SWIG_From_bool(bool value)
+{
+  PyObject *obj = value ? Py_True : Py_False;
+  Py_INCREF(obj);
+  return obj;
+}
+
+static struct libtrace_out_t *new_libtrace_out_t(char *uri){ return trace_create_output(uri); }
+static void delete_libtrace_out_t(struct libtrace_out_t *self){ trace_destroy_output(self); }
+static int libtrace_out_t_trace_start_output(struct libtrace_out_t *self){
+                return trace_start_output(self);
+        }
+static int libtrace_out_t_trace_config_output(struct libtrace_out_t *self,trace_option_output_t option,void *value){
+                return trace_config_output(self, option, value);
+        }
+static libtrace_err_t libtrace_out_t_trace_get_err_output(struct libtrace_out_t *self){
+                return trace_get_err_output(self);
+        }
+static bool libtrace_out_t_trace_is_err_output(struct libtrace_out_t *self){
+                return trace_is_err_output(self);
+        }
+static int libtrace_out_t_trace_write_packet(struct libtrace_out_t *self,libtrace_packet_t *packet){
+                return trace_write_packet(self, packet);
         }
 #ifdef __cplusplus
@@ -1389 +2080 @@
 #endif
 static PyObject *_wrap_in_addr_s_addr_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct in_addr *arg1 = (struct in_addr *) 0 ;
     int arg2 ;
@@ -1396 +2087 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:in_addr_s_addr_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_in_addr,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int)SWIG_As_int(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_in_addr, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (int)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->s_addr = arg2;
     
@@ -1410 +2103 @@
 
 static PyObject *_wrap_in_addr_s_addr_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct in_addr *arg1 = (struct in_addr *) 0 ;
     int result;
@@ -1416 +2109 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:in_addr_s_addr_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_in_addr,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_in_addr, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int) ((arg1)->s_addr);
     
-    resultobj = SWIG_From_int((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
@@ -1435 +2130 @@
 }
 static PyObject *_wrap_libtrace_ip_ip_hl_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     unsigned int arg2 ;
@@ -1442 +2137 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_ip_ip_hl_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (unsigned int)(SWIG_As_unsigned_SS_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->ip_hl = arg2;
     
@@ -1456 +2153 @@
 
 static PyObject *_wrap_libtrace_ip_ip_hl_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     unsigned int result;
@@ -1462 +2159 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_hl_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (unsigned int) ((arg1)->ip_hl);
     
-    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result)); 
+    }
     return resultobj;
     fail:
@@ -1474 +2173 @@
 
 static PyObject *_wrap_libtrace_ip_ip_v_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     unsigned int arg2 ;
@@ -1481 +2180 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_ip_ip_v_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (unsigned int)(SWIG_As_unsigned_SS_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->ip_v = arg2;
     
@@ -1495 +2196 @@
 
 static PyObject *_wrap_libtrace_ip_ip_v_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     unsigned int result;
@@ -1501 +2202 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_v_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (unsigned int) ((arg1)->ip_v);
     
-    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result)); 
+    }
     return resultobj;
     fail:
@@ -1513 +2216 @@
 
 static PyObject *_wrap_libtrace_ip_ip_tos_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint8_t arg2 ;
@@ -1520 +2223 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_ip_ip_tos_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint8_t)SWIG_As_unsigned_SS_char(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint8_t)(SWIG_As_unsigned_SS_char(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->ip_tos = arg2;
     
@@ -1534 +2239 @@
 
 static PyObject *_wrap_libtrace_ip_ip_tos_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint8_t result;
@@ -1540 +2245 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_tos_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint8_t) ((arg1)->ip_tos);
     
-    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); 
+    }
     return resultobj;
     fail:
@@ -1552 +2259 @@
 
 static PyObject *_wrap_libtrace_ip_ip_ttl_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint8_t arg2 ;
@@ -1559 +2266 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_ip_ip_ttl_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint8_t)SWIG_As_unsigned_SS_char(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint8_t)(SWIG_As_unsigned_SS_char(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->ip_ttl = arg2;
     
@@ -1573 +2282 @@
 
 static PyObject *_wrap_libtrace_ip_ip_ttl_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint8_t result;
@@ -1579 +2288 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_ttl_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint8_t) ((arg1)->ip_ttl);
     
-    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); 
+    }
     return resultobj;
     fail:
@@ -1591 +2302 @@
 
 static PyObject *_wrap_libtrace_ip_ip_p_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint8_t arg2 ;
@@ -1598 +2309 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_ip_ip_p_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint8_t)SWIG_As_unsigned_SS_char(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint8_t)(SWIG_As_unsigned_SS_char(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->ip_p = arg2;
     
@@ -1612 +2325 @@
 
 static PyObject *_wrap_libtrace_ip_ip_p_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint8_t result;
@@ -1618 +2331 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_p_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint8_t) ((arg1)->ip_p);
     
-    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); 
+    }
     return resultobj;
     fail:
@@ -1630 +2345 @@
 
 static PyObject *_wrap_libtrace_ip_ip_sum_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint16_t result;
@@ -1636 +2351 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_sum_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_ip_ip_sum_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1648 +2365 @@
 
 static PyObject *_wrap_libtrace_ip_ip_len_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint16_t result;
@@ -1654 +2371 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_len_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_ip_ip_len_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1666 +2385 @@
 
 static PyObject *_wrap_libtrace_ip_ip_id_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint16_t result;
@@ -1672 +2391 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_id_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_ip_ip_id_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1684 +2405 @@
 
 static PyObject *_wrap_libtrace_ip_ip_off_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     uint16_t result;
@@ -1690 +2411 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_off_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_ip_ip_off_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1702 +2425 @@
 
 static PyObject *_wrap_libtrace_ip_ip_src_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     char *result;
@@ -1708 +2431 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_src_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (char *)libtrace_ip_ip_src_get(arg1);
     
@@ -1721 +2444 @@
 
 static PyObject *_wrap_libtrace_ip_ip_dst_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_ip *arg1 = (struct libtrace_ip *) 0 ;
     char *result;
@@ -1727 +2450 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_ip_ip_dst_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_ip,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_ip, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (char *)libtrace_ip_ip_dst_get(arg1);
     
@@ -1747 +2470 @@
 }
 static PyObject *_wrap_libtrace_tcp_res1_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -1754 +2477 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_res1_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->res1 = arg2;
     
@@ -1768 +2493 @@
 
 static PyObject *_wrap_libtrace_tcp_res1_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -1774 +2499 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_res1_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->res1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1786 +2513 @@
 
 static PyObject *_wrap_libtrace_tcp_doff_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -1793 +2520 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_doff_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->doff = arg2;
     
@@ -1807 +2536 @@
 
 static PyObject *_wrap_libtrace_tcp_doff_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -1813 +2542 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_doff_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->doff);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1825 +2556 @@
 
 static PyObject *_wrap_libtrace_tcp_fin_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -1832 +2563 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_fin_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->fin = arg2;
     
@@ -1846 +2579 @@
 
 static PyObject *_wrap_libtrace_tcp_fin_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -1852 +2585 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_fin_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->fin);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1864 +2599 @@
 
 static PyObject *_wrap_libtrace_tcp_syn_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -1871 +2606 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_syn_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->syn = arg2;
     
@@ -1885 +2622 @@
 
 static PyObject *_wrap_libtrace_tcp_syn_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -1891 +2628 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_syn_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->syn);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1903 +2642 @@
 
 static PyObject *_wrap_libtrace_tcp_rst_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -1910 +2649 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_rst_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->rst = arg2;
     
@@ -1924 +2665 @@
 
 static PyObject *_wrap_libtrace_tcp_rst_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -1930 +2671 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_rst_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->rst);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1942 +2685 @@
 
 static PyObject *_wrap_libtrace_tcp_psh_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -1949 +2692 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_psh_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->psh = arg2;
     
@@ -1963 +2708 @@
 
 static PyObject *_wrap_libtrace_tcp_psh_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -1969 +2714 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_psh_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->psh);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -1981 +2728 @@
 
 static PyObject *_wrap_libtrace_tcp_ack_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -1988 +2735 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_ack_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->ack = arg2;
     
@@ -2002 +2751 @@
 
 static PyObject *_wrap_libtrace_tcp_ack_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2008 +2757 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_ack_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->ack);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2020 +2771 @@
 
 static PyObject *_wrap_libtrace_tcp_urg_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -2027 +2778 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_urg_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->urg = arg2;
     
@@ -2041 +2794 @@
 
 static PyObject *_wrap_libtrace_tcp_urg_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2047 +2800 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_urg_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->urg);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2059 +2814 @@
 
 static PyObject *_wrap_libtrace_tcp_res2_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t arg2 ;
@@ -2066 +2821 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_tcp_res2_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->res2 = arg2;
     
@@ -2080 +2837 @@
 
 static PyObject *_wrap_libtrace_tcp_res2_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2086 +2843 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_res2_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->res2);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2098 +2857 @@
 
 static PyObject *_wrap_libtrace_tcp_source_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2104 +2863 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_source_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_tcp_source_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2116 +2877 @@
 
 static PyObject *_wrap_libtrace_tcp_dest_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2122 +2883 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_dest_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_tcp_dest_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2134 +2897 @@
 
 static PyObject *_wrap_libtrace_tcp_window_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2140 +2903 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_window_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_tcp_window_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2152 +2917 @@
 
 static PyObject *_wrap_libtrace_tcp_check_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2158 +2923 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_check_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_tcp_check_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2170 +2937 @@
 
 static PyObject *_wrap_libtrace_tcp_urg_ptr_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint16_t result;
@@ -2176 +2943 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_urg_ptr_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_tcp_urg_ptr_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2188 +2957 @@
 
 static PyObject *_wrap_libtrace_tcp_seq_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint32_t result;
@@ -2194 +2963 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_seq_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint32_t)libtrace_tcp_seq_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result)); 
+    }
     return resultobj;
     fail:
@@ -2206 +2977 @@
 
 static PyObject *_wrap_libtrace_tcp_ack_seq_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_tcp *arg1 = (struct libtrace_tcp *) 0 ;
     uint32_t result;
@@ -2212 +2983 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_tcp_ack_seq_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_tcp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_tcp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint32_t)libtrace_tcp_ack_seq_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result)); 
+    }
     return resultobj;
     fail:
@@ -2231 +3004 @@
 }
 static PyObject *_wrap_libtrace_udp_source_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_udp *arg1 = (struct libtrace_udp *) 0 ;
     uint16_t result;
@@ -2237 +3010 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_udp_source_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_udp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_udp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_udp_source_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2249 +3024 @@
 
 static PyObject *_wrap_libtrace_udp_dest_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_udp *arg1 = (struct libtrace_udp *) 0 ;
     uint16_t result;
@@ -2255 +3030 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_udp_dest_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_udp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_udp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_udp_dest_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2267 +3044 @@
 
 static PyObject *_wrap_libtrace_udp_len_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_udp *arg1 = (struct libtrace_udp *) 0 ;
     uint16_t result;
@@ -2273 +3050 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_udp_len_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_udp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_udp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_udp_len_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2285 +3064 @@
 
 static PyObject *_wrap_libtrace_udp_check_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_udp *arg1 = (struct libtrace_udp *) 0 ;
     uint16_t result;
@@ -2291 +3070 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_udp_check_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_udp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_udp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t)libtrace_udp_check_get(arg1);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2310 +3091 @@
 }
 static PyObject *_wrap_libtrace_icmp_type_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_icmp *arg1 = (struct libtrace_icmp *) 0 ;
     uint8_t arg2 ;
@@ -2317 +3098 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_type_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint8_t)SWIG_As_unsigned_SS_char(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint8_t)(SWIG_As_unsigned_SS_char(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->type = arg2;
     
@@ -2331 +3114 @@
 
 static PyObject *_wrap_libtrace_icmp_type_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_icmp *arg1 = (struct libtrace_icmp *) 0 ;
     uint8_t result;
@@ -2337 +3120 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_type_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint8_t) ((arg1)->type);
     
-    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); 
+    }
     return resultobj;
     fail:
@@ -2349 +3134 @@
 
 static PyObject *_wrap_libtrace_icmp_code_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_icmp *arg1 = (struct libtrace_icmp *) 0 ;
     uint8_t arg2 ;
@@ -2356 +3141 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_code_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint8_t)SWIG_As_unsigned_SS_char(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint8_t)(SWIG_As_unsigned_SS_char(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->code = arg2;
     
@@ -2370 +3157 @@
 
 static PyObject *_wrap_libtrace_icmp_code_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_icmp *arg1 = (struct libtrace_icmp *) 0 ;
     uint8_t result;
@@ -2376 +3163 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_code_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint8_t) ((arg1)->code);
     
-    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); 
+    }
     return resultobj;
     fail:
@@ -2388 +3177 @@
 
 static PyObject *_wrap_libtrace_icmp_checksum_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_icmp *arg1 = (struct libtrace_icmp *) 0 ;
     uint16_t arg2 ;
@@ -2395 +3184 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_checksum_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->checksum = arg2;
     
@@ -2409 +3200 @@
 
 static PyObject *_wrap_libtrace_icmp_checksum_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_icmp *arg1 = (struct libtrace_icmp *) 0 ;
     uint16_t result;
@@ -2415 +3206 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_checksum_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->checksum);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2427 +3220 @@
 
 static PyObject *_wrap_libtrace_icmp_un_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_icmp *arg1 = (struct libtrace_icmp *) 0 ;
     libtrace_icmp_un *result;
@@ -2433 +3226 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (libtrace_icmp_un *)& ((arg1)->un);
     
@@ -2452 +3245 @@
 }
 static PyObject *_wrap_libtrace_icmp_un_gateway_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un *arg1 = (libtrace_icmp_un *) 0 ;
     uint32_t arg2 ;
@@ -2459 +3252 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_un_gateway_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint32_t)SWIG_As_unsigned_SS_int(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint32_t)(SWIG_As_unsigned_SS_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->gateway = arg2;
     
@@ -2473 +3268 @@
 
 static PyObject *_wrap_libtrace_icmp_un_gateway_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un *arg1 = (libtrace_icmp_un *) 0 ;
     uint32_t result;
@@ -2479 +3274 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_gateway_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint32_t) ((arg1)->gateway);
     
-    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result)); 
+    }
     return resultobj;
     fail:
@@ -2491 +3288 @@
 
 static PyObject *_wrap_libtrace_icmp_un_frag_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un *arg1 = (libtrace_icmp_un *) 0 ;
     libtrace_icmp_un_frag *result;
@@ -2497 +3294 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_frag_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (libtrace_icmp_un_frag *)& ((arg1)->frag);
     
@@ -2509 +3306 @@
 
 static PyObject *_wrap_libtrace_icmp_un_echo_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un *arg1 = (libtrace_icmp_un *) 0 ;
     libtrace_icmp_un_echo *result;
@@ -2515 +3312 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_echo_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (libtrace_icmp_un_echo *)& ((arg1)->echo);
     
@@ -2534 +3331 @@
 }
 static PyObject *_wrap_libtrace_icmp_un_frag___unused_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_frag *arg1 = (libtrace_icmp_un_frag *) 0 ;
     uint16_t arg2 ;
@@ -2541 +3338 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_un_frag___unused_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_frag,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_frag, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->__unused = arg2;
     
@@ -2555 +3354 @@
 
 static PyObject *_wrap_libtrace_icmp_un_frag___unused_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_frag *arg1 = (libtrace_icmp_un_frag *) 0 ;
     uint16_t result;
@@ -2561 +3360 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_frag___unused_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_frag,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_frag, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->__unused);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2573 +3374 @@
 
 static PyObject *_wrap_libtrace_icmp_un_frag_mtu_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_frag *arg1 = (libtrace_icmp_un_frag *) 0 ;
     uint16_t arg2 ;
@@ -2580 +3381 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_un_frag_mtu_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_frag,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_frag, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->mtu = arg2;
     
@@ -2594 +3397 @@
 
 static PyObject *_wrap_libtrace_icmp_un_frag_mtu_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_frag *arg1 = (libtrace_icmp_un_frag *) 0 ;
     uint16_t result;
@@ -2600 +3403 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_frag_mtu_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_frag,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_frag, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->mtu);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2619 +3424 @@
 }
 static PyObject *_wrap_libtrace_icmp_un_echo_id_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_echo *arg1 = (libtrace_icmp_un_echo *) 0 ;
     uint16_t arg2 ;
@@ -2626 +3431 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_un_echo_id_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_echo,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_echo, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->id = arg2;
     
@@ -2640 +3447 @@
 
 static PyObject *_wrap_libtrace_icmp_un_echo_id_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_echo *arg1 = (libtrace_icmp_un_echo *) 0 ;
     uint16_t result;
@@ -2646 +3453 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_echo_id_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_echo,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_echo, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->id);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2658 +3467 @@
 
 static PyObject *_wrap_libtrace_icmp_un_echo_sequence_set(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_echo *arg1 = (libtrace_icmp_un_echo *) 0 ;
     uint16_t arg2 ;
@@ -2665 +3474 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:libtrace_icmp_un_echo_sequence_set",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_echo,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint16_t)SWIG_As_unsigned_SS_short(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_echo, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint16_t)(SWIG_As_unsigned_SS_short(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     if (arg1) (arg1)->sequence = arg2;
     
@@ -2679 +3490 @@
 
 static PyObject *_wrap_libtrace_icmp_un_echo_sequence_get(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     libtrace_icmp_un_echo *arg1 = (libtrace_icmp_un_echo *) 0 ;
     uint16_t result;
@@ -2685 +3496 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:libtrace_icmp_un_echo_sequence_get",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_icmp_un_echo,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_icmp_un_echo, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (uint16_t) ((arg1)->sequence);
     
-    resultobj = SWIG_From_unsigned_SS_short((unsigned short)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2704 +3517 @@
 }
 static PyObject *_wrap_new_Packet(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *result;
     
@@ -2718 +3531 @@
 
 static PyObject *_wrap_delete_Packet(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     PyObject * obj0 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"O:delete_Packet",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     delete_libtrace_packet_t(arg1);
     
@@ -2734 +3547 @@
 
 
+static PyObject *_wrap_Packet_trace_copy_packet(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    libtrace_packet_t *result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_copy_packet",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (libtrace_packet_t *)libtrace_packet_t_trace_copy_packet(arg1);
+    
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_libtrace_packet_t, 0);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_get_link(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    void *result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_link",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (void *)libtrace_packet_t_trace_get_link(arg1);
+    
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_void, 0);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_get_transport(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    uint8_t *arg2 = (uint8_t *) 0 ;
+    uint32_t *arg3 = (uint32_t *) 0 ;
+    void *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OOO:Packet_trace_get_transport",&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_unsigned_char, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_unsigned_int, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(3)) SWIG_fail;
+    result = (void *)libtrace_packet_t_trace_get_transport(arg1,arg2,arg3);
+    
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_void, 0);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_Packet_trace_get_ip(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     struct libtrace_ip *result;
@@ -2741 +3616 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_ip",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (struct libtrace_ip *)libtrace_packet_t_trace_get_ip(arg1);
     
@@ -2753 +3628 @@
 
 static PyObject *_wrap_Packet_trace_get_tcp(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     struct libtrace_tcp *result;
@@ -2759 +3634 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_tcp",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (struct libtrace_tcp *)libtrace_packet_t_trace_get_tcp(arg1);
     
@@ -2771 +3646 @@
 
 static PyObject *_wrap_Packet_trace_get_udp(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     struct libtrace_udp *result;
@@ -2777 +3652 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_udp",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (struct libtrace_udp *)libtrace_packet_t_trace_get_udp(arg1);
     
@@ -2789 +3664 @@
 
 static PyObject *_wrap_Packet_trace_get_icmp(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     struct libtrace_icmp *result;
@@ -2795 +3670 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_icmp",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (struct libtrace_icmp *)libtrace_packet_t_trace_get_icmp(arg1);
     
@@ -2806 +3681 @@
 
 
-static PyObject *_wrap_Packet_trace_get_link(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+static PyObject *_wrap_Packet_trace_get_destination_mac(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
-    void *result;
-    PyObject * obj0 = 0 ;
-    
-    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_link",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    result = (void *)libtrace_packet_t_trace_get_link(arg1);
-    
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_void, 0);
+    char *result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_destination_mac",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (char *)libtrace_packet_t_trace_get_destination_mac(arg1);
+    
+    resultobj = SWIG_FromCharPtr(result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_get_source_mac(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    char *result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_source_mac",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (char *)libtrace_packet_t_trace_get_source_mac(arg1);
+    
+    resultobj = SWIG_FromCharPtr(result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_ether_ntoa(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    uint8_t *arg2 = (uint8_t *) 0 ;
+    char *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OO:Packet_trace_ether_ntoa",&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_unsigned_char, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    result = (char *)libtrace_packet_t_trace_ether_ntoa(arg1,arg2);
+    
+    resultobj = SWIG_FromCharPtr(result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_get_source_port(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    uint16_t result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_source_port",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (uint16_t)libtrace_packet_t_trace_get_source_port(arg1);
+    
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_get_destination_port(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    uint16_t result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_destination_port",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (uint16_t)libtrace_packet_t_trace_get_destination_port(arg1);
+    
+    {
+        resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result)); 
+    }
     return resultobj;
     fail:
@@ -2825 +3780 @@
 
 static PyObject *_wrap_Packet_trace_get_seconds(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     double result;
@@ -2831 +3786 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_seconds",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (double)libtrace_packet_t_trace_get_seconds(arg1);
     
-    resultobj = SWIG_From_double((double)result);
+    {
+        resultobj = SWIG_From_double((double)(result)); 
+    }
     return resultobj;
     fail:
@@ -2843 +3800 @@
 
 static PyObject *_wrap_Packet_trace_get_erf_timestamp(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     uint64_t result;
@@ -2849 +3806 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_erf_timestamp",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = libtrace_packet_t_trace_get_erf_timestamp(arg1);
     
@@ -2856 +3813 @@
         uint64_t * resultptr;
         resultptr = (uint64_t *) malloc(sizeof(uint64_t));
-        memmove(resultptr, &result, sizeof(uint64_t));
+        if (resultptr) memcpy(resultptr, &result, sizeof(uint64_t));
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_uint64_t, 1);
     }
@@ -2866 +3823 @@
 
 static PyObject *_wrap_Packet_trace_get_timeval(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     struct timeval result;
@@ -2872 +3829 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_timeval",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = libtrace_packet_t_trace_get_timeval(arg1);
     
@@ -2879 +3836 @@
         struct timeval * resultptr;
         resultptr = (struct timeval *) malloc(sizeof(struct timeval));
-        memmove(resultptr, &result, sizeof(struct timeval));
+        if (resultptr) memcpy(resultptr, &result, sizeof(struct timeval));
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_timeval, 1);
     }
@@ -2889 +3846 @@
 
 static PyObject *_wrap_Packet_trace_get_capture_length(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     int result;
@@ -2895 +3852 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_capture_length",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int)libtrace_packet_t_trace_get_capture_length(arg1);
     
-    resultobj = SWIG_From_int((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_set_capture_length(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    size_t arg2 ;
+    size_t result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OO:Packet_trace_set_capture_length",&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (size_t)(SWIG_As_unsigned_SS_long(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    result = libtrace_packet_t_trace_set_capture_length(arg1,arg2);
+    
+    {
+        resultobj = SWIG_From_unsigned_SS_long((unsigned long)(result)); 
+    }
     return resultobj;
     fail:
@@ -2907 +3892 @@
 
 static PyObject *_wrap_Packet_trace_get_wire_lenth(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     int result;
@@ -2913 +3898 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_wire_lenth",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = (int)libtrace_packet_t_trace_get_wire_lenth(arg1);
     
-    resultobj = SWIG_From_int((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Packet_trace_get_framing_length(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_framing_length",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (int)libtrace_packet_t_trace_get_framing_length(arg1);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
@@ -2925 +3932 @@
 
 static PyObject *_wrap_Packet_trace_get_link_type(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     libtrace_linktype_t result;
@@ -2931 +3938 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_link_type",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = libtrace_packet_t_trace_get_link_type(arg1);
     
@@ -2938 +3945 @@
         libtrace_linktype_t * resultptr;
         resultptr = (libtrace_linktype_t *) malloc(sizeof(libtrace_linktype_t));
-        memmove(resultptr, &result, sizeof(libtrace_linktype_t));
+        if (resultptr) memcpy(resultptr, &result, sizeof(libtrace_linktype_t));
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_libtrace_linktype_t, 1);
     }
@@ -2948 +3955 @@
 
 static PyObject *_wrap_Packet_trace_get_direction(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     int8_t result;
@@ -2954 +3961 @@
     
     if(!PyArg_ParseTuple(args,(char *)"O:Packet_trace_get_direction",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     result = libtrace_packet_t_trace_get_direction(arg1);
     
@@ -2961 +3968 @@
         int8_t * resultptr;
         resultptr = (int8_t *) malloc(sizeof(int8_t));
-        memmove(resultptr, &result, sizeof(int8_t));
+        if (resultptr) memcpy(resultptr, &result, sizeof(int8_t));
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_int8_t, 1);
     }
@@ -2971 +3978 @@
 
 static PyObject *_wrap_Packet_trace_set_direction(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     int8_t arg2 ;
     int8_t result;
-    int8_t *argp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"OO:Packet_trace_set_direction",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **)(&argp2),SWIGTYPE_p_int8_t,
-    SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        int8_t * argp;
+        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_int8_t, SWIG_POINTER_EXCEPTION);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (argp == NULL) {
+            SWIG_null_ref("int8_t");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        arg2 = *argp;
+    }
     result = libtrace_packet_t_trace_set_direction(arg1,arg2);
     
@@ -2990 +4003 @@
         int8_t * resultptr;
         resultptr = (int8_t *) malloc(sizeof(int8_t));
-        memmove(resultptr, &result, sizeof(int8_t));
+        if (resultptr) memcpy(resultptr, &result, sizeof(int8_t));
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_int8_t, 1);
     }
@@ -2999 +4012 @@
 
 
-static PyObject *_wrap_Packet_trace_bpf_filter(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+static PyObject *_wrap_Packet_trace_apply_filter(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     struct libtrace_filter_t *arg2 = (struct libtrace_filter_t *) 0 ;
@@ -3007 +4020 @@
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:Packet_trace_bpf_filter",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_libtrace_filter_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    result = (int)libtrace_packet_t_trace_bpf_filter(arg1,arg2);
-    
-    resultobj = SWIG_From_int((int)result);
+    if(!PyArg_ParseTuple(args,(char *)"OO:Packet_trace_apply_filter",&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_libtrace_filter_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    result = (int)libtrace_packet_t_trace_apply_filter(arg1,arg2);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
@@ -3022 +4037 @@
 
 static PyObject *_wrap_Packet_trace_get_server_port(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_packet_t *arg1 = (struct libtrace_packet_t *) 0 ;
     uint8_t arg2 ;
@@ -3034 +4049 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OOOO:Packet_trace_get_server_port",&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (uint8_t)SWIG_As_unsigned_SS_char(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (uint16_t)SWIG_As_unsigned_SS_short(obj2); 
-    if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (uint16_t)SWIG_As_unsigned_SS_short(obj3); 
-    if (PyErr_Occurred()) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        arg2 = (uint8_t)(SWIG_As_unsigned_SS_char(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    {
+        arg3 = (uint16_t)(SWIG_As_unsigned_SS_short(obj2)); 
+        if (SWIG_arg_fail(3)) SWIG_fail;
+    }
+    {
+        arg4 = (uint16_t)(SWIG_As_unsigned_SS_short(obj3)); 
+        if (SWIG_arg_fail(4)) SWIG_fail;
+    }
     result = (uint8_t)libtrace_packet_t_trace_get_server_port(arg1,arg2,arg3,arg4);
     
-    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
+    {
+        resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); 
+    }
     return resultobj;
     fail:
@@ -3059 +4082 @@
 }
 static PyObject *_wrap_new_Filter(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
-    char *arg1 ;
+    PyObject *resultobj = NULL;
+    char *arg1 = (char *) 0 ;
     struct libtrace_filter_t *result;
     PyObject * obj0 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"O:new_Filter",&obj0)) goto fail;
-    if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) {
+        SWIG_arg_fail(1);SWIG_fail;
+    }
     result = (struct libtrace_filter_t *)new_libtrace_filter_t(arg1);
     
@@ -3075 +4100 @@
 
 
-static PyObject *_wrap_Filter_trace_bpf_filter(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+static PyObject *_wrap_delete_Filter(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_filter_t *arg1 = (struct libtrace_filter_t *) 0 ;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:delete_Filter",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_filter_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    delete_libtrace_filter_t(arg1);
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Filter_trace_apply_filter(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
     struct libtrace_filter_t *arg1 = (struct libtrace_filter_t *) 0 ;
     struct libtrace_packet_t *arg2 = (struct libtrace_packet_t *) 0 ;
@@ -3083 +4125 @@
     PyObject * obj1 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO:Filter_trace_bpf_filter",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_filter_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    result = (int)libtrace_filter_t_trace_bpf_filter(arg1,arg2);
-    
-    resultobj = SWIG_From_int((int)result);
+    if(!PyArg_ParseTuple(args,(char *)"OO:Filter_trace_apply_filter",&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_filter_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    result = (int)libtrace_filter_t_trace_apply_filter(arg1,arg2);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
     return resultobj;
     fail:
@@ -3105 +4149 @@
 }
 static PyObject *_wrap_new_Trace(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
-    char *arg1 ;
+    PyObject *resultobj = NULL;
+    char *arg1 = (char *) 0 ;
     struct libtrace_t *result;
     PyObject * obj0 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"O:new_Trace",&obj0)) goto fail;
-    if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) {
+        SWIG_arg_fail(1);SWIG_fail;
+    }
     result = (struct libtrace_t *)new_libtrace_t(arg1);
     
@@ -3122 +4168 @@
 
 static PyObject *_wrap_delete_Trace(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
     PyObject * obj0 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"O:delete_Trace",&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
     delete_libtrace_t(arg1);
     
@@ -3139 +4185 @@
 
 static PyObject *_wrap_Trace_trace_read_packet(PyObject *self, PyObject *args) {
-    PyObject *resultobj;
+    PyObject *resultobj = NULL;
     struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
     struct libtrace_packet_t *arg2 = (struct libtrace_packet_t *) 0 ;
@@ -3147 +4193 @@
     
     if(!PyArg_ParseTuple(args,(char *)"OO:Trace_trace_read_packet",&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_libtrace_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_libtrace_packet_t,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
     result = (int)libtrace_t_trace_read_packet(arg1,arg2);
     
-    resultobj = SWIG_From_int((int)result);
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Trace_trace_start(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Trace_trace_start",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (int)libtrace_t_trace_start(arg1);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Trace_trace_pause(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Trace_trace_pause",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (int)libtrace_t_trace_pause(arg1);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Trace_trace_help(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Trace_trace_help",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    libtrace_t_trace_help(arg1);
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Trace_trace_config(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
+    trace_option_t arg2 ;
+    void *arg3 = (void *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OOO:Trace_trace_config",&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        trace_option_t * argp;
+        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_trace_option_t, SWIG_POINTER_EXCEPTION);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (argp == NULL) {
+            SWIG_null_ref("trace_option_t");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        arg2 = *argp;
+    }
+    {
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),0,SWIG_POINTER_EXCEPTION|0))== -1) {
+            SWIG_arg_fail(3);SWIG_fail;
+        }
+    }
+    result = (int)libtrace_t_trace_config(arg1,arg2,arg3);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Trace_trace_get_err(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
+    libtrace_err_t result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Trace_trace_get_err",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = libtrace_t_trace_get_err(arg1);
+    
+    {
+        libtrace_err_t * resultptr;
+        resultptr = (libtrace_err_t *) malloc(sizeof(libtrace_err_t));
+        if (resultptr) memcpy(resultptr, &result, sizeof(libtrace_err_t));
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_libtrace_err_t, 1);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Trace_trace_is_err(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_t *arg1 = (struct libtrace_t *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Trace_trace_is_err",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (bool)libtrace_t_trace_is_err(arg1);
+    
+    {
+        resultobj = SWIG_From_bool((bool)(result)); 
+    }
     return resultobj;
     fail:
@@ -3167 +4354 @@
     return Py_BuildValue((char *)"");
 }
+static PyObject *_wrap_new_OutputTrace(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    char *arg1 = (char *) 0 ;
+    struct libtrace_out_t *result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:new_OutputTrace",&obj0)) goto fail;
+    if (!SWIG_AsCharPtr(obj0, (char**)&arg1)) {
+        SWIG_arg_fail(1);SWIG_fail;
+    }
+    result = (struct libtrace_out_t *)new_libtrace_out_t(arg1);
+    
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_libtrace_out_t, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_delete_OutputTrace(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_out_t *arg1 = (struct libtrace_out_t *) 0 ;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:delete_OutputTrace",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_out_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    delete_libtrace_out_t(arg1);
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_OutputTrace_trace_start_output(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_out_t *arg1 = (struct libtrace_out_t *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:OutputTrace_trace_start_output",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_out_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (int)libtrace_out_t_trace_start_output(arg1);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_OutputTrace_trace_config_output(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_out_t *arg1 = (struct libtrace_out_t *) 0 ;
+    trace_option_output_t arg2 ;
+    void *arg3 = (void *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OOO:OutputTrace_trace_config_output",&obj0,&obj1,&obj2)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_out_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    {
+        trace_option_output_t * argp;
+        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_trace_option_output_t, SWIG_POINTER_EXCEPTION);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        if (argp == NULL) {
+            SWIG_null_ref("trace_option_output_t");
+        }
+        if (SWIG_arg_fail(2)) SWIG_fail;
+        arg2 = *argp;
+    }
+    {
+        if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),0,SWIG_POINTER_EXCEPTION|0))== -1) {
+            SWIG_arg_fail(3);SWIG_fail;
+        }
+    }
+    result = (int)libtrace_out_t_trace_config_output(arg1,arg2,arg3);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_OutputTrace_trace_get_err_output(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_out_t *arg1 = (struct libtrace_out_t *) 0 ;
+    libtrace_err_t result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:OutputTrace_trace_get_err_output",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_out_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = libtrace_out_t_trace_get_err_output(arg1);
+    
+    {
+        libtrace_err_t * resultptr;
+        resultptr = (libtrace_err_t *) malloc(sizeof(libtrace_err_t));
+        if (resultptr) memcpy(resultptr, &result, sizeof(libtrace_err_t));
+        resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_libtrace_err_t, 1);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_OutputTrace_trace_is_err_output(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_out_t *arg1 = (struct libtrace_out_t *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:OutputTrace_trace_is_err_output",&obj0)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_out_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    result = (bool)libtrace_out_t_trace_is_err_output(arg1);
+    
+    {
+        resultobj = SWIG_From_bool((bool)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_OutputTrace_trace_write_packet(PyObject *self, PyObject *args) {
+    PyObject *resultobj = NULL;
+    struct libtrace_out_t *arg1 = (struct libtrace_out_t *) 0 ;
+    libtrace_packet_t *arg2 = (libtrace_packet_t *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OO:OutputTrace_trace_write_packet",&obj0,&obj1)) goto fail;
+    SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_libtrace_out_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(1)) SWIG_fail;
+    SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_libtrace_packet_t, SWIG_POINTER_EXCEPTION | 0);
+    if (SWIG_arg_fail(2)) SWIG_fail;
+    result = (int)libtrace_out_t_trace_write_packet(arg1,arg2);
+    
+    {
+        resultobj = SWIG_From_int((int)(result)); 
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject * OutputTrace_swigregister(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_libtrace_out_t, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
 static PyMethodDef SwigMethods[] = {
-         { (char *)"in_addr_s_addr_set", _wrap_in_addr_s_addr_set, METH_VARARGS, NULL },
-         { (char *)"in_addr_s_addr_get", _wrap_in_addr_s_addr_get, METH_VARARGS, NULL },
-         { (char *)"in_addr_swigregister", in_addr_swigregister, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_hl_set", _wrap_libtrace_ip_ip_hl_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_hl_get", _wrap_libtrace_ip_ip_hl_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_v_set", _wrap_libtrace_ip_ip_v_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_v_get", _wrap_libtrace_ip_ip_v_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_tos_set", _wrap_libtrace_ip_ip_tos_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_tos_get", _wrap_libtrace_ip_ip_tos_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_ttl_set", _wrap_libtrace_ip_ip_ttl_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_ttl_get", _wrap_libtrace_ip_ip_ttl_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_p_set", _wrap_libtrace_ip_ip_p_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_p_get", _wrap_libtrace_ip_ip_p_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_sum_get", _wrap_libtrace_ip_ip_sum_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_len_get", _wrap_libtrace_ip_ip_len_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_id_get", _wrap_libtrace_ip_ip_id_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_off_get", _wrap_libtrace_ip_ip_off_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_src_get", _wrap_libtrace_ip_ip_src_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_ip_dst_get", _wrap_libtrace_ip_ip_dst_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_ip_swigregister", libtrace_ip_swigregister, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_res1_set", _wrap_libtrace_tcp_res1_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_res1_get", _wrap_libtrace_tcp_res1_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_doff_set", _wrap_libtrace_tcp_doff_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_doff_get", _wrap_libtrace_tcp_doff_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_fin_set", _wrap_libtrace_tcp_fin_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_fin_get", _wrap_libtrace_tcp_fin_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_syn_set", _wrap_libtrace_tcp_syn_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_syn_get", _wrap_libtrace_tcp_syn_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_rst_set", _wrap_libtrace_tcp_rst_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_rst_get", _wrap_libtrace_tcp_rst_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_psh_set", _wrap_libtrace_tcp_psh_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_psh_get", _wrap_libtrace_tcp_psh_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_ack_set", _wrap_libtrace_tcp_ack_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_ack_get", _wrap_libtrace_tcp_ack_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_urg_set", _wrap_libtrace_tcp_urg_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_urg_get", _wrap_libtrace_tcp_urg_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_res2_set", _wrap_libtrace_tcp_res2_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_res2_get", _wrap_libtrace_tcp_res2_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_source_get", _wrap_libtrace_tcp_source_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_dest_get", _wrap_libtrace_tcp_dest_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_window_get", _wrap_libtrace_tcp_window_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_check_get", _wrap_libtrace_tcp_check_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_urg_ptr_get", _wrap_libtrace_tcp_urg_ptr_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_seq_get", _wrap_libtrace_tcp_seq_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_ack_seq_get", _wrap_libtrace_tcp_ack_seq_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_tcp_swigregister", libtrace_tcp_swigregister, METH_VARARGS, NULL },
-         { (char *)"libtrace_udp_source_get", _wrap_libtrace_udp_source_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_udp_dest_get", _wrap_libtrace_udp_dest_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_udp_len_get", _wrap_libtrace_udp_len_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_udp_check_get", _wrap_libtrace_udp_check_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_udp_swigregister", libtrace_udp_swigregister, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_type_set", _wrap_libtrace_icmp_type_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_type_get", _wrap_libtrace_icmp_type_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_code_set", _wrap_libtrace_icmp_code_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_code_get", _wrap_libtrace_icmp_code_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_checksum_set", _wrap_libtrace_icmp_checksum_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_checksum_get", _wrap_libtrace_icmp_checksum_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_get", _wrap_libtrace_icmp_un_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_swigregister", libtrace_icmp_swigregister, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_gateway_set", _wrap_libtrace_icmp_un_gateway_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_gateway_get", _wrap_libtrace_icmp_un_gateway_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_frag_get", _wrap_libtrace_icmp_un_frag_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_echo_get", _wrap_libtrace_icmp_un_echo_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_swigregister", libtrace_icmp_un_swigregister, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_frag___unused_set", _wrap_libtrace_icmp_un_frag___unused_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_frag___unused_get", _wrap_libtrace_icmp_un_frag___unused_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_frag_mtu_set", _wrap_libtrace_icmp_un_frag_mtu_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_frag_mtu_get", _wrap_libtrace_icmp_un_frag_mtu_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_frag_swigregister", libtrace_icmp_un_frag_swigregister, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_echo_id_set", _wrap_libtrace_icmp_un_echo_id_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_echo_id_get", _wrap_libtrace_icmp_un_echo_id_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_echo_sequence_set", _wrap_libtrace_icmp_un_echo_sequence_set, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_echo_sequence_get", _wrap_libtrace_icmp_un_echo_sequence_get, METH_VARARGS, NULL },
-         { (char *)"libtrace_icmp_un_echo_swigregister", libtrace_icmp_un_echo_swigregister, METH_VARARGS, NULL },
-         { (char *)"new_Packet", _wrap_new_Packet, METH_VARARGS, NULL },
-         { (char *)"delete_Packet", _wrap_delete_Packet, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_ip", _wrap_Packet_trace_get_ip, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_tcp", _wrap_Packet_trace_get_tcp, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_udp", _wrap_Packet_trace_get_udp, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_icmp", _wrap_Packet_trace_get_icmp, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_link", _wrap_Packet_trace_get_link, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_seconds", _wrap_Packet_trace_get_seconds, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_erf_timestamp", _wrap_Packet_trace_get_erf_timestamp, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_timeval", _wrap_Packet_trace_get_timeval, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_capture_length", _wrap_Packet_trace_get_capture_length, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_wire_lenth", _wrap_Packet_trace_get_wire_lenth, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_link_type", _wrap_Packet_trace_get_link_type, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_direction", _wrap_Packet_trace_get_direction, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_set_direction", _wrap_Packet_trace_set_direction, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_bpf_filter", _wrap_Packet_trace_bpf_filter, METH_VARARGS, NULL },
-         { (char *)"Packet_trace_get_server_port", _wrap_Packet_trace_get_server_port, METH_VARARGS, NULL },
-         { (char *)"Packet_swigregister", Packet_swigregister, METH_VARARGS, NULL },
-         { (char *)"new_Filter", _wrap_new_Filter, METH_VARARGS, NULL },
-         { (char *)"Filter_trace_bpf_filter", _wrap_Filter_trace_bpf_filter, METH_VARARGS, NULL },
-         { (char *)"Filter_swigregister", Filter_swigregister, METH_VARARGS, NULL },
-         { (char *)"new_Trace", _wrap_new_Trace, METH_VARARGS, NULL },
-         { (char *)"delete_Trace", _wrap_delete_Trace, METH_VARARGS, NULL },
-         { (char *)"Trace_trace_read_packet", _wrap_Trace_trace_read_packet, METH_VARARGS, NULL },
-         { (char *)"Trace_swigregister", Trace_swigregister, METH_VARARGS, NULL },
+         { (char *)"in_addr_s_addr_set", _wrap_in_addr_s_addr_set, METH_VARARGS, NULL},
+         { (char *)"in_addr_s_addr_get", _wrap_in_addr_s_addr_get, METH_VARARGS, NULL},
+         { (char *)"in_addr_swigregister", in_addr_swigregister, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_hl_set", _wrap_libtrace_ip_ip_hl_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_hl_get", _wrap_libtrace_ip_ip_hl_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_v_set", _wrap_libtrace_ip_ip_v_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_v_get", _wrap_libtrace_ip_ip_v_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_tos_set", _wrap_libtrace_ip_ip_tos_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_tos_get", _wrap_libtrace_ip_ip_tos_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_ttl_set", _wrap_libtrace_ip_ip_ttl_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_ttl_get", _wrap_libtrace_ip_ip_ttl_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_p_set", _wrap_libtrace_ip_ip_p_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_p_get", _wrap_libtrace_ip_ip_p_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_sum_get", _wrap_libtrace_ip_ip_sum_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_len_get", _wrap_libtrace_ip_ip_len_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_id_get", _wrap_libtrace_ip_ip_id_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_off_get", _wrap_libtrace_ip_ip_off_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_src_get", _wrap_libtrace_ip_ip_src_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_ip_dst_get", _wrap_libtrace_ip_ip_dst_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_ip_swigregister", libtrace_ip_swigregister, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_res1_set", _wrap_libtrace_tcp_res1_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_res1_get", _wrap_libtrace_tcp_res1_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_doff_set", _wrap_libtrace_tcp_doff_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_doff_get", _wrap_libtrace_tcp_doff_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_fin_set", _wrap_libtrace_tcp_fin_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_fin_get", _wrap_libtrace_tcp_fin_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_syn_set", _wrap_libtrace_tcp_syn_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_syn_get", _wrap_libtrace_tcp_syn_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_rst_set", _wrap_libtrace_tcp_rst_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_rst_get", _wrap_libtrace_tcp_rst_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_psh_set", _wrap_libtrace_tcp_psh_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_psh_get", _wrap_libtrace_tcp_psh_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_ack_set", _wrap_libtrace_tcp_ack_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_ack_get", _wrap_libtrace_tcp_ack_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_urg_set", _wrap_libtrace_tcp_urg_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_urg_get", _wrap_libtrace_tcp_urg_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_res2_set", _wrap_libtrace_tcp_res2_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_res2_get", _wrap_libtrace_tcp_res2_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_source_get", _wrap_libtrace_tcp_source_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_dest_get", _wrap_libtrace_tcp_dest_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_window_get", _wrap_libtrace_tcp_window_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_check_get", _wrap_libtrace_tcp_check_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_urg_ptr_get", _wrap_libtrace_tcp_urg_ptr_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_seq_get", _wrap_libtrace_tcp_seq_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_ack_seq_get", _wrap_libtrace_tcp_ack_seq_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_tcp_swigregister", libtrace_tcp_swigregister, METH_VARARGS, NULL},
+         { (char *)"libtrace_udp_source_get", _wrap_libtrace_udp_source_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_udp_dest_get", _wrap_libtrace_udp_dest_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_udp_len_get", _wrap_libtrace_udp_len_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_udp_check_get", _wrap_libtrace_udp_check_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_udp_swigregister", libtrace_udp_swigregister, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_type_set", _wrap_libtrace_icmp_type_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_type_get", _wrap_libtrace_icmp_type_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_code_set", _wrap_libtrace_icmp_code_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_code_get", _wrap_libtrace_icmp_code_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_checksum_set", _wrap_libtrace_icmp_checksum_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_checksum_get", _wrap_libtrace_icmp_checksum_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_get", _wrap_libtrace_icmp_un_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_swigregister", libtrace_icmp_swigregister, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_gateway_set", _wrap_libtrace_icmp_un_gateway_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_gateway_get", _wrap_libtrace_icmp_un_gateway_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_frag_get", _wrap_libtrace_icmp_un_frag_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_echo_get", _wrap_libtrace_icmp_un_echo_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_swigregister", libtrace_icmp_un_swigregister, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_frag___unused_set", _wrap_libtrace_icmp_un_frag___unused_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_frag___unused_get", _wrap_libtrace_icmp_un_frag___unused_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_frag_mtu_set", _wrap_libtrace_icmp_un_frag_mtu_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_frag_mtu_get", _wrap_libtrace_icmp_un_frag_mtu_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_frag_swigregister", libtrace_icmp_un_frag_swigregister, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_echo_id_set", _wrap_libtrace_icmp_un_echo_id_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_echo_id_get", _wrap_libtrace_icmp_un_echo_id_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_echo_sequence_set", _wrap_libtrace_icmp_un_echo_sequence_set, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_echo_sequence_get", _wrap_libtrace_icmp_un_echo_sequence_get, METH_VARARGS, NULL},
+         { (char *)"libtrace_icmp_un_echo_swigregister", libtrace_icmp_un_echo_swigregister, METH_VARARGS, NULL},
+         { (char *)"new_Packet", _wrap_new_Packet, METH_VARARGS, NULL},
+         { (char *)"delete_Packet", _wrap_delete_Packet, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_copy_packet", _wrap_Packet_trace_copy_packet, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_link", _wrap_Packet_trace_get_link, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_transport", _wrap_Packet_trace_get_transport, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_ip", _wrap_Packet_trace_get_ip, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_tcp", _wrap_Packet_trace_get_tcp, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_udp", _wrap_Packet_trace_get_udp, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_icmp", _wrap_Packet_trace_get_icmp, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_destination_mac", _wrap_Packet_trace_get_destination_mac, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_source_mac", _wrap_Packet_trace_get_source_mac, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_ether_ntoa", _wrap_Packet_trace_ether_ntoa, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_source_port", _wrap_Packet_trace_get_source_port, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_destination_port", _wrap_Packet_trace_get_destination_port, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_seconds", _wrap_Packet_trace_get_seconds, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_erf_timestamp", _wrap_Packet_trace_get_erf_timestamp, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_timeval", _wrap_Packet_trace_get_timeval, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_capture_length", _wrap_Packet_trace_get_capture_length, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_set_capture_length", _wrap_Packet_trace_set_capture_length, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_wire_lenth", _wrap_Packet_trace_get_wire_lenth, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_framing_length", _wrap_Packet_trace_get_framing_length, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_link_type", _wrap_Packet_trace_get_link_type, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_direction", _wrap_Packet_trace_get_direction, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_set_direction", _wrap_Packet_trace_set_direction, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_apply_filter", _wrap_Packet_trace_apply_filter, METH_VARARGS, NULL},
+         { (char *)"Packet_trace_get_server_port", _wrap_Packet_trace_get_server_port, METH_VARARGS, NULL},
+         { (char *)"Packet_swigregister", Packet_swigregister, METH_VARARGS, NULL},
+         { (char *)"new_Filter", _wrap_new_Filter, METH_VARARGS, NULL},
+         { (char *)"delete_Filter", _wrap_delete_Filter, METH_VARARGS, NULL},
+         { (char *)"Filter_trace_apply_filter", _wrap_Filter_trace_apply_filter, METH_VARARGS, NULL},
+         { (char *)"Filter_swigregister", Filter_swigregister, METH_VARARGS, NULL},
+         { (char *)"new_Trace", _wrap_new_Trace, METH_VARARGS, NULL},
+         { (char *)"delete_Trace", _wrap_delete_Trace, METH_VARARGS, NULL},
+         { (char *)"Trace_trace_read_packet", _wrap_Trace_trace_read_packet, METH_VARARGS, NULL},
+         { (char *)"Trace_trace_start", _wrap_Trace_trace_start, METH_VARARGS, NULL},
+         { (char *)"Trace_trace_pause", _wrap_Trace_trace_pause, METH_VARARGS, NULL},
+         { (char *)"Trace_trace_help", _wrap_Trace_trace_help, METH_VARARGS, NULL},
+         { (char *)"Trace_trace_config", _wrap_Trace_trace_config, METH_VARARGS, NULL},
+         { (char *)"Trace_trace_get_err", _wrap_Trace_trace_get_err, METH_VARARGS, NULL},
+         { (char *)"Trace_trace_is_err", _wrap_Trace_trace_is_err, METH_VARARGS, NULL},
+         { (char *)"Trace_swigregister", Trace_swigregister, METH_VARARGS, NULL},
+        &nbs