zeroc-ice 3.6b1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a992be542b49dfcbb36d407fdf628b5e8aae52d
-  data.tar.gz: fc0cbdde4c937f252caf595a571f1cc54b7f0b50
+  metadata.gz: 9c32676b4cadc1bc932c034963bf2840c4ab95d5
+  data.tar.gz: f6f764dd8f1f1268cc22be2cc4665c12591c02d5
 SHA512:
-  metadata.gz: 250be15341a291c38994fbd9ae917075351b5e97a906bf43274a62e8416994b7c910cbcabe6d7bd0aecbd3316b1b496516d22608f9c6efe9f9803c4040e92d27
-  data.tar.gz: a34268ad46d6ef65fbc4e72f20a6fc655082e3ca69d8916f6e71066c5674a4fab2fc087e5f0ec9b822cdd0cb5e7b876bcde713d17c7780acb94d03fc16f91830
+  metadata.gz: 4ea6bdcb9a610d2d47a9b84fffc47cd442230407c5251b2c86ae4725171bcc1ec72dbe65e3c6066a76dc2635fcd7027291c673a0524f07ad7bad4f62141c11cd
+  data.tar.gz: 02adf655a449f8c264c789b302a9f51423307b02fcc612a85053db05d275a23d4db39675e6a6e734885387c6ac4e820bc78d60bfabbdc69139e951d7e73aaf45

data/ICE_LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 
 This copy of Ice is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as
@@ -23,19 +23,13 @@ such shall be licensed under the terms of the GNU General Public License
 version 2. This includes the situation where Ice is only being used 
 through an abstraction layer.
 
-As a special exception to the above, ZeroC grants to the contributors for
-the following projects the permission to license their Ice-based software 
-under the terms of the GNU Lesser General Public License (LGPL) version 
-2.1 or of the BSD license:
-
- - Orca Robotics (http://orca-robotics.sourceforge.net)
- 
- - Mumble (http://mumble.sourceforge.net)
-
-This exception does not extend to the parts of Ice used by these 
-projects, or to any other derived work: as a whole, any work based on Ice
-shall be licensed under the terms and conditions of the GNU General
-Public License version 2.
+As a special exception to the above, ZeroC grants to the copyright 
+holders and contributors of the Mumble project (http://www.mumble.info) 
+the permission to license the Ice-based software they contribute to 
+Mumble under the terms of the BSD license. This exception does not extend
+to the parts of Ice used by Mumble, or to any other derived work: as a 
+whole, any work based on Ice shall be licensed under the terms and 
+conditions of the GNU General Public License version 2.
 
 You may also combine Ice with any software not derived from Ice, provided
 the license of such software is compatible with the GNU General Public 

data/LICENSE

@@ -2,7 +2,8 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

data/{ext/ice/MCPP_LICENSE → MCPP_LICENSE}

@@ -1,13 +1,5 @@
-The Slice compilers use mcpp as their preprocessor:
-
-  http://mcpp.sourceforge.net
-
-
-License Agreement for mcpp:
----------_-----------------
-
 /*-
- * Copyright (c) 1998, 2002-2007 Kiyoshi Matsui <kmatsui@t3.rim.or.jp>
+ * Copyright (c) 1998, 2002-2008 Kiyoshi Matsui <kmatsui@t3.rim.or.jp>
  * All rights reserved.
  *
  * This software including the files in this directory is provided under
@@ -34,3 +26,4 @@ License Agreement for mcpp:
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+

data/bin/slice2rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # **********************************************************************
 #
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.

data/ext/Communicator.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Communicator.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Config.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -87,25 +87,4 @@ typedef VALUE(*ICE_RUBY_ENTRY_POINT)(...);
 #   define RFLOAT_VALUE(v) RFLOAT(v)->value
 #endif
 
-#ifndef RBIGNUM_LEN
-#   define RBIGNUM_LEN(v) RBIGNUM(v)->len
-#endif
-
-//
-// The definition of RBIGNUM_DIGITS in 1.8.7p248+ causes a compilation error (see bug 4653),
-// so we undefine it and use our own definition below. Note that the macro HAVE_RUBY_RUBY_H
-// is only defined in Ruby 1.9.
-//
-#ifndef HAVE_RUBY_RUBY_H
-#   undef RBIGNUM_DIGITS
-#endif
-
-#ifndef RBIGNUM_DIGITS
-#   define RBIGNUM_DIGITS(v) ((BDIGIT*)RBIGNUM(v)->digits)
-#endif
-
-#ifndef RBIGNUM_SIGN
-#   define RBIGNUM_SIGN(v) RBIGNUM(v)->sign
-#endif
-
 #endif

data/ext/Connection.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -12,6 +12,7 @@
 #include <Types.h>
 #include <Util.h>
 #include <Ice/Object.h>
+#include <IceSSL/ConnectionInfo.h>
 
 using namespace std;
 using namespace IceRuby;
@@ -22,6 +23,9 @@ static VALUE _connectionInfoClass;
 static VALUE _ipConnectionInfoClass;
 static VALUE _tcpConnectionInfoClass;
 static VALUE _udpConnectionInfoClass;
+static VALUE _wsConnectionInfoClass;
+static VALUE _sslConnectionInfoClass;
+static VALUE _wssConnectionInfoClass;
 
 // **********************************************************************
 // Connection
@@ -218,6 +222,23 @@ IceRuby_Connection_getEndpoint(VALUE self)
     ICE_RUBY_CATCH
     return Qnil;
 }
+extern "C"
+VALUE
+IceRuby_Connection_setBufferSize(VALUE self, VALUE r, VALUE s)
+{
+    ICE_RUBY_TRY
+    {
+        Ice::ConnectionPtr* p = reinterpret_cast<Ice::ConnectionPtr*>(DATA_PTR(self));
+        assert(p);
+
+        int rcvSize = static_cast<int>(getInteger(r));
+        int sndSize = static_cast<int>(getInteger(s));
+
+        (*p)->setBufferSize(rcvSize, sndSize);
+    }
+    ICE_RUBY_CATCH
+    return Qnil;
+}
 
 extern "C"
 VALUE
@@ -273,7 +294,26 @@ VALUE
 IceRuby::createConnectionInfo(const Ice::ConnectionInfoPtr& p)
 {
     VALUE info;
-    if(Ice::TCPConnectionInfoPtr::dynamicCast(p))
+    if(Ice::WSConnectionInfoPtr::dynamicCast(p))
+    {
+        info = Data_Wrap_Struct(_wsConnectionInfoClass, 0, IceRuby_ConnectionInfo_free, new Ice::ConnectionInfoPtr(p));
+
+        Ice::WSConnectionInfoPtr ws = Ice::WSConnectionInfoPtr::dynamicCast(p);
+        rb_ivar_set(info, rb_intern("@localAddress"), createString(ws->localAddress));
+        rb_ivar_set(info, rb_intern("@localPort"), INT2FIX(ws->localPort));
+        rb_ivar_set(info, rb_intern("@remoteAddress"), createString(ws->remoteAddress));
+        rb_ivar_set(info, rb_intern("@remotePort"), INT2FIX(ws->remotePort));
+
+        volatile VALUE result = callRuby(rb_hash_new);
+        for(Ice::HeaderDict::const_iterator q = ws->headers.begin(); q != ws->headers.end(); ++q)
+        {
+            volatile VALUE key = createString(q->first);
+            volatile VALUE value = createString(q->second);
+            callRuby(rb_hash_aset, result, key, value);
+        }
+        rb_ivar_set(info, rb_intern("@headers"), result);
+    }
+    else if(Ice::TCPConnectionInfoPtr::dynamicCast(p))
     {
         info = Data_Wrap_Struct(_tcpConnectionInfoClass, 0, IceRuby_ConnectionInfo_free, new Ice::ConnectionInfoPtr(p));
 
@@ -295,6 +335,41 @@ IceRuby::createConnectionInfo(const Ice::ConnectionInfoPtr& p)
         rb_ivar_set(info, rb_intern("@mcastAddress"), createString(udp->mcastAddress));
         rb_ivar_set(info, rb_intern("@mcastPort"), INT2FIX(udp->mcastPort));
     }
+    else if(IceSSL::WSSConnectionInfoPtr::dynamicCast(p))
+    {
+        info = Data_Wrap_Struct(_wssConnectionInfoClass, 0, IceRuby_ConnectionInfo_free, new Ice::ConnectionInfoPtr(p));
+
+        IceSSL::WSSConnectionInfoPtr wss = IceSSL::WSSConnectionInfoPtr::dynamicCast(p);
+        rb_ivar_set(info, rb_intern("@localAddress"), createString(wss->localAddress));
+        rb_ivar_set(info, rb_intern("@localPort"), INT2FIX(wss->localPort));
+        rb_ivar_set(info, rb_intern("@remoteAddress"), createString(wss->remoteAddress));
+        rb_ivar_set(info, rb_intern("@remotePort"), INT2FIX(wss->remotePort));
+        rb_ivar_set(info, rb_intern("@cipher"), createString(wss->cipher));
+        rb_ivar_set(info, rb_intern("@certs"), stringSeqToArray(wss->certs));
+        rb_ivar_set(info, rb_intern("@verified"), wss->verified ? Qtrue : Qfalse);
+
+        volatile VALUE result = callRuby(rb_hash_new);
+        for(Ice::HeaderDict::const_iterator q = wss->headers.begin(); q != wss->headers.end(); ++q)
+        {
+            volatile VALUE key = createString(q->first);
+            volatile VALUE value = createString(q->second);
+            callRuby(rb_hash_aset, result, key, value);
+        }
+        rb_ivar_set(info, rb_intern("@headers"), result);
+    }
+    else if(IceSSL::ConnectionInfoPtr::dynamicCast(p))
+    {
+        info = Data_Wrap_Struct(_sslConnectionInfoClass, 0, IceRuby_ConnectionInfo_free, new Ice::ConnectionInfoPtr(p));
+
+        IceSSL::ConnectionInfoPtr ssl = IceSSL::ConnectionInfoPtr::dynamicCast(p);
+        rb_ivar_set(info, rb_intern("@localAddress"), createString(ssl->localAddress));
+        rb_ivar_set(info, rb_intern("@localPort"), INT2FIX(ssl->localPort));
+        rb_ivar_set(info, rb_intern("@remoteAddress"), createString(ssl->remoteAddress));
+        rb_ivar_set(info, rb_intern("@remotePort"), INT2FIX(ssl->remotePort));
+        rb_ivar_set(info, rb_intern("@cipher"), createString(ssl->cipher));
+        rb_ivar_set(info, rb_intern("@certs"), stringSeqToArray(ssl->certs));
+        rb_ivar_set(info, rb_intern("@verified"), ssl->verified ? Qtrue : Qfalse);
+    }
     else if(Ice::IPConnectionInfoPtr::dynamicCast(p))
     {
         info = Data_Wrap_Struct(_ipConnectionInfoClass, 0, IceRuby_ConnectionInfo_free, new Ice::ConnectionInfoPtr(p));
@@ -311,6 +386,8 @@ IceRuby::createConnectionInfo(const Ice::ConnectionInfoPtr& p)
     }
     rb_ivar_set(info, rb_intern("@incoming"), p->incoming ? Qtrue : Qfalse);
     rb_ivar_set(info, rb_intern("@adapterName"), createString(p->adapterName));
+    rb_ivar_set(info, rb_intern("@rcvSize"), INT2FIX(p->rcvSize));
+    rb_ivar_set(info, rb_intern("@sndSize"), INT2FIX(p->sndSize));
     return info;
 }
 
@@ -333,6 +410,7 @@ IceRuby::initConnection(VALUE iceModule)
     rb_define_method(_connectionClass, "timeout", CAST_METHOD(IceRuby_Connection_timeout), 0);
     rb_define_method(_connectionClass, "getInfo", CAST_METHOD(IceRuby_Connection_getInfo), 0);
     rb_define_method(_connectionClass, "getEndpoint", CAST_METHOD(IceRuby_Connection_getEndpoint), 0);
+    rb_define_method(_connectionClass, "setBufferSize", CAST_METHOD(IceRuby_Connection_setBufferSize), 2);
     rb_define_method(_connectionClass, "toString", CAST_METHOD(IceRuby_Connection_toString), 0);
     rb_define_method(_connectionClass, "to_s", CAST_METHOD(IceRuby_Connection_toString), 0);
     rb_define_method(_connectionClass, "inspect", CAST_METHOD(IceRuby_Connection_toString), 0);
@@ -345,10 +423,12 @@ IceRuby::initConnection(VALUE iceModule)
     _connectionInfoClass = rb_define_class_under(iceModule, "ConnectionInfo", rb_cObject);
 
     //
-    // Instance members. 
+    // Instance members.
     //
-    rb_define_attr(_connectionInfoClass, "incoming", 1, 0); 
-    rb_define_attr(_connectionInfoClass, "adapterName", 1, 0); 
+    rb_define_attr(_connectionInfoClass, "incoming", 1, 0);
+    rb_define_attr(_connectionInfoClass, "adapterName", 1, 0);
+    rb_define_attr(_connectionInfoClass, "rcvSize", 1, 0);
+    rb_define_attr(_connectionInfoClass, "sndSize", 1, 0);
 
     //
     // IPConnectionInfo
@@ -356,12 +436,12 @@ IceRuby::initConnection(VALUE iceModule)
     _ipConnectionInfoClass = rb_define_class_under(iceModule, "IPConnectionInfo", _connectionInfoClass);
 
     //
-    // Instance members. 
+    // Instance members.
     //
-    rb_define_attr(_ipConnectionInfoClass, "localAddress", 1, 0); 
-    rb_define_attr(_ipConnectionInfoClass, "localPort", 1, 0); 
-    rb_define_attr(_ipConnectionInfoClass, "remoteAddress", 1, 0); 
-    rb_define_attr(_ipConnectionInfoClass, "remotePort", 1, 0); 
+    rb_define_attr(_ipConnectionInfoClass, "localAddress", 1, 0);
+    rb_define_attr(_ipConnectionInfoClass, "localPort", 1, 0);
+    rb_define_attr(_ipConnectionInfoClass, "remoteAddress", 1, 0);
+    rb_define_attr(_ipConnectionInfoClass, "remotePort", 1, 0);
 
     //
     // TCPConnectionInfo
@@ -374,8 +454,40 @@ IceRuby::initConnection(VALUE iceModule)
     _udpConnectionInfoClass = rb_define_class_under(iceModule, "UDPConnectionInfo", _ipConnectionInfoClass);
 
     //
-    // Instance members. 
+    // Instance members.
+    //
+    rb_define_attr(_udpConnectionInfoClass, "mcastAddress", 1, 0);
+    rb_define_attr(_udpConnectionInfoClass, "mcastPort", 1, 0);
+
+    //
+    // WSConnectionInfo
+    //
+    _wsConnectionInfoClass = rb_define_class_under(iceModule, "WSConnectionInfo", _ipConnectionInfoClass);
+
+    //
+    // Instance members.
+    //
+    rb_define_attr(_wsConnectionInfoClass, "headers", 1, 0);
+
+    //
+    // SSLConnectionInfo
+    //
+    _sslConnectionInfoClass = rb_define_class_under(iceModule, "SSLConnectionInfo", _ipConnectionInfoClass);
+
+    //
+    // Instance members.
+    //
+    rb_define_attr(_wsConnectionInfoClass, "cipher", 1, 0);
+    rb_define_attr(_wsConnectionInfoClass, "certs", 1, 0);
+    rb_define_attr(_wsConnectionInfoClass, "verified", 1, 0);
+
+    //
+    // WSSConnectionInfo
+    //
+    _wssConnectionInfoClass = rb_define_class_under(iceModule, "WSSConnectionInfo", _sslConnectionInfoClass);
+
+    //
+    // Instance members.
     //
-    rb_define_attr(_udpConnectionInfoClass, "mcastAddress", 1, 0); 
-    rb_define_attr(_udpConnectionInfoClass, "mcastPort", 1, 0); 
+    rb_define_attr(_wssConnectionInfoClass, "headers", 1, 0);
 }

data/ext/Connection.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Endpoint.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -10,6 +10,7 @@
 #include <Endpoint.h>
 #include <Util.h>
 #include <Ice/Object.h>
+#include <IceSSL/EndpointInfo.h>
 
 using namespace std;
 using namespace IceRuby;
@@ -20,7 +21,10 @@ static VALUE _endpointInfoClass;
 static VALUE _ipEndpointInfoClass;
 static VALUE _tcpEndpointInfoClass;
 static VALUE _udpEndpointInfoClass;
+static VALUE _wsEndpointInfoClass;
 static VALUE _opaqueEndpointInfoClass;
+static VALUE _sslEndpointInfoClass;
+static VALUE _wssEndpointInfoClass;
 
 // **********************************************************************
 // Endpoint
@@ -129,7 +133,17 @@ VALUE
 IceRuby::createEndpointInfo(const Ice::EndpointInfoPtr& p)
 {
     VALUE info;
-    if(Ice::TCPEndpointInfoPtr::dynamicCast(p))
+    if(Ice::WSEndpointInfoPtr::dynamicCast(p))
+    {
+        info = Data_Wrap_Struct(_wsEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p));
+
+        Ice::WSEndpointInfoPtr ws = Ice::WSEndpointInfoPtr::dynamicCast(p);
+        rb_ivar_set(info, rb_intern("@host"), createString(ws->host));
+        rb_ivar_set(info, rb_intern("@port"), INT2FIX(ws->port));
+        rb_ivar_set(info, rb_intern("@sourceAddress"), createString(ws->sourceAddress));
+        rb_ivar_set(info, rb_intern("@resource"), createString(ws->resource));
+    }
+    else if(Ice::TCPEndpointInfoPtr::dynamicCast(p))
     {
         info = Data_Wrap_Struct(_tcpEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p));
 
@@ -155,10 +169,29 @@ IceRuby::createEndpointInfo(const Ice::EndpointInfoPtr& p)
 
         Ice::OpaqueEndpointInfoPtr opaque = Ice::OpaqueEndpointInfoPtr::dynamicCast(p);
         Ice::ByteSeq b = opaque->rawBytes;
-        VALUE v = callRuby(rb_str_new, reinterpret_cast<const char*>(&b[0]), static_cast<long>(b.size()));
+        volatile VALUE v = callRuby(rb_str_new, reinterpret_cast<const char*>(&b[0]), static_cast<long>(b.size()));
         rb_ivar_set(info, rb_intern("@rawBytes"), v);
         rb_ivar_set(info, rb_intern("@rawEncoding"), createEncodingVersion(opaque->rawEncoding));
     }
+    else if(IceSSL::WSSEndpointInfoPtr::dynamicCast(p))
+    {
+        info = Data_Wrap_Struct(_wssEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p));
+
+        IceSSL::WSSEndpointInfoPtr wss = IceSSL::WSSEndpointInfoPtr::dynamicCast(p);
+        rb_ivar_set(info, rb_intern("@host"), createString(wss->host));
+        rb_ivar_set(info, rb_intern("@port"), INT2FIX(wss->port));
+        rb_ivar_set(info, rb_intern("@sourceAddress"), createString(wss->sourceAddress));
+        rb_ivar_set(info, rb_intern("@resource"), createString(wss->resource));
+    }
+    else if(IceSSL::EndpointInfoPtr::dynamicCast(p))
+    {
+        info = Data_Wrap_Struct(_sslEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p));
+
+        IceSSL::EndpointInfoPtr ssl = IceSSL::EndpointInfoPtr::dynamicCast(p);
+        rb_ivar_set(info, rb_intern("@host"), createString(ssl->host));
+        rb_ivar_set(info, rb_intern("@port"), INT2FIX(ssl->port));
+        rb_ivar_set(info, rb_intern("@sourceAddress"), createString(ssl->sourceAddress));
+    }
     else if(Ice::IPEndpointInfoPtr::dynamicCast(p))
     {
         info = Data_Wrap_Struct(_ipEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p));
@@ -172,6 +205,7 @@ IceRuby::createEndpointInfo(const Ice::EndpointInfoPtr& p)
     {
         info = Data_Wrap_Struct(_endpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p));
     }
+
     rb_ivar_set(info, rb_intern("@timeout"), INT2FIX(p->timeout));
     rb_ivar_set(info, rb_intern("@compress"), p->compress ? Qtrue : Qfalse);
     return info;
@@ -292,6 +326,16 @@ IceRuby::initEndpoint(VALUE iceModule)
     rb_define_attr(_udpEndpointInfoClass, "mcastInterface", 1, 0);
     rb_define_attr(_udpEndpointInfoClass, "mcastTtl", 1, 0);
 
+    //
+    // WSEndpointInfo
+    //
+    _wsEndpointInfoClass = rb_define_class_under(iceModule, "WSEndpointInfo", _tcpEndpointInfoClass);
+
+    //
+    // Instance members.
+    //
+    rb_define_attr(_wsEndpointInfoClass, "resource", 1, 0);
+
     //
     // OpaqueEndpointInfo
     //
@@ -302,6 +346,21 @@ IceRuby::initEndpoint(VALUE iceModule)
     //
     rb_define_attr(_opaqueEndpointInfoClass, "rawBytes", 1, 0);
     rb_define_attr(_opaqueEndpointInfoClass, "rawEncoding", 1, 0);
+
+    //
+    // SSLEndpointInfo
+    //
+    _sslEndpointInfoClass = rb_define_class_under(iceModule, "SSLEndpointInfo", _ipEndpointInfoClass);
+
+    //
+    // WSSEndpointInfo
+    //
+    _wssEndpointInfoClass = rb_define_class_under(iceModule, "WSSEndpointInfo", _sslEndpointInfoClass);
+
+    //
+    // Instance members.
+    //
+    rb_define_attr(_wssEndpointInfoClass, "resource", 1, 0);
 }
 
 bool