eventmachine 0.7.0 → 0.7.2

data/LEGAL

@@ -0,0 +1,25 @@
+LEGAL NOTICE INFORMATION
+------------------------
+
+EventMachine is Copyright (C) 2006-07 by Francis Cianfrocca.
+
+EventMachine is copyrighted software owned by Francis Cianfrocca
+(blackhedd ... gmail.com). You may redistribute and/or modify this
+software as long as you comply with either the terms of the GPL
+(see the file GPL), or Ruby's license (see the file COPYING).
+
+Your use of all the files in this distribution is controlled by these
+license terms, except for those files specifically mentioned below:
+
+
+
+setup.rb
+	This file is Copyright (C) 2000-2005 by Minero Aoki
+	You can distribute/modify this file under the terms of
+	the GNU LGPL, Lesser General Public License version 2.1.
+
+
+lib/protocols/buftok.rb
+	This file is Copyright (C) 2007 by Tony Arcieri. This file is
+	covered by the terms of Ruby's License (see the file COPYING).
+

data/README

@@ -1,12 +1,14 @@
-$Id: README 47 2006-05-15 21:42:38Z blackhedd $
+$Id: README 317 2007-05-22 21:55:43Z blackhedd $
 
 = RUBY/EventMachine
 
 Homepage::  http://rubyeventmachine.com
-Copyright:: (C) 2006 by Francis Cianfrocca. All Rights Reserved.
+Copyright:: (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
 Email:: gmail address: garbagecat10
 
-This program is made available under the terms of the Lesser-GPL version 2.
+EventMachine is copyrighted free software made available under the terms
+of either the GPL or Ruby's License. See the file COPYING for full licensing
+information.
 See EventMachine and EventMachine::Connection for documentation and
 usage examples.
 

data/RELEASE_NOTES

@@ -1,9 +1,14 @@
-$Id: RELEASE_NOTES 223 2006-08-08 20:30:41Z blackhedd $
+$Id: RELEASE_NOTES 286 2006-11-28 03:18:18Z blackhedd $
 
 RUBY/EventMachine RELEASE NOTES
 
 --------------------------------------------------
-Version: 0.7.0, released xxAug06
+Version: 0.7.1, released xxNov06
+Added protocol handlers for line-oriented protocols.
+Various bug fixes.
+
+--------------------------------------------------
+Version: 0.7.0, released 20Nov06
 Added a fix in em.cpp/ConnectToServer to fix a fatal exception that
 occurred in FreeBSD when connecting successfully to a remote server.
 

data/ext/binder.cpp

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: binder.cpp 47 2006-05-15 21:42:38Z blackhedd $
+$Id: binder.cpp 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     binder.cpp
 Date:     07Apr06
 
-Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-Gmail: garbagecat20
+Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+Gmail: blackhedd
 
 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
+it under the terms of either: 1) 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; or 2) Ruby's License.
+
+See the file COPYING for complete licensing information.
 
 *****************************************************************************/
 

data/ext/binder.h

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: binder.h 61 2006-05-17 04:58:31Z blackhedd $
+$Id: binder.h 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     binder.h
 Date:     07Apr06
 
-Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-Gmail: garbagecat20
+Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+Gmail: blackhedd
 
 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
+it under the terms of either: 1) 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; or 2) Ruby's License.
+
+See the file COPYING for complete licensing information.
 
 *****************************************************************************/
 

data/ext/cmain.cpp

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: cmain.cpp 265 2006-10-05 19:07:45Z blackhedd $
+$Id: cmain.cpp 318 2007-05-22 22:06:24Z blackhedd $
 
-File:     libmain.cpp
+File:     cmain.cpp
 Date:     06Apr06
 
-Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-Gmail: garbagecat20
+Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+Gmail: blackhedd
 
 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.
+it under the terms of either: 1) 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; or 2) Ruby's License.
 
-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
+See the file COPYING for complete licensing information.
 
 *****************************************************************************/
 
@@ -93,6 +86,17 @@ extern "C" const char *evma_connect_to_server (const char *server, int port)
 	return EventMachine->ConnectToServer (server, port);
 }
 
+/***************************
+evma_connect_to_unix_server
+***************************/
+
+extern "C" const char *evma_connect_to_unix_server (const char *server)
+{
+	if (!EventMachine)
+		throw std::runtime_error ("not initialized");
+	return EventMachine->ConnectToUnixServer (server);
+}
+
 
 /**********************
 evma_create_tcp_server
@@ -276,3 +280,13 @@ extern "C" void evma_set_timer_quantum (int interval)
   EventMachine->SetTimerQuantum (interval);
 }
 
+/******************
+evma_setuid_string
+******************/
+
+extern "C" void evma_setuid_string (const char *username)
+{
+    // We do NOT need to be running an EM instance because this method is static.
+    EventMachine_t::SetuidString (username);
+}
+

data/ext/ed.cpp

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: ed.cpp 255 2006-09-15 11:21:15Z blackhedd $
+$Id: ed.cpp 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     ed.cpp
 Date:     06Apr06
 
-Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-Gmail: garbagecat20
+Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+Gmail: blackhedd
 
 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.
+it under the terms of either: 1) 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; or 2) Ruby's License.
 
-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
+See the file COPYING for complete licensing information.
 
 *****************************************************************************/
 
@@ -51,37 +44,37 @@ EventableDescriptor::EventableDescriptor
 ****************************************/
 
 EventableDescriptor::EventableDescriptor (int sd):
-  EventCallback (NULL),
-  LastRead (0),
-  LastWritten (0),
-  MySocket (sd),
-  bCloseNow (false),
-  bCloseAfterWriting (false)
+	EventCallback (NULL),
+	LastRead (0),
+	LastWritten (0),
+	MySocket (sd),
+	bCloseNow (false),
+	bCloseAfterWriting (false)
 {
-  /* There are three ways to close a socket, all of which should
-   * automatically signal to the event machine that this object
-   * should be removed from the polling scheduler.
-   * First is a hard close, intended for bad errors or possible
-   * security violations. It immediately closes the connection
-   * and puts this object into an error state.
-   * Second is to set bCloseNow, which will cause the event machine
-   * to delete this object (and thus close the connection in our
-   * destructor) the next chance it gets. bCloseNow also inhibits
-   * the writing of new data on the socket (but not necessarily
-   * the reading of new data).
-   * The third way is to set bCloseAfterWriting, which inhibits
-   * the writing of new data and converts to bCloseNow as soon
-   * as everything in the outbound queue has been written.
-   * bCloseAfterWriting is really for use only by protocol handlers
-   * (for example, HTTP writes an HTML page and then closes the
-   * connection). All of the error states we generate internally
-   * cause an immediate close to be scheduled, which may have the
-   * effect of discarding outbound data.
-   */
+	/* There are three ways to close a socket, all of which should
+	 * automatically signal to the event machine that this object
+	 * should be removed from the polling scheduler.
+	 * First is a hard close, intended for bad errors or possible
+	 * security violations. It immediately closes the connection
+	 * and puts this object into an error state.
+	 * Second is to set bCloseNow, which will cause the event machine
+	 * to delete this object (and thus close the connection in our
+	 * destructor) the next chance it gets. bCloseNow also inhibits
+	 * the writing of new data on the socket (but not necessarily
+	 * the reading of new data).
+	 * The third way is to set bCloseAfterWriting, which inhibits
+	 * the writing of new data and converts to bCloseNow as soon
+	 * as everything in the outbound queue has been written.
+	 * bCloseAfterWriting is really for use only by protocol handlers
+	 * (for example, HTTP writes an HTML page and then closes the
+	 * connection). All of the error states we generate internally
+	 * cause an immediate close to be scheduled, which may have the
+	 * effect of discarding outbound data.
+	 */
 
-  if (sd == INVALID_SOCKET)
-    throw std::runtime_error ("bad eventable descriptor");
-  CreatedAt = gCurrentLoopTime;
+	if (sd == INVALID_SOCKET)
+		throw std::runtime_error ("bad eventable descriptor");
+	CreatedAt = gCurrentLoopTime;
 }
 
 

data/ext/ed.h

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: ed.h 254 2006-09-15 11:17:01Z blackhedd $
+$Id: ed.h 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     ed.h
 Date:     06Apr06
 
-Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-Gmail: garbagecat20
+Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+Gmail: blackhedd
 
 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
+it under the terms of either: 1) 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; or 2) Ruby's License.
+
+See the file COPYING for complete licensing information.
 
 *****************************************************************************/
 

data/ext/em.cpp

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: em.cpp 267 2006-10-25 02:02:02Z blackhedd $
+$Id: em.cpp 318 2007-05-22 22:06:24Z blackhedd $
 
-File:     ed.cpp
+File:     em.cpp
 Date:     06Apr06
 
-Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-Gmail: garbagecat10
+Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+Gmail: blackhedd
 
 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.
+it under the terms of either: 1) 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; or 2) Ruby's License.
 
-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
+See the file COPYING for complete licensing information.
 
 *****************************************************************************/
 
@@ -125,6 +118,35 @@ void EventMachine_t::SetTimerQuantum (int interval)
 }
 
 
+/*************************************
+(STATIC) EventMachine_t::SetuidString
+*************************************/
+
+void EventMachine_t::SetuidString (const char *username)
+{
+    /* This method takes a caller-supplied username and tries to setuid
+     * to that user. There is no meaningful implementation (and no error)
+     * on Windows. On Unix, a failure to setuid the caller-supplied string
+     * causes a fatal abort, because presumably the program is calling us
+     * in order to fulfill a security requirement. If we fail silently,
+     * the user may continue to run with too much privilege.
+     */
+
+    #ifdef OS_UNIX
+    if (!username || !*username)
+	throw std::runtime_error ("setuid_string failed: no username specified");
+
+    struct passwd *p = getpwnam (username);
+    if (!p)
+	throw std::runtime_error ("setuid_string failed: unknown username");
+
+    if (setuid (p->pw_uid) != 0)
+	throw std::runtime_error ("setuid_string failed: no setuid");
+
+    // Success.
+    #endif
+}
+
 
 /*********************************
 EventMachine_t::SignalLoopBreaker
@@ -234,7 +256,7 @@ bool EventMachine_t::_RunOnce()
 	// if we know we're running on a 2.6 kernel.
 	// epoll will be effective if we provide it as an alternative,
 	// however it has the same problem interoperating with Ruby
-	// threads that selct does.
+	// threads that select does.
 
 	//cerr << "X";
 
@@ -617,6 +639,79 @@ const char *EventMachine_t::ConnectToServer (const char *server, int port)
 	return out;
 }
 
+/***********************************
+EventMachine_t::ConnectToUnixServer
+***********************************/
+
+const char *EventMachine_t::ConnectToUnixServer (const char *server)
+{
+	/* Connect to a Unix-domain server, which by definition is running
+	 * on the same host.
+	 * There is no meaningful implementation on Windows.
+	 * There's no need to do a nonblocking connect, since the connection
+	 * is always local and can always be fulfilled immediately.
+	 */
+
+	#ifdef OS_WIN32
+	throw std::runtime_error ("unix-domain connection unavailable on this platform");
+	return NULL;
+	#endif
+
+	// The whole rest of this function is only compiled on Unix systems.
+	#ifdef OS_UNIX
+
+	const char *out = NULL;
+
+	if (!server || !*server)
+		return NULL;
+
+	sockaddr_un pun;
+	memset (&pun, 0, sizeof(pun));
+	pun.sun_family = AF_LOCAL;
+
+	// You ordinarily expect the server name field to be at least 1024 bytes long,
+	// but on Linux it can be MUCH shorter.
+	if (strlen(server) >= sizeof(pun.sun_path))
+		throw std::runtime_error ("unix-domain server name is too long");
+
+
+	strcpy (pun.sun_path, server);
+
+	int fd = socket (AF_LOCAL, SOCK_STREAM, 0);
+	if (fd == INVALID_SOCKET)
+		return NULL;
+
+	// From here on, ALL error returns must close the socket.
+	// NOTE: At this point, the socket is still a blocking socket.
+	if (connect (fd, (struct sockaddr*)&pun, sizeof(pun)) != 0) {
+		closesocket (fd);
+		return NULL;
+	}
+
+	// Set the newly-connected socket nonblocking.
+	if (!SetSocketNonblocking (fd)) {
+		closesocket (fd);
+		return NULL;
+	}
+
+	// Set up a connection descriptor and add it to the event-machine.
+	// Observe, even though we know the connection status is connect-success,
+	// we still set the "pending" flag, so some needed initializations take
+	// place.
+	ConnectionDescriptor *cd = new ConnectionDescriptor (fd);
+	if (!cd)
+		throw std::runtime_error ("no connection allocated");
+	cd->SetConnectPending (true);
+	Add (cd);
+	out = cd->GetBinding().c_str();
+
+	if (out == NULL)
+		closesocket (fd);
+
+	return out;
+	#endif
+}
+
 
 /*******************************
 EventMachine_t::CreateTcpServer
@@ -859,7 +954,7 @@ const char *EventMachine_t::CreateUnixDomainServer (const char *filename)
 	#ifdef OS_UNIX
 	const char *output_binding = NULL;
 
-	struct sockaddr_un sun;
+	struct sockaddr_un s_sun;
 
 	int sd_accept = socket (AF_LOCAL, SOCK_STREAM, 0);
 	if (sd_accept == INVALID_SOCKET) {
@@ -870,9 +965,9 @@ const char *EventMachine_t::CreateUnixDomainServer (const char *filename)
 		goto fail;
 	unlink (filename);
 
-	bzero (&sun, sizeof(sun));
-	sun.sun_family = AF_LOCAL;
-	strncpy (sun.sun_path, filename, sizeof(sun.sun_path)-1);
+	bzero (&s_sun, sizeof(s_sun));
+	s_sun.sun_family = AF_LOCAL;
+	strncpy (s_sun.sun_path, filename, sizeof(s_sun.sun_path)-1);
 
 	// don't bother with reuseaddr for a local socket.
 
@@ -885,7 +980,7 @@ const char *EventMachine_t::CreateUnixDomainServer (const char *filename)
 		#endif
 	}
 
-	if (bind (sd_accept, (struct sockaddr*)&sun, sizeof(sun))) {
+	if (bind (sd_accept, (struct sockaddr*)&s_sun, sizeof(s_sun))) {
 		//__warning ("binding failed");
 		goto fail;
 	}