qpid_proton 0.14.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de527793802641b6b881d82087c5baeb768b0791
-  data.tar.gz: 9382786d7341c03b75a26a3363ac971208ac30ff
+  metadata.gz: 98f1b972dacfed18fba7181a88b4552c891b46a4
+  data.tar.gz: 7fd25bf8ec9093f1611f115545d375a702425226
 SHA512:
-  metadata.gz: d0cbf51c18be0e1174135143ca1106a7442240efb726a440d226b85834a7d979b886bab51c465554af78b52923f5e640bf59239ac9a7cf925a5ae80bde460790
-  data.tar.gz: 445a6e257a66925ce301ed5e660a659c6057f820c2e13806bd73ef6fc3202d56c9acfbc96d51e065cdc13662f456aedc3209c68f63fca2e1cdc00ad4e337f9e3
+  metadata.gz: 8b9bb2b6b1c19020f61af94c7debbf113e7e257b6bbd9704196b158e5dd37c2fa28ae9aa32377ab1566d89be6f73ddb149752437daa6033dc25bdc17886a022d
+  data.tar.gz: 45fb0bb90335659c2044cd97d46ed77b14b51c892a0ac13e2df6a2741817853fa4962cbd98cd8a4cf95ddd7771231fad09cfe90a67504b803e77b5fdb41f057f

data/ext/cproton/cproton.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.7
+ * Version 3.0.12
  *
  * 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
@@ -8,7 +8,11 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+
+#ifndef SWIGRUBY
 #define SWIGRUBY
+#endif
+
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -77,9 +81,11 @@
 #endif
 
 /* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
 #  endif
 #endif
 
@@ -199,9 +205,11 @@
 #endif
 
 /* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
 #  endif
 #endif
 
@@ -751,16 +759,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
     char d = *(c++);
     unsigned char uu;
     if ((d >= '0') && (d <= '9'))
-      uu = ((d - '0') << 4);
+      uu = (unsigned char)((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
-      uu = ((d - ('a'-10)) << 4);
+      uu = (unsigned char)((d - ('a'-10)) << 4);
     else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
-      uu |= (d - '0');
+      uu |= (unsigned char)(d - '0');
     else if ((d >= 'a') && (d <= 'f'))
-      uu |= (d - ('a'-10));
+      uu |= (unsigned char)(d - ('a'-10));
     else
       return (char *) 0;
     *u = uu;
@@ -1342,7 +1350,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 #define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, own)
 #define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Ruby_NewPointerObj(ptr, type, flags)
 #define SWIG_AcquirePtr(ptr, own)                       SWIG_Ruby_AcquirePtr(ptr, own)
-#define swig_owntype                                    ruby_owntype
+#define swig_owntype                                    swig_ruby_owntype
 
 /* for raw packed data */
 #define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty, flags)
@@ -1566,22 +1574,24 @@ SWIG_Ruby_MangleStr(VALUE obj)
 }
 
 /* Acquire a pointer value */
-typedef void (*ruby_owntype)(void*);
+typedef struct {
+  void (*datafree)(void *);
+  int own;
+} swig_ruby_owntype;
 
-SWIGRUNTIME ruby_owntype
-SWIG_Ruby_AcquirePtr(VALUE obj, ruby_owntype own) {
+SWIGRUNTIME swig_ruby_owntype
+SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) {
+  swig_ruby_owntype oldown = {0, 0};
   if (obj) {
-    ruby_owntype oldown = RDATA(obj)->dfree;
-    RDATA(obj)->dfree = own;
-    return oldown;
-  } else {
-    return 0;
+    oldown.datafree = RDATA(obj)->dfree;
+    RDATA(obj)->dfree = own.datafree;
   }
+  return oldown;
 }
 
 /* Convert a pointer value */
 SWIGRUNTIME int
-SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own)
+SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, swig_ruby_owntype *own)
 {
   char *c;
   swig_cast_info *tc;
@@ -1589,7 +1599,8 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
 
   /* Grab the pointer */
   if (NIL_P(obj)) {
-    *ptr = 0;
+    if (ptr)
+      *ptr = 0;
     return SWIG_OK;
   } else {
     if (TYPE(obj) != T_DATA) {
@@ -1598,7 +1609,10 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     Data_Get_Struct(obj, void, vptr);
   }
   
-  if (own) *own = RDATA(obj)->dfree;
+  if (own) {
+    own->datafree = RDATA(obj)->dfree;
+    own->own = 0;
+  }
     
   /* Check to see if the input object is giving up ownership
      of the underlying C struct or C++ object.  If so then we
@@ -1633,8 +1647,6 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
           /* The object has already been deleted */
           return SWIG_ObjectPreviouslyDeletedError;
         }
-        *ptr = vptr;
-        return SWIG_OK;
       }
     }
     if ((c = SWIG_MangleStr(obj)) == NULL) {
@@ -1644,12 +1656,23 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     if (!tc) {
       return SWIG_ERROR;
     } else {
-      int newmemory = 0;
-      *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
-      assert(!newmemory); /* newmemory handling not yet implemented */
+      if (ptr) {
+        if (tc->type == ty) {
+          *ptr = vptr;
+        } else {
+          int newmemory = 0;
+          *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
+          if (newmemory == SWIG_CAST_NEW_MEMORY) {
+            assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
+            if (own)
+              own->own = own->own | SWIG_CAST_NEW_MEMORY;
+          }
+        }
+      }
     }
   } else {
-    *ptr = vptr;
+    if (ptr)
+      *ptr = vptr;
   }
   
   return SWIG_OK;
@@ -1805,12 +1828,12 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_pn_distribution_mode_t swig_types[25]
 #define SWIGTYPE_p_pn_durability_t swig_types[26]
 #define SWIGTYPE_p_pn_error_t swig_types[27]
-#define SWIGTYPE_p_pn_event_t swig_types[28]
-#define SWIGTYPE_p_pn_event_type_t swig_types[29]
-#define SWIGTYPE_p_pn_expiry_policy_t swig_types[30]
-#define SWIGTYPE_p_pn_handler_t swig_types[31]
-#define SWIGTYPE_p_pn_hash_t swig_types[32]
-#define SWIGTYPE_p_pn_io_t swig_types[33]
+#define SWIGTYPE_p_pn_event_batch_t swig_types[28]
+#define SWIGTYPE_p_pn_event_t swig_types[29]
+#define SWIGTYPE_p_pn_event_type_t swig_types[30]
+#define SWIGTYPE_p_pn_expiry_policy_t swig_types[31]
+#define SWIGTYPE_p_pn_handler_t swig_types[32]
+#define SWIGTYPE_p_pn_hash_t swig_types[33]
 #define SWIGTYPE_p_pn_iterator_t swig_types[34]
 #define SWIGTYPE_p_pn_link_t swig_types[35]
 #define SWIGTYPE_p_pn_list_t swig_types[36]
@@ -1820,10 +1843,10 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_pn_rcv_settle_mode_t swig_types[40]
 #define SWIGTYPE_p_pn_reactor_t swig_types[41]
 #define SWIGTYPE_p_pn_record_t swig_types[42]
-#define SWIGTYPE_p_pn_sasl_outcome_t swig_types[43]
-#define SWIGTYPE_p_pn_sasl_t swig_types[44]
-#define SWIGTYPE_p_pn_selectable_t swig_types[45]
-#define SWIGTYPE_p_pn_selector_t swig_types[46]
+#define SWIGTYPE_p_pn_rwbytes_t swig_types[43]
+#define SWIGTYPE_p_pn_sasl_outcome_t swig_types[44]
+#define SWIGTYPE_p_pn_sasl_t swig_types[45]
+#define SWIGTYPE_p_pn_selectable_t swig_types[46]
 #define SWIGTYPE_p_pn_session_t swig_types[47]
 #define SWIGTYPE_p_pn_snd_settle_mode_t swig_types[48]
 #define SWIGTYPE_p_pn_ssl_cert_subject_subfield swig_types[49]
@@ -1868,7 +1891,7 @@ static VALUE mCproton;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x030007 
+#define SWIGVERSION 0x030012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1900,7 +1923,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1929,12 +1952,69 @@ SWIG_AsVal_unsigned_SS_long (VALUE obj, unsigned long *val)
 }
 
 
+#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
+#endif
+
+
+#if defined(LLONG_MAX) && !defined(SWIG_LONG_LONG_AVAILABLE)
+#  define SWIG_LONG_LONG_AVAILABLE
+#endif
+
+
+#ifdef SWIG_LONG_LONG_AVAILABLE
+/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE *args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  long long *res = (long long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2ULL(obj) : rb_big2ull(obj);
+  return obj;
+}
+/*@SWIG@*/
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_long_SS_long (VALUE obj, unsigned long long *val)
+{ 
+  VALUE type = TYPE(obj);
+  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
+    unsigned long long v;
+    VALUE a[2];
+    a[0] = obj;
+    a[1] = (VALUE)(&v);
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+      if (val) *val = v;
+      return SWIG_OK;
+    }
+  }
+  return SWIG_TypeError;
+}
+#endif
+
+
 SWIGINTERNINLINE int
 SWIG_AsVal_size_t (VALUE obj, size_t *val)
 {
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
-  if (SWIG_IsOK(res) && val) *val = (size_t)(v);
+  int res = SWIG_TypeError;
+#ifdef SWIG_LONG_LONG_AVAILABLE
+  if (sizeof(size_t) <= sizeof(unsigned long)) {
+#endif
+    unsigned long v;
+    res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
+    if (SWIG_IsOK(res) && val) *val = (size_t)(v);
+#ifdef SWIG_LONG_LONG_AVAILABLE
+  } else if (sizeof(size_t) <= sizeof(unsigned long long)) {
+    unsigned long long v;
+    res = SWIG_AsVal_unsigned_SS_long_SS_long (obj, val ? &v : 0);
+    if (SWIG_IsOK(res) && val) *val = (size_t)(v);
+  }
+#endif
   return res;
 }
 
@@ -1961,7 +2041,7 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
     if (cptr)  {
       if (alloc) {
 	if (*alloc == SWIG_NEWOBJ) {
-	  *cptr = (char *)memcpy((char *)malloc((size)*sizeof(char)), cstr, sizeof(char)*(size));
+	  *cptr = (char *)memcpy(malloc((size)*sizeof(char)), cstr, sizeof(char)*(size));
 	} else {
 	  *cptr = cstr;
 	  *alloc = SWIG_OLDOBJ;
@@ -2006,16 +2086,6 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
 }
 
 
-#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
-#endif
-
-
   #define SWIG_From_long   LONG2NUM 
 
 
@@ -2227,7 +2297,7 @@ SWIG_From_bool  (bool value)
 
 
 
-/*@SWIG:/usr/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2431,17 +2501,28 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 
 
+#ifdef SWIG_LONG_LONG_AVAILABLE
 SWIGINTERNINLINE VALUE 
-SWIG_From_long_SS_long  (long long value)
+SWIG_From_unsigned_SS_long_SS_long  (unsigned long long value)
 {
-  return LL2NUM(value);
+  return ULL2NUM(value);
 }
+#endif
 
 
 SWIGINTERNINLINE VALUE
 SWIG_From_size_t  (size_t value)
 {    
-  return SWIG_From_unsigned_SS_long  ((unsigned long)(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+  if (sizeof(size_t) <= sizeof(unsigned long)) {
+#endif
+    return SWIG_From_unsigned_SS_long  ((unsigned long)(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+  } else {
+    /* assume sizeof(size_t) <= sizeof(unsigned long long) */
+    return SWIG_From_unsigned_SS_long_SS_long  ((unsigned long long)(value));
+  }
+#endif
 }
 
 
@@ -2453,8 +2534,25 @@ SWIG_From_size_t  (size_t value)
 
 /* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */
 #ifndef SWIG_isfinite
+/* isfinite() is a macro for C99 */
 # if defined(isfinite)
 #  define SWIG_isfinite(X) (isfinite(X))
+# elif defined __cplusplus && __cplusplus >= 201103L
+/* Use a template so that this works whether isfinite() is std::isfinite() or
+ * in the global namespace.  The reality seems to vary between compiler
+ * versions.
+ *
+ * Make sure namespace std exists to avoid compiler warnings.
+ *
+ * extern "C++" is required as this fragment can end up inside an extern "C" { } block
+ */
+namespace std { }
+extern "C++" template<typename T>
+inline int SWIG_isfinite_func(T x) {
+  using namespace std;
+  return isfinite(x);
+}
+#  define SWIG_isfinite(X) (SWIG_isfinite_func(X))
 # elif defined(_MSC_VER)
 #  define SWIG_isfinite(X) (_finite(X))
 # elif defined(__sun) && defined(__SVR4)
@@ -2472,7 +2570,7 @@ SWIG_From_size_t  (size_t value)
 #endif
 
 
-/*@SWIG:/usr/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2537,42 +2635,6 @@ SWIG_AsVal_bool (VALUE obj, bool *val)
 }
 
 
-SWIGINTERNINLINE VALUE 
-SWIG_From_unsigned_SS_long_SS_long  (unsigned long long value)
-{
-  return ULL2NUM(value);
-}
-
-
-/*@SWIG:/usr/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE *args)
-{
-  VALUE obj = args[0];
-  VALUE type = TYPE(obj);
-  long long *res = (long long *)(args[1]);
-  *res = type == T_FIXNUM ? NUM2ULL(obj) : rb_big2ull(obj);
-  return obj;
-}
-/*@SWIG@*/
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_long_SS_long (VALUE obj, unsigned long long *val)
-{ 
-  VALUE type = TYPE(obj);
-  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    unsigned long long v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-
-
 SWIGINTERNINLINE VALUE
 SWIG_From_unsigned_SS_short  (unsigned short value)
 {    
@@ -2596,7 +2658,8 @@ SWIG_AsVal_unsigned_SS_short (VALUE obj, unsigned short *val)
 }
 
 
-/*@SWIG:/usr/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+#ifdef SWIG_LONG_LONG_AVAILABLE
+/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2623,6 +2686,16 @@ SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
   }
   return SWIG_TypeError;
 }
+#endif
+
+
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERNINLINE VALUE 
+SWIG_From_long_SS_long  (long long value)
+{
+  return LL2NUM(value);
+}
+#endif
 
 
   /* assume the binding does the incref in the wrapper */
@@ -2743,7 +2816,7 @@ _wrap_pn_message_encode(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "(char *OUTPUT, size_t *OUTPUT_SIZE)","pn_message_encode", 2, argv[1] ));
   }
-  buff2= (char *)malloc((n2+1)*sizeof(char));
+  buff2= (char *)calloc(n2+1, sizeof(char));
   arg2 = (char *)(buff2);
   size2 = (size_t)(n2);
   arg3 = &size2;
@@ -2822,7 +2895,7 @@ _wrap_pn_link_recv(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "(char *OUTPUT, size_t *OUTPUT_SIZE)","wrap_pn_link_recv", 2, argv[1] ));
   }
-  buff2= (char *)malloc((n2+1)*sizeof(char));
+  buff2= (char *)calloc(n2+1, sizeof(char));
   arg2 = (char *)(buff2);
   size2 = (size_t)(n2);
   arg3 = &size2;
@@ -2901,7 +2974,7 @@ _wrap_pn_transport_output(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "(char *OUTPUT, size_t *OUTPUT_SIZE)","wrap_pn_transport_output", 2, argv[1] ));
   }
-  buff2= (char *)malloc((n2+1)*sizeof(char));
+  buff2= (char *)calloc(n2+1, sizeof(char));
   arg2 = (char *)(buff2);
   size2 = (size_t)(n2);
   arg3 = &size2;
@@ -2942,7 +3015,7 @@ _wrap_pn_transport_peek(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "(char *OUTPUT, size_t *OUTPUT_SIZE)","wrap_pn_transport_peek", 2, argv[1] ));
   }
-  buff2= (char *)malloc((n2+1)*sizeof(char));
+  buff2= (char *)calloc(n2+1, sizeof(char));
   arg2 = (char *)(buff2);
   size2 = (size_t)(n2);
   arg3 = &size2;
@@ -3051,7 +3124,7 @@ _wrap_pn_ssl_get_cipher_name(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "(char *OUTPUT, size_t MAX_OUTPUT_SIZE)","pn_ssl_get_cipher_name", 2, argv[1] ));
   }
-  buff2= (char *)malloc((size2+1)*sizeof(char));
+  buff2= (char *)calloc(size2+1, sizeof(char));
   arg3 = (size_t)(size2);
   arg2 = (char *)(buff2);
   result = (bool)pn_ssl_get_cipher_name(arg1,arg2,arg3);
@@ -3090,7 +3163,7 @@ _wrap_pn_ssl_get_protocol_name(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "(char *OUTPUT, size_t MAX_OUTPUT_SIZE)","pn_ssl_get_protocol_name", 2, argv[1] ));
   }
-  buff2= (char *)malloc((size2+1)*sizeof(char));
+  buff2= (char *)calloc(size2+1, sizeof(char));
   arg3 = (size_t)(size2);
   arg2 = (char *)(buff2);
   result = (bool)pn_ssl_get_protocol_name(arg1,arg2,arg3);
@@ -3505,7 +3578,7 @@ _wrap_pn_ssl_get_peer_hostname(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "(char *OUTPUT, size_t *OUTPUT_SIZE)","pn_ssl_get_peer_hostname", 2, argv[1] ));
   }
-  buff2= (char *)malloc((n2+1)*sizeof(char));
+  buff2= (char *)calloc(n2+1, sizeof(char));
   arg2 = (char *)(buff2);
   size2 = (size_t)(n2);
   arg3 = &size2;
@@ -3635,22 +3708,20 @@ fail:
 }
 
 
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
-_wrap_Pni_rbhandler_t_allocate(VALUE self) {
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+_wrap_Pni_rbhandler_t_allocate(VALUE self)
 #else
-  SWIGINTERN VALUE
-  _wrap_Pni_rbhandler_t_allocate(int argc, VALUE *argv, VALUE self) {
+_wrap_Pni_rbhandler_t_allocate(int argc, VALUE *argv, VALUE self)
 #endif
-    
-    
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_Pni_rbhandler_t);
+{
+  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_Pni_rbhandler_t);
 #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-    rb_obj_call_init(vresult, argc, argv);
+  rb_obj_call_init(vresult, argc, argv);
 #endif
-    return vresult;
-  }
-  
+  return vresult;
+}
+
 
 SWIGINTERN VALUE
 _wrap_new_Pni_rbhandler_t(int argc, VALUE *argv, VALUE self) {
@@ -3668,7 +3739,8 @@ fail:
 
 
 SWIGINTERN void
-free_Pni_rbhandler_t(Pni_rbhandler_t *arg1) {
+free_Pni_rbhandler_t(void *self) {
+    Pni_rbhandler_t *arg1 = (Pni_rbhandler_t *)self;
     free((char *) arg1);
 }
 
@@ -3773,23 +3845,53 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_timestamp_now(int argc, VALUE *argv, VALUE self) {
-  pn_timestamp_t result;
+_wrap_pn_bytes(int argc, VALUE *argv, VALUE self) {
+  size_t arg1 ;
+  char *arg2 = (char *) 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  pn_bytes_t result;
   VALUE vresult = Qnil;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  result = (pn_timestamp_t)pn_timestamp_now();
-  vresult = SWIG_From_long_SS_long((long long)(result));
+  ecode1 = SWIG_AsVal_size_t(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "size_t","pn_bytes", 1, argv[0] ));
+  } 
+  arg1 = (size_t)(val1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_bytes", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  result = pn_bytes(arg1,(char const *)arg2);
+  {
+    vresult = rb_str_new((&result)->start, (&result)->size);
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
 fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_pn_bytes(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_bytes_null_get(VALUE self) {
+  VALUE _val;
+  
+  _val = SWIG_NewPointerObj(SWIG_as_voidptr(&pn_bytes_null), SWIGTYPE_p_pn_bytes_t,  0 );
+  return _val;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_rwbytes(int argc, VALUE *argv, VALUE self) {
   size_t arg1 ;
   char *arg2 = (char *) 0 ;
   size_t val1 ;
@@ -3797,7 +3899,7 @@ _wrap_pn_bytes(int argc, VALUE *argv, VALUE self) {
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
-  pn_bytes_t result;
+  pn_rwbytes_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 2) || (argc > 2)) {
@@ -3805,18 +3907,16 @@ _wrap_pn_bytes(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_size_t(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "size_t","pn_bytes", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "size_t","pn_rwbytes", 1, argv[0] ));
   } 
   arg1 = (size_t)(val1);
   res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_bytes", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","pn_rwbytes", 2, argv[1] ));
   }
   arg2 = (char *)(buf2);
-  result = pn_bytes(arg1,(char const *)arg2);
-  {
-    vresult = rb_str_new((&result)->start, (&result)->size);
-  }
+  result = pn_rwbytes(arg1,arg2);
+  vresult = SWIG_NewPointerObj((pn_rwbytes_t *)memcpy((pn_rwbytes_t *)calloc(1,sizeof(pn_rwbytes_t)),&result,sizeof(pn_rwbytes_t)), SWIGTYPE_p_pn_rwbytes_t, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
 fail:
@@ -3825,6 +3925,15 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_rwbytes_null_get(VALUE self) {
+  VALUE _val;
+  
+  _val = SWIG_NewPointerObj(SWIG_as_voidptr(&pn_rwbytes_null), SWIGTYPE_p_pn_bytes_t,  0 );
+  return _val;
+}
+
+
 SWIGINTERN VALUE
 _wrap_PN_OBJECT_get(VALUE self) {
   VALUE _val;
@@ -3869,7 +3978,7 @@ _wrap_pn_class_id(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (pn_class_t *)(argp1);
   result = pn_class_id((struct pn_class_t const *)arg1);
-  vresult = SWIG_NewPointerObj((pn_cid_t *)memcpy((pn_cid_t *)malloc(sizeof(pn_cid_t)),&result,sizeof(pn_cid_t)), SWIGTYPE_p_pn_cid_t, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((pn_cid_t *)memcpy((pn_cid_t *)calloc(1,sizeof(pn_cid_t)),&result,sizeof(pn_cid_t)), SWIGTYPE_p_pn_cid_t, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -4138,7 +4247,7 @@ _wrap_pn_class_compare(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_class_compare", 3, argv[2] )); 
   }
   result = pn_class_compare((struct pn_class_t const *)arg1,arg2,arg3);
-  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)malloc(sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)calloc(1,sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -4220,21 +4329,31 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_void_hashcode(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  uintptr_t result;
+_wrap_pn_void_new(int argc, VALUE *argv, VALUE self) {
+  pn_class_t *arg1 = (pn_class_t *) 0 ;
+  size_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_hashcode", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_void_new", 1, argv[0] )); 
   }
-  result = (uintptr_t)pn_void_hashcode(arg1);
-  vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
+  arg1 = (pn_class_t *)(argp1);
+  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_void_new", 2, argv[1] ));
+  } 
+  arg2 = (size_t)(val2);
+  result = (void *)pn_void_new((struct pn_class_t const *)arg1,arg2);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -4242,66 +4361,148 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_void_compare(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_void_incref(int argc, VALUE *argv, VALUE self) {
   void *arg1 = (void *) 0 ;
-  void *arg2 = (void *) 0 ;
   int res1 ;
-  int res2 ;
-  intptr_t result;
-  VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_compare", 1, argv[0] )); 
-  }
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_void_compare", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_incref", 1, argv[0] )); 
   }
-  result = pn_void_compare(arg1,arg2);
-  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)malloc(sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
+  pn_void_incref(arg1);
+  return Qnil;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_pn_void_inspect(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_void_decref(int argc, VALUE *argv, VALUE self) {
   void *arg1 = (void *) 0 ;
-  pn_string_t *arg2 = (pn_string_t *) 0 ;
   int res1 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_inspect", 1, argv[0] )); 
-  }
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_string_t *","pn_void_inspect", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_decref", 1, argv[0] )); 
   }
-  arg2 = (pn_string_t *)(argp2);
-  result = (int)pn_void_inspect(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
+  pn_void_decref(arg1);
+  return Qnil;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_pn_object_new(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
+_wrap_pn_void_refcount(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  int res1 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_refcount", 1, argv[0] )); 
+  }
+  result = (int)pn_void_refcount(arg1);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_void_hashcode(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  int res1 ;
+  uintptr_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_hashcode", 1, argv[0] )); 
+  }
+  result = (uintptr_t)pn_void_hashcode(arg1);
+  vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_void_compare(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  void *arg2 = (void *) 0 ;
+  int res1 ;
+  int res2 ;
+  intptr_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_compare", 1, argv[0] )); 
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_void_compare", 2, argv[1] )); 
+  }
+  result = pn_void_compare(arg1,arg2);
+  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)calloc(1,sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_void_inspect(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  pn_string_t *arg2 = (pn_string_t *) 0 ;
+  int res1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_inspect", 1, argv[0] )); 
+  }
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_string_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_string_t *","pn_void_inspect", 2, argv[1] )); 
+  }
+  arg2 = (pn_string_t *)(argp2);
+  result = (int)pn_void_inspect(arg1,arg2);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_object_new(int argc, VALUE *argv, VALUE self) {
+  pn_class_t *arg1 = (pn_class_t *) 0 ;
   size_t arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4582,7 +4783,7 @@ _wrap_pn_compare(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_compare", 2, argv[1] )); 
   }
   result = pn_compare(arg1,arg2);
-  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)malloc(sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)calloc(1,sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -6833,6 +7034,75 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_condition_copy(int argc, VALUE *argv, VALUE self) {
+  pn_condition_t *arg1 = (pn_condition_t *) 0 ;
+  pn_condition_t *arg2 = (pn_condition_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_condition_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_condition_t *","pn_condition_copy", 1, argv[0] )); 
+  }
+  arg1 = (pn_condition_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_condition_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_condition_t *","pn_condition_copy", 2, argv[1] )); 
+  }
+  arg2 = (pn_condition_t *)(argp2);
+  result = (int)pn_condition_copy(arg1,arg2);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_condition(int argc, VALUE *argv, VALUE self) {
+  pn_condition_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (pn_condition_t *)pn_condition();
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_condition_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_condition_free(int argc, VALUE *argv, VALUE self) {
+  pn_condition_t *arg1 = (pn_condition_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_condition_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_condition_t *","pn_condition_free", 1, argv[0] )); 
+  }
+  arg1 = (pn_condition_t *)(argp1);
+  pn_condition_free(arg1);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_connection(int argc, VALUE *argv, VALUE self) {
   pn_connection_t *result = 0 ;
@@ -6950,6 +7220,30 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_connection_collector(int argc, VALUE *argv, VALUE self) {
+  pn_connection_t *arg1 = (pn_connection_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_collector_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_connection_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_connection_t *","pn_connection_collector", 1, argv[0] )); 
+  }
+  arg1 = (pn_connection_t *)(argp1);
+  result = (pn_collector_t *)pn_connection_collector(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_collector_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_connection_get_context(int argc, VALUE *argv, VALUE self) {
   pn_connection_t *arg1 = (pn_connection_t *) 0 ;
@@ -9309,6 +9603,83 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_link_max_message_size(int argc, VALUE *argv, VALUE self) {
+  pn_link_t *arg1 = (pn_link_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  uint64_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_link_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_link_t *","pn_link_max_message_size", 1, argv[0] )); 
+  }
+  arg1 = (pn_link_t *)(argp1);
+  result = (uint64_t)pn_link_max_message_size(arg1);
+  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_link_set_max_message_size(int argc, VALUE *argv, VALUE self) {
+  pn_link_t *arg1 = (pn_link_t *) 0 ;
+  uint64_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned long long val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_link_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_link_t *","pn_link_set_max_message_size", 1, argv[0] )); 
+  }
+  arg1 = (pn_link_t *)(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "uint64_t","pn_link_set_max_message_size", 2, argv[1] ));
+  } 
+  arg2 = (uint64_t)(val2);
+  pn_link_set_max_message_size(arg1,arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_link_remote_max_message_size(int argc, VALUE *argv, VALUE self) {
+  pn_link_t *arg1 = (pn_link_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  uint64_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_link_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_link_t *","pn_link_remote_max_message_size", 1, argv[0] )); 
+  }
+  arg1 = (pn_link_t *)(argp1);
+  result = (uint64_t)pn_link_remote_max_message_size(arg1);
+  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_terminus_get_type(int argc, VALUE *argv, VALUE self) {
   pn_terminus_t *arg1 = (pn_terminus_t *) 0 ;
@@ -12060,11 +12431,11 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_collector_more(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_collector_next(int argc, VALUE *argv, VALUE self) {
   pn_collector_t *arg1 = (pn_collector_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  bool result;
+  pn_event_t *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -12072,11 +12443,11 @@ _wrap_pn_collector_more(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_collector_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_collector_t *","pn_collector_more", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_collector_t *","pn_collector_next", 1, argv[0] )); 
   }
   arg1 = (pn_collector_t *)(argp1);
-  result = (bool)pn_collector_more(arg1);
-  vresult = SWIG_From_bool((bool)(result));
+  result = (pn_event_t *)pn_collector_next(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_event_t, 0 |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -12084,23 +12455,23 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_event_type(int argc, VALUE *argv, VALUE self) {
-  pn_event_t *arg1 = (pn_event_t *) 0 ;
+_wrap_pn_collector_prev(int argc, VALUE *argv, VALUE self) {
+  pn_collector_t *arg1 = (pn_collector_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  pn_event_type_t result;
+  pn_event_t *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_event_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_collector_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_type", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_collector_t *","pn_collector_prev", 1, argv[0] )); 
   }
-  arg1 = (pn_event_t *)(argp1);
-  result = (pn_event_type_t)pn_event_type(arg1);
-  vresult = SWIG_From_int((int)(result));
+  arg1 = (pn_collector_t *)(argp1);
+  result = (pn_event_t *)pn_collector_prev(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_event_t, 0 |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -12108,11 +12479,35 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_event_class(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_collector_more(int argc, VALUE *argv, VALUE self) {
+  pn_collector_t *arg1 = (pn_collector_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_collector_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_collector_t *","pn_collector_more", 1, argv[0] )); 
+  }
+  arg1 = (pn_collector_t *)(argp1);
+  result = (bool)pn_collector_more(arg1);
+  vresult = SWIG_From_bool((bool)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_event_type(int argc, VALUE *argv, VALUE self) {
   pn_event_t *arg1 = (pn_event_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  pn_class_t *result = 0 ;
+  pn_event_type_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -12120,11 +12515,11 @@ _wrap_pn_event_class(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_event_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_class", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_type", 1, argv[0] )); 
   }
   arg1 = (pn_event_t *)(argp1);
-  result = (pn_class_t *)pn_event_class(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_class_t, 0 |  0 );
+  result = (pn_event_type_t)pn_event_type(arg1);
+  vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
   return Qnil;
@@ -12132,11 +12527,11 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_event_context(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_event_class(int argc, VALUE *argv, VALUE self) {
   pn_event_t *arg1 = (pn_event_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *result = 0 ;
+  pn_class_t *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -12144,11 +12539,11 @@ _wrap_pn_event_context(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_event_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_context", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_class", 1, argv[0] )); 
   }
   arg1 = (pn_event_t *)(argp1);
-  result = (void *)pn_event_context(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  result = (pn_class_t *)pn_event_class(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_class_t, 0 |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -12156,11 +12551,11 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_event_root(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_event_context(int argc, VALUE *argv, VALUE self) {
   pn_event_t *arg1 = (pn_event_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  pn_handler_t *result = 0 ;
+  void *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -12168,11 +12563,11 @@ _wrap_pn_event_root(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_event_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_root", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_context", 1, argv[0] )); 
   }
   arg1 = (pn_event_t *)(argp1);
-  result = (pn_handler_t *)pn_event_root(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_handler_t, 0 |  0 );
+  result = (void *)pn_event_context(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -12323,6 +12718,30 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_event_batch_next(int argc, VALUE *argv, VALUE self) {
+  pn_event_batch_t *arg1 = (pn_event_batch_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_event_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_event_batch_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_batch_t *","pn_event_batch_next", 1, argv[0] )); 
+  }
+  arg1 = (pn_event_batch_t *)(argp1);
+  result = (pn_event_t *)pn_event_batch_next(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_event_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_event_copy(int argc, VALUE *argv, VALUE self) {
   pn_event_t *arg1 = (pn_event_t *) 0 ;
@@ -15886,509 +16305,47 @@ _wrap_pn_messenger_deadline(int argc, VALUE *argv, VALUE self) {
   pn_timestamp_t result;
   VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_deadline", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  result = (pn_timestamp_t)pn_messenger_deadline(arg1);
-  vresult = SWIG_From_long_SS_long((long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_messenger_set_flags(int argc, VALUE *argv, VALUE self) {
-  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_flags", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","pn_messenger_set_flags", 2, argv[1] ));
-  } 
-  arg2 = (int)(val2);
-  result = (int)pn_messenger_set_flags(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_messenger_get_flags(int argc, VALUE *argv, VALUE self) {
-  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_get_flags", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  result = (int)pn_messenger_get_flags(arg1);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_messenger_set_snd_settle_mode(int argc, VALUE *argv, VALUE self) {
-  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
-  pn_snd_settle_mode_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_snd_settle_mode", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_snd_settle_mode_t","pn_messenger_set_snd_settle_mode", 2, argv[1] ));
-  } 
-  arg2 = (pn_snd_settle_mode_t)(val2);
-  result = (int)pn_messenger_set_snd_settle_mode(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_messenger_set_rcv_settle_mode(int argc, VALUE *argv, VALUE self) {
-  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
-  pn_rcv_settle_mode_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_rcv_settle_mode", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_rcv_settle_mode_t","pn_messenger_set_rcv_settle_mode", 2, argv[1] ));
-  } 
-  arg2 = (pn_rcv_settle_mode_t)(val2);
-  result = (int)pn_messenger_set_rcv_settle_mode(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_messenger_set_tracer(int argc, VALUE *argv, VALUE self) {
-  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
-  pn_tracer_t arg2 = (pn_tracer_t) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_tracer", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_struct_pn_transport_t_p_q_const__char__void);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "pn_tracer_t","pn_messenger_set_tracer", 2, argv[1] )); 
-    }
-  }
-  pn_messenger_set_tracer(arg1,arg2);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_messenger_get_remote_idle_timeout(int argc, VALUE *argv, VALUE self) {
-  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  pn_millis_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_get_remote_idle_timeout", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_messenger_get_remote_idle_timeout", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  result = (pn_millis_t)pn_messenger_get_remote_idle_timeout(arg1,(char const *)arg2);
-  vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_messenger_set_ssl_peer_authentication_mode(int argc, VALUE *argv, VALUE self) {
-  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
-  pn_ssl_verify_mode_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_ssl_peer_authentication_mode", 1, argv[0] )); 
-  }
-  arg1 = (pn_messenger_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_ssl_verify_mode_t","pn_messenger_set_ssl_peer_authentication_mode", 2, argv[1] ));
-  } 
-  arg2 = (pn_ssl_verify_mode_t)(val2);
-  result = (int)pn_messenger_set_ssl_peer_authentication_mode(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_io(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  result = (pn_io_t *)pn_io();
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_io_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_io_free(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_io_free", 1, argv[0] )); 
-  }
-  arg1 = (pn_io_t *)(argp1);
-  pn_io_free(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_io_error(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  pn_error_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_io_error", 1, argv[0] )); 
-  }
-  arg1 = (pn_io_t *)(argp1);
-  result = (pn_error_t *)pn_io_error(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_error_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_connect(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
-  pn_socket_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_connect", 1, argv[0] )); 
-  }
-  arg1 = (pn_io_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_connect", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","pn_connect", 3, argv[2] ));
-  }
-  arg3 = (char *)(buf3);
-  result = (pn_socket_t)pn_connect(arg1,(char const *)arg2,(char const *)arg3);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_listen(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
-  pn_socket_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_listen", 1, argv[0] )); 
-  }
-  arg1 = (pn_io_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_listen", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","pn_listen", 3, argv[2] ));
-  }
-  arg3 = (char *)(buf3);
-  result = (pn_socket_t)pn_listen(arg1,(char const *)arg2,(char const *)arg3);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_accept(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  pn_socket_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  size_t arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
-  size_t val4 ;
-  int ecode4 = 0 ;
-  pn_socket_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_accept", 1, argv[0] )); 
-  }
-  arg1 = (pn_io_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_socket_t","pn_accept", 2, argv[1] ));
-  } 
-  arg2 = (pn_socket_t)(val2);
-  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char *","pn_accept", 3, argv[2] ));
-  }
-  arg3 = (char *)(buf3);
-  ecode4 = SWIG_AsVal_size_t(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "size_t","pn_accept", 4, argv[3] ));
-  } 
-  arg4 = (size_t)(val4);
-  result = (pn_socket_t)pn_accept(arg1,arg2,arg3,arg4);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return vresult;
-fail:
-  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_close(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  pn_socket_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_close", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_deadline", 1, argv[0] )); 
   }
-  arg1 = (pn_io_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_socket_t","pn_close", 2, argv[1] ));
-  } 
-  arg2 = (pn_socket_t)(val2);
-  pn_close(arg1,arg2);
-  return Qnil;
+  arg1 = (pn_messenger_t *)(argp1);
+  result = (pn_timestamp_t)pn_messenger_deadline(arg1);
+  vresult = SWIG_From_long_SS_long((long long)(result));
+  return vresult;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_pn_send(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  pn_socket_t arg2 ;
-  void *arg3 = (void *) 0 ;
-  size_t arg4 ;
+_wrap_pn_messenger_set_flags(int argc, VALUE *argv, VALUE self) {
+  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  int res3 ;
-  size_t val4 ;
-  int ecode4 = 0 ;
-  ssize_t result;
+  int result;
   VALUE vresult = Qnil;
   
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_send", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_flags", 1, argv[0] )); 
   }
-  arg1 = (pn_io_t *)(argp1);
+  arg1 = (pn_messenger_t *)(argp1);
   ecode2 = SWIG_AsVal_int(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_socket_t","pn_send", 2, argv[1] ));
-  } 
-  arg2 = (pn_socket_t)(val2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void const *","pn_send", 3, argv[2] )); 
-  }
-  ecode4 = SWIG_AsVal_size_t(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "size_t","pn_send", 4, argv[3] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","pn_messenger_set_flags", 2, argv[1] ));
   } 
-  arg4 = (size_t)(val4);
-  result = (ssize_t)pn_send(arg1,arg2,(void const *)arg3,arg4);
+  arg2 = (int)(val2);
+  result = (int)pn_messenger_set_flags(arg1,arg2);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -16397,44 +16354,22 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_recv(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  pn_socket_t arg2 ;
-  void *arg3 = (void *) 0 ;
-  size_t arg4 ;
+_wrap_pn_messenger_get_flags(int argc, VALUE *argv, VALUE self) {
+  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  size_t val4 ;
-  int ecode4 = 0 ;
-  ssize_t result;
+  int result;
   VALUE vresult = Qnil;
   
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_recv", 1, argv[0] )); 
-  }
-  arg1 = (pn_io_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_socket_t","pn_recv", 2, argv[1] ));
-  } 
-  arg2 = (pn_socket_t)(val2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_recv", 3, argv[2] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_get_flags", 1, argv[0] )); 
   }
-  ecode4 = SWIG_AsVal_size_t(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "size_t","pn_recv", 4, argv[3] ));
-  } 
-  arg4 = (size_t)(val4);
-  result = (ssize_t)pn_recv(arg1,arg2,arg3,arg4);
+  arg1 = (pn_messenger_t *)(argp1);
+  result = (int)pn_messenger_get_flags(arg1);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -16443,30 +16378,30 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_pipe(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  pn_socket_t *arg2 = (pn_socket_t *) 0 ;
+_wrap_pn_messenger_set_snd_settle_mode(int argc, VALUE *argv, VALUE self) {
+  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
+  pn_snd_settle_mode_t arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   int result;
   VALUE vresult = Qnil;
   
   if ((argc < 2) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_pipe", 1, argv[0] )); 
-  }
-  arg1 = (pn_io_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_socket_t *","pn_pipe", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_snd_settle_mode", 1, argv[0] )); 
   }
-  arg2 = (pn_socket_t *)(argp2);
-  result = (int)pn_pipe(arg1,arg2);
+  arg1 = (pn_messenger_t *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_snd_settle_mode_t","pn_messenger_set_snd_settle_mode", 2, argv[1] ));
+  } 
+  arg2 = (pn_snd_settle_mode_t)(val2);
+  result = (int)pn_messenger_set_snd_settle_mode(arg1,arg2);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -16475,44 +16410,30 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_read(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  pn_socket_t arg2 ;
-  void *arg3 = (void *) 0 ;
-  size_t arg4 ;
+_wrap_pn_messenger_set_rcv_settle_mode(int argc, VALUE *argv, VALUE self) {
+  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
+  pn_rcv_settle_mode_t arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  int res3 ;
-  size_t val4 ;
-  int ecode4 = 0 ;
-  ssize_t result;
+  int result;
   VALUE vresult = Qnil;
   
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_read", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_rcv_settle_mode", 1, argv[0] )); 
   }
-  arg1 = (pn_io_t *)(argp1);
+  arg1 = (pn_messenger_t *)(argp1);
   ecode2 = SWIG_AsVal_int(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_socket_t","pn_read", 2, argv[1] ));
-  } 
-  arg2 = (pn_socket_t)(val2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_read", 3, argv[2] )); 
-  }
-  ecode4 = SWIG_AsVal_size_t(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "size_t","pn_read", 4, argv[3] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_rcv_settle_mode_t","pn_messenger_set_rcv_settle_mode", 2, argv[1] ));
   } 
-  arg4 = (size_t)(val4);
-  result = (ssize_t)pn_read(arg1,arg2,arg3,arg4);
+  arg2 = (pn_rcv_settle_mode_t)(val2);
+  result = (int)pn_messenger_set_rcv_settle_mode(arg1,arg2);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -16521,93 +16442,94 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_write(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
-  pn_socket_t arg2 ;
-  void *arg3 = (void *) 0 ;
-  size_t arg4 ;
+_wrap_pn_messenger_set_tracer(int argc, VALUE *argv, VALUE self) {
+  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
+  pn_tracer_t arg2 = (pn_tracer_t) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  size_t val4 ;
-  int ecode4 = 0 ;
-  ssize_t result;
-  VALUE vresult = Qnil;
   
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_write", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_tracer", 1, argv[0] )); 
   }
-  arg1 = (pn_io_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_socket_t","pn_write", 2, argv[1] ));
-  } 
-  arg2 = (pn_socket_t)(val2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void const *","pn_write", 3, argv[2] )); 
+  arg1 = (pn_messenger_t *)(argp1);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_struct_pn_transport_t_p_q_const__char__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "pn_tracer_t","pn_messenger_set_tracer", 2, argv[1] )); 
+    }
   }
-  ecode4 = SWIG_AsVal_size_t(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "size_t","pn_write", 4, argv[3] ));
-  } 
-  arg4 = (size_t)(val4);
-  result = (ssize_t)pn_write(arg1,arg2,(void const *)arg3,arg4);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
+  pn_messenger_set_tracer(arg1,arg2);
+  return Qnil;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_pn_wouldblock(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
+_wrap_pn_messenger_get_remote_idle_timeout(int argc, VALUE *argv, VALUE self) {
+  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
+  char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  bool result;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  pn_millis_t result;
   VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_wouldblock", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_get_remote_idle_timeout", 1, argv[0] )); 
   }
-  arg1 = (pn_io_t *)(argp1);
-  result = (bool)pn_wouldblock(arg1);
-  vresult = SWIG_From_bool((bool)(result));
+  arg1 = (pn_messenger_t *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_messenger_get_remote_idle_timeout", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  result = (pn_millis_t)pn_messenger_get_remote_idle_timeout(arg1,(char const *)arg2);
+  vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
 fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_pn_io_selector(int argc, VALUE *argv, VALUE self) {
-  pn_io_t *arg1 = (pn_io_t *) 0 ;
+_wrap_pn_messenger_set_ssl_peer_authentication_mode(int argc, VALUE *argv, VALUE self) {
+  pn_messenger_t *arg1 = (pn_messenger_t *) 0 ;
+  pn_ssl_verify_mode_t arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  pn_selector_t *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int result;
   VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_io_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_messenger_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_io_t *","pn_io_selector", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_messenger_t *","pn_messenger_set_ssl_peer_authentication_mode", 1, argv[0] )); 
   }
-  arg1 = (pn_io_t *)(argp1);
-  result = (pn_selector_t *)pn_io_selector(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_selector_t, 0 |  0 );
+  arg1 = (pn_messenger_t *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_ssl_verify_mode_t","pn_messenger_set_ssl_peer_authentication_mode", 2, argv[1] ));
+  } 
+  arg2 = (pn_ssl_verify_mode_t)(val2);
+  result = (int)pn_messenger_set_ssl_peer_authentication_mode(arg1,arg2);
+  vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
   return Qnil;
@@ -21249,30 +21171,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-_wrap_pn_reactor_io(int argc, VALUE *argv, VALUE self) {
-  pn_reactor_t *arg1 = (pn_reactor_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  pn_io_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_reactor_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_reactor_t *","pn_reactor_io", 1, argv[0] )); 
-  }
-  arg1 = (pn_reactor_t *)(argp1);
-  result = (pn_io_t *)pn_reactor_io(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_io_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
 SWIGINTERN VALUE
 _wrap_pn_reactor_children(int argc, VALUE *argv, VALUE self) {
   pn_reactor_t *arg1 = (pn_reactor_t *) 0 ;
@@ -21404,6 +21302,30 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_reactor_error(int argc, VALUE *argv, VALUE self) {
+  pn_reactor_t *arg1 = (pn_reactor_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_reactor_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_reactor_t *","pn_reactor_error", 1, argv[0] )); 
+  }
+  arg1 = (pn_reactor_t *)(argp1);
+  result = (pn_error_t *)pn_reactor_error(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_error_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_reactor_connection_to_host(int argc, VALUE *argv, VALUE self) {
   pn_reactor_t *arg1 = (pn_reactor_t *) 0 ;
@@ -22129,6 +22051,30 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_event_root(int argc, VALUE *argv, VALUE self) {
+  pn_event_t *arg1 = (pn_event_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_handler_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_event_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_event_t *","pn_event_root", 1, argv[0] )); 
+  }
+  arg1 = (pn_event_t *)(argp1);
+  result = (pn_handler_t *)pn_event_root(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_handler_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_handshaker(int argc, VALUE *argv, VALUE self) {
   pn_handshaker_t *result = 0 ;
@@ -22203,7 +22149,7 @@ static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64_t *|long lon
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_acceptor_t = {"_p_pn_acceptor_t", "struct pn_acceptor_t *|pn_acceptor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_atom_t = {"_p_pn_atom_t", "pn_atom_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_bytes_t = {"_p_pn_bytes_t", "pn_bytes_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_bytes_t = {"_p_pn_bytes_t", "struct pn_bytes_t *|pn_bytes_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_cid_t = {"_p_pn_cid_t", "pn_cid_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_class_t = {"_p_pn_class_t", "struct pn_class_t *|pn_class_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_collector_t = {"_p_pn_collector_t", "struct pn_collector_t *|pn_collector_t *", 0, 0, (void*)0, 0};
@@ -22216,12 +22162,12 @@ static swig_type_info _swigt__p_pn_disposition_t = {"_p_pn_disposition_t", "stru
 static swig_type_info _swigt__p_pn_distribution_mode_t = {"_p_pn_distribution_mode_t", "enum pn_distribution_mode_t *|pn_distribution_mode_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_durability_t = {"_p_pn_durability_t", "enum pn_durability_t *|pn_durability_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_error_t = {"_p_pn_error_t", "struct pn_error_t *|pn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_event_batch_t = {"_p_pn_event_batch_t", "struct pn_event_batch_t *|pn_event_batch_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_event_t = {"_p_pn_event_t", "struct pn_event_t *|pn_event_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_event_type_t = {"_p_pn_event_type_t", "enum pn_event_type_t *|pn_event_type_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_expiry_policy_t = {"_p_pn_expiry_policy_t", "enum pn_expiry_policy_t *|pn_expiry_policy_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_handler_t = {"_p_pn_handler_t", "pn_handshaker_t *|struct pn_handler_t *|pn_flowcontroller_t *|pn_handler_t *|pn_iohandler_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_hash_t = {"_p_pn_hash_t", "struct pn_hash_t *|pn_hash_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_io_t = {"_p_pn_io_t", "struct pn_io_t *|pn_io_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_iterator_t = {"_p_pn_iterator_t", "pn_selectables_t *|struct pn_iterator_t *|pn_iterator_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_link_t = {"_p_pn_link_t", "struct pn_link_t *|pn_link_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_list_t = {"_p_pn_list_t", "struct pn_list_t *|pn_list_t *", 0, 0, (void*)0, 0};
@@ -22231,10 +22177,10 @@ static swig_type_info _swigt__p_pn_messenger_t = {"_p_pn_messenger_t", "struct p
 static swig_type_info _swigt__p_pn_rcv_settle_mode_t = {"_p_pn_rcv_settle_mode_t", "enum pn_rcv_settle_mode_t *|pn_rcv_settle_mode_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_reactor_t = {"_p_pn_reactor_t", "struct pn_reactor_t *|pn_reactor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_record_t = {"_p_pn_record_t", "struct pn_record_t *|pn_record_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_rwbytes_t = {"_p_pn_rwbytes_t", "struct pn_rwbytes_t *|pn_rwbytes_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_sasl_outcome_t = {"_p_pn_sasl_outcome_t", "enum pn_sasl_outcome_t *|pn_sasl_outcome_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_sasl_t = {"_p_pn_sasl_t", "struct pn_sasl_t *|pn_sasl_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_selectable_t = {"_p_pn_selectable_t", "struct pn_selectable_t *|pn_selectable_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_selector_t = {"_p_pn_selector_t", "struct pn_selector_t *|pn_selector_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_session_t = {"_p_pn_session_t", "struct pn_session_t *|pn_session_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_snd_settle_mode_t = {"_p_pn_snd_settle_mode_t", "enum pn_snd_settle_mode_t *|pn_snd_settle_mode_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_ssl_cert_subject_subfield = {"_p_pn_ssl_cert_subject_subfield", "enum pn_ssl_cert_subject_subfield *|pn_ssl_cert_subject_subfield *", 0, 0, (void*)0, 0};
@@ -22293,12 +22239,12 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_pn_distribution_mode_t,
   &_swigt__p_pn_durability_t,
   &_swigt__p_pn_error_t,
+  &_swigt__p_pn_event_batch_t,
   &_swigt__p_pn_event_t,
   &_swigt__p_pn_event_type_t,
   &_swigt__p_pn_expiry_policy_t,
   &_swigt__p_pn_handler_t,
   &_swigt__p_pn_hash_t,
-  &_swigt__p_pn_io_t,
   &_swigt__p_pn_iterator_t,
   &_swigt__p_pn_link_t,
   &_swigt__p_pn_list_t,
@@ -22308,10 +22254,10 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_pn_rcv_settle_mode_t,
   &_swigt__p_pn_reactor_t,
   &_swigt__p_pn_record_t,
+  &_swigt__p_pn_rwbytes_t,
   &_swigt__p_pn_sasl_outcome_t,
   &_swigt__p_pn_sasl_t,
   &_swigt__p_pn_selectable_t,
-  &_swigt__p_pn_selector_t,
   &_swigt__p_pn_session_t,
   &_swigt__p_pn_snd_settle_mode_t,
   &_swigt__p_pn_ssl_cert_subject_subfield,
@@ -22370,12 +22316,12 @@ static swig_cast_info _swigc__p_pn_disposition_t[] = {  {&_swigt__p_pn_dispositi
 static swig_cast_info _swigc__p_pn_distribution_mode_t[] = {  {&_swigt__p_pn_distribution_mode_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_durability_t[] = {  {&_swigt__p_pn_durability_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_error_t[] = {  {&_swigt__p_pn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_pn_event_batch_t[] = {  {&_swigt__p_pn_event_batch_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_event_t[] = {  {&_swigt__p_pn_event_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_event_type_t[] = {  {&_swigt__p_pn_event_type_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_expiry_policy_t[] = {  {&_swigt__p_pn_expiry_policy_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_handler_t[] = {  {&_swigt__p_pn_handler_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_hash_t[] = {  {&_swigt__p_pn_hash_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pn_io_t[] = {  {&_swigt__p_pn_io_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_iterator_t[] = {  {&_swigt__p_pn_iterator_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_link_t[] = {  {&_swigt__p_pn_link_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_list_t[] = {  {&_swigt__p_pn_list_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -22385,10 +22331,10 @@ static swig_cast_info _swigc__p_pn_messenger_t[] = {  {&_swigt__p_pn_messenger_t
 static swig_cast_info _swigc__p_pn_rcv_settle_mode_t[] = {  {&_swigt__p_pn_rcv_settle_mode_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_reactor_t[] = {  {&_swigt__p_pn_reactor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_record_t[] = {  {&_swigt__p_pn_record_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_pn_rwbytes_t[] = {  {&_swigt__p_pn_rwbytes_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_sasl_outcome_t[] = {  {&_swigt__p_pn_sasl_outcome_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_sasl_t[] = {  {&_swigt__p_pn_sasl_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_selectable_t[] = {  {&_swigt__p_pn_selectable_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pn_selector_t[] = {  {&_swigt__p_pn_selector_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_session_t[] = {  {&_swigt__p_pn_session_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_snd_settle_mode_t[] = {  {&_swigt__p_pn_snd_settle_mode_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_ssl_cert_subject_subfield[] = {  {&_swigt__p_pn_ssl_cert_subject_subfield, 0, 0, 0},{0, 0, 0, 0}};
@@ -22447,12 +22393,12 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_pn_distribution_mode_t,
   _swigc__p_pn_durability_t,
   _swigc__p_pn_error_t,
+  _swigc__p_pn_event_batch_t,
   _swigc__p_pn_event_t,
   _swigc__p_pn_event_type_t,
   _swigc__p_pn_expiry_policy_t,
   _swigc__p_pn_handler_t,
   _swigc__p_pn_hash_t,
-  _swigc__p_pn_io_t,
   _swigc__p_pn_iterator_t,
   _swigc__p_pn_link_t,
   _swigc__p_pn_list_t,
@@ -22462,10 +22408,10 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_pn_rcv_settle_mode_t,
   _swigc__p_pn_reactor_t,
   _swigc__p_pn_record_t,
+  _swigc__p_pn_rwbytes_t,
   _swigc__p_pn_sasl_outcome_t,
   _swigc__p_pn_sasl_t,
   _swigc__p_pn_selectable_t,
-  _swigc__p_pn_selector_t,
   _swigc__p_pn_session_t,
   _swigc__p_pn_snd_settle_mode_t,
   _swigc__p_pn_ssl_cert_subject_subfield,
@@ -22794,12 +22740,14 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_rbhandler", _wrap_pn_rbhandler, -1);
   rb_define_const(mCproton, "PROTON_IMPORT_EXPORT_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PN_VERSION_MAJOR", SWIG_From_int((int)(0)));
-  rb_define_const(mCproton, "PN_VERSION_MINOR", SWIG_From_int((int)(14)));
+  rb_define_const(mCproton, "PN_VERSION_MINOR", SWIG_From_int((int)(17)));
   rb_define_const(mCproton, "PN_VERSION_POINT", SWIG_From_int((int)(0)));
   rb_define_const(mCproton, "PROTON_TYPES_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PN_MILLIS_MAX", SWIG_From_unsigned_SS_int((unsigned int)((~0U))));
-  rb_define_module_function(mCproton, "pn_timestamp_now", _wrap_pn_timestamp_now, -1);
   rb_define_module_function(mCproton, "pn_bytes", _wrap_pn_bytes, -1);
+  rb_define_singleton_method(mCproton, "pn_bytes_null", _wrap_pn_bytes_null_get, 0);
+  rb_define_module_function(mCproton, "pn_rwbytes", _wrap_pn_rwbytes, -1);
+  rb_define_singleton_method(mCproton, "pn_rwbytes_null", _wrap_pn_rwbytes_null_get, 0);
   rb_define_const(mCproton, "PROTON_OBJECT_H", SWIG_From_int((int)(1)));
   rb_define_singleton_method(mCproton, "PN_OBJECT", _wrap_PN_OBJECT_get, 0);
   rb_define_singleton_method(mCproton, "PN_VOID", _wrap_PN_VOID_get, 0);
@@ -22816,6 +22764,10 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_class_compare", _wrap_pn_class_compare, -1);
   rb_define_module_function(mCproton, "pn_class_equals", _wrap_pn_class_equals, -1);
   rb_define_module_function(mCproton, "pn_class_inspect", _wrap_pn_class_inspect, -1);
+  rb_define_module_function(mCproton, "pn_void_new", _wrap_pn_void_new, -1);
+  rb_define_module_function(mCproton, "pn_void_incref", _wrap_pn_void_incref, -1);
+  rb_define_module_function(mCproton, "pn_void_decref", _wrap_pn_void_decref, -1);
+  rb_define_module_function(mCproton, "pn_void_refcount", _wrap_pn_void_refcount, -1);
   rb_define_module_function(mCproton, "pn_void_hashcode", _wrap_pn_void_hashcode, -1);
   rb_define_module_function(mCproton, "pn_void_compare", _wrap_pn_void_compare, -1);
   rb_define_module_function(mCproton, "pn_void_inspect", _wrap_pn_void_inspect, -1);
@@ -22923,6 +22875,9 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_condition_is_redirect", _wrap_pn_condition_is_redirect, -1);
   rb_define_module_function(mCproton, "pn_condition_redirect_host", _wrap_pn_condition_redirect_host, -1);
   rb_define_module_function(mCproton, "pn_condition_redirect_port", _wrap_pn_condition_redirect_port, -1);
+  rb_define_module_function(mCproton, "pn_condition_copy", _wrap_pn_condition_copy, -1);
+  rb_define_module_function(mCproton, "pn_condition", _wrap_pn_condition, -1);
+  rb_define_module_function(mCproton, "pn_condition_free", _wrap_pn_condition_free, -1);
   rb_define_const(mCproton, "PROTON_CONNECTION_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PN_LOCAL_UNINIT", SWIG_From_int((int)((1))));
   rb_define_const(mCproton, "PN_LOCAL_ACTIVE", SWIG_From_int((int)((2))));
@@ -22937,6 +22892,7 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_connection_release", _wrap_pn_connection_release, -1);
   rb_define_module_function(mCproton, "pn_connection_error", _wrap_pn_connection_error, -1);
   rb_define_module_function(mCproton, "pn_connection_collect", _wrap_pn_connection_collect, -1);
+  rb_define_module_function(mCproton, "pn_connection_collector", _wrap_pn_connection_collector, -1);
   rb_define_module_function(mCproton, "pn_connection_get_context", _wrap_pn_connection_get_context, -1);
   rb_define_module_function(mCproton, "pn_connection_set_context", _wrap_pn_connection_set_context, -1);
   rb_define_module_function(mCproton, "pn_connection_attachments", _wrap_pn_connection_attachments, -1);
@@ -23034,6 +22990,9 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_link_drain", _wrap_pn_link_drain, -1);
   rb_define_module_function(mCproton, "pn_link_set_drain", _wrap_pn_link_set_drain, -1);
   rb_define_module_function(mCproton, "pn_link_draining", _wrap_pn_link_draining, -1);
+  rb_define_module_function(mCproton, "pn_link_max_message_size", _wrap_pn_link_max_message_size, -1);
+  rb_define_module_function(mCproton, "pn_link_set_max_message_size", _wrap_pn_link_set_max_message_size, -1);
+  rb_define_module_function(mCproton, "pn_link_remote_max_message_size", _wrap_pn_link_remote_max_message_size, -1);
   rb_define_const(mCproton, "PROTON_TERMINUS_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PN_UNSPECIFIED", SWIG_From_int((int)(PN_UNSPECIFIED)));
   rb_define_const(mCproton, "PN_SOURCE", SWIG_From_int((int)(PN_SOURCE)));
@@ -23194,7 +23153,9 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_const(mCproton, "PN_TRANSPORT_AUTHENTICATED", SWIG_From_int((int)(PN_TRANSPORT_AUTHENTICATED)));
   rb_define_const(mCproton, "PN_TRANSPORT_ERROR", SWIG_From_int((int)(PN_TRANSPORT_ERROR)));
   rb_define_const(mCproton, "PN_TRANSPORT_HEAD_CLOSED", SWIG_From_int((int)(PN_TRANSPORT_HEAD_CLOSED)));
+  rb_define_const(mCproton, "PN_TRANSPORT_WRITE_CLOSED", SWIG_From_int((int)(PN_TRANSPORT_WRITE_CLOSED)));
   rb_define_const(mCproton, "PN_TRANSPORT_TAIL_CLOSED", SWIG_From_int((int)(PN_TRANSPORT_TAIL_CLOSED)));
+  rb_define_const(mCproton, "PN_TRANSPORT_READ_CLOSED", SWIG_From_int((int)(PN_TRANSPORT_READ_CLOSED)));
   rb_define_const(mCproton, "PN_TRANSPORT_CLOSED", SWIG_From_int((int)(PN_TRANSPORT_CLOSED)));
   rb_define_const(mCproton, "PN_SELECTABLE_INIT", SWIG_From_int((int)(PN_SELECTABLE_INIT)));
   rb_define_const(mCproton, "PN_SELECTABLE_UPDATED", SWIG_From_int((int)(PN_SELECTABLE_UPDATED)));
@@ -23203,6 +23164,12 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_const(mCproton, "PN_SELECTABLE_ERROR", SWIG_From_int((int)(PN_SELECTABLE_ERROR)));
   rb_define_const(mCproton, "PN_SELECTABLE_EXPIRED", SWIG_From_int((int)(PN_SELECTABLE_EXPIRED)));
   rb_define_const(mCproton, "PN_SELECTABLE_FINAL", SWIG_From_int((int)(PN_SELECTABLE_FINAL)));
+  rb_define_const(mCproton, "PN_CONNECTION_WAKE", SWIG_From_int((int)(PN_CONNECTION_WAKE)));
+  rb_define_const(mCproton, "PN_LISTENER_ACCEPT", SWIG_From_int((int)(PN_LISTENER_ACCEPT)));
+  rb_define_const(mCproton, "PN_LISTENER_CLOSE", SWIG_From_int((int)(PN_LISTENER_CLOSE)));
+  rb_define_const(mCproton, "PN_PROACTOR_INTERRUPT", SWIG_From_int((int)(PN_PROACTOR_INTERRUPT)));
+  rb_define_const(mCproton, "PN_PROACTOR_TIMEOUT", SWIG_From_int((int)(PN_PROACTOR_TIMEOUT)));
+  rb_define_const(mCproton, "PN_PROACTOR_INACTIVE", SWIG_From_int((int)(PN_PROACTOR_INACTIVE)));
   rb_define_module_function(mCproton, "pn_event_type_name", _wrap_pn_event_type_name, -1);
   rb_define_module_function(mCproton, "pn_collector", _wrap_pn_collector, -1);
   rb_define_module_function(mCproton, "pn_collector_free", _wrap_pn_collector_free, -1);
@@ -23210,17 +23177,19 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_collector_put", _wrap_pn_collector_put, -1);
   rb_define_module_function(mCproton, "pn_collector_peek", _wrap_pn_collector_peek, -1);
   rb_define_module_function(mCproton, "pn_collector_pop", _wrap_pn_collector_pop, -1);
+  rb_define_module_function(mCproton, "pn_collector_next", _wrap_pn_collector_next, -1);
+  rb_define_module_function(mCproton, "pn_collector_prev", _wrap_pn_collector_prev, -1);
   rb_define_module_function(mCproton, "pn_collector_more", _wrap_pn_collector_more, -1);
   rb_define_module_function(mCproton, "pn_event_type", _wrap_pn_event_type, -1);
   rb_define_module_function(mCproton, "pn_event_class", _wrap_pn_event_class, -1);
   rb_define_module_function(mCproton, "pn_event_context", _wrap_pn_event_context, -1);
-  rb_define_module_function(mCproton, "pn_event_root", _wrap_pn_event_root, -1);
   rb_define_module_function(mCproton, "pn_event_connection", _wrap_pn_event_connection, -1);
   rb_define_module_function(mCproton, "pn_event_session", _wrap_pn_event_session, -1);
   rb_define_module_function(mCproton, "pn_event_link", _wrap_pn_event_link, -1);
   rb_define_module_function(mCproton, "pn_event_delivery", _wrap_pn_event_delivery, -1);
   rb_define_module_function(mCproton, "pn_event_transport", _wrap_pn_event_transport, -1);
   rb_define_module_function(mCproton, "pn_event_attachments", _wrap_pn_event_attachments, -1);
+  rb_define_module_function(mCproton, "pn_event_batch_next", _wrap_pn_event_batch_next, -1);
   rb_define_module_function(mCproton, "pn_event_copy", _wrap_pn_event_copy, -1);
   rb_define_const(mCproton, "PROTON_MESSAGE_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PN_DEFAULT_PRIORITY", SWIG_From_int((int)((4))));
@@ -23364,23 +23333,8 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_messenger_set_tracer", _wrap_pn_messenger_set_tracer, -1);
   rb_define_module_function(mCproton, "pn_messenger_get_remote_idle_timeout", _wrap_pn_messenger_get_remote_idle_timeout, -1);
   rb_define_module_function(mCproton, "pn_messenger_set_ssl_peer_authentication_mode", _wrap_pn_messenger_set_ssl_peer_authentication_mode, -1);
-  rb_define_const(mCproton, "PROTON_IO_H", SWIG_From_int((int)(1)));
-  rb_define_const(mCproton, "PN_INVALID_SOCKET", SWIG_From_int((int)((-1))));
-  rb_define_module_function(mCproton, "pn_io", _wrap_pn_io, -1);
-  rb_define_module_function(mCproton, "pn_io_free", _wrap_pn_io_free, -1);
-  rb_define_module_function(mCproton, "pn_io_error", _wrap_pn_io_error, -1);
-  rb_define_module_function(mCproton, "pn_connect", _wrap_pn_connect, -1);
-  rb_define_module_function(mCproton, "pn_listen", _wrap_pn_listen, -1);
-  rb_define_module_function(mCproton, "pn_accept", _wrap_pn_accept, -1);
-  rb_define_module_function(mCproton, "pn_close", _wrap_pn_close, -1);
-  rb_define_module_function(mCproton, "pn_send", _wrap_pn_send, -1);
-  rb_define_module_function(mCproton, "pn_recv", _wrap_pn_recv, -1);
-  rb_define_module_function(mCproton, "pn_pipe", _wrap_pn_pipe, -1);
-  rb_define_module_function(mCproton, "pn_read", _wrap_pn_read, -1);
-  rb_define_module_function(mCproton, "pn_write", _wrap_pn_write, -1);
-  rb_define_module_function(mCproton, "pn_wouldblock", _wrap_pn_wouldblock, -1);
-  rb_define_module_function(mCproton, "pn_io_selector", _wrap_pn_io_selector, -1);
   rb_define_const(mCproton, "PROTON_SELECTABLE_H", SWIG_From_int((int)(1)));
+  rb_define_const(mCproton, "PN_INVALID_SOCKET", SWIG_From_int((int)((-1))));
   rb_define_module_function(mCproton, "pn_selectables", _wrap_pn_selectables, -1);
   rb_define_module_function(mCproton, "pn_selectables_next", _wrap_pn_selectables_next, -1);
   rb_define_module_function(mCproton, "pn_selectables_free", _wrap_pn_selectables_free, -1);
@@ -23563,6 +23517,7 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_cast_pn_reactor", _wrap_pn_cast_pn_reactor, -1);
   rb_define_module_function(mCproton, "pn_cast_pn_task", _wrap_pn_cast_pn_task, -1);
   rb_define_module_function(mCproton, "pn_cast_pn_selectable", _wrap_pn_cast_pn_selectable, -1);
+  rb_define_const(mCproton, "PROTON_URL_H", SWIG_From_int((int)(1)));
   rb_define_module_function(mCproton, "pn_url", _wrap_pn_url, -1);
   rb_define_module_function(mCproton, "pn_url_parse", _wrap_pn_url_parse, -1);
   rb_define_module_function(mCproton, "pn_url_free", _wrap_pn_url_free, -1);
@@ -23601,11 +23556,11 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_reactor_set_global_handler", _wrap_pn_reactor_set_global_handler, -1);
   rb_define_module_function(mCproton, "pn_reactor_get_handler", _wrap_pn_reactor_get_handler, -1);
   rb_define_module_function(mCproton, "pn_reactor_set_handler", _wrap_pn_reactor_set_handler, -1);
-  rb_define_module_function(mCproton, "pn_reactor_io", _wrap_pn_reactor_io, -1);
   rb_define_module_function(mCproton, "pn_reactor_children", _wrap_pn_reactor_children, -1);
   rb_define_module_function(mCproton, "pn_reactor_selectable", _wrap_pn_reactor_selectable, -1);
   rb_define_module_function(mCproton, "pn_reactor_update", _wrap_pn_reactor_update, -1);
   rb_define_module_function(mCproton, "pn_reactor_acceptor", _wrap_pn_reactor_acceptor, -1);
+  rb_define_module_function(mCproton, "pn_reactor_error", _wrap_pn_reactor_error, -1);
   rb_define_module_function(mCproton, "pn_reactor_connection_to_host", _wrap_pn_reactor_connection_to_host, -1);
   rb_define_module_function(mCproton, "pn_reactor_connection", _wrap_pn_reactor_connection, -1);
   rb_define_module_function(mCproton, "pn_reactor_set_connection_host", _wrap_pn_reactor_set_connection_host, -1);
@@ -23632,6 +23587,7 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_event_reactor", _wrap_pn_event_reactor, -1);
   rb_define_module_function(mCproton, "pn_record_get_handler", _wrap_pn_record_get_handler, -1);
   rb_define_module_function(mCproton, "pn_record_set_handler", _wrap_pn_record_set_handler, -1);
+  rb_define_module_function(mCproton, "pn_event_root", _wrap_pn_event_root, -1);
   rb_define_const(mCproton, "PROTON_HANDLERS_H", SWIG_From_int((int)(1)));
   rb_define_module_function(mCproton, "pn_handshaker", _wrap_pn_handshaker, -1);
   rb_define_module_function(mCproton, "pn_iohandler", _wrap_pn_iohandler, -1);