quickfix_ruby 1.14.3.1 → 1.15.1

data/ext/quickfix/ThreadedSSLSocketInitiator.h

@@ -0,0 +1,201 @@
+/* ====================================================================
+ * Copyright (c) 1998-2006 Ralf S. Engelschall. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by
+ *     Ralf S. Engelschall <rse@engelschall.com> for use in the
+ *     mod_ssl project (http://www.modssl.org/)."
+ *
+ * 4. The names "mod_ssl" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    rse@engelschall.com.
+ *
+ * 5. Products derived from this software may not be called "mod_ssl"
+ *    nor may "mod_ssl" appear in their names without prior
+ *    written permission of Ralf S. Engelschall.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by
+ *     Ralf S. Engelschall <rse@engelschall.com> for use in the
+ *     mod_ssl project (http://www.modssl.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL RALF S. ENGELSCHALL OR
+ * HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+/* ====================================================================
+ * Copyright (c) 1995-1999 Ben Laurie. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by Ben Laurie
+ *    for use in the Apache-SSL HTTP server project."
+ *
+ * 4. The name "Apache-SSL Server" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission.
+ *
+ * 5. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Ben Laurie
+ *    for use in the Apache-SSL HTTP server project."
+ *
+ * THIS SOFTWARE IS PROVIDED BY BEN LAURIE ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL BEN LAURIE OR
+ * HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+/* -*- C++ -*- */
+
+/****************************************************************************
+** Copyright (c) 2001-2014
+**
+** This file is part of the QuickFIX FIX Engine
+**
+** This file may be distributed under the terms of the quickfixengine.org
+** license as defined by quickfixengine.org and appearing in the file
+** LICENSE included in the packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.quickfixengine.org/LICENSE for licensing information.
+**
+** Contact ask@quickfixengine.org if any conditions of this licensing are
+** not clear to you.
+**
+****************************************************************************/
+
+#ifndef FIX_THREADEDSSLSOCKETINITIATOR_H
+#define FIX_THREADEDSSLSOCKETINITIATOR_H
+
+#if (HAVE_SSL > 0)
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4503 4355 4786 4290)
+#endif
+
+#include "Initiator.h"
+#include "ThreadedSSLSocketConnection.h"
+#include <map>
+
+namespace FIX
+{
+/*! \addtogroup user
+ *  @{
+ */
+/// Threaded Socket implementation of Initiator.
+class ThreadedSSLSocketInitiator : public Initiator
+{
+public:
+  ThreadedSSLSocketInitiator(Application &, MessageStoreFactory &,
+                             const SessionSettings &) throw(ConfigError);
+  ThreadedSSLSocketInitiator(Application &, MessageStoreFactory &,
+                             const SessionSettings &,
+                             LogFactory &) throw(ConfigError);
+
+  virtual ~ThreadedSSLSocketInitiator();
+
+  void setPassword(const std::string &pwd) { m_password.assign(pwd); }
+
+  void setCertAndKey(X509 *cert, RSA *key)
+  {
+    m_cert = cert;
+    m_key = key;
+  }
+
+  int passwordHandleCallback(char *buf, size_t bufsize, int verify, void *job);
+
+  static int passwordHandleCB(char *buf, int bufsize, int verify, void *job);
+
+private:
+  typedef std::pair< int, SSL * > SocketKey;
+  typedef std::map< SocketKey, thread_id > SocketToThread;
+  typedef std::map< SessionID, int > SessionToHostNum;
+  typedef std::pair< ThreadedSSLSocketInitiator *,
+                     ThreadedSSLSocketConnection * > ThreadPair;
+
+  void onConfigure(const SessionSettings &) throw(ConfigError);
+  void onInitialize(const SessionSettings &) throw(RuntimeError);
+
+  void onStart();
+  bool onPoll(double timeout);
+  void onStop();
+
+  void doConnect(const SessionID &s, const Dictionary &d);
+
+  void addThread(SocketKey s, thread_id t);
+  void removeThread(SocketKey s);
+  void lock() { Locker l(m_mutex); }
+  static THREAD_PROC socketThread(void *p);
+
+  void getHost(const SessionID &, const Dictionary &, std::string &, short &);
+
+  SessionToHostNum m_sessionToHostNum;
+  time_t m_lastConnect;
+  int m_reconnectInterval;
+  bool m_noDelay;
+  int m_sendBufSize;
+  int m_rcvBufSize;
+  SocketToThread m_threads;
+  Mutex m_mutex;
+  bool m_sslInit;
+  SSL_CTX *m_ctx;
+  std::string m_password;
+  X509 *m_cert;
+  RSA *m_key;
+};
+/*! @} */
+}
+
+#endif // FIX_THREADEDSOCKETINITIATOR_H
+
+#endif

data/ext/quickfix/ThreadedSocketAcceptor.cpp

@@ -228,8 +228,12 @@ THREAD_PROC ThreadedSocketAcceptor::socketAcceptorThread( void* p )
 
       thread_id thread;
       if ( !thread_spawn( &socketConnectionThread, info, thread ) )
+      {
         delete info;
-      pAcceptor->addThread( socket, thread );
+        delete pConnection;
+      }
+      else
+        pAcceptor->addThread( socket, thread );
     }
   }
 

data/ext/quickfix/ThreadedSocketConnection.cpp

@@ -44,8 +44,10 @@ ThreadedSocketConnection::ThreadedSocketConnection
 ThreadedSocketConnection::ThreadedSocketConnection
 ( const SessionID& sessionID, int s,
   const std::string& address, short port, 
-  Log* pLog )
+  Log* pLog,
+  const std::string& sourceAddress, short sourcePort )
   : m_socket( s ), m_address( address ), m_port( port ),
+    m_sourceAddress( sourceAddress ), m_sourcePort( sourcePort ),
     m_pLog( pLog ),
     m_pSession( Session::lookupSession( sessionID ) ),
     m_disconnect( false )
@@ -79,6 +81,10 @@ bool ThreadedSocketConnection::send( const std::string& msg )
 
 bool ThreadedSocketConnection::connect()
 {
+  // do the bind in the thread as name resolution may block
+  if ( !m_sourceAddress.empty() || m_sourcePort )
+    socket_bind( m_socket, m_sourceAddress.c_str(), m_sourcePort );
+
   return socket_connect(getSocket(), m_address.c_str(), m_port) >= 0;
 }
 
@@ -101,7 +107,7 @@ bool ThreadedSocketConnection::read()
     if( result > 0 ) // Something to read
     {
       // We can read without blocking
-      ssize_t size = recv( m_socket, m_buffer, sizeof(m_buffer), 0 );
+      ssize_t size = socket_recv( m_socket, m_buffer, sizeof(m_buffer) );
       if ( size <= 0 ) { throw SocketRecvFailed( size ); }
       m_parser.addToStream( m_buffer, size );
     }

data/ext/quickfix/ThreadedSocketConnection.h

@@ -49,7 +49,8 @@ public:
   ThreadedSocketConnection( int s, Sessions sessions, Log* pLog );
   ThreadedSocketConnection( const SessionID&, int s, 
                             const std::string& address, short port, 
-                            Log* pLog );
+                            Log* pLog,
+                            const std::string& sourceAddress = "", short sourcePort = 0);
   virtual ~ThreadedSocketConnection() ;
 
   Session* getSession() const { return m_pSession; }
@@ -69,6 +70,8 @@ private:
 
   std::string m_address;
   int m_port;
+  std::string m_sourceAddress;
+  int m_sourcePort;
 
   Log* m_pLog;
   Parser m_parser;

data/ext/quickfix/ThreadedSocketInitiator.cpp

@@ -141,7 +141,9 @@ void ThreadedSocketInitiator::doConnect( const SessionID& s, const Dictionary& d
 
     std::string address;
     short port = 0;
-    getHost( s, d, address, port );
+    std::string sourceAddress;
+    short sourcePort = 0;
+    getHost( s, d, address, port, sourceAddress, sourcePort );
 
     int socket = socket_createConnector();
     if( m_noDelay )
@@ -152,10 +154,10 @@ void ThreadedSocketInitiator::doConnect( const SessionID& s, const Dictionary& d
       socket_setsockopt( socket, SO_RCVBUF, m_rcvBufSize );
 
     setPending( s );
-    log->onEvent( "Connecting to " + address + " on port " + IntConvertor::convert((unsigned short)port) );
+    log->onEvent( "Connecting to " + address + " on port " + IntConvertor::convert((unsigned short)port) + " (Source " + sourceAddress + ":" + IntConvertor::convert((unsigned short)sourcePort) + ")");
 
     ThreadedSocketConnection* pConnection =
-      new ThreadedSocketConnection( s, socket, address, port, getLog() );
+      new ThreadedSocketConnection( s, socket, address, port, getLog(), sourceAddress, sourcePort );
 
     ThreadPair* pair = new ThreadPair( this, pConnection );
 
@@ -236,7 +238,8 @@ THREAD_PROC ThreadedSocketInitiator::socketThread( void* p )
 }
 
 void ThreadedSocketInitiator::getHost( const SessionID& s, const Dictionary& d,
-                                       std::string& address, short& port )
+                                       std::string& address, short& port,
+                                       std::string& sourceAddress, short& sourcePort )
 {
   int num = 0;
   SessionToHostNum::iterator i = m_sessionToHostNum.find( s );
@@ -254,12 +257,29 @@ void ThreadedSocketInitiator::getHost( const SessionID& s, const Dictionary& d,
   {
     address = d.getString( hostString );
     port = ( short ) d.getInt( portString );
+
+    std::stringstream sourceHostStream;
+    sourceHostStream << SOCKET_CONNECT_SOURCE_HOST << num;
+    hostString = sourceHostStream.str();
+    if( d.has(hostString) )
+      sourceAddress = d.getString( hostString );
+
+    std::stringstream sourcePortStream;
+    sourcePortStream << SOCKET_CONNECT_SOURCE_PORT << num;
+    portString = sourcePortStream.str();
+    if( d.has(portString) )
+      sourcePort = ( short ) d.getInt( portString );
   }
   else
   {
     num = 0;
     address = d.getString( SOCKET_CONNECT_HOST );
     port = ( short ) d.getInt( SOCKET_CONNECT_PORT );
+
+    if( d.has(SOCKET_CONNECT_SOURCE_HOST) )
+      sourceAddress = d.getString( SOCKET_CONNECT_SOURCE_HOST );
+    if( d.has(SOCKET_CONNECT_SOURCE_PORT) )
+      sourcePort = ( short ) d.getInt( SOCKET_CONNECT_SOURCE_PORT );
   }
 
   m_sessionToHostNum[ s ] = ++num;

data/ext/quickfix/ThreadedSocketInitiator.h

@@ -66,7 +66,7 @@ private:
   void lock() { Locker l(m_mutex); }
   static THREAD_PROC socketThread( void* p );
 
-  void getHost( const SessionID&, const Dictionary&, std::string&, short& );
+  void getHost( const SessionID&, const Dictionary&, std::string&, short&, std::string&, short& );
 
   SessionSettings m_settings;
   SessionToHostNum m_sessionToHostNum;

data/ext/quickfix/Utility.cpp

@@ -100,6 +100,23 @@ void socket_term()
 #endif
 }
 
+int socket_bind( int socket, const char* hostname, int port )
+{
+  sockaddr_in address;
+  socklen_t socklen;
+
+  address.sin_family = PF_INET;
+  address.sin_port = htons( port );
+  if ( !hostname || !*hostname )
+    address.sin_addr.s_addr = INADDR_ANY;
+  else
+    address.sin_addr.s_addr = inet_addr( hostname );
+  socklen = sizeof( address );
+
+  return  bind( socket, reinterpret_cast < sockaddr* > ( &address ),
+                     socklen );
+}
+
 int socket_createAcceptor(int port, bool reuse)
 {
   int socket = ::socket( PF_INET, SOCK_STREAM, 0 );
@@ -150,6 +167,11 @@ int socket_accept( int s )
   return accept( s, 0, 0 );
 }
 
+ssize_t socket_recv( int s, char* buf, size_t length )
+{
+  return recv( s, buf, length, 0 );
+}
+
 ssize_t socket_send( int s, const char* msg, size_t length )
 {
   return send( s, msg, length, 0 );
@@ -396,7 +418,7 @@ bool thread_spawn( THREAD_START_ROUTINE func, void* var, thread_id& thread )
 #ifdef _MSC_VER
   thread_id result = 0;
   unsigned int id = 0;
-  result = _beginthreadex( NULL, 0, &func, var, 0, &id );
+  result = _beginthreadex( NULL, 0, func, var, 0, &id );
   if ( result == 0 ) return false;
 #else
   thread_id result = 0;

data/ext/quickfix/Utility.h

@@ -74,6 +74,9 @@ typedef int ssize_t;
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#if defined(__SUNPRO_CC)
+#include <sys/filio.h>
+#endif
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
@@ -98,11 +101,29 @@ typedef int ssize_t;
 #include <cstdlib>
 #include <memory>
 
+#if !defined(HAVE_STD_UNIQUE_PTR)
+#define SmartPtr std::auto_ptr
+#else
+#include <memory>
+#define SmartPtr std::unique_ptr
+#endif
+
 #if defined(HAVE_STD_SHARED_PTR)
   namespace ptr = std;
 #elif defined(HAVE_STD_TR1_SHARED_PTR)
   #include <tr1/memory>
   namespace ptr = std::tr1;
+#elif defined(HAVE_BOOST_SHARED_PTR)
+  #include <boost/shared_ptr.hpp>
+  namespace ptr = boost;
+#elif defined(__SUNPRO_CC)
+  #if (__SUNPRO_CC <= 0x5140)
+  #include "./wx/sharedptr.h"
+  namespace ptr = wxWidgets;
+  #endif
+#elif defined(__TOS_AIX__)
+  #include <memory>
+  namespace ptr = std::tr1;
 #else
   namespace ptr = std;
 #endif
@@ -119,10 +140,12 @@ std::string string_strip( const std::string& value );
 
 void socket_init();
 void socket_term();
+int socket_bind( int socket, const char* hostname, int port );
 int socket_createAcceptor( int port, bool reuse = false );
 int socket_createConnector();
 int socket_connect( int s, const char* address, int port );
 int socket_accept( int s );
+ssize_t socket_recv( int s, char* buf, size_t length );
 ssize_t socket_send( int s, const char* msg, size_t length );
 void socket_close( int s );
 bool socket_fionread( int s, int& bytes );
@@ -150,8 +173,11 @@ std::pair<int, int> socket_createpair();
 tm time_gmtime( const time_t* t );
 tm time_localtime( const time_t* t );
 
-#ifdef _MSC_VER
-typedef unsigned int (_stdcall THREAD_START_ROUTINE)(void *);
+#if(_MSC_VER >= 1900)
+typedef _beginthreadex_proc_type THREAD_START_ROUTINE;
+#define THREAD_PROC unsigned int _stdcall
+#elif(_MSC_VER > 0)
+typedef unsigned int (_stdcall * THREAD_START_ROUTINE)(void *);
 #define  THREAD_PROC unsigned int _stdcall
 #else
 extern "C" { typedef void * (THREAD_START_ROUTINE)(void *); }