qpid_proton 0.19.0 → 0.21.0

data/examples/simple_recv.rb

@@ -0,0 +1,57 @@
+#--
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#++
+
+require 'qpid_proton'
+require 'optparse'
+
+class SimpleReceive < Qpid::Proton::MessagingHandler
+
+  def initialize(url, address, count)
+    super()
+    @url = url
+    @address = address
+    @expected = count
+    @received = 0
+  end
+
+  def on_container_start(container)
+    c = container.connect(@url)
+    c.open_receiver(@address)
+  end
+
+  def on_message(delivery, message)
+    if @expected.zero? || (@received < @expected)
+      puts "Received: #{message.body}"
+      @received = @received + 1
+      if @received == @expected
+        delivery.connection.close
+      end
+    end
+  end
+end
+
+unless (2..3).include? ARGV.size
+  STDERR.puts "Usage: #{__FILE__} URL ADDRESS [COUNT]}
+Connect to URL and receive COUNT messages from ADDRESS"
+  return 1
+end
+url, address, count = ARGV
+count = Integer(count || 10)
+Qpid::Proton::Container.new(SimpleReceive.new(url, address, count)).run
+

data/examples/simple_send.rb

@@ -0,0 +1,63 @@
+#--
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#++
+
+require 'qpid_proton'
+require 'optparse'
+
+class SimpleSend < Qpid::Proton::MessagingHandler
+
+  def initialize(url, address, expected)
+    super()
+    @url = url
+    @address = address
+    @sent = 0
+    @confirmed = 0
+    @expected = expected
+  end
+
+  def on_container_start(container)
+    c = container.connect(@url)
+    c.open_sender(@address)
+  end
+
+  def on_sendable(sender)
+    while sender.credit > 0 && @sent < @expected
+      msg = Qpid::Proton::Message.new("sequence #{@sent}", { :id => @sent } )
+      sender.send(msg)
+      @sent = @sent + 1
+    end
+  end
+
+  def on_tracker_accept(tracker)
+    @confirmed = @confirmed + 1
+    if @confirmed == @expected
+      puts "All #{@expected} messages confirmed!"
+      tracker.connection.close
+    end
+  end
+end
+
+unless (2..3).include? ARGV.size
+  STDERR.puts "Usage: #{__FILE__} URL ADDRESS [COUNT]}
+Connect to URL and send COUNT messages to ADDRESS"
+  return 1
+end
+url, address, count = ARGV
+count = Integer(count || 10)
+Qpid::Proton::Container.new(SimpleSend.new(url, address, count)).run

data/examples/ssl_certs/README.txt

@@ -0,0 +1,24 @@
+This directory contains basic self signed test certificates for use by
+proton examples.
+
+The ".pem" files are in the format expected by proton implementations
+using OpenSSL.  The ".p12" file are for Windows implementations using
+SChannel.
+
+The commands used to generate the certificates follow.
+
+
+make_pn_cert()
+{
+  name=$1
+  subject=$2
+  passwd=$3
+  # create the pem files
+  openssl req -newkey rsa:2048 -keyout $name-private-key.pem -out $name-certificate.pem -subj $subject -passout pass:$passwd -x509 -days 3650
+  # create the p12 files
+  openssl pkcs12 -export -out $name-full.p12 -passin pass:$passwd -passout pass:$passwd -inkey $name-private-key.pem -in $name-certificate.pem -name $name
+  openssl pkcs12 -export -out $name-certificate.p12 -in $name-certificate.pem -name $name -nokeys -passout pass:
+}
+
+make_pn_cert tserver /CN=test_server/OU=proton_test tserverpw
+make_pn_cert tclient /CN=test_client/OU=proton_test tclientpw

data/examples/ssl_certs/tclient-certificate.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDKzCCAhOgAwIBAgIJAIV7frIjftgcMA0GCSqGSIb3DQEBCwUAMCwxFDASBgNV
+BAMMC3Rlc3RfY2xpZW50MRQwEgYDVQQLDAtwcm90b25fdGVzdDAeFw0xNTExMjcx
+ODEwMzlaFw0yNTExMjQxODEwMzlaMCwxFDASBgNVBAMMC3Rlc3RfY2xpZW50MRQw
+EgYDVQQLDAtwcm90b25fdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPCIS4qUdOtQplUxZ6WW0LXcvosqFP6qOiCARLSEWpR3B8bq213rzefwwfcM
+4TtMr88bP+huLKmlyMfwpl8yB88eXkscPgaAce2zk24urWkFXKSQ6GPitWBLGqBa
+V+W0wJ4mfW7MwefVslWfGXI381QEUlBHjkFG30AtzMMTRj2GK2JqUlRXZPljGyB7
+WcXwxcoS+HkKV7FtHWSkLAzyXwQ9vsCUEYdWTUaGXfCUNRSRV7h1LIANbu03NxV0
+XdEl7WXcr7tuTw3axeUGhRFVhLegrxKLuZTTno4aAJnEr8uaDzjxvXnv3Ne2igvy
+gRfZgOMx+XrZEob9OpAoRghQt4cCAwEAAaNQME4wHQYDVR0OBBYEFE4vbyiM0RjG
+TLMLLGGhMZE/5x1GMB8GA1UdIwQYMBaAFE4vbyiM0RjGTLMLLGGhMZE/5x1GMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAErr/rvLS9Ig0UCMwh1J1lA9
+/gvXf93iIK/SjrFIAqYRmfZxg4husfoes8t2hFUeuqoH05TuSOoXG8p8DpgTSGmF
+jAFe+T90vJZTm0oqZkkkI/hdzjGQoHURRp9/O2Z/lm39KSKGVAN5pUWCUDi/G5iS
+P9LZPJN6a5syXMrR6x62IPxAXowlpXkRghKClF3zPOaOBTzT1V27EkI8IEgC+p45
+246EooLnw8ibB+ucNc3KHNzpgKGVd/622+I+Q5eg9AT9PLFttP+R2ECsrVDDPYuA
+p0qaSnwgeozj/d6K3FOgKKEKbzBmpWgkv0jdcVk18aPMHypI/RDtZ/+3ET2Ksi8=
+-----END CERTIFICATE-----

data/examples/ssl_certs/tclient-private-key.pem

@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQICy6ghWp45z4CAggA
+MBQGCCqGSIb3DQMHBAiVdDoo4NIghQSCBMixGm1bm/omMxsaKnIPO7zm5dyLexJ+
+yTFpmh2KV7kQqmpzCyIOdoG6K8YqFnie2XdFWm3S8faRHoMq54bDmyEWIxfQPq5f
+I1iYFbIZkbnhUvK53RActsEUMf0locS4xylU7VQK3XTAwp0TVip3Lp3ehEMEdcXL
+iUWibGsoTPKcY9MIWGXZAJXsEXoeHt6k2hHo1G4E0/Bi6mLW1LY/cxZCjHTGD6qI
+Kt54SCCDvinqVa+rixw6yX9F14EA6bhALami8e+Ccd3lqHOyYlXcBaSS1ezCg6ig
+oNK97mC+gEGy1KlkZDKWXclFoOCBXRBe4DByre6Rlq3yeI9L42bvAuSBSmf5QT5g
+73Yl8vjEAKR65awBT09dPuKu7t+Fb6vkwF8/t+uyj9IuL+42UuXhMLK3ohf+6DbU
+8/zB4y3GXI80QmWM0+Wx4n6khFhPFLHt2q0Sn6V9PG1vtHyiq50oSCoyrPQLaecp
+hefnMCFBYTcT3JUwmoVGGy0boIAwL7T4aGsMt7QhwOx5tU35tKFxyY7m4fX14AKo
+2EIy+TPQwCGkGf3Puy/Pc9VA8IAxB5+WwSrjk+NeCv88eIX7gy43k4rCr+OmD9FF
+wknr3xoP3KYhNXjdZ4Ep/1UHSK+JAtzzbNLQjDcqN+gQPg/yUX6ih0j5K3Wvh9bK
+E/DvzbpJroUZPgzR+8z5O68CfsD+OIdpHBFTKqAFmzvUuqpADpr998LdCjD+lW+V
+xZZgZa8KEblwgiH3fdGbYl46Ho1zrZisf439DbqyybAuBIQB4NSZcL/MAgVGO17k
+QDpVElWZWYrFm4CFTcvS2HvIzRmbefF5m5oJedsN7Q6WQCp+3gnwYx1xIOknd7pW
+N4AHNnqjscSj9yACj/EiBVKAKNnC5H7ZGZTsaAjMETZyjLXfI2AZ3Fviz4zFR+oz
+NkAfFB6WUpRpl7H02FzrzYT7XkkLcXd6H6g+mv2iDa9uKWk/PS2QlqnJt8/dHEHD
+JKTG331yDK5GHlKAVGF3nP5BwFGgTQMuSoeiOervMXPUwDpQ8OaYkuaRej0cZLgT
+kAF9sUjqdsoYNcXDFHALp6y5g8qYkfrxrlIbKs82zIsmB5I+dtZbUaD3a0zAUrmW
+5Xm3Pc9dVP0EXKwfHz6zqPReEw2yYLisB5IoHd4M2wa3GzHBdra1ij4QTmvd3o7e
+buGFoX8KJQAcig0zpbYkoDP2gPhIh9rY4unVPQNX1Q8/wRsiJAZZsYvZY+A+SmuZ
+bwSwk+8ZJRsFzdYYYhQeRytD5cDAIQiClcI5Yj4T9dWQV/gf0N/wIBDNTMp0jJAy
+1l7PuXTfGZodNJWZH0oqsrNoWbn/k67NildvvofIKX+h09Nxszr670Pvj0qoHd5/
+CWq30lnxoJBUgbikFOz6ZuuHi/ZiCXL+haH+v8hJKN5ptRKnyYJQHchRB/IOGRoT
+5lmWxo8a7K+yXhp0VBDHJfw3685ms0xQX8Xj4X3MEuN64zd0fB1JmhtP12ydK85J
+ABawNKlRQPw5weckwtCviXQX+vX25S/xu3xA6IuqlHyqL/1t3DICzuxeOyT2mZxD
+tKQxEgNihPvu32vn9m74qA3adEaxuWPRkPZuTeITHOkMTZolvqYX/5olBsSgYwka
+7/g=
+-----END ENCRYPTED PRIVATE KEY-----

data/examples/ssl_certs/tserver-certificate.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDKzCCAhOgAwIBAgIJAPnYOOQCJ3kDMA0GCSqGSIb3DQEBCwUAMCwxFDASBgNV
+BAMMC3Rlc3Rfc2VydmVyMRQwEgYDVQQLDAtwcm90b25fdGVzdDAeFw0xNTExMjcx
+ODEwMzlaFw0yNTExMjQxODEwMzlaMCwxFDASBgNVBAMMC3Rlc3Rfc2VydmVyMRQw
+EgYDVQQLDAtwcm90b25fdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKJNB78lgw4KtXDAvXocTLud6mbn6zgfB6ETIF+kcrukOH9DnPxjLBBM4Lig
+sp1+kmeudFK5/X8riDrvIW52b/rlEBLgLB+oDtI74m6OTbBs9L+FUFYOuxApetQF
+qoJy2vf9pWfy4uku24vCpeo7eVLi6ypu4lXE3LR+Km3FruHI1NKonHBMhwXSOWqF
+pYM6/4IZJ4fbV0+eU0Jrx+05s6XHg5vone2BVJKxeSIBje+zWnNnh8+qG0Z70Jgp
+aMetME5KGnLNgD1okpH0vb3lwjvuqkkx4WswGVZGbLLkSqqBpXPyM9fCFVy5aKSL
+DBq7IABQtO67O2nBzK3OyigHrUUCAwEAAaNQME4wHQYDVR0OBBYEFGV1PY0FCFbJ
+gpcDVKI6JGiRTt3kMB8GA1UdIwQYMBaAFGV1PY0FCFbJgpcDVKI6JGiRTt3kMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAIx1TOTGWnnbpan4bse7wuvH
+GYSNDJhoTVS+X1TC63xukJD1JBAsCNTqg/ZV6lN3XEl7vvOXfGoCiyXM6a9XOKUo
+gSDtMrIr+wTh6Ss1yRO8QcCJmxH5JDXNu1ojtwsjFW/vneI4IL9kwpDsSlMQEX/E
+EkkQwtAx/Cvfe7pecZL4qSeykJOUMTts9H8fCAZqEiRZBA3ugJxqF8jwLP3DoFVQ
+6QZzKDY6CSPqfMnVb5i0MAIYVDpau+e3N9dgQpZD22F/zbua0OVbfAPdiRMnYxML
+FT4sxLnh+5YVqwpVWbEKp4onHe2Fq6YIvAxUYAJ3SBA2C8O2RAVKWxf1jko3jYI=
+-----END CERTIFICATE-----

data/examples/ssl_certs/tserver-private-key.pem

@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI1cT0c2J3GcQCAggA
+MBQGCCqGSIb3DQMHBAi1hxSX2LJ+EgSCBMheHJ0iXr5A36Natjk/LcAEeKUMT9s+
+sMzoQceCWe8qMlQluWksr9iDdZ4JRIE8cpK8dbmx4dLY/SShUzdlhJHCSa4zZBHq
+8cZ/jGUF/RF1rqdgjK589eUq+uOl3/gXKzG/SxBqayy6PSn12kX3qnvmlkXCmtwU
+lg+iBm5wRcJ0MyVHaJkyA8sW8gr186C/VAau6Yu0crQXN7NRo9snrd4ewuYMIEhZ
+hgaG9XsYQWB1bPhAaKj80CZGxsQbJyTwcbKKkB3IY4WXx8mmhuiNl+vKT3HBJ9Ju
+YB6tgIjs8CJ4X2P4aU3yNJwG1QldgHSqmFGQ19bcZAw3s3kzwjdzRf4H2V16XOBd
+zQ5AEs/ffVMzMIAfkb1gYwgunZ2CVwwDJ2mi1RcgkX+Og2aFQc+fxXcVOnDcGLxV
+6fuCuZ2lsXfoiIyRh9kj3L75N12GtVUvgBdnMuOc1wPw6XnGQtDwt0acJpdexLMG
+k0j57r/gcgzTcmF3qNM+y9L/HLssgrJkvVJw2Np5gmtIyfDocsDUWUbClS4dTpYf
+oTngUTU+vWtHBuaUnb+f5/WJaRS/S7mmR8usbVG3i9WnEr/vlPJpbJFSjW2S6u/H
+7cFxKUmmBZsSuEv/EKt9a+Sh62kprOChm4myqfCI1/gvNKfUZC6m0Vp8zf+2LgAq
+2RgbMuqysMjWUtV4kDRZT7oCYckUDwsCHdbLES3nmVrtBk2ShMKHBpDp8/GoRuiV
+jdV7/EjKM/M1kXtFYYe3z7Mxv++lKYIJ7bNwVrQ8nrhce/VwHw6D5emWXNCJXhKZ
+FW7EM2ZOZ9eaKOlCsIi8sbjV6Yie9IY6HJKKmi3CpO0Tv5kLBdHkru8vGCSFm3O1
+n7wz7Ys5FBSlZ19X0NwQSCQX1Q4w+tido6i1SCRX0qJEdTNGuGwVXMHCf4/1zyHV
+hj8vnxh8fzo79LFrwlTTgwLg1Mr8sEUFFDJ/raJ1AhFXi8n24trtNR8EHxRW8wtD
+CLCKaqkEqfBiFXK/Yq3RrefCayPHiD+DaNsI8BwefMGpED3vD8YYCjAzXNPh/CSF
+sc1i1jWMzbJhzOoFSPNXhlfusbUFMFQ/6olatmH47SY6HBBOL3DDP5uQ0jw8P454
+QBjlMOpEZmZxO6TcEtJwu0vzgog4rQ5g3NWy6SIpjWehNwTynLt7yM3R5WTI6cZs
+0GTv/rqo2/SUoNsFmnGIUwj/DrBe4XOAq1nS2ZlEctxKhBsKH0hMFp6D1rXOzrgl
+bwcq+oistoB0TLcThShyNgSqzW1znQ1n5SVUk9b5rRhSttJxn3yOMewH0i3v8bPo
+HOhP5kaGjblPsCYyhlL/SNVF0OXEGTwLNey7FQdWFOwVwTRRXe7k+uGZ2d5hg+Jn
+It/trDZ1RDYbVmB7/Qy73c16J4mvhOUJ2de5ZciFBjkidbiiUKLj9xnjK9k9Sauo
+MKhNnDMAEU5VDQM3xNe5BRdX8dFLwfF5H64sU3nROF83aUnDgvfFEowYPnCuPYfm
+m4aQHfoBSg4j3v1OeOwktcl+Q2TjxPHfWhbWeRBfxOTqQ/suYhnQChuFSK/qyo9K
+ccgotqghhunRsWMoZT25H7AZM6yKb1sMz/0oyMRIKeGqoYh+ULM5XLY0xNYd4/xU
+WtQ=
+-----END ENCRYPTED PRIVATE KEY-----

data/examples/ssl_send.rb

@@ -0,0 +1,70 @@
+#--
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#++
+
+require 'qpid_proton'
+require 'optparse'
+
+class SimpleSend < Qpid::Proton::MessagingHandler
+
+  def initialize(url, address, expected)
+    super()
+    @url = url
+    @address = address
+    @sent = 0
+    @confirmed = 0
+    @expected = expected
+  end
+
+  def on_container_start(container)
+    # Use a default client SSL domain
+    ssl_domain = Qpid::Proton::SSLDomain.new(Qpid::Proton::SSLDomain::MODE_CLIENT)
+    c = container.connect(@url, { :ssl_domain => ssl_domain })
+    c.open_sender(@address)
+  end
+
+  def on_connection_open(c)
+    raise "No security!"  unless c.transport.ssl?
+    STDOUT.puts "Connection secured with #{c.transport.ssl.protocol_name.inspect}"
+  end
+
+  def on_sendable(sender)
+    while sender.credit > 0 && @sent < @expected
+      msg = Qpid::Proton::Message.new("sequence #{@sent}", { :id => @sent } )
+      sender.send(msg)
+      @sent = @sent + 1
+    end
+  end
+
+  def on_tracker_accept(tracker)
+    @confirmed = @confirmed + 1
+    if @confirmed == @expected
+      puts "All #{@expected} messages confirmed!"
+      tracker.connection.close
+    end
+  end
+end
+
+unless (2..3).include? ARGV.size
+  STDERR.puts "Usage: #{__FILE__} URL ADDRESS [COUNT]}
+Connect to URL and send COUNT messages to ADDRESS"
+  return 1
+end
+url, address, count = ARGV
+count = Integer(count || 10)
+Qpid::Proton::Container.new(SimpleSend.new(url, address, count)).run

data/ext/cproton/cproton.c

@@ -1813,73 +1813,74 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_long swig_types[10]
 #define SWIGTYPE_p_long_long swig_types[11]
 #define SWIGTYPE_p_p_char swig_types[12]
-#define SWIGTYPE_p_pn_acceptor_t swig_types[13]
-#define SWIGTYPE_p_pn_atom_t swig_types[14]
-#define SWIGTYPE_p_pn_bytes_t swig_types[15]
-#define SWIGTYPE_p_pn_cid_t swig_types[16]
-#define SWIGTYPE_p_pn_class_t swig_types[17]
-#define SWIGTYPE_p_pn_collector_t swig_types[18]
-#define SWIGTYPE_p_pn_condition_t swig_types[19]
-#define SWIGTYPE_p_pn_connection_driver_t swig_types[20]
-#define SWIGTYPE_p_pn_connection_t swig_types[21]
-#define SWIGTYPE_p_pn_data_t swig_types[22]
-#define SWIGTYPE_p_pn_decimal128_t swig_types[23]
-#define SWIGTYPE_p_pn_delivery_t swig_types[24]
-#define SWIGTYPE_p_pn_disposition_t swig_types[25]
-#define SWIGTYPE_p_pn_distribution_mode_t swig_types[26]
-#define SWIGTYPE_p_pn_durability_t swig_types[27]
-#define SWIGTYPE_p_pn_error_t swig_types[28]
-#define SWIGTYPE_p_pn_event_batch_t swig_types[29]
-#define SWIGTYPE_p_pn_event_t swig_types[30]
-#define SWIGTYPE_p_pn_event_type_t swig_types[31]
-#define SWIGTYPE_p_pn_expiry_policy_t swig_types[32]
-#define SWIGTYPE_p_pn_handler_t swig_types[33]
-#define SWIGTYPE_p_pn_hash_t swig_types[34]
-#define SWIGTYPE_p_pn_iterator_t swig_types[35]
-#define SWIGTYPE_p_pn_link_t swig_types[36]
-#define SWIGTYPE_p_pn_list_t swig_types[37]
-#define SWIGTYPE_p_pn_listener_t swig_types[38]
-#define SWIGTYPE_p_pn_map_t swig_types[39]
-#define SWIGTYPE_p_pn_message_t swig_types[40]
-#define SWIGTYPE_p_pn_messenger_t swig_types[41]
-#define SWIGTYPE_p_pn_proactor_t swig_types[42]
-#define SWIGTYPE_p_pn_rcv_settle_mode_t swig_types[43]
-#define SWIGTYPE_p_pn_reactor_t swig_types[44]
-#define SWIGTYPE_p_pn_record_t swig_types[45]
-#define SWIGTYPE_p_pn_rwbytes_t swig_types[46]
-#define SWIGTYPE_p_pn_sasl_outcome_t swig_types[47]
-#define SWIGTYPE_p_pn_sasl_t swig_types[48]
-#define SWIGTYPE_p_pn_selectable_t swig_types[49]
-#define SWIGTYPE_p_pn_session_t swig_types[50]
-#define SWIGTYPE_p_pn_snd_settle_mode_t swig_types[51]
-#define SWIGTYPE_p_pn_ssl_cert_subject_subfield swig_types[52]
-#define SWIGTYPE_p_pn_ssl_domain_t swig_types[53]
-#define SWIGTYPE_p_pn_ssl_hash_alg swig_types[54]
-#define SWIGTYPE_p_pn_ssl_mode_t swig_types[55]
-#define SWIGTYPE_p_pn_ssl_resume_status_t swig_types[56]
-#define SWIGTYPE_p_pn_ssl_t swig_types[57]
-#define SWIGTYPE_p_pn_ssl_verify_mode_t swig_types[58]
-#define SWIGTYPE_p_pn_status_t swig_types[59]
-#define SWIGTYPE_p_pn_string_t swig_types[60]
-#define SWIGTYPE_p_pn_subscription_t swig_types[61]
-#define SWIGTYPE_p_pn_task_t swig_types[62]
-#define SWIGTYPE_p_pn_terminus_t swig_types[63]
-#define SWIGTYPE_p_pn_terminus_type_t swig_types[64]
-#define SWIGTYPE_p_pn_timer_t swig_types[65]
-#define SWIGTYPE_p_pn_transport_t swig_types[66]
-#define SWIGTYPE_p_pn_type_t swig_types[67]
-#define SWIGTYPE_p_pn_url_t swig_types[68]
-#define SWIGTYPE_p_pn_uuid_t swig_types[69]
-#define SWIGTYPE_p_short swig_types[70]
-#define SWIGTYPE_p_signed_char swig_types[71]
-#define SWIGTYPE_p_unsigned_char swig_types[72]
-#define SWIGTYPE_p_unsigned_int swig_types[73]
-#define SWIGTYPE_p_unsigned_long swig_types[74]
-#define SWIGTYPE_p_unsigned_long_long swig_types[75]
-#define SWIGTYPE_p_unsigned_short swig_types[76]
-#define SWIGTYPE_p_void swig_types[77]
-static swig_type_info *swig_types[79];
-static swig_module_info swig_module = {swig_types, 78, 0, 0, 0, 0};
+#define SWIGTYPE_p_p_pn_connection_driver_t swig_types[13]
+#define SWIGTYPE_p_pn_acceptor_t swig_types[14]
+#define SWIGTYPE_p_pn_atom_t swig_types[15]
+#define SWIGTYPE_p_pn_bytes_t swig_types[16]
+#define SWIGTYPE_p_pn_cid_t swig_types[17]
+#define SWIGTYPE_p_pn_class_t swig_types[18]
+#define SWIGTYPE_p_pn_collector_t swig_types[19]
+#define SWIGTYPE_p_pn_condition_t swig_types[20]
+#define SWIGTYPE_p_pn_connection_driver_t swig_types[21]
+#define SWIGTYPE_p_pn_connection_t swig_types[22]
+#define SWIGTYPE_p_pn_data_t swig_types[23]
+#define SWIGTYPE_p_pn_decimal128_t swig_types[24]
+#define SWIGTYPE_p_pn_delivery_t swig_types[25]
+#define SWIGTYPE_p_pn_disposition_t swig_types[26]
+#define SWIGTYPE_p_pn_distribution_mode_t swig_types[27]
+#define SWIGTYPE_p_pn_durability_t swig_types[28]
+#define SWIGTYPE_p_pn_error_t swig_types[29]
+#define SWIGTYPE_p_pn_event_batch_t swig_types[30]
+#define SWIGTYPE_p_pn_event_t swig_types[31]
+#define SWIGTYPE_p_pn_event_type_t swig_types[32]
+#define SWIGTYPE_p_pn_expiry_policy_t swig_types[33]
+#define SWIGTYPE_p_pn_handler_t swig_types[34]
+#define SWIGTYPE_p_pn_hash_t swig_types[35]
+#define SWIGTYPE_p_pn_iterator_t swig_types[36]
+#define SWIGTYPE_p_pn_link_t swig_types[37]
+#define SWIGTYPE_p_pn_list_t swig_types[38]
+#define SWIGTYPE_p_pn_listener_t swig_types[39]
+#define SWIGTYPE_p_pn_map_t swig_types[40]
+#define SWIGTYPE_p_pn_message_t swig_types[41]
+#define SWIGTYPE_p_pn_messenger_t swig_types[42]
+#define SWIGTYPE_p_pn_proactor_t swig_types[43]
+#define SWIGTYPE_p_pn_rcv_settle_mode_t swig_types[44]
+#define SWIGTYPE_p_pn_reactor_t swig_types[45]
+#define SWIGTYPE_p_pn_record_t swig_types[46]
+#define SWIGTYPE_p_pn_rwbytes_t swig_types[47]
+#define SWIGTYPE_p_pn_sasl_outcome_t swig_types[48]
+#define SWIGTYPE_p_pn_sasl_t swig_types[49]
+#define SWIGTYPE_p_pn_selectable_t swig_types[50]
+#define SWIGTYPE_p_pn_session_t swig_types[51]
+#define SWIGTYPE_p_pn_snd_settle_mode_t swig_types[52]
+#define SWIGTYPE_p_pn_ssl_cert_subject_subfield swig_types[53]
+#define SWIGTYPE_p_pn_ssl_domain_t swig_types[54]
+#define SWIGTYPE_p_pn_ssl_hash_alg swig_types[55]
+#define SWIGTYPE_p_pn_ssl_mode_t swig_types[56]
+#define SWIGTYPE_p_pn_ssl_resume_status_t swig_types[57]
+#define SWIGTYPE_p_pn_ssl_t swig_types[58]
+#define SWIGTYPE_p_pn_ssl_verify_mode_t swig_types[59]
+#define SWIGTYPE_p_pn_status_t swig_types[60]
+#define SWIGTYPE_p_pn_string_t swig_types[61]
+#define SWIGTYPE_p_pn_subscription_t swig_types[62]
+#define SWIGTYPE_p_pn_task_t swig_types[63]
+#define SWIGTYPE_p_pn_terminus_t swig_types[64]
+#define SWIGTYPE_p_pn_terminus_type_t swig_types[65]
+#define SWIGTYPE_p_pn_timer_t swig_types[66]
+#define SWIGTYPE_p_pn_transport_t swig_types[67]
+#define SWIGTYPE_p_pn_type_t swig_types[68]
+#define SWIGTYPE_p_pn_url_t swig_types[69]
+#define SWIGTYPE_p_pn_uuid_t swig_types[70]
+#define SWIGTYPE_p_short swig_types[71]
+#define SWIGTYPE_p_signed_char swig_types[72]
+#define SWIGTYPE_p_unsigned_char swig_types[73]
+#define SWIGTYPE_p_unsigned_int swig_types[74]
+#define SWIGTYPE_p_unsigned_long swig_types[75]
+#define SWIGTYPE_p_unsigned_long_long swig_types[76]
+#define SWIGTYPE_p_unsigned_short swig_types[77]
+#define SWIGTYPE_p_void swig_types[78]
+static swig_type_info *swig_types[80];
+static swig_module_info swig_module = {swig_types, 79, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2160,18 +2161,19 @@ SWIG_From_bool  (bool value)
 }
 
 
-#if defined(RUBY20) || defined(RUBY21)
+#if defined(RUBY_USE_rb_thread_call_without_gvl)
 
+  #include <ruby/thread.h>
   typedef void *non_blocking_return_t;
-#define RB_BLOCKING_CALL rb_thread_call_without_gvl
+  #define RB_BLOCKING_CALL (VALUE)rb_thread_call_without_gvl
 
-#elif defined(RUBY19)
+#elif defined(RUBY_USE_rb_thread_blocking_region)
 
-    typedef VALUE non_blocking_return_t;
-#define RB_BLOCKING_CALL rb_thread_blocking_region
+  typedef VALUE non_blocking_return_t;
+  #define RB_BLOCKING_CALL rb_thread_blocking_region
 
 #endif
-  
+
 
 
 #if defined(RB_BLOCKING_CALL)
@@ -21143,6 +21145,30 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_connection_driver_ptr(int argc, VALUE *argv, VALUE self) {
+  pn_connection_t *arg1 = (pn_connection_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_connection_driver_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_driver_ptr", 1, argv[0] )); 
+  }
+  arg1 = (pn_connection_t *)(argp1);
+  result = (pn_connection_driver_t **)pn_connection_driver_ptr(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_pn_connection_driver_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_url(int argc, VALUE *argv, VALUE self) {
   pn_url_t *result = 0 ;
@@ -23070,6 +23096,7 @@ static swig_type_info _swigt__p_intptr_t = {"_p_intptr_t", "intptr_t *|pn_shandl
 static swig_type_info _swigt__p_long = {"_p_long", "int32_t *|long *|pn_sequence_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64_t *|long long *|pn_tracker_t *|pn_timestamp_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_pn_connection_driver_t = {"_p_p_pn_connection_driver_t", "struct pn_connection_driver_t **|pn_connection_driver_t **", 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", "struct pn_bytes_t *|pn_bytes_t *", 0, 0, (void*)0, 0};
@@ -23150,6 +23177,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_long,
   &_swigt__p_long_long,
   &_swigt__p_p_char,
+  &_swigt__p_p_pn_connection_driver_t,
   &_swigt__p_pn_acceptor_t,
   &_swigt__p_pn_atom_t,
   &_swigt__p_pn_bytes_t,
@@ -23230,6 +23258,7 @@ static swig_cast_info _swigc__p_intptr_t[] = {  {&_swigt__p_intptr_t, 0, 0, 0},{
 static swig_cast_info _swigc__p_long[] = {  {&_swigt__p_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_pn_connection_driver_t[] = {  {&_swigt__p_p_pn_connection_driver_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_acceptor_t[] = {  {&_swigt__p_pn_acceptor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_atom_t[] = {  {&_swigt__p_pn_atom_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_bytes_t[] = {  {&_swigt__p_pn_bytes_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -23310,6 +23339,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_long,
   _swigc__p_long_long,
   _swigc__p_p_char,
+  _swigc__p_p_pn_connection_driver_t,
   _swigc__p_pn_acceptor_t,
   _swigc__p_pn_atom_t,
   _swigc__p_pn_bytes_t,
@@ -23681,7 +23711,7 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pni_connection_driver", _wrap_pni_connection_driver, -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)(19)));
+  rb_define_const(mCproton, "PN_VERSION_MINOR", SWIG_From_int((int)(21)));
   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))));
@@ -24487,6 +24517,7 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_connection_driver_errorf", _wrap_pn_connection_driver_errorf, -1);
   rb_define_module_function(mCproton, "pn_event_batch_connection_driver", _wrap_pn_event_batch_connection_driver, -1);
   rb_define_module_function(mCproton, "pn_connection_driver_log", _wrap_pn_connection_driver_log, -1);
+  rb_define_module_function(mCproton, "pn_connection_driver_ptr", _wrap_pn_connection_driver_ptr, -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);

data/lib/core/container.rb

@@ -125,7 +125,8 @@ module Qpid::Proton
       # - nil on the @work queue makes a #run thread exit
 
       @work = Queue.new
-      @work << :start << self   # Issue start and start start selecting
+      @work << :start
+      @work << self             # Issue start and start start selecting
       @wake = IO.pipe           # Wakes #run thread in IO.select
       @auto_stop = true         # Stop when @active drops to 0
 

data/lib/core/ssl_domain.rb

@@ -48,7 +48,7 @@ module Qpid::Proton
     # @private
     def initialize(mode)
       @impl = Cproton.pn_ssl_domain(mode)
-      raise SSLUnavailable.new if @impl.nil?
+      raise Qpid::Proton::SSLError, "SSL Unavailable" if @impl.nil?
     end
 
     # Set the certificate that identifies the local node to the remote.

data/lib/core/uri.rb

@@ -37,9 +37,15 @@ module URI
 end
 
 module Qpid::Proton
-  # Returns +s+ converted to a {URI::AMQP} or {URI::AMQPS} object
+  private
+  # Make sure to allow empty hostnames, Ruby 2.0.0 does not.
+  DEFAULT_URI_PARSER = URI::Parser.new(:HOSTNAME => /(?:#{URI::PATTERN::HOSTNAME})|/)
+
+  public
+
+  # Convert +s+ to a {URI::AMQP} or {URI::AMQPS} object
   #
-  # Shortcut strings are allowed: an "amqp://" prefix is added if +s+ does
+  # Shortcut strings like "host:port" are allowed: an "amqp://" prefix is added if +s+ does
   # not already look like an 'amqp:', 'amqps:' URI.
   #
   # @note this does not give the same result as a standard URI parser in all cases.
@@ -54,19 +60,19 @@ module Qpid::Proton
   #
   def self.uri(s)
     case s
-      when URI::AMQP then s     # Pass-thru
-    when URI::Generic
-      s.scheme ||= 'amqp'
-      u = URI.parse(s.to_s)      # Re-parse as amqp
+    when URI::AMQP then s       # This is already an AMQP or AMQPS URL.
+    when URI::Generic           # Re-parse a generic URI that was not parsed as AMQP/AMQPS class
+      s.scheme ||= 'amqp'       # Default to amqp: scheme
+      u = DEFAULT_URI_PARSER.parse(s.to_s)
       raise URI::BadURIError, "Not an AMQP URI: '#{u}'" unless u.is_a? URI::AMQP
       u
     else
       s = String.try_convert s
       raise ::ArgumentError, "bad argument (expected URI object or URI string)" unless s
       case s
-      when %r{^amqps?:} then URI.parse(s)      # Looks like an AMQP URI
-      when %r{^//} then URI.parse("amqp:#{s}") # Looks like a scheme-less URI
-      else URI.parse("amqp://#{s}")            # Treat as a bare host:port/path string
+      when %r{^amqps?:} then DEFAULT_URI_PARSER.parse(s)      # Looks like an AMQP URI
+      when %r{^//} then DEFAULT_URI_PARSER.parse("amqp:#{s}") # Looks like an authority with no scheme
+      else DEFAULT_URI_PARSER.parse("amqp://#{s}")            # Treat as a bare host:port/path string
       end
     end
   end