eventmachine 0.4.5 → 0.5.1

data/ext/ed.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.h 2378 2006-04-24 03:37:19Z francis $
+$Id: ed.h 2445 2006-05-04 21:05:44Z francis $
 
 File:     ed.h
 Date:     06Apr06
@@ -29,6 +29,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 class EventMachine_t; // forward reference
+class SslBox_t; // forward reference
+
+
+bool SetSocketNonblocking (SOCKET);
 
 
 /*************************
@@ -62,6 +66,8 @@ class EventableDescriptor: public Bindable_t
 
 		void SetEventCallback (void (*cb)(const char*, int, const char*, int));
 
+    virtual void StartTls() {}
+
 	protected:
 		enum {
 			PendingConnectTimeout = 4 // can easily be made an instance variable
@@ -106,6 +112,10 @@ class ConnectionDescriptor: public EventableDescriptor
 		// Do we have any data to write? This is used by ShouldDelete.
 		virtual int GetOutboundDataSize() {return OutboundDataSize;}
 
+		virtual void StartTls();
+		void SetServerMode() {bIsServer = true;}
+
+
 	protected:
 		struct OutboundPage {
 			OutboundPage (const char *b, int l, int o=0): Buffer(b), Length(l), Offset(o) {}
@@ -121,8 +131,15 @@ class ConnectionDescriptor: public EventableDescriptor
 		deque<OutboundPage> OutboundPages;
 		int OutboundDataSize;
 
+		SslBox_t *SslBox;
+		bool bIsServer;
+
 	private:
 		void _WriteOutboundData();
+		void _DispatchInboundData (const char *buffer, int size);
+		void _DispatchCiphertext();
+		int _SendRawOutboundData (const char*, int);
+
 };
 
 

data/ext/em.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.cpp 2378 2006-04-24 03:37:19Z francis $
+$Id: em.cpp 2457 2006-05-05 14:57:21Z francis $
 
 File:     ed.cpp
 Date:     06Apr06
@@ -82,6 +82,10 @@ EventMachine_t::Run
 
 void EventMachine_t::Run()
 {
+	#ifdef OS_WIN32
+	HookControlC (true);
+	#endif
+
 	while (true) {
 		gCurrentLoopTime = time(NULL);
 		if (!_RunTimers())
@@ -92,6 +96,10 @@ void EventMachine_t::Run()
 		if (gTerminateSignalReceived)
 			break;
 	}
+
+	#ifdef OS_WIN32
+	HookControlC (false);
+	#endif
 }
 
 
@@ -111,8 +119,13 @@ bool EventMachine_t::_RunOnce()
 
 	//cerr << "X";
 	if (Descriptors.size() == 0) {
+		#ifdef OS_UNIX
 		timeval tv = {0, 200 * 1000};
 		select (0, NULL, NULL, NULL, &tv);
+		#endif
+		#ifdef OS_WIN32
+		Sleep (200);
+		#endif
 		return true;
 	}
 
@@ -128,7 +141,7 @@ bool EventMachine_t::_RunOnce()
 		EventableDescriptor *ed = Descriptors[i];
 		assert (ed);
 		int sd = ed->GetSocket();
-		assert (sd != -1);
+		assert (sd != INVALID_SOCKET);
 
 		if (ed->SelectForRead())
 			FD_SET (sd, &fdreads);
@@ -148,7 +161,7 @@ bool EventMachine_t::_RunOnce()
 				EventableDescriptor *ed = Descriptors[i];
 				assert (ed);
 				int sd = ed->GetSocket();
-				assert (sd != -1);
+				assert (sd != INVALID_SOCKET);
 
 				if (FD_ISSET (sd, &fdwrites))
 					ed->Write();
@@ -294,18 +307,19 @@ const char *EventMachine_t::ConnectToServer (const char *server, int port)
 	pin.sin_port = htons (port);
 
 	int sd = socket (AF_INET, SOCK_STREAM, 0);
-	if (sd == -1)
+	if (sd == INVALID_SOCKET)
 		return NULL;
 
 	// From here on, ALL error returns must close the socket.
 	// Set the new socket nonblocking.
-	int val = fcntl (sd, F_GETFL, 0);
-	if (fcntl (sd, F_SETFL, val | O_NONBLOCK) == -1) {
-		close (sd);
+	if (!SetSocketNonblocking (sd)) {
+		closesocket (sd);
 		return NULL;
 	}
 
 	const char *out = NULL;
+
+	#ifdef OS_UNIX
 	if (connect (sd, (sockaddr*)&pin, sizeof pin) == 0) {
 		// This is a connect success, which Linux appears
 		// never to give when the socket is nonblocking,
@@ -338,9 +352,37 @@ const char *EventMachine_t::ConnectToServer (const char *server, int port)
 	else {
 		// The error from connect was something other then EINPROGRESS.
 	}
+	#endif
+
+	#ifdef OS_WIN32
+	if (connect (sd, (sockaddr*)&pin, sizeof pin) == 0) {
+		// This is a connect success, which Windows appears
+		// never to give when the socket is nonblocking,
+		// even if the connection is intramachine or to
+		// localhost.
+		throw std::runtime_error ("unimplemented");
+	}
+	else if (WSAGetLastError() == WSAEWOULDBLOCK) {
+		// Here, there's no disposition.
+		// Windows appears not to surface refused connections or
+		// such stuff at this point.
+		// Put the connection on the stack and wait for it to complete
+		// or time out.
+		ConnectionDescriptor *cd = new ConnectionDescriptor (sd);
+		if (!cd)
+			throw std::runtime_error ("no connection allocated");
+		cd->SetConnectPending (true);
+		Add (cd);
+		out = cd->GetBinding().c_str();
+	}
+	else {
+		// The error from connect was something other then WSAEWOULDBLOCK.
+	}
+
+	#endif
 
 	if (out == NULL)
-		close (sd);
+		closesocket (sd);
 	return out;
 }
 
@@ -362,7 +404,7 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 	struct sockaddr_in sin;
 
 	int sd_accept = socket (AF_INET, SOCK_STREAM, 0);
-	if (sd_accept == -1) {
+	if (sd_accept == INVALID_SOCKET) {
 		goto fail;
 	}
 
@@ -391,11 +433,13 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 		}
 	}
 
-	{ // set CLOEXEC.
+	{ // set CLOEXEC. Only makes sense on Unix
+		#ifdef OS_UNIX
 		int cloexec = fcntl (sd_accept, F_GETFD, 0);
 		assert (cloexec >= 0);
 		cloexec |= FD_CLOEXEC;
 		fcntl (sd_accept, F_SETFD, cloexec);
+		#endif
 	}
 
 
@@ -412,8 +456,9 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 	{
 		// Set the acceptor non-blocking.
 		// THIS IS CRUCIALLY IMPORTANT because we read it in a select loop.
-		int val = fcntl (sd_accept, F_GETFL, 0);
-		if (fcntl (sd_accept, F_SETFL, val | O_NONBLOCK) == -1) {
+		if (!SetSocketNonblocking (sd_accept)) {
+		//int val = fcntl (sd_accept, F_GETFL, 0);
+		//if (fcntl (sd_accept, F_SETFL, val | O_NONBLOCK) == -1) {
 			goto fail;
 		}
 	}
@@ -429,8 +474,8 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 	return output_binding;
 
 	fail:
-	if (sd_accept != -1)
-		close (sd_accept);
+	if (sd_accept != INVALID_SOCKET)
+		closesocket (sd_accept);
 	return NULL;
 }
 
@@ -444,7 +489,7 @@ const char *EventMachine_t::OpenDatagramSocket (const char *address, int port)
 	const char *output_binding = NULL;
 
 	int sd = socket (AF_INET, SOCK_DGRAM, 0);
-	if (sd == -1)
+	if (sd == INVALID_SOCKET)
 		goto fail;
 	// from here on, early returns must close the socket!
 
@@ -470,8 +515,9 @@ const char *EventMachine_t::OpenDatagramSocket (const char *address, int port)
 
 	// Set the new socket nonblocking.
 	{
-		int val = fcntl (sd, F_GETFL, 0);
-		if (fcntl (sd, F_SETFL, val | O_NONBLOCK) == -1)
+		if (!SetSocketNonblocking (sd))
+		//int val = fcntl (sd, F_GETFL, 0);
+		//if (fcntl (sd, F_SETFL, val | O_NONBLOCK) == -1)
 			goto fail;
 	}
 
@@ -489,8 +535,8 @@ const char *EventMachine_t::OpenDatagramSocket (const char *address, int port)
 	return output_binding;
 
 	fail:
-	if (sd != -1)
-		close (sd);
+	if (sd != INVALID_SOCKET)
+		closesocket (sd);
 	return NULL;
 }
 

data/ext/em.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.h 2362 2006-04-23 13:57:09Z francis $
+$Id: em.h 2412 2006-04-29 01:18:59Z francis $
 
 File:     ed.h
 Date:     06Apr06

data/ext/eventmachine.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: eventmachine.h 2363 2006-04-23 14:32:40Z francis $
+$Id: eventmachine.h 2421 2006-04-29 23:48:49Z francis $
 
 File:     eventmachine.h
 Date:     15Apr06
@@ -38,6 +38,7 @@ extern "C" {
 	const char *evma_connect_to_server (const char *server, int port);
 	const char *evma_create_tcp_server (const char *address, int port);
 	const char *evma_open_datagram_socket (const char *server, int port);
+	void evma_start_tls (const char *binding);
 	int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
 	int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port);
 	void evma_close_connection (const char *binding, int after_writing);

data/ext/extconf.rb

@@ -1,4 +1,4 @@
-# $Id: extconf.rb 2328 2006-04-19 16:31:45Z francis $
+# $Id: extconf.rb 2451 2006-05-05 03:16:31Z francis $
 #
 #----------------------------------------------------------------------------
 #
@@ -27,6 +27,55 @@
 #
 
 require 'mkmf'
-CONFIG['LDSHARED'] = "$(CXX) -shared"
-$LOCAL_LIBS << "-lpthread"
+
+flags = []
+
+case RUBY_PLATFORM.split('-',2)[1]
+when 'mswin32', 'mingw32', 'bccwin32'
+  unless have_header('windows.h') and
+      have_header('winsock.h') and
+      have_library('kernel32') and
+      have_library('rpcrt4') and
+      have_library('gdi32')
+    exit
+  end
+
+  flags << "-D OS_WIN32"
+  flags << "-GX"
+  flags << "-GR"
+
+  if have_library('ssleay32') and
+	  have_library('libeay32') and
+	  have_header('openssl/ssl.h') and
+	  have_header('openssl/err.h')
+    flags << '-D WITH_SSL'
+  else
+    flags << '-D WITHOUT_SSL'
+  end
+else
+  unless have_library('pthread')
+	  exit
+  end
+
+  flags << '-D OS_UNIX'
+
+  if have_library('ssl') and
+	  have_library('crypto') and
+	  have_header('openssl/ssl.h') and
+	  have_header('openssl/err.h')
+    flags << '-D WITH_SSL'
+  else
+    flags << '-D WITHOUT_SSL'
+  end
+  # on Unix we need a g++ link, not gcc.
+  CONFIG['LDSHARED'] = "$(CXX) -shared"
+end
+
+if $CPPFLAGS
+  $CPPFLAGS += flags.join(' ')
+else
+  $CFLAGS + flags.join(' ')
+end
+
+
 create_makefile "rubyeventmachine"

data/ext/page.cpp

@@ -0,0 +1,114 @@
+/*****************************************************************************
+
+$Id: page.cpp 2426 2006-04-30 00:21:48Z francis $
+
+File:     page.cpp
+Date:     30Apr06
+
+Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
+Gmail: garbagecat20
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*****************************************************************************/
+
+
+#include "project.h"
+
+
+/******************
+PageList::PageList
+******************/
+
+PageList::PageList()
+{
+}
+
+
+/*******************
+PageList::~PageList
+*******************/
+
+PageList::~PageList()
+{
+	while (HasPages())
+		PopFront();
+}
+
+
+/***************
+PageList::Front
+***************/
+
+void PageList::Front (const char **page, int *length)
+{
+	assert (page && length);
+
+	if (HasPages()) {
+		Page p = Pages.front();
+		*page = p.Buffer;
+		*length = p.Size;
+	}
+	else {
+		*page = NULL;
+		*length = 0;
+	}
+}
+
+
+/******************
+PageList::PopFront
+******************/
+
+void PageList::PopFront()
+{
+	if (HasPages()) {
+		Page p = Pages.front();
+		Pages.pop_front();
+		if (p.Buffer)
+			free ((void*)p.Buffer);
+	}
+}
+
+
+/******************
+PageList::HasPages
+******************/
+
+bool PageList::HasPages()
+{
+	return (Pages.size() > 0) ? true : false;
+}
+
+
+/**************
+PageList::Push
+**************/
+
+void PageList::Push (const char *buf, int size)
+{
+	if (buf && (size > 0)) {
+		char *copy = (char*) malloc (size);
+		if (!copy)
+			throw runtime_error ("no memory in pagelist");
+		memcpy (copy, buf, size);
+		Pages.push_back (Page (copy, size));
+	}
+}
+
+
+
+
+