[Bro] Installing Bro-1.5.1 Ubuntu 9.10 Problem with gcc

Robin Sommer robin at icir.org
Thu Feb 11 08:15:22 PST 2010


On Thu, Feb 11, 2010 at 07:05 -0800, ssm_as wrote:

> broccoli_intern_wrap.c:8557: error: ‘Swig_var_bro_debug_messages_get’ undeclared (first use in this function)
> broccoli_intern_wrap.c:8557: error: ‘Swig_var_bro_debug_messages_set’ undeclared (first use in this function)

That looks like a problem similar to one we have heard about
earlier: a config difference between your system and the system
generating the Python bindings for Broccoli. 

There's an experimental patch to fix such problems, I'm attaching
it. Can you see if that helps already?

Thanks,

Robin

-- 
Robin Sommer * Phone +1 (510) 666-2886 * robin at icir.org 
ICSI/LBNL    * Fax   +1 (510) 666-2956 *   www.icir.org
-------------- next part --------------
Index: aux/broccoli/bindings/python/broccoli_intern.i
===================================================================
--- aux/broccoli/bindings/python/broccoli_intern.i	(revision 6962)
+++ aux/broccoli/bindings/python/broccoli_intern.i	(working copy)
@@ -333,5 +333,60 @@
         free($2);
 }
 
-// Parse the header file to generate wrappers
-%include <broccoli.h>
+///// The following is a subset of broccoli.h for which we provide wrappers. 
+
+#define BRO_TYPE_UNKNOWN           0
+#define BRO_TYPE_BOOL              1
+#define BRO_TYPE_INT               2
+#define BRO_TYPE_COUNT             3
+#define BRO_TYPE_COUNTER           4
+#define BRO_TYPE_DOUBLE            5
+#define BRO_TYPE_TIME              6
+#define BRO_TYPE_INTERVAL          7
+#define BRO_TYPE_STRING            8
+#define BRO_TYPE_PATTERN           9
+#define BRO_TYPE_ENUM             10
+#define BRO_TYPE_TIMER            11
+#define BRO_TYPE_PORT             12
+#define BRO_TYPE_IPADDR           13
+#define BRO_TYPE_NET              14
+#define BRO_TYPE_SUBNET           15
+#define BRO_TYPE_ANY              16
+#define BRO_TYPE_TABLE            17
+#define BRO_TYPE_UNION            18
+#define BRO_TYPE_RECORD           19
+#define BRO_TYPE_LIST             20
+#define BRO_TYPE_FUNC             21
+#define BRO_TYPE_FILE             22
+#define BRO_TYPE_VECTOR           23
+#define BRO_TYPE_ERROR            24
+#define BRO_TYPE_PACKET           25 
+#define BRO_TYPE_SET              26
+#define BRO_TYPE_MAX              27
+#define BRO_CFLAG_NONE                      0
+#define BRO_CFLAG_RECONNECT           (1 << 0)
+#define BRO_CFLAG_ALWAYS_QUEUE        (1 << 1)
+#define BRO_CFLAG_SHAREABLE           (1 << 2)
+#define BRO_CFLAG_DONTCACHE           (1 << 3)
+#define BRO_CFLAG_YIELD               (1 << 4)
+#define BRO_CFLAG_CACHE               (1 << 5)
+
+// The exact types of these don't really matter as we're only
+// passing pointers around.
+typedef void BroCtx;
+typedef void BroConn;
+typedef void BroEvent;
+
+int            bro_init(const BroCtx *ctx);
+BroConn       *bro_conn_new_str(const char *hostname, int flags);
+void           bro_conn_set_class(BroConn *bc, const char *classname);
+int            bro_conn_connect(BroConn *bc);
+int            bro_conn_process_input(BroConn *bc);
+int            bro_event_queue_length(BroConn *bc);
+BroEvent      *bro_event_new(const char *event_name);
+void           bro_event_free(BroEvent *be);
+int            bro_event_add_val(BroEvent *be, int type, const char *type_name,const void *val);
+int            bro_event_send(BroConn *bc, BroEvent *be);
+void           bro_event_registry_add_compact(BroConn *bc, const char *event_name, BroCompactEventFunc func, void *user_data);
+double         bro_util_current_time(void);
+                          
Index: aux/broccoli/bindings/python/broccoli_intern.py
===================================================================
--- aux/broccoli/bindings/python/broccoli_intern.py	(revision 6962)
+++ aux/broccoli/bindings/python/broccoli_intern.py	(working copy)
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 1.3.31
 #
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
@@ -48,8 +48,6 @@
 del types
 
 
-FALSE = _broccoli_intern.FALSE
-TRUE = _broccoli_intern.TRUE
 BRO_TYPE_UNKNOWN = _broccoli_intern.BRO_TYPE_UNKNOWN
 BRO_TYPE_BOOL = _broccoli_intern.BRO_TYPE_BOOL
 BRO_TYPE_INT = _broccoli_intern.BRO_TYPE_INT
@@ -85,297 +83,17 @@
 BRO_CFLAG_DONTCACHE = _broccoli_intern.BRO_CFLAG_DONTCACHE
 BRO_CFLAG_YIELD = _broccoli_intern.BRO_CFLAG_YIELD
 BRO_CFLAG_CACHE = _broccoli_intern.BRO_CFLAG_CACHE
-class BroCtx(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BroCtx, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BroCtx, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["lock_func"] = _broccoli_intern.BroCtx_lock_func_set
-    __swig_getmethods__["lock_func"] = _broccoli_intern.BroCtx_lock_func_get
-    if _newclass:lock_func = _swig_property(_broccoli_intern.BroCtx_lock_func_get, _broccoli_intern.BroCtx_lock_func_set)
-    __swig_setmethods__["id_func"] = _broccoli_intern.BroCtx_id_func_set
-    __swig_getmethods__["id_func"] = _broccoli_intern.BroCtx_id_func_get
-    if _newclass:id_func = _swig_property(_broccoli_intern.BroCtx_id_func_get, _broccoli_intern.BroCtx_id_func_set)
-    __swig_setmethods__["dl_create_func"] = _broccoli_intern.BroCtx_dl_create_func_set
-    __swig_getmethods__["dl_create_func"] = _broccoli_intern.BroCtx_dl_create_func_get
-    if _newclass:dl_create_func = _swig_property(_broccoli_intern.BroCtx_dl_create_func_get, _broccoli_intern.BroCtx_dl_create_func_set)
-    __swig_setmethods__["dl_lock_func"] = _broccoli_intern.BroCtx_dl_lock_func_set
-    __swig_getmethods__["dl_lock_func"] = _broccoli_intern.BroCtx_dl_lock_func_get
-    if _newclass:dl_lock_func = _swig_property(_broccoli_intern.BroCtx_dl_lock_func_get, _broccoli_intern.BroCtx_dl_lock_func_set)
-    __swig_setmethods__["dl_free_func"] = _broccoli_intern.BroCtx_dl_free_func_set
-    __swig_getmethods__["dl_free_func"] = _broccoli_intern.BroCtx_dl_free_func_get
-    if _newclass:dl_free_func = _swig_property(_broccoli_intern.BroCtx_dl_free_func_get, _broccoli_intern.BroCtx_dl_free_func_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_BroCtx(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_BroCtx
-    __del__ = lambda self : None;
-BroCtx_swigregister = _broccoli_intern.BroCtx_swigregister
-BroCtx_swigregister(BroCtx)
-cvar = _broccoli_intern.cvar
-
-class BroConnStats(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BroConnStats, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BroConnStats, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["tx_buflen"] = _broccoli_intern.BroConnStats_tx_buflen_set
-    __swig_getmethods__["tx_buflen"] = _broccoli_intern.BroConnStats_tx_buflen_get
-    if _newclass:tx_buflen = _swig_property(_broccoli_intern.BroConnStats_tx_buflen_get, _broccoli_intern.BroConnStats_tx_buflen_set)
-    __swig_setmethods__["rx_buflen"] = _broccoli_intern.BroConnStats_rx_buflen_set
-    __swig_getmethods__["rx_buflen"] = _broccoli_intern.BroConnStats_rx_buflen_get
-    if _newclass:rx_buflen = _swig_property(_broccoli_intern.BroConnStats_rx_buflen_get, _broccoli_intern.BroConnStats_rx_buflen_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_BroConnStats(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_BroConnStats
-    __del__ = lambda self : None;
-BroConnStats_swigregister = _broccoli_intern.BroConnStats_swigregister
-BroConnStats_swigregister(BroConnStats)
-
-class BroString(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BroString, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BroString, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["str_len"] = _broccoli_intern.BroString_str_len_set
-    __swig_getmethods__["str_len"] = _broccoli_intern.BroString_str_len_get
-    if _newclass:str_len = _swig_property(_broccoli_intern.BroString_str_len_get, _broccoli_intern.BroString_str_len_set)
-    __swig_setmethods__["str_val"] = _broccoli_intern.BroString_str_val_set
-    __swig_getmethods__["str_val"] = _broccoli_intern.BroString_str_val_get
-    if _newclass:str_val = _swig_property(_broccoli_intern.BroString_str_val_get, _broccoli_intern.BroString_str_val_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_BroString(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_BroString
-    __del__ = lambda self : None;
-BroString_swigregister = _broccoli_intern.BroString_swigregister
-BroString_swigregister(BroString)
-
-class BroPort(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BroPort, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BroPort, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["port_num"] = _broccoli_intern.BroPort_port_num_set
-    __swig_getmethods__["port_num"] = _broccoli_intern.BroPort_port_num_get
-    if _newclass:port_num = _swig_property(_broccoli_intern.BroPort_port_num_get, _broccoli_intern.BroPort_port_num_set)
-    __swig_setmethods__["port_proto"] = _broccoli_intern.BroPort_port_proto_set
-    __swig_getmethods__["port_proto"] = _broccoli_intern.BroPort_port_proto_get
-    if _newclass:port_proto = _swig_property(_broccoli_intern.BroPort_port_proto_get, _broccoli_intern.BroPort_port_proto_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_BroPort(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_BroPort
-    __del__ = lambda self : None;
-BroPort_swigregister = _broccoli_intern.BroPort_swigregister
-BroPort_swigregister(BroPort)
-
-class BroSubnet(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BroSubnet, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BroSubnet, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["sn_net"] = _broccoli_intern.BroSubnet_sn_net_set
-    __swig_getmethods__["sn_net"] = _broccoli_intern.BroSubnet_sn_net_get
-    if _newclass:sn_net = _swig_property(_broccoli_intern.BroSubnet_sn_net_get, _broccoli_intern.BroSubnet_sn_net_set)
-    __swig_setmethods__["sn_width"] = _broccoli_intern.BroSubnet_sn_width_set
-    __swig_getmethods__["sn_width"] = _broccoli_intern.BroSubnet_sn_width_get
-    if _newclass:sn_width = _swig_property(_broccoli_intern.BroSubnet_sn_width_get, _broccoli_intern.BroSubnet_sn_width_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_BroSubnet(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_BroSubnet
-    __del__ = lambda self : None;
-BroSubnet_swigregister = _broccoli_intern.BroSubnet_swigregister
-BroSubnet_swigregister(BroSubnet)
-
-class BroEvArg(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BroEvArg, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BroEvArg, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["arg_data"] = _broccoli_intern.BroEvArg_arg_data_set
-    __swig_getmethods__["arg_data"] = _broccoli_intern.BroEvArg_arg_data_get
-    if _newclass:arg_data = _swig_property(_broccoli_intern.BroEvArg_arg_data_get, _broccoli_intern.BroEvArg_arg_data_set)
-    __swig_setmethods__["arg_type"] = _broccoli_intern.BroEvArg_arg_type_set
-    __swig_getmethods__["arg_type"] = _broccoli_intern.BroEvArg_arg_type_get
-    if _newclass:arg_type = _swig_property(_broccoli_intern.BroEvArg_arg_type_get, _broccoli_intern.BroEvArg_arg_type_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_BroEvArg(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_BroEvArg
-    __del__ = lambda self : None;
-BroEvArg_swigregister = _broccoli_intern.BroEvArg_swigregister
-BroEvArg_swigregister(BroEvArg)
-
-class bro_ev_meta(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, bro_ev_meta, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, bro_ev_meta, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["ev_name"] = _broccoli_intern.bro_ev_meta_ev_name_set
-    __swig_getmethods__["ev_name"] = _broccoli_intern.bro_ev_meta_ev_name_get
-    if _newclass:ev_name = _swig_property(_broccoli_intern.bro_ev_meta_ev_name_get, _broccoli_intern.bro_ev_meta_ev_name_set)
-    __swig_setmethods__["ev_ts"] = _broccoli_intern.bro_ev_meta_ev_ts_set
-    __swig_getmethods__["ev_ts"] = _broccoli_intern.bro_ev_meta_ev_ts_get
-    if _newclass:ev_ts = _swig_property(_broccoli_intern.bro_ev_meta_ev_ts_get, _broccoli_intern.bro_ev_meta_ev_ts_set)
-    __swig_setmethods__["ev_numargs"] = _broccoli_intern.bro_ev_meta_ev_numargs_set
-    __swig_getmethods__["ev_numargs"] = _broccoli_intern.bro_ev_meta_ev_numargs_get
-    if _newclass:ev_numargs = _swig_property(_broccoli_intern.bro_ev_meta_ev_numargs_get, _broccoli_intern.bro_ev_meta_ev_numargs_set)
-    __swig_setmethods__["ev_args"] = _broccoli_intern.bro_ev_meta_ev_args_set
-    __swig_getmethods__["ev_args"] = _broccoli_intern.bro_ev_meta_ev_args_get
-    if _newclass:ev_args = _swig_property(_broccoli_intern.bro_ev_meta_ev_args_get, _broccoli_intern.bro_ev_meta_ev_args_set)
-    __swig_setmethods__["ev_start"] = _broccoli_intern.bro_ev_meta_ev_start_set
-    __swig_getmethods__["ev_start"] = _broccoli_intern.bro_ev_meta_ev_start_get
-    if _newclass:ev_start = _swig_property(_broccoli_intern.bro_ev_meta_ev_start_get, _broccoli_intern.bro_ev_meta_ev_start_set)
-    __swig_setmethods__["ev_end"] = _broccoli_intern.bro_ev_meta_ev_end_set
-    __swig_getmethods__["ev_end"] = _broccoli_intern.bro_ev_meta_ev_end_get
-    if _newclass:ev_end = _swig_property(_broccoli_intern.bro_ev_meta_ev_end_get, _broccoli_intern.bro_ev_meta_ev_end_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_bro_ev_meta(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_bro_ev_meta
-    __del__ = lambda self : None;
-bro_ev_meta_swigregister = _broccoli_intern.bro_ev_meta_swigregister
-bro_ev_meta_swigregister(bro_ev_meta)
-
-class bro_packet(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, bro_packet, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, bro_packet, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["pkt_time"] = _broccoli_intern.bro_packet_pkt_time_set
-    __swig_getmethods__["pkt_time"] = _broccoli_intern.bro_packet_pkt_time_get
-    if _newclass:pkt_time = _swig_property(_broccoli_intern.bro_packet_pkt_time_get, _broccoli_intern.bro_packet_pkt_time_set)
-    __swig_setmethods__["pkt_hdr_size"] = _broccoli_intern.bro_packet_pkt_hdr_size_set
-    __swig_getmethods__["pkt_hdr_size"] = _broccoli_intern.bro_packet_pkt_hdr_size_get
-    if _newclass:pkt_hdr_size = _swig_property(_broccoli_intern.bro_packet_pkt_hdr_size_get, _broccoli_intern.bro_packet_pkt_hdr_size_set)
-    __swig_setmethods__["pkt_link_type"] = _broccoli_intern.bro_packet_pkt_link_type_set
-    __swig_getmethods__["pkt_link_type"] = _broccoli_intern.bro_packet_pkt_link_type_get
-    if _newclass:pkt_link_type = _swig_property(_broccoli_intern.bro_packet_pkt_link_type_get, _broccoli_intern.bro_packet_pkt_link_type_set)
-    __swig_setmethods__["pkt_pcap_hdr"] = _broccoli_intern.bro_packet_pkt_pcap_hdr_set
-    __swig_getmethods__["pkt_pcap_hdr"] = _broccoli_intern.bro_packet_pkt_pcap_hdr_get
-    if _newclass:pkt_pcap_hdr = _swig_property(_broccoli_intern.bro_packet_pkt_pcap_hdr_get, _broccoli_intern.bro_packet_pkt_pcap_hdr_set)
-    __swig_setmethods__["pkt_data"] = _broccoli_intern.bro_packet_pkt_data_set
-    __swig_getmethods__["pkt_data"] = _broccoli_intern.bro_packet_pkt_data_get
-    if _newclass:pkt_data = _swig_property(_broccoli_intern.bro_packet_pkt_data_get, _broccoli_intern.bro_packet_pkt_data_set)
-    __swig_setmethods__["pkt_tag"] = _broccoli_intern.bro_packet_pkt_tag_set
-    __swig_getmethods__["pkt_tag"] = _broccoli_intern.bro_packet_pkt_tag_get
-    if _newclass:pkt_tag = _swig_property(_broccoli_intern.bro_packet_pkt_tag_get, _broccoli_intern.bro_packet_pkt_tag_set)
-    def __init__(self, *args): 
-        this = _broccoli_intern.new_bro_packet(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _broccoli_intern.delete_bro_packet
-    __del__ = lambda self : None;
-bro_packet_swigregister = _broccoli_intern.bro_packet_swigregister
-bro_packet_swigregister(bro_packet)
-
 bro_init = _broccoli_intern.bro_init
-bro_ctx_init = _broccoli_intern.bro_ctx_init
-bro_conn_new = _broccoli_intern.bro_conn_new
 bro_conn_new_str = _broccoli_intern.bro_conn_new_str
-bro_conn_new_socket = _broccoli_intern.bro_conn_new_socket
 bro_conn_set_class = _broccoli_intern.bro_conn_set_class
-bro_conn_get_peer_class = _broccoli_intern.bro_conn_get_peer_class
-bro_conn_get_connstats = _broccoli_intern.bro_conn_get_connstats
 bro_conn_connect = _broccoli_intern.bro_conn_connect
-bro_conn_reconnect = _broccoli_intern.bro_conn_reconnect
-bro_conn_delete = _broccoli_intern.bro_conn_delete
-bro_conn_alive = _broccoli_intern.bro_conn_alive
-bro_conn_adopt_events = _broccoli_intern.bro_conn_adopt_events
-bro_conn_get_fd = _broccoli_intern.bro_conn_get_fd
 bro_conn_process_input = _broccoli_intern.bro_conn_process_input
-bro_conn_data_set = _broccoli_intern.bro_conn_data_set
-bro_conn_data_get = _broccoli_intern.bro_conn_data_get
-bro_conn_data_del = _broccoli_intern.bro_conn_data_del
+bro_event_queue_length = _broccoli_intern.bro_event_queue_length
 bro_event_new = _broccoli_intern.bro_event_new
 bro_event_free = _broccoli_intern.bro_event_free
 bro_event_add_val = _broccoli_intern.bro_event_add_val
-bro_event_set_val = _broccoli_intern.bro_event_set_val
 bro_event_send = _broccoli_intern.bro_event_send
-bro_event_send_raw = _broccoli_intern.bro_event_send_raw
-bro_event_queue_length = _broccoli_intern.bro_event_queue_length
-bro_event_queue_length_max = _broccoli_intern.bro_event_queue_length_max
-bro_event_queue_flush = _broccoli_intern.bro_event_queue_flush
-bro_event_registry_add = _broccoli_intern.bro_event_registry_add
 bro_event_registry_add_compact = _broccoli_intern.bro_event_registry_add_compact
-bro_event_registry_remove = _broccoli_intern.bro_event_registry_remove
-bro_event_registry_request = _broccoli_intern.bro_event_registry_request
-bro_buf_new = _broccoli_intern.bro_buf_new
-bro_buf_free = _broccoli_intern.bro_buf_free
-bro_buf_append = _broccoli_intern.bro_buf_append
-bro_buf_consume = _broccoli_intern.bro_buf_consume
-bro_buf_reset = _broccoli_intern.bro_buf_reset
-bro_buf_get = _broccoli_intern.bro_buf_get
-bro_buf_get_end = _broccoli_intern.bro_buf_get_end
-bro_buf_get_size = _broccoli_intern.bro_buf_get_size
-bro_buf_get_used_size = _broccoli_intern.bro_buf_get_used_size
-bro_buf_ptr_get = _broccoli_intern.bro_buf_ptr_get
-bro_buf_ptr_tell = _broccoli_intern.bro_buf_ptr_tell
-bro_buf_ptr_seek = _broccoli_intern.bro_buf_ptr_seek
-bro_buf_ptr_check = _broccoli_intern.bro_buf_ptr_check
-bro_buf_ptr_read = _broccoli_intern.bro_buf_ptr_read
-bro_buf_ptr_write = _broccoli_intern.bro_buf_ptr_write
-bro_conf_set_domain = _broccoli_intern.bro_conf_set_domain
-bro_conf_get_int = _broccoli_intern.bro_conf_get_int
-bro_conf_get_dbl = _broccoli_intern.bro_conf_get_dbl
-bro_conf_get_str = _broccoli_intern.bro_conf_get_str
-bro_string_init = _broccoli_intern.bro_string_init
-bro_string_set = _broccoli_intern.bro_string_set
-bro_string_set_data = _broccoli_intern.bro_string_set_data
-bro_string_get_data = _broccoli_intern.bro_string_get_data
-bro_string_get_length = _broccoli_intern.bro_string_get_length
-bro_string_copy = _broccoli_intern.bro_string_copy
-bro_string_assign = _broccoli_intern.bro_string_assign
-bro_string_cleanup = _broccoli_intern.bro_string_cleanup
-bro_string_free = _broccoli_intern.bro_string_free
-bro_record_new = _broccoli_intern.bro_record_new
-bro_record_free = _broccoli_intern.bro_record_free
-bro_record_get_length = _broccoli_intern.bro_record_get_length
-bro_record_add_val = _broccoli_intern.bro_record_add_val
-bro_record_get_nth_val = _broccoli_intern.bro_record_get_nth_val
-bro_record_get_nth_name = _broccoli_intern.bro_record_get_nth_name
-bro_record_get_named_val = _broccoli_intern.bro_record_get_named_val
-bro_record_set_nth_val = _broccoli_intern.bro_record_set_nth_val
-bro_record_set_named_val = _broccoli_intern.bro_record_set_named_val
-bro_table_new = _broccoli_intern.bro_table_new
-bro_table_free = _broccoli_intern.bro_table_free
-bro_table_insert = _broccoli_intern.bro_table_insert
-bro_table_find = _broccoli_intern.bro_table_find
-bro_table_get_size = _broccoli_intern.bro_table_get_size
-bro_table_foreach = _broccoli_intern.bro_table_foreach
-bro_table_get_types = _broccoli_intern.bro_table_get_types
-bro_set_new = _broccoli_intern.bro_set_new
-bro_set_free = _broccoli_intern.bro_set_free
-bro_set_insert = _broccoli_intern.bro_set_insert
-bro_set_find = _broccoli_intern.bro_set_find
-bro_set_get_size = _broccoli_intern.bro_set_get_size
-bro_set_foreach = _broccoli_intern.bro_set_foreach
-bro_set_get_type = _broccoli_intern.bro_set_get_type
-bro_conn_set_packet_ctxt = _broccoli_intern.bro_conn_set_packet_ctxt
-bro_conn_get_packet_ctxt = _broccoli_intern.bro_conn_get_packet_ctxt
-bro_packet_new = _broccoli_intern.bro_packet_new
-bro_packet_clone = _broccoli_intern.bro_packet_clone
-bro_packet_free = _broccoli_intern.bro_packet_free
-bro_packet_send = _broccoli_intern.bro_packet_send
 bro_util_current_time = _broccoli_intern.bro_util_current_time
-bro_util_timeval_to_double = _broccoli_intern.bro_util_timeval_to_double
 
 
Index: aux/broccoli/bindings/python/broccoli.py
===================================================================
--- aux/broccoli/bindings/python/broccoli.py	(revision 6962)
+++ aux/broccoli/bindings/python/broccoli.py	(working copy)
@@ -207,7 +207,7 @@
         Val.__init__(self, BRO_TYPE_IPADDR, v)
 
     def __str__(self):
-        return socket.inet_ntoa(struct.pack('l', self.val))
+        return socket.inet_ntoa(struct.pack('=l', self.val))
         
     @staticmethod
     def _factory(val, dst_type):
@@ -218,7 +218,7 @@
         return v
     
     def _parse(self, str):
-        return struct.unpack('l',socket.inet_aton(str))[0]
+        return struct.unpack('=l',socket.inet_aton(str))[0]
 
 # Not supported at this point. Need to write a parse function.
 class net(Val):
@@ -247,7 +247,7 @@
 
     def __str__(self):
         (net, mask) = self.val
-        return "%s/%d" % (socket.inet_ntoa(struct.pack('l', net)), mask)
+        return "%s/%d" % (socket.inet_ntoa(struct.pack('=l', net)), mask)
     
     @staticmethod
     def _factory(val, dst_type):
@@ -259,7 +259,7 @@
     
     def _parse(self, str):
         (net, mask) = str.split("/")
-        return (struct.unpack('l',socket.inet_aton(net))[0], int(mask))
+        return (struct.unpack('=l',socket.inet_aton(net))[0], int(mask))
 
 # Not supported at this point since Broccoli seems to have problems with
 # enums. Also need to write parse functions.
Index: aux/broccoli/bindings/python/broccoli_intern_wrap.c
===================================================================
--- aux/broccoli/bindings/python/broccoli_intern_wrap.c	(revision 6962)
+++ aux/broccoli/bindings/python/broccoli_intern_wrap.c	(working copy)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.31
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -17,14 +17,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+#     define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+#     define SWIGTEMPLATEDISAMBIGUATOR 
+#   endif
 # else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#   define SWIGTEMPLATEDISAMBIGUATOR 
 # endif
 #endif
 
@@ -107,13 +107,7 @@
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
 
-
-
 /* Python.h has to appear first */
 #include <Python.h>
 
@@ -126,7 +120,7 @@
 
 /* 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 "4"
+#define SWIG_RUNTIME_VERSION "3"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -161,7 +155,6 @@
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
-#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -302,10 +295,10 @@
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *, int *);
+typedef void *(*swig_converter_func)(void *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store information on one type */
+/* Structure to store inforomation on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -350,7 +343,7 @@
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (int)((l1 - f1) - (l2 - f2));
+  return (l1 - f1) - (l2 - f2);
 }
 
 /*
@@ -432,8 +425,8 @@
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
 }
 
 /* 
@@ -857,7 +850,7 @@
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_SetString(PyExc_RuntimeError, mesg);
+    PyErr_Format(PyExc_RuntimeError, mesg);
   }
 }
 
@@ -1097,14 +1090,14 @@
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-		   name, (min == max ? "" : "at least "), (int)min);
+		   name, (min == max ? "" : "at least "), min);
       return 0;
     }
   }  
@@ -1112,14 +1105,14 @@
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register Py_ssize_t l = PyTuple_GET_SIZE(args);
+    register int l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at least "), (int)min, (int)l);
+		   name, (min == max ? "" : "at least "), min, l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at most "), (int)max, (int)l);
+		   name, (min == max ? "" : "at most "), max, l);
       return 0;
     } else {
       register int i;
@@ -1417,7 +1410,7 @@
 {
   PySwigObject *sobj = (PySwigObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own == SWIG_POINTER_OWN) {
+  if (sobj->own) {
     swig_type_info *ty = sobj->ty;
     PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
@@ -1435,13 +1428,12 @@
 	res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } 
-#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-    else {
+    } else {
       const char *name = SWIG_TypePrettyName(ty);
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
-    }
+#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
 #endif
+    }
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
@@ -1599,11 +1591,9 @@
     (unaryfunc)0,                 /*nb_float*/
     (unaryfunc)PySwigObject_oct,  /*nb_oct*/
     (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
-    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 /* 2.0.0 */
+#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
   };
@@ -1946,7 +1936,7 @@
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own == SWIG_POINTER_OWN) {
+  if (own) {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
@@ -1967,8 +1957,6 @@
     return SWIG_OK;
   } else {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
-    if (own)
-      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1982,15 +1970,7 @@
 	  if (!tc) {
 	    sobj = (PySwigObject *)sobj->next;
 	  } else {
-	    if (ptr) {
-              int newmemory = 0;
-              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-              if (newmemory == SWIG_CAST_NEW_MEMORY) {
-                assert(own);
-                if (own)
-                  *own = *own | SWIG_CAST_NEW_MEMORY;
-              }
-            }
+	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
 	    break;
 	  }
 	}
@@ -2000,8 +1980,7 @@
       }
     }
     if (sobj) {
-      if (own)
-        *own = *own | sobj->own;
+      if (own) *own = sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
 	sobj->own = 0;
       }
@@ -2066,13 +2045,8 @@
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
+      if (!tc) return SWIG_ERROR;
+      *ptr = SWIG_TypeCast(tc,vptr);
     } else {
       *ptr = vptr;
     }
@@ -2474,42 +2448,11 @@
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define SWIGTYPE_p_bro_buf swig_types[0]
-#define SWIGTYPE_p_bro_conn swig_types[1]
-#define SWIGTYPE_p_bro_conn_stats swig_types[2]
-#define SWIGTYPE_p_bro_ctx swig_types[3]
-#define SWIGTYPE_p_bro_ev_arg swig_types[4]
-#define SWIGTYPE_p_bro_ev_meta swig_types[5]
-#define SWIGTYPE_p_bro_event swig_types[6]
-#define SWIGTYPE_p_bro_packet swig_types[7]
-#define SWIGTYPE_p_bro_port swig_types[8]
-#define SWIGTYPE_p_bro_record swig_types[9]
-#define SWIGTYPE_p_bro_string swig_types[10]
-#define SWIGTYPE_p_bro_subnet swig_types[11]
-#define SWIGTYPE_p_bro_table swig_types[12]
-#define SWIGTYPE_p_char swig_types[13]
-#define SWIGTYPE_p_double swig_types[14]
-#define SWIGTYPE_p_f_int_int_p_q_const__char_int__void swig_types[15]
-#define SWIGTYPE_p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void swig_types[16]
-#define SWIGTYPE_p_f_p_q_const__char_int__p_CRYPTO_dynlock_value swig_types[17]
-#define SWIGTYPE_p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void swig_types[18]
-#define SWIGTYPE_p_f_p_struct_bro_conn_p_void_p_struct_bro_ev_meta__void swig_types[19]
-#define SWIGTYPE_p_f_p_struct_bro_conn_p_void_v_______void swig_types[20]
-#define SWIGTYPE_p_f_p_void_p_void__int swig_types[21]
-#define SWIGTYPE_p_f_p_void_p_void_p_void__int swig_types[22]
-#define SWIGTYPE_p_f_void__unsigned_long swig_types[23]
-#define SWIGTYPE_p_in_addr swig_types[24]
-#define SWIGTYPE_p_int swig_types[25]
-#define SWIGTYPE_p_pcap_pkthdr swig_types[26]
-#define SWIGTYPE_p_timeval swig_types[27]
-#define SWIGTYPE_p_u_char swig_types[28]
-#define SWIGTYPE_p_uint swig_types[29]
-#define SWIGTYPE_p_unsigned_char swig_types[30]
-#define SWIGTYPE_p_unsigned_int swig_types[31]
-#define SWIGTYPE_p_unsigned_short swig_types[32]
-#define SWIGTYPE_p_void swig_types[33]
-static swig_type_info *swig_types[35];
-static swig_module_info swig_module = {swig_types, 34, 0, 0, 0, 0};
+#define SWIGTYPE_p_BroCompactEventFunc swig_types[0]
+#define SWIGTYPE_p_char swig_types[1]
+#define SWIGTYPE_p_void swig_types[2]
+static swig_type_info *swig_types[4];
+static swig_module_info swig_module = {swig_types, 3, 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)
 
@@ -2528,7 +2471,7 @@
 
 #define SWIG_name    "_broccoli_intern"
 
-#define SWIGVERSION 0x010335 
+#define SWIGVERSION 0x010331 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2821,14 +2764,94 @@
 
 
 
+  #define SWIG_From_long   PyInt_FromLong 
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
+}
+
+
+SWIGINTERN swig_type_info*
+SWIG_pchar_descriptor(void)
+{
+  static int init = 0;
+  static swig_type_info* info = 0;
+  if (!init) {
+    info = SWIG_TypeQuery("_p_char");
+    init = 1;
+  }
+  return info;
+}
+
+
+SWIGINTERN int
+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
+{
+  if (PyString_Check(obj)) {
+    char *cstr; Py_ssize_t len;
+    PyString_AsStringAndSize(obj, &cstr, &len);
+    if (cptr)  {
+      if (alloc) {
+	/* 
+	   In python the user should not be able to modify the inner
+	   string representation. To warranty that, if you define
+	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
+	   buffer is always returned.
+
+	   The default behavior is just to return the pointer value,
+	   so, be careful.
+	*/ 
+#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
+	if (*alloc != SWIG_OLDOBJ) 
+#else
+	if (*alloc == SWIG_NEWOBJ) 
+#endif
+	  {
+	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
+	    *alloc = SWIG_NEWOBJ;
+	  }
+	else {
+	  *cptr = cstr;
+	  *alloc = SWIG_OLDOBJ;
+	}
+      } else {
+	*cptr = PyString_AsString(obj);
+      }
+    }
+    if (psize) *psize = len + 1;
+    return SWIG_OK;
+  } else {
+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+    if (pchar_descriptor) {
+      void* vptr = 0;
+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+	if (cptr) *cptr = (char *) vptr;
+	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
+	if (alloc) *alloc = SWIG_OLDOBJ;
+	return SWIG_OK;
+      }
+    }
+  }
+  return SWIG_TypeError;
+}
+
+
+
+
+
 #include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-#   define LLONG_MAX __LONG_LONG_MAX__
-#   define LLONG_MIN (-LLONG_MAX - 1LL)
-#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
+#ifndef LLONG_MIN
+# define LLONG_MIN	LONG_LONG_MIN
 #endif
+#ifndef LLONG_MAX
+# define LLONG_MAX	LONG_LONG_MAX
+#endif
+#ifndef ULLONG_MAX
+# define ULLONG_MAX	ULONG_LONG_MAX
+#endif
 
 
 SWIGINTERN int
@@ -2966,2052 +2989,24 @@
 }
 
 
-  #define SWIG_From_long   PyInt_FromLong 
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_int  (int value)
-{    
-  return SWIG_From_long  (value);
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
-{
-  if (PyInt_Check(obj)) {
-    long v = PyInt_AsLong(obj);
-    if (v >= 0) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }
-  } else if (PyLong_Check(obj)) {
-    unsigned long v = PyLong_AsUnsignedLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-    }
-  }
-#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    int dispatch = 0;
-    unsigned long v = PyLong_AsUnsignedLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_AddCast(SWIG_OK);
-    } else {
-      PyErr_Clear();
-    }
-    if (!dispatch) {
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) {
-	if (val) *val = (unsigned long)(d);
-	return res;
-      }
-    }
-  }
-#endif
-  return SWIG_TypeError;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > UINT_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = (unsigned int)(v);
-    }
-  }  
-  return res;
-}
-
-
-SWIGINTERNINLINE PyObject* 
-SWIG_From_unsigned_SS_long  (unsigned long value)
-{
-  return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)(value)); 
-}
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_unsigned_SS_int  (unsigned int value)
-{    
-  return SWIG_From_unsigned_SS_long  (value);
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_short (PyObject * obj, unsigned short *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > USHRT_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = (unsigned short)(v);
-    }
-  }  
-  return res;
-}
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_unsigned_SS_short  (unsigned short value)
-{    
-  return SWIG_From_unsigned_SS_long  (value);
-}
-
-
-SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor(void)
-{
-  static int init = 0;
-  static swig_type_info* info = 0;
-  if (!init) {
-    info = SWIG_TypeQuery("_p_char");
-    init = 1;
-  }
-  return info;
-}
-
-
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
-{
-  if (PyString_Check(obj)) {
-    char *cstr; Py_ssize_t len;
-    PyString_AsStringAndSize(obj, &cstr, &len);
-    if (cptr)  {
-      if (alloc) {
-	/* 
-	   In python the user should not be able to modify the inner
-	   string representation. To warranty that, if you define
-	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
-	   buffer is always returned.
-
-	   The default behavior is just to return the pointer value,
-	   so, be careful.
-	*/ 
-#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
-	if (*alloc != SWIG_OLDOBJ) 
-#else
-	if (*alloc == SWIG_NEWOBJ) 
-#endif
-	  {
-	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
-	    *alloc = SWIG_NEWOBJ;
-	  }
-	else {
-	  *cptr = cstr;
-	  *alloc = SWIG_OLDOBJ;
-	}
-      } else {
-	*cptr = PyString_AsString(obj);
-      }
-    }
-    if (psize) *psize = len + 1;
-    return SWIG_OK;
-  } else {
-    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-    if (pchar_descriptor) {
-      void* vptr = 0;
-      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-	if (cptr) *cptr = (char *) vptr;
-	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-	if (alloc) *alloc = SWIG_OLDOBJ;
-	return SWIG_OK;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-
-
-
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  if (carray) {
-    if (size > INT_MAX) {
-      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-      return pchar_descriptor ? 
-	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
-    } else {
-      return PyString_FromStringAndSize(carray, (int)(size));
-    }
-  } else {
-    return SWIG_Py_Void();
-  }
-}
-
-
-SWIGINTERNINLINE PyObject * 
-SWIG_FromCharPtr(const char *cptr)
-{ 
-  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
-}
-
-
   #define SWIG_From_double   PyFloat_FromDouble 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-SWIGINTERN int Swig_var_bro_debug_calltrace_set(PyObject *_val) {
-  {
-    int val;
-    int res = SWIG_AsVal_int(_val, &val);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in variable '""bro_debug_calltrace""' of type '""int""'");
-    }
-    bro_debug_calltrace = (int)(val);
-  }
-  return 0;
-fail:
-  return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_bro_debug_calltrace_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_From_int((int)(bro_debug_calltrace));
-  return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_bro_debug_messages_set(PyObject *_val) {
-  {
-    int val;
-    int res = SWIG_AsVal_int(_val, &val);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in variable '""bro_debug_messages""' of type '""int""'");
-    }
-    bro_debug_messages = (int)(val);
-  }
-  return 0;
-fail:
-  return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_bro_debug_messages_get(void) {
-  PyObject *pyobj = 0;
-  
-  pyobj = SWIG_From_int((int)(bro_debug_messages));
-  return pyobj;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_lock_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_lock_func arg2 = (OpenSSL_lock_func) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroCtx_lock_func_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_lock_func_set" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_int_int_p_q_const__char_int__void);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "BroCtx_lock_func_set" "', argument " "2"" of type '" "OpenSSL_lock_func""'"); 
-    }
-  }
-  if (arg1) (arg1)->lock_func = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_lock_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_lock_func result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroCtx_lock_func_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_lock_func_get" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  result = (OpenSSL_lock_func) ((arg1)->lock_func);
-  resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_int_int_p_q_const__char_int__void);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_id_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_thread_id_func arg2 = (OpenSSL_thread_id_func) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroCtx_id_func_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_id_func_set" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_void__unsigned_long);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "BroCtx_id_func_set" "', argument " "2"" of type '" "OpenSSL_thread_id_func""'"); 
-    }
-  }
-  if (arg1) (arg1)->id_func = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_id_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_thread_id_func result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroCtx_id_func_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_id_func_get" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  result = (OpenSSL_thread_id_func) ((arg1)->id_func);
-  resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_void__unsigned_long);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_dl_create_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_dynlock_create_func arg2 = (OpenSSL_dynlock_create_func) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroCtx_dl_create_func_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_dl_create_func_set" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_p_q_const__char_int__p_CRYPTO_dynlock_value);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "BroCtx_dl_create_func_set" "', argument " "2"" of type '" "OpenSSL_dynlock_create_func""'"); 
-    }
-  }
-  if (arg1) (arg1)->dl_create_func = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_dl_create_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_dynlock_create_func result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroCtx_dl_create_func_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_dl_create_func_get" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  result = (OpenSSL_dynlock_create_func) ((arg1)->dl_create_func);
-  resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_q_const__char_int__p_CRYPTO_dynlock_value);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_dl_lock_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_dynlock_lock_func arg2 = (OpenSSL_dynlock_lock_func) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroCtx_dl_lock_func_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_dl_lock_func_set" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "BroCtx_dl_lock_func_set" "', argument " "2"" of type '" "OpenSSL_dynlock_lock_func""'"); 
-    }
-  }
-  if (arg1) (arg1)->dl_lock_func = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_dl_lock_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_dynlock_lock_func result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroCtx_dl_lock_func_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_dl_lock_func_get" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  result = (OpenSSL_dynlock_lock_func) ((arg1)->dl_lock_func);
-  resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_dl_free_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_dynlock_free_func arg2 = (OpenSSL_dynlock_free_func) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroCtx_dl_free_func_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_dl_free_func_set" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "BroCtx_dl_free_func_set" "', argument " "2"" of type '" "OpenSSL_dynlock_free_func""'"); 
-    }
-  }
-  if (arg1) (arg1)->dl_free_func = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroCtx_dl_free_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  OpenSSL_dynlock_free_func result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroCtx_dl_free_func_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroCtx_dl_free_func_get" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  result = (OpenSSL_dynlock_free_func) ((arg1)->dl_free_func);
-  resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_BroCtx(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_BroCtx")) SWIG_fail;
-  result = (BroCtx *)calloc(1, sizeof(BroCtx));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_ctx, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_BroCtx(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_BroCtx",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BroCtx" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *BroCtx_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_ctx, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_BroConnStats_tx_buflen_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConnStats *arg1 = (BroConnStats *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroConnStats_tx_buflen_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn_stats, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroConnStats_tx_buflen_set" "', argument " "1"" of type '" "BroConnStats *""'"); 
-  }
-  arg1 = (BroConnStats *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroConnStats_tx_buflen_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->tx_buflen = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroConnStats_tx_buflen_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConnStats *arg1 = (BroConnStats *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroConnStats_tx_buflen_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn_stats, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroConnStats_tx_buflen_get" "', argument " "1"" of type '" "BroConnStats *""'"); 
-  }
-  arg1 = (BroConnStats *)(argp1);
-  result = (int) ((arg1)->tx_buflen);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroConnStats_rx_buflen_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConnStats *arg1 = (BroConnStats *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroConnStats_rx_buflen_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn_stats, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroConnStats_rx_buflen_set" "', argument " "1"" of type '" "BroConnStats *""'"); 
-  }
-  arg1 = (BroConnStats *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroConnStats_rx_buflen_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->rx_buflen = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroConnStats_rx_buflen_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConnStats *arg1 = (BroConnStats *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroConnStats_rx_buflen_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn_stats, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroConnStats_rx_buflen_get" "', argument " "1"" of type '" "BroConnStats *""'"); 
-  }
-  arg1 = (BroConnStats *)(argp1);
-  result = (int) ((arg1)->rx_buflen);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_BroConnStats(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConnStats *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_BroConnStats")) SWIG_fail;
-  result = (BroConnStats *)calloc(1, sizeof(BroConnStats));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_conn_stats, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_BroConnStats(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConnStats *arg1 = (BroConnStats *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_BroConnStats",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn_stats, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BroConnStats" "', argument " "1"" of type '" "BroConnStats *""'"); 
-  }
-  arg1 = (BroConnStats *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *BroConnStats_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_conn_stats, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_BroString_str_len_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  uint32 arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroString_str_len_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroString_str_len_set" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroString_str_len_set" "', argument " "2"" of type '" "uint32""'");
-  } 
-  arg2 = (uint32)(val2);
-  if (arg1) (arg1)->str_len = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroString_str_len_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  uint32 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroString_str_len_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroString_str_len_get" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  result = (uint32) ((arg1)->str_len);
-  resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroString_str_val_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  uchar *arg2 = (uchar *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroString_str_val_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroString_str_val_set" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_unsigned_char, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BroString_str_val_set" "', argument " "2"" of type '" "uchar *""'"); 
-  }
-  arg2 = (uchar *)(argp2);
-  if (arg1) (arg1)->str_val = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroString_str_val_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  uchar *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroString_str_val_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroString_str_val_get" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  result = (uchar *) ((arg1)->str_val);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_BroString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_BroString")) SWIG_fail;
-  result = (BroString *)calloc(1, sizeof(BroString));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_string, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_BroString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_BroString",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BroString" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *BroString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_string, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_BroPort_port_num_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPort *arg1 = (BroPort *) 0 ;
-  uint16 arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned short val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroPort_port_num_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_port, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroPort_port_num_set" "', argument " "1"" of type '" "BroPort *""'"); 
-  }
-  arg1 = (BroPort *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroPort_port_num_set" "', argument " "2"" of type '" "uint16""'");
-  } 
-  arg2 = (uint16)(val2);
-  if (arg1) (arg1)->port_num = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroPort_port_num_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPort *arg1 = (BroPort *) 0 ;
-  uint16 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroPort_port_num_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_port, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroPort_port_num_get" "', argument " "1"" of type '" "BroPort *""'"); 
-  }
-  arg1 = (BroPort *)(argp1);
-  result = (uint16) ((arg1)->port_num);
-  resultobj = SWIG_From_unsigned_SS_short((unsigned short)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroPort_port_proto_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPort *arg1 = (BroPort *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroPort_port_proto_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_port, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroPort_port_proto_set" "', argument " "1"" of type '" "BroPort *""'"); 
-  }
-  arg1 = (BroPort *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroPort_port_proto_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->port_proto = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroPort_port_proto_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPort *arg1 = (BroPort *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroPort_port_proto_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_port, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroPort_port_proto_get" "', argument " "1"" of type '" "BroPort *""'"); 
-  }
-  arg1 = (BroPort *)(argp1);
-  result = (int) ((arg1)->port_proto);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_BroPort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPort *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_BroPort")) SWIG_fail;
-  result = (BroPort *)calloc(1, sizeof(BroPort));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_port, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_BroPort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPort *arg1 = (BroPort *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_BroPort",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_port, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BroPort" "', argument " "1"" of type '" "BroPort *""'"); 
-  }
-  arg1 = (BroPort *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *BroPort_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_port, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_BroSubnet_sn_net_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSubnet *arg1 = (BroSubnet *) 0 ;
-  uint32 arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroSubnet_sn_net_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_subnet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroSubnet_sn_net_set" "', argument " "1"" of type '" "BroSubnet *""'"); 
-  }
-  arg1 = (BroSubnet *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroSubnet_sn_net_set" "', argument " "2"" of type '" "uint32""'");
-  } 
-  arg2 = (uint32)(val2);
-  if (arg1) (arg1)->sn_net = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroSubnet_sn_net_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSubnet *arg1 = (BroSubnet *) 0 ;
-  uint32 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroSubnet_sn_net_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_subnet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroSubnet_sn_net_get" "', argument " "1"" of type '" "BroSubnet *""'"); 
-  }
-  arg1 = (BroSubnet *)(argp1);
-  result = (uint32) ((arg1)->sn_net);
-  resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroSubnet_sn_width_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSubnet *arg1 = (BroSubnet *) 0 ;
-  uint32 arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroSubnet_sn_width_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_subnet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroSubnet_sn_width_set" "', argument " "1"" of type '" "BroSubnet *""'"); 
-  }
-  arg1 = (BroSubnet *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroSubnet_sn_width_set" "', argument " "2"" of type '" "uint32""'");
-  } 
-  arg2 = (uint32)(val2);
-  if (arg1) (arg1)->sn_width = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroSubnet_sn_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSubnet *arg1 = (BroSubnet *) 0 ;
-  uint32 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroSubnet_sn_width_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_subnet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroSubnet_sn_width_get" "', argument " "1"" of type '" "BroSubnet *""'"); 
-  }
-  arg1 = (BroSubnet *)(argp1);
-  result = (uint32) ((arg1)->sn_width);
-  resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_BroSubnet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSubnet *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_BroSubnet")) SWIG_fail;
-  result = (BroSubnet *)calloc(1, sizeof(BroSubnet));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_subnet, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_BroSubnet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSubnet *arg1 = (BroSubnet *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_BroSubnet",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_subnet, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BroSubnet" "', argument " "1"" of type '" "BroSubnet *""'"); 
-  }
-  arg1 = (BroSubnet *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *BroSubnet_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_subnet, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_BroEvArg_arg_data_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroEvArg *arg1 = (BroEvArg *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroEvArg_arg_data_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_arg, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroEvArg_arg_data_set" "', argument " "1"" of type '" "BroEvArg *""'"); 
-  }
-  arg1 = (BroEvArg *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BroEvArg_arg_data_set" "', argument " "2"" of type '" "void *""'"); 
-  }
-  if (arg1) (arg1)->arg_data = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroEvArg_arg_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroEvArg *arg1 = (BroEvArg *) 0 ;
-  void *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroEvArg_arg_data_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_arg, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroEvArg_arg_data_get" "', argument " "1"" of type '" "BroEvArg *""'"); 
-  }
-  arg1 = (BroEvArg *)(argp1);
-  result = (void *) ((arg1)->arg_data);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroEvArg_arg_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroEvArg *arg1 = (BroEvArg *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:BroEvArg_arg_type_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_arg, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroEvArg_arg_type_set" "', argument " "1"" of type '" "BroEvArg *""'"); 
-  }
-  arg1 = (BroEvArg *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BroEvArg_arg_type_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->arg_type = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_BroEvArg_arg_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroEvArg *arg1 = (BroEvArg *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:BroEvArg_arg_type_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_arg, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BroEvArg_arg_type_get" "', argument " "1"" of type '" "BroEvArg *""'"); 
-  }
-  arg1 = (BroEvArg *)(argp1);
-  result = (int) ((arg1)->arg_type);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_BroEvArg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroEvArg *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_BroEvArg")) SWIG_fail;
-  result = (BroEvArg *)calloc(1, sizeof(BroEvArg));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_ev_arg, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_BroEvArg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroEvArg *arg1 = (BroEvArg *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_BroEvArg",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_arg, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BroEvArg" "', argument " "1"" of type '" "BroEvArg *""'"); 
-  }
-  arg1 = (BroEvArg *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *BroEvArg_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_ev_arg, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_ev_meta_ev_name_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_name_set" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_ev_meta_ev_name_set" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  if (arg2) {
-    size_t size = strlen((const char *)((const char *)(arg2))) + 1;
-    arg1->ev_name = (char const *)(char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
-  } else {
-    arg1->ev_name = 0;
-  }
-  resultobj = SWIG_Py_Void();
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  char *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_ev_meta_ev_name_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_name_get" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  result = (char *) ((arg1)->ev_name);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_ts_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_ev_meta_ev_ts_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_ts_set" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_ev_meta_ev_ts_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->ev_ts = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_ts_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  double result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_ev_meta_ev_ts_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_ts_get" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  result = (double) ((arg1)->ev_ts);
-  resultobj = SWIG_From_double((double)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_numargs_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_ev_meta_ev_numargs_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_numargs_set" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_ev_meta_ev_numargs_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->ev_numargs = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_numargs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_ev_meta_ev_numargs_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_numargs_get" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  result = (int) ((arg1)->ev_numargs);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_args_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  BroEvArg *arg2 = (BroEvArg *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_ev_meta_ev_args_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_args_set" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_bro_ev_arg, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_ev_meta_ev_args_set" "', argument " "2"" of type '" "BroEvArg *""'"); 
-  }
-  arg2 = (BroEvArg *)(argp2);
-  if (arg1) (arg1)->ev_args = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_args_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  BroEvArg *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_ev_meta_ev_args_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_args_get" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  result = (BroEvArg *) ((arg1)->ev_args);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_ev_arg, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_start_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  uchar *arg2 = (uchar *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_ev_meta_ev_start_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_start_set" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_unsigned_char, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_ev_meta_ev_start_set" "', argument " "2"" of type '" "uchar const *""'"); 
-  }
-  arg2 = (uchar *)(argp2);
-  if (arg1) (arg1)->ev_start = (uchar const *)arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_start_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  uchar *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_ev_meta_ev_start_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_start_get" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  result = (uchar *) ((arg1)->ev_start);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_end_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  uchar *arg2 = (uchar *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_ev_meta_ev_end_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_end_set" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_unsigned_char, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_ev_meta_ev_end_set" "', argument " "2"" of type '" "uchar const *""'"); 
-  }
-  arg2 = (uchar *)(argp2);
-  if (arg1) (arg1)->ev_end = (uchar const *)arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_ev_meta_ev_end_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  uchar *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_ev_meta_ev_end_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ev_meta_ev_end_get" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  result = (uchar *) ((arg1)->ev_end);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_bro_ev_meta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_bro_ev_meta")) SWIG_fail;
-  result = (struct bro_ev_meta *)calloc(1, sizeof(struct bro_ev_meta));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_ev_meta, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_bro_ev_meta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_ev_meta *arg1 = (struct bro_ev_meta *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_bro_ev_meta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ev_meta, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_bro_ev_meta" "', argument " "1"" of type '" "struct bro_ev_meta *""'"); 
-  }
-  arg1 = (struct bro_ev_meta *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *bro_ev_meta_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_ev_meta, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_time_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_packet_pkt_time_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_time_set" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_packet_pkt_time_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->pkt_time = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_time_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  double result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_pkt_time_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_time_get" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  result = (double) ((arg1)->pkt_time);
-  resultobj = SWIG_From_double((double)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_hdr_size_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  uint32 arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_packet_pkt_hdr_size_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_hdr_size_set" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_packet_pkt_hdr_size_set" "', argument " "2"" of type '" "uint32""'");
-  } 
-  arg2 = (uint32)(val2);
-  if (arg1) (arg1)->pkt_hdr_size = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_hdr_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  uint32 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_pkt_hdr_size_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_hdr_size_get" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  result = (uint32) ((arg1)->pkt_hdr_size);
-  resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_link_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  uint32 arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_packet_pkt_link_type_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_link_type_set" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_packet_pkt_link_type_set" "', argument " "2"" of type '" "uint32""'");
-  } 
-  arg2 = (uint32)(val2);
-  if (arg1) (arg1)->pkt_link_type = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_link_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  uint32 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_pkt_link_type_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_link_type_get" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  result = (uint32) ((arg1)->pkt_link_type);
-  resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_pcap_hdr_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  struct pcap_pkthdr arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_packet_pkt_pcap_hdr_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_pcap_hdr_set" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_pcap_pkthdr,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_packet_pkt_pcap_hdr_set" "', argument " "2"" of type '" "struct pcap_pkthdr""'"); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "bro_packet_pkt_pcap_hdr_set" "', argument " "2"" of type '" "struct pcap_pkthdr""'");
-    } else {
-      arg2 = *((struct pcap_pkthdr *)(argp2));
-    }
-  }
-  if (arg1) (arg1)->pkt_pcap_hdr = arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_pcap_hdr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  struct pcap_pkthdr result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_pkt_pcap_hdr_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_pcap_hdr_get" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  result =  ((arg1)->pkt_pcap_hdr);
-  resultobj = SWIG_NewPointerObj((struct pcap_pkthdr *)memcpy((struct pcap_pkthdr *)malloc(sizeof(struct pcap_pkthdr)),&result,sizeof(struct pcap_pkthdr)), SWIGTYPE_p_pcap_pkthdr, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_data_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  u_char *arg2 = (u_char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_packet_pkt_data_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_data_set" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_u_char, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_packet_pkt_data_set" "', argument " "2"" of type '" "u_char const *""'"); 
-  }
-  arg2 = (u_char *)(argp2);
-  if (arg1) (arg1)->pkt_data = (u_char const *)arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  u_char *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_pkt_data_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_data_get" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  result = (u_char *) ((arg1)->pkt_data);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_u_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_tag_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_packet_pkt_tag_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_tag_set" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_packet_pkt_tag_set" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  if (arg2) {
-    size_t size = strlen((const char *)((const char *)(arg2))) + 1;
-    arg1->pkt_tag = (char const *)(char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
-  } else {
-    arg1->pkt_tag = 0;
-  }
-  resultobj = SWIG_Py_Void();
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_pkt_tag_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  char *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_pkt_tag_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_pkt_tag_get" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  result = (char *) ((arg1)->pkt_tag);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_bro_packet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_bro_packet")) SWIG_fail;
-  result = (struct bro_packet *)calloc(1, sizeof(struct bro_packet));
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_packet, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_bro_packet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct bro_packet *arg1 = (struct bro_packet *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_bro_packet",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_bro_packet" "', argument " "1"" of type '" "struct bro_packet *""'"); 
-  }
-  arg1 = (struct bro_packet *)(argp1);
-  free((char *) arg1);
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *bro_packet_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_bro_packet, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
 SWIGINTERN PyObject *_wrap_bro_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroCtx *arg1 = (BroCtx *) 0 ;
   int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int res1 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:bro_init",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_init" "', argument " "1"" of type '" "BroCtx const *""'"); 
   }
-  arg1 = (BroCtx *)(argp1);
-  result = (int)bro_init((struct bro_ctx const *)arg1);
+  result = (int)bro_init((void const *)arg1);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
 fail:
@@ -5019,67 +3014,6 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_ctx_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroCtx *arg1 = (BroCtx *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_ctx_init",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_ctx, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_ctx_init" "', argument " "1"" of type '" "BroCtx *""'"); 
-  }
-  arg1 = (BroCtx *)(argp1);
-  bro_ctx_init(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_new(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct in_addr *arg1 = (struct in_addr *) 0 ;
-  uint16 arg2 ;
-  int arg3 ;
-  BroConn *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned short val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_conn_new",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_in_addr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_new" "', argument " "1"" of type '" "struct in_addr *""'"); 
-  }
-  arg1 = (struct in_addr *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_conn_new" "', argument " "2"" of type '" "uint16""'");
-  } 
-  arg2 = (uint16)(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "bro_conn_new" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  result = (BroConn *)bro_conn_new(arg1,arg2,arg3);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_conn, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_conn_new_str(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
@@ -5105,7 +3039,7 @@
   } 
   arg2 = (int)(val2);
   result = (BroConn *)bro_conn_new_str((char const *)arg1,arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_conn, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return resultobj;
 fail:
@@ -5114,43 +3048,11 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_conn_new_socket(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  int arg2 ;
-  BroConn *result = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_new_socket",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "bro_conn_new_socket" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_conn_new_socket" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  result = (BroConn *)bro_conn_new_socket(arg1,arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_conn, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_conn_set_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroConn *arg1 = (BroConn *) 0 ;
   char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int res1 ;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
@@ -5158,11 +3060,10 @@
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_set_class",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_set_class" "', argument " "1"" of type '" "BroConn *""'"); 
   }
-  arg1 = (BroConn *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conn_set_class" "', argument " "2"" of type '" "char const *""'");
@@ -5178,72 +3079,18 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_conn_get_peer_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  char *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_conn_get_peer_class",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_get_peer_class" "', argument " "1"" of type '" "BroConn const *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (char *)bro_conn_get_peer_class((struct bro_conn const *)arg1);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_get_connstats(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  BroConnStats *arg2 = (BroConnStats *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_get_connstats",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_get_connstats" "', argument " "1"" of type '" "BroConn const *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_bro_conn_stats, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conn_get_connstats" "', argument " "2"" of type '" "BroConnStats *""'"); 
-  }
-  arg2 = (BroConnStats *)(argp2);
-  bro_conn_get_connstats((struct bro_conn const *)arg1,arg2);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_conn_connect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroConn *arg1 = (BroConn *) 0 ;
   int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int res1 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:bro_conn_connect",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_connect" "', argument " "1"" of type '" "BroConn *""'"); 
   }
-  arg1 = (BroConn *)(argp1);
   result = (int)bro_conn_connect(arg1);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -5252,138 +3099,18 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_conn_reconnect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_conn_reconnect",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_reconnect" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (int)bro_conn_reconnect(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_conn_delete",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_delete" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (int)bro_conn_delete(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_alive(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_conn_alive",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_alive" "', argument " "1"" of type '" "BroConn const *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (int)bro_conn_alive((struct bro_conn const *)arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_adopt_events(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  BroConn *arg2 = (BroConn *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_adopt_events",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_adopt_events" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conn_adopt_events" "', argument " "2"" of type '" "BroConn *""'"); 
-  }
-  arg2 = (BroConn *)(argp2);
-  bro_conn_adopt_events(arg1,arg2);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_get_fd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_conn_get_fd",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_get_fd" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (int)bro_conn_get_fd(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_conn_process_input(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroConn *arg1 = (BroConn *) 0 ;
   int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int res1 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:bro_conn_process_input",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_process_input" "', argument " "1"" of type '" "BroConn *""'"); 
   }
-  arg1 = (BroConn *)(argp1);
   result = (int)bro_conn_process_input(arg1);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -5392,114 +3119,26 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_conn_data_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_bro_event_queue_length(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroConn *arg1 = (BroConn *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int res3 ;
+  int result;
+  int res1 ;
   PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_conn_data_set",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:bro_event_queue_length",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_data_set" "', argument " "1"" of type '" "BroConn *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_queue_length" "', argument " "1"" of type '" "BroConn *""'"); 
   }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conn_data_set" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_conn_data_set" "', argument " "3"" of type '" "void *""'"); 
-  }
-  bro_conn_data_set(arg1,(char const *)arg2,arg3);
-  resultobj = SWIG_Py_Void();
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  result = (int)bro_event_queue_length(arg1);
+  resultobj = SWIG_From_int((int)(result));
   return resultobj;
 fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_conn_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_data_get",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_data_get" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conn_data_get" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  result = (void *)bro_conn_data_get(arg1,(char const *)arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_data_del(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_data_del",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_data_del" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conn_data_del" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  result = (void *)bro_conn_data_del(arg1,(char const *)arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_event_new(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
@@ -5516,7 +3155,7 @@
   }
   arg1 = (char *)(buf1);
   result = (BroEvent *)bro_event_new((char const *)arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_event, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return resultobj;
 fail:
@@ -5528,16 +3167,14 @@
 SWIGINTERN PyObject *_wrap_bro_event_free(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroEvent *arg1 = (BroEvent *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int res1 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:bro_event_free",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_event, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_free" "', argument " "1"" of type '" "BroEvent *""'"); 
   }
-  arg1 = (BroEvent *)(argp1);
   bro_event_free(arg1);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -5553,17 +3190,15 @@
   char *arg3 = (char *) 0 ;
   void *arg4 = (void *) 0 ;
   int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int res1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:bro_event_add_val",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_event, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_add_val" "', argument " "1"" of type '" "BroEvent *""'"); 
   }
-  arg1 = (BroEvent *)(argp1);
   {
     int type;
     const char* type_name;
@@ -5607,99 +3242,25 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_event_set_val(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroEvent *arg1 = (BroEvent *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  char *arg4 = (char *) 0 ;
-  void *arg5 = (void *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_event_set_val",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_event, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_set_val" "', argument " "1"" of type '" "BroEvent *""'"); 
-  }
-  arg1 = (BroEvent *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_event_set_val" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  {
-    int type;
-    const char* type_name;
-    void *data;
-    
-    PyObject *val;
-    
-    //bro_debug_messages = 1;
-    //bro_debug_calltrace = 1;
-    
-    
-    if ( ! parseTypeTuple(obj2, &type, &val) )
-    return NULL;
-    
-    if ( ! pyObjToVal(val, type, &type_name, &data) )
-    return NULL;
-    
-    arg3 = type;
-    arg4 = type_name;
-    arg5 = data;
-  }
-  result = (int)bro_event_set_val(arg1,arg2,arg3,(char const *)arg4,(void const *)arg5);
-  resultobj = SWIG_From_int((int)(result));
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return resultobj;
-fail:
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_event_send(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroConn *arg1 = (BroConn *) 0 ;
   BroEvent *arg2 = (BroEvent *) 0 ;
   int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int res1 ;
+  int res2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:bro_event_send",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_send" "', argument " "1"" of type '" "BroConn *""'"); 
   }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_bro_event, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_event_send" "', argument " "2"" of type '" "BroEvent *""'"); 
   }
-  arg2 = (BroEvent *)(argp2);
   result = (int)bro_event_send(arg1,arg2);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -5708,168 +3269,13 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_event_send_raw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  uchar *arg2 = (uchar *) 0 ;
-  int arg3 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_event_send_raw",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_send_raw" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_unsigned_char, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_event_send_raw" "', argument " "2"" of type '" "uchar const *""'"); 
-  }
-  arg2 = (uchar *)(argp2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "bro_event_send_raw" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  result = (int)bro_event_send_raw(arg1,(unsigned char const *)arg2,arg3);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_event_queue_length(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_event_queue_length",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_queue_length" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (int)bro_event_queue_length(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_event_queue_length_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_event_queue_length_max",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_queue_length_max" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (int)bro_event_queue_length_max(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_event_queue_flush(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_event_queue_flush",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_queue_flush" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  result = (int)bro_event_queue_flush(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_event_registry_add(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  char *arg2 = (char *) 0 ;
-  BroEventFunc arg3 = (BroEventFunc) 0 ;
-  void *arg4 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int res4 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:bro_event_registry_add",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_registry_add" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_event_registry_add" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj2, (void**)(&arg3), SWIGTYPE_p_f_p_struct_bro_conn_p_void_v_______void);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "bro_event_registry_add" "', argument " "3"" of type '" "BroEventFunc""'"); 
-    }
-  }
-  res4 = SWIG_ConvertPtr(obj3,SWIG_as_voidptrptr(&arg4), 0, 0);
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "bro_event_registry_add" "', argument " "4"" of type '" "void *""'"); 
-  }
-  bro_event_registry_add(arg1,(char const *)arg2,arg3,arg4);
-  resultobj = SWIG_Py_Void();
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_event_registry_add_compact(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   BroConn *arg1 = (BroConn *) 0 ;
   char *arg2 = (char *) 0 ;
-  BroCompactEventFunc arg3 = (BroCompactEventFunc) 0 ;
+  BroCompactEventFunc arg3 ;
   void *arg4 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int res1 ;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
@@ -5878,11 +3284,10 @@
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:bro_event_registry_add_compact",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_registry_add_compact" "', argument " "1"" of type '" "BroConn *""'"); 
   }
-  arg1 = (BroConn *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_event_registry_add_compact" "', argument " "2"" of type '" "char const *""'");
@@ -5908,1769 +3313,6 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_event_registry_remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_event_registry_remove",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_registry_remove" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_event_registry_remove" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  bro_event_registry_remove(arg1,(char const *)arg2);
-  resultobj = SWIG_Py_Void();
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_event_registry_request(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_event_registry_request",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_event_registry_request" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  bro_event_registry_request(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_new(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":bro_buf_new")) SWIG_fail;
-  result = (BroBuf *)bro_buf_new();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_buf, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_free(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_free",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_free" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  bro_buf_free(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int arg3 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_buf_append",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_append" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_buf_append" "', argument " "2"" of type '" "void *""'"); 
-  }
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "bro_buf_append" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  result = (int)bro_buf_append(arg1,arg2,arg3);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_consume(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_consume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_consume" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  bro_buf_consume(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_reset",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_reset" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  bro_buf_reset(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  uchar *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_get" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  result = (uchar *)bro_buf_get(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_get_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  uchar *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_get_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_get_end" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  result = (uchar *)bro_buf_get_end(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_get_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  uint result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_get_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_get_size" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  result = bro_buf_get_size(arg1);
-  resultobj = SWIG_NewPointerObj((uint *)memcpy((uint *)malloc(sizeof(uint)),&result,sizeof(uint)), SWIGTYPE_p_uint, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_get_used_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  uint result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_get_used_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_get_used_size" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  result = bro_buf_get_used_size(arg1);
-  resultobj = SWIG_NewPointerObj((uint *)memcpy((uint *)malloc(sizeof(uint)),&result,sizeof(uint)), SWIGTYPE_p_uint, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  uchar *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_ptr_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_ptr_get" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  result = (uchar *)bro_buf_ptr_get(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_ptr_tell(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  uint32 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_buf_ptr_tell",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_ptr_tell" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  result = (uint32)bro_buf_ptr_tell(arg1);
-  resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_ptr_seek(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_buf_ptr_seek",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_ptr_seek" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_buf_ptr_seek" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "bro_buf_ptr_seek" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  result = (int)bro_buf_ptr_seek(arg1,arg2,arg3);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_ptr_check(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  int arg2 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_buf_ptr_check",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_ptr_check" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_buf_ptr_check" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  result = (int)bro_buf_ptr_check(arg1,arg2);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_ptr_read(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int arg3 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_buf_ptr_read",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_ptr_read" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_buf_ptr_read" "', argument " "2"" of type '" "void *""'"); 
-  }
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "bro_buf_ptr_read" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  result = (int)bro_buf_ptr_read(arg1,arg2,arg3);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_buf_ptr_write(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroBuf *arg1 = (BroBuf *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int arg3 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_buf_ptr_write",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_buf, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_buf_ptr_write" "', argument " "1"" of type '" "BroBuf *""'"); 
-  }
-  arg1 = (BroBuf *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_buf_ptr_write" "', argument " "2"" of type '" "void *""'"); 
-  }
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "bro_buf_ptr_write" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  result = (int)bro_buf_ptr_write(arg1,arg2,arg3);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conf_set_domain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_conf_set_domain",&obj0)) SWIG_fail;
-  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conf_set_domain" "', argument " "1"" of type '" "char const *""'");
-  }
-  arg1 = (char *)(buf1);
-  bro_conf_set_domain((char const *)arg1);
-  resultobj = SWIG_Py_Void();
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return resultobj;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conf_get_int(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int result;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conf_get_int",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conf_get_int" "', argument " "1"" of type '" "char const *""'");
-  }
-  arg1 = (char *)(buf1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conf_get_int" "', argument " "2"" of type '" "int *""'"); 
-  }
-  arg2 = (int *)(argp2);
-  result = (int)bro_conf_get_int((char const *)arg1,arg2);
-  resultobj = SWIG_From_int((int)(result));
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return resultobj;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conf_get_dbl(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  double *arg2 = (double *) 0 ;
-  int result;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conf_get_dbl",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conf_get_dbl" "', argument " "1"" of type '" "char const *""'");
-  }
-  arg1 = (char *)(buf1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conf_get_dbl" "', argument " "2"" of type '" "double *""'"); 
-  }
-  arg2 = (double *)(argp2);
-  result = (int)bro_conf_get_dbl((char const *)arg1,arg2);
-  resultobj = SWIG_From_int((int)(result));
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return resultobj;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conf_get_str(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_conf_get_str",&obj0)) SWIG_fail;
-  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conf_get_str" "', argument " "1"" of type '" "char const *""'");
-  }
-  arg1 = (char *)(buf1);
-  result = (char *)bro_conf_get_str((char const *)arg1);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return resultobj;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_string_init",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_init" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  bro_string_init(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_string_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_set" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_string_set" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  result = (int)bro_string_set(arg1,(char const *)arg2);
-  resultobj = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_set_data(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  uchar *arg2 = (uchar *) 0 ;
-  int arg3 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_string_set_data",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_set_data" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_unsigned_char, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_string_set_data" "', argument " "2"" of type '" "uchar const *""'"); 
-  }
-  arg2 = (uchar *)(argp2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "bro_string_set_data" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  result = (int)bro_string_set_data(arg1,(unsigned char const *)arg2,arg3);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_get_data(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  uchar *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_string_get_data",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_get_data" "', argument " "1"" of type '" "BroString const *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  result = (uchar *)bro_string_get_data((struct bro_string const *)arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_get_length(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  uint32 result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_string_get_length",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_get_length" "', argument " "1"" of type '" "BroString const *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  result = (uint32)bro_string_get_length((struct bro_string const *)arg1);
-  resultobj = SWIG_From_unsigned_SS_int((unsigned int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  BroString *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_string_copy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_copy" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  result = (BroString *)bro_string_copy(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_string, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  BroString *arg2 = (BroString *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_string_assign",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_assign" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_string_assign" "', argument " "2"" of type '" "BroString *""'"); 
-  }
-  arg2 = (BroString *)(argp2);
-  bro_string_assign(arg1,arg2);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_cleanup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_string_cleanup",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_cleanup" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  bro_string_cleanup(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_string_free(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroString *arg1 = (BroString *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_string_free",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_string, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_string_free" "', argument " "1"" of type '" "BroString *""'"); 
-  }
-  arg1 = (BroString *)(argp1);
-  bro_string_free(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_new(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":bro_record_new")) SWIG_fail;
-  result = (BroRecord *)bro_record_new();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_record, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_free(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_record_free",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_free" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  bro_record_free(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_get_length(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_record_get_length",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_get_length" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  result = (int)bro_record_get_length(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_add_val(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  char *arg4 = (char *) 0 ;
-  void *arg5 = (void *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_record_add_val",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_add_val" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_record_add_val" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  {
-    int type;
-    const char* type_name;
-    void *data;
-    
-    PyObject *val;
-    
-    //bro_debug_messages = 1;
-    //bro_debug_calltrace = 1;
-    
-    
-    if ( ! parseTypeTuple(obj2, &type, &val) )
-    return NULL;
-    
-    if ( ! pyObjToVal(val, type, &type_name, &data) )
-    return NULL;
-    
-    arg3 = type;
-    arg4 = type_name;
-    arg5 = data;
-  }
-  result = (int)bro_record_add_val(arg1,(char const *)arg2,arg3,(char const *)arg4,(void const *)arg5);
-  resultobj = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_get_nth_val(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  int arg2 ;
-  int *arg3 = (int *) 0 ;
-  void *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_record_get_nth_val",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_get_nth_val" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_record_get_nth_val" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_record_get_nth_val" "', argument " "3"" of type '" "int *""'"); 
-  }
-  arg3 = (int *)(argp3);
-  result = (void *)bro_record_get_nth_val(arg1,arg2,arg3);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_get_nth_name(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  int arg2 ;
-  char *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_record_get_nth_name",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_get_nth_name" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_record_get_nth_name" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  result = (char *)bro_record_get_nth_name(arg1,arg2);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_get_named_val(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int *arg3 = (int *) 0 ;
-  void *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_record_get_named_val",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_get_named_val" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_record_get_named_val" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_record_get_named_val" "', argument " "3"" of type '" "int *""'"); 
-  }
-  arg3 = (int *)(argp3);
-  result = (void *)bro_record_get_named_val(arg1,(char const *)arg2,arg3);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_set_nth_val(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  char *arg4 = (char *) 0 ;
-  void *arg5 = (void *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_record_set_nth_val",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_set_nth_val" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_record_set_nth_val" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  {
-    int type;
-    const char* type_name;
-    void *data;
-    
-    PyObject *val;
-    
-    //bro_debug_messages = 1;
-    //bro_debug_calltrace = 1;
-    
-    
-    if ( ! parseTypeTuple(obj2, &type, &val) )
-    return NULL;
-    
-    if ( ! pyObjToVal(val, type, &type_name, &data) )
-    return NULL;
-    
-    arg3 = type;
-    arg4 = type_name;
-    arg5 = data;
-  }
-  result = (int)bro_record_set_nth_val(arg1,arg2,arg3,(char const *)arg4,(void const *)arg5);
-  resultobj = SWIG_From_int((int)(result));
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return resultobj;
-fail:
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_record_set_named_val(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroRecord *arg1 = (BroRecord *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  char *arg4 = (char *) 0 ;
-  void *arg5 = (void *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_record_set_named_val",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_set_named_val" "', argument " "1"" of type '" "BroRecord *""'"); 
-  }
-  arg1 = (BroRecord *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_record_set_named_val" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = (char *)(buf2);
-  {
-    int type;
-    const char* type_name;
-    void *data;
-    
-    PyObject *val;
-    
-    //bro_debug_messages = 1;
-    //bro_debug_calltrace = 1;
-    
-    
-    if ( ! parseTypeTuple(obj2, &type, &val) )
-    return NULL;
-    
-    if ( ! pyObjToVal(val, type, &type_name, &data) )
-    return NULL;
-    
-    arg3 = type;
-    arg4 = type_name;
-    arg5 = data;
-  }
-  result = (int)bro_record_set_named_val(arg1,(char const *)arg2,arg3,(char const *)arg4,(void const *)arg5);
-  resultobj = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  {
-    // Broccoli makes copies of the passed data so we need to clean up.
-    freeBroccoliVal(arg3, arg5);
-    
-    if ( arg4 )
-    free(arg4);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_table_new(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroTable *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":bro_table_new")) SWIG_fail;
-  result = (BroTable *)bro_table_new();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_table, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_table_free(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroTable *arg1 = (BroTable *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_table_free",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_table_free" "', argument " "1"" of type '" "BroTable *""'"); 
-  }
-  arg1 = (BroTable *)(argp1);
-  bro_table_free(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_table_insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroTable *arg1 = (BroTable *) 0 ;
-  int arg2 ;
-  void *arg3 = (void *) 0 ;
-  int arg4 ;
-  void *arg5 = (void *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int res5 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:bro_table_insert",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_table_insert" "', argument " "1"" of type '" "BroTable *""'"); 
-  }
-  arg1 = (BroTable *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_table_insert" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_table_insert" "', argument " "3"" of type '" "void const *""'"); 
-  }
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "bro_table_insert" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(obj4,SWIG_as_voidptrptr(&arg5), 0, 0);
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "bro_table_insert" "', argument " "5"" of type '" "void const *""'"); 
-  }
-  result = (int)bro_table_insert(arg1,arg2,(void const *)arg3,arg4,(void const *)arg5);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_table_find(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroTable *arg1 = (BroTable *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_table_find",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_table_find" "', argument " "1"" of type '" "BroTable *""'"); 
-  }
-  arg1 = (BroTable *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_table_find" "', argument " "2"" of type '" "void const *""'"); 
-  }
-  result = (void *)bro_table_find(arg1,(void const *)arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_table_get_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroTable *arg1 = (BroTable *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_table_get_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_table_get_size" "', argument " "1"" of type '" "BroTable *""'"); 
-  }
-  arg1 = (BroTable *)(argp1);
-  result = (int)bro_table_get_size(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_table_foreach(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroTable *arg1 = (BroTable *) 0 ;
-  BroTableCallback arg2 = (BroTableCallback) 0 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_table_foreach",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_table_foreach" "', argument " "1"" of type '" "BroTable *""'"); 
-  }
-  arg1 = (BroTable *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_p_void_p_void_p_void__int);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "bro_table_foreach" "', argument " "2"" of type '" "BroTableCallback""'"); 
-    }
-  }
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_table_foreach" "', argument " "3"" of type '" "void *""'"); 
-  }
-  bro_table_foreach(arg1,arg2,arg3);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_table_get_types(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroTable *arg1 = (BroTable *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int *arg3 = (int *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_table_get_types",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_table_get_types" "', argument " "1"" of type '" "BroTable *""'"); 
-  }
-  arg1 = (BroTable *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_table_get_types" "', argument " "2"" of type '" "int *""'"); 
-  }
-  arg2 = (int *)(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_table_get_types" "', argument " "3"" of type '" "int *""'"); 
-  }
-  arg3 = (int *)(argp3);
-  bro_table_get_types(arg1,arg2,arg3);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_set_new(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSet *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":bro_set_new")) SWIG_fail;
-  result = (BroSet *)bro_set_new();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_table, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_set_free(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSet *arg1 = (BroSet *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_set_free",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_set_free" "', argument " "1"" of type '" "BroSet *""'"); 
-  }
-  arg1 = (BroSet *)(argp1);
-  bro_set_free(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_set_insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSet *arg1 = (BroSet *) 0 ;
-  int arg2 ;
-  void *arg3 = (void *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_set_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_set_insert" "', argument " "1"" of type '" "BroSet *""'"); 
-  }
-  arg1 = (BroSet *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_set_insert" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_set_insert" "', argument " "3"" of type '" "void const *""'"); 
-  }
-  result = (int)bro_set_insert(arg1,arg2,(void const *)arg3);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_set_find(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSet *arg1 = (BroSet *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_set_find",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_set_find" "', argument " "1"" of type '" "BroSet *""'"); 
-  }
-  arg1 = (BroSet *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_set_find" "', argument " "2"" of type '" "void const *""'"); 
-  }
-  result = (int)bro_set_find(arg1,(void const *)arg2);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_set_get_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSet *arg1 = (BroSet *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_set_get_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_set_get_size" "', argument " "1"" of type '" "BroSet *""'"); 
-  }
-  arg1 = (BroSet *)(argp1);
-  result = (int)bro_set_get_size(arg1);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_set_foreach(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSet *arg1 = (BroSet *) 0 ;
-  BroSetCallback arg2 = (BroSetCallback) 0 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_set_foreach",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_set_foreach" "', argument " "1"" of type '" "BroSet *""'"); 
-  }
-  arg1 = (BroSet *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_p_void_p_void__int);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "bro_set_foreach" "', argument " "2"" of type '" "BroSetCallback""'"); 
-    }
-  }
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_set_foreach" "', argument " "3"" of type '" "void *""'"); 
-  }
-  bro_set_foreach(arg1,arg2,arg3);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_set_get_type(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroSet *arg1 = (BroSet *) 0 ;
-  int *arg2 = (int *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_set_get_type",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_table, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_set_get_type" "', argument " "1"" of type '" "BroSet *""'"); 
-  }
-  arg1 = (BroSet *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_set_get_type" "', argument " "2"" of type '" "int *""'"); 
-  }
-  arg2 = (int *)(argp2);
-  bro_set_get_type(arg1,arg2);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_set_packet_ctxt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_set_packet_ctxt",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_set_packet_ctxt" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_conn_set_packet_ctxt" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  bro_conn_set_packet_ctxt(arg1,arg2);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_conn_get_packet_ctxt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  int *arg2 = (int *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_conn_get_packet_ctxt",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_conn_get_packet_ctxt" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_conn_get_packet_ctxt" "', argument " "2"" of type '" "int *""'"); 
-  }
-  arg2 = (int *)(argp2);
-  bro_conn_get_packet_ctxt(arg1,arg2);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_new(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct pcap_pkthdr *arg1 = (struct pcap_pkthdr *) 0 ;
-  u_char *arg2 = (u_char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  BroPacket *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:bro_packet_new",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_pcap_pkthdr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_new" "', argument " "1"" of type '" "struct pcap_pkthdr const *""'"); 
-  }
-  arg1 = (struct pcap_pkthdr *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_u_char, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_packet_new" "', argument " "2"" of type '" "u_char const *""'"); 
-  }
-  arg2 = (u_char *)(argp2);
-  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "bro_packet_new" "', argument " "3"" of type '" "char const *""'");
-  }
-  arg3 = (char *)(buf3);
-  result = (BroPacket *)bro_packet_new((struct pcap_pkthdr const *)arg1,(u_char const *)arg2,(char const *)arg3);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return resultobj;
-fail:
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPacket *arg1 = (BroPacket *) 0 ;
-  BroPacket *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_clone" "', argument " "1"" of type '" "BroPacket const *""'"); 
-  }
-  arg1 = (BroPacket *)(argp1);
-  result = (BroPacket *)bro_packet_clone((struct bro_packet const *)arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_bro_packet, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_free(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroPacket *arg1 = (BroPacket *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_packet_free",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_free" "', argument " "1"" of type '" "BroPacket *""'"); 
-  }
-  arg1 = (BroPacket *)(argp1);
-  bro_packet_free(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_bro_packet_send(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  BroConn *arg1 = (BroConn *) 0 ;
-  BroPacket *arg2 = (BroPacket *) 0 ;
-  int result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:bro_packet_send",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_bro_conn, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_packet_send" "', argument " "1"" of type '" "BroConn *""'"); 
-  }
-  arg1 = (BroConn *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_bro_packet, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "bro_packet_send" "', argument " "2"" of type '" "BroPacket *""'"); 
-  }
-  arg2 = (BroPacket *)(argp2);
-  result = (int)bro_packet_send(arg1,arg2);
-  resultobj = SWIG_From_int((int)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_bro_util_current_time(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double result;
@@ -7684,344 +3326,42 @@
 }
 
 
-SWIGINTERN PyObject *_wrap_bro_util_timeval_to_double(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct timeval *arg1 = (struct timeval *) 0 ;
-  double result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:bro_util_timeval_to_double",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_timeval, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_util_timeval_to_double" "', argument " "1"" of type '" "struct timeval const *""'"); 
-  }
-  arg1 = (struct timeval *)(argp1);
-  result = (double)bro_util_timeval_to_double((struct timeval const *)arg1);
-  resultobj = SWIG_From_double((double)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 static PyMethodDef SwigMethods[] = {
-	 { (char *)"BroCtx_lock_func_set", _wrap_BroCtx_lock_func_set, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_lock_func_get", _wrap_BroCtx_lock_func_get, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_id_func_set", _wrap_BroCtx_id_func_set, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_id_func_get", _wrap_BroCtx_id_func_get, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_dl_create_func_set", _wrap_BroCtx_dl_create_func_set, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_dl_create_func_get", _wrap_BroCtx_dl_create_func_get, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_dl_lock_func_set", _wrap_BroCtx_dl_lock_func_set, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_dl_lock_func_get", _wrap_BroCtx_dl_lock_func_get, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_dl_free_func_set", _wrap_BroCtx_dl_free_func_set, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_dl_free_func_get", _wrap_BroCtx_dl_free_func_get, METH_VARARGS, NULL},
-	 { (char *)"new_BroCtx", _wrap_new_BroCtx, METH_VARARGS, NULL},
-	 { (char *)"delete_BroCtx", _wrap_delete_BroCtx, METH_VARARGS, NULL},
-	 { (char *)"BroCtx_swigregister", BroCtx_swigregister, METH_VARARGS, NULL},
-	 { (char *)"BroConnStats_tx_buflen_set", _wrap_BroConnStats_tx_buflen_set, METH_VARARGS, NULL},
-	 { (char *)"BroConnStats_tx_buflen_get", _wrap_BroConnStats_tx_buflen_get, METH_VARARGS, NULL},
-	 { (char *)"BroConnStats_rx_buflen_set", _wrap_BroConnStats_rx_buflen_set, METH_VARARGS, NULL},
-	 { (char *)"BroConnStats_rx_buflen_get", _wrap_BroConnStats_rx_buflen_get, METH_VARARGS, NULL},
-	 { (char *)"new_BroConnStats", _wrap_new_BroConnStats, METH_VARARGS, NULL},
-	 { (char *)"delete_BroConnStats", _wrap_delete_BroConnStats, METH_VARARGS, NULL},
-	 { (char *)"BroConnStats_swigregister", BroConnStats_swigregister, METH_VARARGS, NULL},
-	 { (char *)"BroString_str_len_set", _wrap_BroString_str_len_set, METH_VARARGS, NULL},
-	 { (char *)"BroString_str_len_get", _wrap_BroString_str_len_get, METH_VARARGS, NULL},
-	 { (char *)"BroString_str_val_set", _wrap_BroString_str_val_set, METH_VARARGS, NULL},
-	 { (char *)"BroString_str_val_get", _wrap_BroString_str_val_get, METH_VARARGS, NULL},
-	 { (char *)"new_BroString", _wrap_new_BroString, METH_VARARGS, NULL},
-	 { (char *)"delete_BroString", _wrap_delete_BroString, METH_VARARGS, NULL},
-	 { (char *)"BroString_swigregister", BroString_swigregister, METH_VARARGS, NULL},
-	 { (char *)"BroPort_port_num_set", _wrap_BroPort_port_num_set, METH_VARARGS, NULL},
-	 { (char *)"BroPort_port_num_get", _wrap_BroPort_port_num_get, METH_VARARGS, NULL},
-	 { (char *)"BroPort_port_proto_set", _wrap_BroPort_port_proto_set, METH_VARARGS, NULL},
-	 { (char *)"BroPort_port_proto_get", _wrap_BroPort_port_proto_get, METH_VARARGS, NULL},
-	 { (char *)"new_BroPort", _wrap_new_BroPort, METH_VARARGS, NULL},
-	 { (char *)"delete_BroPort", _wrap_delete_BroPort, METH_VARARGS, NULL},
-	 { (char *)"BroPort_swigregister", BroPort_swigregister, METH_VARARGS, NULL},
-	 { (char *)"BroSubnet_sn_net_set", _wrap_BroSubnet_sn_net_set, METH_VARARGS, NULL},
-	 { (char *)"BroSubnet_sn_net_get", _wrap_BroSubnet_sn_net_get, METH_VARARGS, NULL},
-	 { (char *)"BroSubnet_sn_width_set", _wrap_BroSubnet_sn_width_set, METH_VARARGS, NULL},
-	 { (char *)"BroSubnet_sn_width_get", _wrap_BroSubnet_sn_width_get, METH_VARARGS, NULL},
-	 { (char *)"new_BroSubnet", _wrap_new_BroSubnet, METH_VARARGS, NULL},
-	 { (char *)"delete_BroSubnet", _wrap_delete_BroSubnet, METH_VARARGS, NULL},
-	 { (char *)"BroSubnet_swigregister", BroSubnet_swigregister, METH_VARARGS, NULL},
-	 { (char *)"BroEvArg_arg_data_set", _wrap_BroEvArg_arg_data_set, METH_VARARGS, NULL},
-	 { (char *)"BroEvArg_arg_data_get", _wrap_BroEvArg_arg_data_get, METH_VARARGS, NULL},
-	 { (char *)"BroEvArg_arg_type_set", _wrap_BroEvArg_arg_type_set, METH_VARARGS, NULL},
-	 { (char *)"BroEvArg_arg_type_get", _wrap_BroEvArg_arg_type_get, METH_VARARGS, NULL},
-	 { (char *)"new_BroEvArg", _wrap_new_BroEvArg, METH_VARARGS, NULL},
-	 { (char *)"delete_BroEvArg", _wrap_delete_BroEvArg, METH_VARARGS, NULL},
-	 { (char *)"BroEvArg_swigregister", BroEvArg_swigregister, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_name_set", _wrap_bro_ev_meta_ev_name_set, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_name_get", _wrap_bro_ev_meta_ev_name_get, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_ts_set", _wrap_bro_ev_meta_ev_ts_set, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_ts_get", _wrap_bro_ev_meta_ev_ts_get, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_numargs_set", _wrap_bro_ev_meta_ev_numargs_set, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_numargs_get", _wrap_bro_ev_meta_ev_numargs_get, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_args_set", _wrap_bro_ev_meta_ev_args_set, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_args_get", _wrap_bro_ev_meta_ev_args_get, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_start_set", _wrap_bro_ev_meta_ev_start_set, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_start_get", _wrap_bro_ev_meta_ev_start_get, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_end_set", _wrap_bro_ev_meta_ev_end_set, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_ev_end_get", _wrap_bro_ev_meta_ev_end_get, METH_VARARGS, NULL},
-	 { (char *)"new_bro_ev_meta", _wrap_new_bro_ev_meta, METH_VARARGS, NULL},
-	 { (char *)"delete_bro_ev_meta", _wrap_delete_bro_ev_meta, METH_VARARGS, NULL},
-	 { (char *)"bro_ev_meta_swigregister", bro_ev_meta_swigregister, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_time_set", _wrap_bro_packet_pkt_time_set, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_time_get", _wrap_bro_packet_pkt_time_get, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_hdr_size_set", _wrap_bro_packet_pkt_hdr_size_set, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_hdr_size_get", _wrap_bro_packet_pkt_hdr_size_get, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_link_type_set", _wrap_bro_packet_pkt_link_type_set, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_link_type_get", _wrap_bro_packet_pkt_link_type_get, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_pcap_hdr_set", _wrap_bro_packet_pkt_pcap_hdr_set, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_pcap_hdr_get", _wrap_bro_packet_pkt_pcap_hdr_get, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_data_set", _wrap_bro_packet_pkt_data_set, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_data_get", _wrap_bro_packet_pkt_data_get, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_tag_set", _wrap_bro_packet_pkt_tag_set, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_pkt_tag_get", _wrap_bro_packet_pkt_tag_get, METH_VARARGS, NULL},
-	 { (char *)"new_bro_packet", _wrap_new_bro_packet, METH_VARARGS, NULL},
-	 { (char *)"delete_bro_packet", _wrap_delete_bro_packet, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_swigregister", bro_packet_swigregister, METH_VARARGS, NULL},
 	 { (char *)"bro_init", _wrap_bro_init, METH_VARARGS, NULL},
-	 { (char *)"bro_ctx_init", _wrap_bro_ctx_init, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_new", _wrap_bro_conn_new, METH_VARARGS, NULL},
 	 { (char *)"bro_conn_new_str", _wrap_bro_conn_new_str, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_new_socket", _wrap_bro_conn_new_socket, METH_VARARGS, NULL},
 	 { (char *)"bro_conn_set_class", _wrap_bro_conn_set_class, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_get_peer_class", _wrap_bro_conn_get_peer_class, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_get_connstats", _wrap_bro_conn_get_connstats, METH_VARARGS, NULL},
 	 { (char *)"bro_conn_connect", _wrap_bro_conn_connect, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_reconnect", _wrap_bro_conn_reconnect, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_delete", _wrap_bro_conn_delete, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_alive", _wrap_bro_conn_alive, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_adopt_events", _wrap_bro_conn_adopt_events, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_get_fd", _wrap_bro_conn_get_fd, METH_VARARGS, NULL},
 	 { (char *)"bro_conn_process_input", _wrap_bro_conn_process_input, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_data_set", _wrap_bro_conn_data_set, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_data_get", _wrap_bro_conn_data_get, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_data_del", _wrap_bro_conn_data_del, METH_VARARGS, NULL},
+	 { (char *)"bro_event_queue_length", _wrap_bro_event_queue_length, METH_VARARGS, NULL},
 	 { (char *)"bro_event_new", _wrap_bro_event_new, METH_VARARGS, NULL},
 	 { (char *)"bro_event_free", _wrap_bro_event_free, METH_VARARGS, NULL},
 	 { (char *)"bro_event_add_val", _wrap_bro_event_add_val, METH_VARARGS, NULL},
-	 { (char *)"bro_event_set_val", _wrap_bro_event_set_val, METH_VARARGS, NULL},
 	 { (char *)"bro_event_send", _wrap_bro_event_send, METH_VARARGS, NULL},
-	 { (char *)"bro_event_send_raw", _wrap_bro_event_send_raw, METH_VARARGS, NULL},
-	 { (char *)"bro_event_queue_length", _wrap_bro_event_queue_length, METH_VARARGS, NULL},
-	 { (char *)"bro_event_queue_length_max", _wrap_bro_event_queue_length_max, METH_VARARGS, NULL},
-	 { (char *)"bro_event_queue_flush", _wrap_bro_event_queue_flush, METH_VARARGS, NULL},
-	 { (char *)"bro_event_registry_add", _wrap_bro_event_registry_add, METH_VARARGS, NULL},
 	 { (char *)"bro_event_registry_add_compact", _wrap_bro_event_registry_add_compact, METH_VARARGS, NULL},
-	 { (char *)"bro_event_registry_remove", _wrap_bro_event_registry_remove, METH_VARARGS, NULL},
-	 { (char *)"bro_event_registry_request", _wrap_bro_event_registry_request, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_new", _wrap_bro_buf_new, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_free", _wrap_bro_buf_free, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_append", _wrap_bro_buf_append, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_consume", _wrap_bro_buf_consume, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_reset", _wrap_bro_buf_reset, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_get", _wrap_bro_buf_get, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_get_end", _wrap_bro_buf_get_end, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_get_size", _wrap_bro_buf_get_size, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_get_used_size", _wrap_bro_buf_get_used_size, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_ptr_get", _wrap_bro_buf_ptr_get, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_ptr_tell", _wrap_bro_buf_ptr_tell, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_ptr_seek", _wrap_bro_buf_ptr_seek, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_ptr_check", _wrap_bro_buf_ptr_check, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_ptr_read", _wrap_bro_buf_ptr_read, METH_VARARGS, NULL},
-	 { (char *)"bro_buf_ptr_write", _wrap_bro_buf_ptr_write, METH_VARARGS, NULL},
-	 { (char *)"bro_conf_set_domain", _wrap_bro_conf_set_domain, METH_VARARGS, NULL},
-	 { (char *)"bro_conf_get_int", _wrap_bro_conf_get_int, METH_VARARGS, NULL},
-	 { (char *)"bro_conf_get_dbl", _wrap_bro_conf_get_dbl, METH_VARARGS, NULL},
-	 { (char *)"bro_conf_get_str", _wrap_bro_conf_get_str, METH_VARARGS, NULL},
-	 { (char *)"bro_string_init", _wrap_bro_string_init, METH_VARARGS, NULL},
-	 { (char *)"bro_string_set", _wrap_bro_string_set, METH_VARARGS, NULL},
-	 { (char *)"bro_string_set_data", _wrap_bro_string_set_data, METH_VARARGS, NULL},
-	 { (char *)"bro_string_get_data", _wrap_bro_string_get_data, METH_VARARGS, NULL},
-	 { (char *)"bro_string_get_length", _wrap_bro_string_get_length, METH_VARARGS, NULL},
-	 { (char *)"bro_string_copy", _wrap_bro_string_copy, METH_VARARGS, NULL},
-	 { (char *)"bro_string_assign", _wrap_bro_string_assign, METH_VARARGS, NULL},
-	 { (char *)"bro_string_cleanup", _wrap_bro_string_cleanup, METH_VARARGS, NULL},
-	 { (char *)"bro_string_free", _wrap_bro_string_free, METH_VARARGS, NULL},
-	 { (char *)"bro_record_new", _wrap_bro_record_new, METH_VARARGS, NULL},
-	 { (char *)"bro_record_free", _wrap_bro_record_free, METH_VARARGS, NULL},
-	 { (char *)"bro_record_get_length", _wrap_bro_record_get_length, METH_VARARGS, NULL},
-	 { (char *)"bro_record_add_val", _wrap_bro_record_add_val, METH_VARARGS, NULL},
-	 { (char *)"bro_record_get_nth_val", _wrap_bro_record_get_nth_val, METH_VARARGS, NULL},
-	 { (char *)"bro_record_get_nth_name", _wrap_bro_record_get_nth_name, METH_VARARGS, NULL},
-	 { (char *)"bro_record_get_named_val", _wrap_bro_record_get_named_val, METH_VARARGS, NULL},
-	 { (char *)"bro_record_set_nth_val", _wrap_bro_record_set_nth_val, METH_VARARGS, NULL},
-	 { (char *)"bro_record_set_named_val", _wrap_bro_record_set_named_val, METH_VARARGS, NULL},
-	 { (char *)"bro_table_new", _wrap_bro_table_new, METH_VARARGS, NULL},
-	 { (char *)"bro_table_free", _wrap_bro_table_free, METH_VARARGS, NULL},
-	 { (char *)"bro_table_insert", _wrap_bro_table_insert, METH_VARARGS, NULL},
-	 { (char *)"bro_table_find", _wrap_bro_table_find, METH_VARARGS, NULL},
-	 { (char *)"bro_table_get_size", _wrap_bro_table_get_size, METH_VARARGS, NULL},
-	 { (char *)"bro_table_foreach", _wrap_bro_table_foreach, METH_VARARGS, NULL},
-	 { (char *)"bro_table_get_types", _wrap_bro_table_get_types, METH_VARARGS, NULL},
-	 { (char *)"bro_set_new", _wrap_bro_set_new, METH_VARARGS, NULL},
-	 { (char *)"bro_set_free", _wrap_bro_set_free, METH_VARARGS, NULL},
-	 { (char *)"bro_set_insert", _wrap_bro_set_insert, METH_VARARGS, NULL},
-	 { (char *)"bro_set_find", _wrap_bro_set_find, METH_VARARGS, NULL},
-	 { (char *)"bro_set_get_size", _wrap_bro_set_get_size, METH_VARARGS, NULL},
-	 { (char *)"bro_set_foreach", _wrap_bro_set_foreach, METH_VARARGS, NULL},
-	 { (char *)"bro_set_get_type", _wrap_bro_set_get_type, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_set_packet_ctxt", _wrap_bro_conn_set_packet_ctxt, METH_VARARGS, NULL},
-	 { (char *)"bro_conn_get_packet_ctxt", _wrap_bro_conn_get_packet_ctxt, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_new", _wrap_bro_packet_new, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_clone", _wrap_bro_packet_clone, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_free", _wrap_bro_packet_free, METH_VARARGS, NULL},
-	 { (char *)"bro_packet_send", _wrap_bro_packet_send, METH_VARARGS, NULL},
 	 { (char *)"bro_util_current_time", _wrap_bro_util_current_time, METH_VARARGS, NULL},
-	 { (char *)"bro_util_timeval_to_double", _wrap_bro_util_timeval_to_double, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static swig_type_info _swigt__p_bro_buf = {"_p_bro_buf", "BroBuf *|struct bro_buf *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_conn = {"_p_bro_conn", "struct bro_conn *|BroConn *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_conn_stats = {"_p_bro_conn_stats", "struct bro_conn_stats *|BroConnStats *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_ctx = {"_p_bro_ctx", "struct bro_ctx *|BroCtx *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_ev_arg = {"_p_bro_ev_arg", "struct bro_ev_arg *|BroEvArg *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_ev_meta = {"_p_bro_ev_meta", "struct bro_ev_meta *|BroEvMeta *|bro_ev_meta *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_event = {"_p_bro_event", "struct bro_event *|BroEvent *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_packet = {"_p_bro_packet", "struct bro_packet *|bro_packet *|BroPacket *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_port = {"_p_bro_port", "struct bro_port *|BroPort *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_record = {"_p_bro_record", "struct bro_record *|BroRecord *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_string = {"_p_bro_string", "struct bro_string *|BroString *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_subnet = {"_p_bro_subnet", "struct bro_subnet *|BroSubnet *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_bro_table = {"_p_bro_table", "struct bro_table *|BroTable *|BroSet *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_BroCompactEventFunc = {"_p_BroCompactEventFunc", "BroCompactEventFunc *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_int_int_p_q_const__char_int__void = {"_p_f_int_int_p_q_const__char_int__void", "OpenSSL_lock_func|void (*)(int,int,char const *,int)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void = {"_p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void", "OpenSSL_dynlock_lock_func|void (*)(int,struct CRYPTO_dynlock_value *,char const *,int)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__char_int__p_CRYPTO_dynlock_value = {"_p_f_p_q_const__char_int__p_CRYPTO_dynlock_value", "struct CRYPTO_dynlock_value *(*)(char const *,int)|OpenSSL_dynlock_create_func", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void = {"_p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void", "OpenSSL_dynlock_free_func|void (*)(struct CRYPTO_dynlock_value *,char const *,int)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_struct_bro_conn_p_void_p_struct_bro_ev_meta__void = {"_p_f_p_struct_bro_conn_p_void_p_struct_bro_ev_meta__void", "void (*)(struct bro_conn *,void *,struct bro_ev_meta *)|BroCompactEventFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_struct_bro_conn_p_void_v_______void = {"_p_f_p_struct_bro_conn_p_void_v_______void", "void (*)(struct bro_conn *,void *,...)|BroEventFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_void_p_void__int = {"_p_f_p_void_p_void__int", "int (*)(void *,void *)|BroSetCallback", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_void_p_void_p_void__int = {"_p_f_p_void_p_void_p_void__int", "int (*)(void *,void *,void *)|BroTableCallback", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_void__unsigned_long = {"_p_f_void__unsigned_long", "OpenSSL_thread_id_func|unsigned long (*)(void)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_in_addr = {"_p_in_addr", "struct in_addr *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pcap_pkthdr = {"_p_pcap_pkthdr", "struct pcap_pkthdr *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_timeval = {"_p_timeval", "struct timeval *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_u_char = {"_p_u_char", "u_char *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_uint = {"_p_uint", "uint *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "uchar *|unsigned char *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "uint32 *|unsigned int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "uint16 *|unsigned short *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_void = {"_p_void", "void *|BroEvent *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
-  &_swigt__p_bro_buf,
-  &_swigt__p_bro_conn,
-  &_swigt__p_bro_conn_stats,
-  &_swigt__p_bro_ctx,
-  &_swigt__p_bro_ev_arg,
-  &_swigt__p_bro_ev_meta,
-  &_swigt__p_bro_event,
-  &_swigt__p_bro_packet,
-  &_swigt__p_bro_port,
-  &_swigt__p_bro_record,
-  &_swigt__p_bro_string,
-  &_swigt__p_bro_subnet,
-  &_swigt__p_bro_table,
+  &_swigt__p_BroCompactEventFunc,
   &_swigt__p_char,
-  &_swigt__p_double,
-  &_swigt__p_f_int_int_p_q_const__char_int__void,
-  &_swigt__p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void,
-  &_swigt__p_f_p_q_const__char_int__p_CRYPTO_dynlock_value,
-  &_swigt__p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void,
-  &_swigt__p_f_p_struct_bro_conn_p_void_p_struct_bro_ev_meta__void,
-  &_swigt__p_f_p_struct_bro_conn_p_void_v_______void,
-  &_swigt__p_f_p_void_p_void__int,
-  &_swigt__p_f_p_void_p_void_p_void__int,
-  &_swigt__p_f_void__unsigned_long,
-  &_swigt__p_in_addr,
-  &_swigt__p_int,
-  &_swigt__p_pcap_pkthdr,
-  &_swigt__p_timeval,
-  &_swigt__p_u_char,
-  &_swigt__p_uint,
-  &_swigt__p_unsigned_char,
-  &_swigt__p_unsigned_int,
-  &_swigt__p_unsigned_short,
   &_swigt__p_void,
 };
 
-static swig_cast_info _swigc__p_bro_buf[] = {  {&_swigt__p_bro_buf, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_conn[] = {  {&_swigt__p_bro_conn, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_conn_stats[] = {  {&_swigt__p_bro_conn_stats, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_ctx[] = {  {&_swigt__p_bro_ctx, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_ev_arg[] = {  {&_swigt__p_bro_ev_arg, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_ev_meta[] = {  {&_swigt__p_bro_ev_meta, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_event[] = {  {&_swigt__p_bro_event, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_packet[] = {  {&_swigt__p_bro_packet, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_port[] = {  {&_swigt__p_bro_port, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_record[] = {  {&_swigt__p_bro_record, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_string[] = {  {&_swigt__p_bro_string, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_subnet[] = {  {&_swigt__p_bro_subnet, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_bro_table[] = {  {&_swigt__p_bro_table, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_BroCompactEventFunc[] = {  {&_swigt__p_BroCompactEventFunc, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_int_int_p_q_const__char_int__void[] = {  {&_swigt__p_f_int_int_p_q_const__char_int__void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void[] = {  {&_swigt__p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_q_const__char_int__p_CRYPTO_dynlock_value[] = {  {&_swigt__p_f_p_q_const__char_int__p_CRYPTO_dynlock_value, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void[] = {  {&_swigt__p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_struct_bro_conn_p_void_p_struct_bro_ev_meta__void[] = {  {&_swigt__p_f_p_struct_bro_conn_p_void_p_struct_bro_ev_meta__void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_struct_bro_conn_p_void_v_______void[] = {  {&_swigt__p_f_p_struct_bro_conn_p_void_v_______void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_void_p_void__int[] = {  {&_swigt__p_f_p_void_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_void_p_void_p_void__int[] = {  {&_swigt__p_f_p_void_p_void_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_void__unsigned_long[] = {  {&_swigt__p_f_void__unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_in_addr[] = {  {&_swigt__p_in_addr, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pcap_pkthdr[] = {  {&_swigt__p_pcap_pkthdr, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_timeval[] = {  {&_swigt__p_timeval, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_u_char[] = {  {&_swigt__p_u_char, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_uint[] = {  {&_swigt__p_uint, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_void[] = {  {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
-  _swigc__p_bro_buf,
-  _swigc__p_bro_conn,
-  _swigc__p_bro_conn_stats,
-  _swigc__p_bro_ctx,
-  _swigc__p_bro_ev_arg,
-  _swigc__p_bro_ev_meta,
-  _swigc__p_bro_event,
-  _swigc__p_bro_packet,
-  _swigc__p_bro_port,
-  _swigc__p_bro_record,
-  _swigc__p_bro_string,
-  _swigc__p_bro_subnet,
-  _swigc__p_bro_table,
+  _swigc__p_BroCompactEventFunc,
   _swigc__p_char,
-  _swigc__p_double,
-  _swigc__p_f_int_int_p_q_const__char_int__void,
-  _swigc__p_f_int_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void,
-  _swigc__p_f_p_q_const__char_int__p_CRYPTO_dynlock_value,
-  _swigc__p_f_p_struct_CRYPTO_dynlock_value_p_q_const__char_int__void,
-  _swigc__p_f_p_struct_bro_conn_p_void_p_struct_bro_ev_meta__void,
-  _swigc__p_f_p_struct_bro_conn_p_void_v_______void,
-  _swigc__p_f_p_void_p_void__int,
-  _swigc__p_f_p_void_p_void_p_void__int,
-  _swigc__p_f_void__unsigned_long,
-  _swigc__p_in_addr,
-  _swigc__p_int,
-  _swigc__p_pcap_pkthdr,
-  _swigc__p_timeval,
-  _swigc__p_u_char,
-  _swigc__p_uint,
-  _swigc__p_unsigned_char,
-  _swigc__p_unsigned_int,
-  _swigc__p_unsigned_short,
   _swigc__p_void,
 };
 
@@ -8091,7 +3431,7 @@
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found, init;
+  int found;
   
   clientdata = clientdata;
   
@@ -8101,9 +3441,6 @@
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
-    init = 1;
-  } else {
-    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -8132,12 +3469,6 @@
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
-       a different interpreter, but not yet have a pointer in this interpreter.
-       In this case, we do not want to continue adding types... everything should be
-       set up already */
-  if (init == 0) return;
-  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -8552,11 +3883,6 @@
   SWIG_InstallConstants(d,swig_const_table);
   
   
-  PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
-  SWIG_addvarlink(SWIG_globals(),(char*)"bro_debug_calltrace",Swig_var_bro_debug_calltrace_get, Swig_var_bro_debug_calltrace_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"bro_debug_messages",Swig_var_bro_debug_messages_get, Swig_var_bro_debug_messages_set);
-  SWIG_Python_SetConstant(d, "FALSE",SWIG_From_int((int)((0))));
-  SWIG_Python_SetConstant(d, "TRUE",SWIG_From_int((int)((!(0)))));
   SWIG_Python_SetConstant(d, "BRO_TYPE_UNKNOWN",SWIG_From_int((int)(0)));
   SWIG_Python_SetConstant(d, "BRO_TYPE_BOOL",SWIG_From_int((int)(1)));
   SWIG_Python_SetConstant(d, "BRO_TYPE_INT",SWIG_From_int((int)(2)));


More information about the Bro mailing list