eventmachine 0.7.0 → 0.7.2

data/ext/em.h

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: em.h 264 2006-10-05 16:33:22Z blackhedd $
+$Id: em.h 318 2007-05-22 22:06:24Z blackhedd $
 
-File:     ed.h
+File:     em.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.
+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.
 
 *****************************************************************************/
 
@@ -72,6 +65,7 @@ class EventMachine_t
 		void SignalLoopBreaker();
 		const char *InstallOneshotTimer (int);
 		const char *ConnectToServer (const char *, int);
+		const char *ConnectToUnixServer (const char *);
 		const char *CreateTcpServer (const char *, int);
 		const char *OpenDatagramSocket (const char *, int);
 		const char *CreateUnixDomainServer (const char*);
@@ -80,6 +74,7 @@ class EventMachine_t
 		void Add (EventableDescriptor*);
 
 		void SetTimerQuantum (int);
+		static void SetuidString (const char*);
 
 	public:
 		enum { // Event names
@@ -101,7 +96,7 @@ class EventMachine_t
 
 	private:
 		enum {
-			MaxOutstandingTimers = 40,
+			MaxOutstandingTimers = 1000,
 			HeartbeatInterval = 2
 		};
 		void (*EventCallback)(const char*, int, const char*, int);

data/ext/emwin.cpp

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: emwin.cpp 47 2006-05-15 21:42:38Z blackhedd $
+$Id: emwin.cpp 318 2007-05-22 22:06:24Z blackhedd $
 
-File:     edwin.cpp
+File:     emwin.cpp
 Date:     05May06
 
-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.
-
-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/emwin.h

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: emwin.h 209 2006-07-16 23:32:16Z blackhedd $
+$Id: emwin.h 318 2007-05-22 22:06:24Z blackhedd $
 
-File:     edwin.h
+File:     emwin.h
 Date:     05May06
 
-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.
-
-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/eventmachine.h

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: eventmachine.h 265 2006-10-05 19:07:45Z blackhedd $
+$Id: eventmachine.h 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     eventmachine.h
 Date:     15Apr06
 
-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.
 
 *****************************************************************************/
 
@@ -36,6 +29,7 @@ extern "C" {
 	void evma_release_library();
 	const char *evma_install_oneshot_timer (int seconds);
 	const char *evma_connect_to_server (const char *server, int port);
+	const char *evma_connect_to_unix_server (const char *server);
 	const char *evma_create_tcp_server (const char *address, int port);
 	const char *evma_create_unix_domain_server (const char *filename);
 	const char *evma_open_datagram_socket (const char *server, int port);
@@ -48,6 +42,7 @@ extern "C" {
 	void evma_close_connection (const char *binding, int after_writing);
 	void evma_signal_loopbreak();
 	void evma_set_timer_quantum (int);
+	void evma_setuid_string (const char *username);
 	void evma_stop_machine();
 
 	const char *evma__write_file (const char *filename);

data/ext/extconf.rb

@@ -1,24 +1,16 @@
-# $Id: extconf.rb 63 2006-05-17 06:03:18Z blackhedd $
+# $Id: extconf.rb 318 2007-05-22 22:06:24Z blackhedd $
 #
 #----------------------------------------------------------------------------
 #
-# 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/files.cpp

@@ -5,22 +5,15 @@ $Id: ed.cpp 250 2006-08-25 02:17:58Z blackhedd $
 File:     files.cpp
 Date:     26Aug06
 
-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/files.h

@@ -5,22 +5,15 @@ $Id: ed.h 243 2006-08-23 02:00:10Z blackhedd $
 File:     files.h
 Date:     26Aug06
 
-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/page.cpp

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: page.cpp 47 2006-05-15 21:42:38Z blackhedd $
+$Id: page.cpp 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     page.cpp
 Date:     30Apr06
 
-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/page.h

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: page.h 47 2006-05-15 21:42:38Z blackhedd $
+$Id: page.h 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     page.h
 Date:     30Apr06
 
-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/project.h

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: project.h 265 2006-10-05 19:07:45Z blackhedd $
+$Id: project.h 318 2007-05-22 22:06:24Z blackhedd $
 
 File:     project.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.
+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.
 
 *****************************************************************************/
 
@@ -55,12 +48,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
+#include <pwd.h>
 typedef int SOCKET;
 #define closesocket close
 #define INVALID_SOCKET -1
 #define SOCKET_ERROR -1
 #ifdef OS_SOLARIS8
-#define INADDR_NONE ((unsigned long)-1)
+#include <strings.h>
+#include <sys/un.h>
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif
+// The ff is superfluous on Solaris > 7. Thanks to Brett Eisenberg.
+//#define INADDR_NONE ((unsigned long)-1)
 #endif
 #endif
 

data/ext/rubymain.cpp

@@ -1,26 +1,19 @@
 /*****************************************************************************
 
-$Id: rubymain.cpp 265 2006-10-05 19:07:45Z blackhedd $
+$Id: rubymain.cpp 318 2007-05-22 22:06:24Z blackhedd $
 
-File:     libmain.cpp
+File:     rubymain.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.
 
 *****************************************************************************/
 
@@ -200,7 +193,23 @@ t_connect_server
 
 static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 {
-	const char *f = evma_connect_to_server (StringValuePtr(server), FIX2INT(port));
+	// Avoid FIX2INT in this case, because it doesn't deal with type errors properly.
+	// Specifically, if the value of port comes in as a string rather than an integer,
+	// NUM2INT will throw a type error, but FIX2INT will generate garbage.
+
+	const char *f = evma_connect_to_server (StringValuePtr(server), NUM2INT(port));
+	if (!f || !*f)
+		rb_raise (rb_eRuntimeError, "no connection");
+	return rb_str_new2 (f);
+}
+
+/*********************
+t_connect_unix_server
+*********************/
+
+static VALUE t_connect_unix_server (VALUE self, VALUE serversocket)
+{
+	const char *f = evma_connect_to_unix_server (StringValuePtr(serversocket));
 	if (!f || !*f)
 		rb_raise (rb_eRuntimeError, "no connection");
 	return rb_str_new2 (f);
@@ -272,6 +281,16 @@ static VALUE t_set_timer_quantum (VALUE self, VALUE interval)
   return Qnil;
 }
 
+/***************
+t_setuid_string
+***************/
+
+static VALUE t_setuid_string (VALUE self, VALUE username)
+{
+  evma_setuid_string (StringValuePtr (username));
+  return Qnil;
+}
+
 
 
 /*************
@@ -308,12 +327,14 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "send_datagram", (VALUE(*)(...))t_send_datagram, 5);
 	rb_define_module_function (EmModule, "close_connection", (VALUE(*)(...))t_close_connection, 2);
 	rb_define_module_function (EmModule, "connect_server", (VALUE(*)(...))t_connect_server, 2);
+	rb_define_module_function (EmModule, "connect_unix_server", (VALUE(*)(...))t_connect_unix_server, 1);
 	rb_define_module_function (EmModule, "open_udp_socket", (VALUE(*)(...))t_open_udp_socket, 2);
 	rb_define_module_function (EmModule, "release_machine", (VALUE(*)(...))t_release_machine, 0);
 	rb_define_module_function (EmModule, "stop", (VALUE(*)(...))t_stop, 0);
 	rb_define_module_function (EmModule, "signal_loopbreak", (VALUE(*)(...))t_signal_loopbreak, 0);
 	rb_define_module_function (EmModule, "library_type", (VALUE(*)(...))t_library_type, 0);
 	rb_define_module_function (EmModule, "set_timer_quantum", (VALUE(*)(...))t_set_timer_quantum, 1);
+	rb_define_module_function (EmModule, "setuid_string", (VALUE(*)(...))t_setuid_string, 1);
 
   // Provisional:
 	rb_define_module_function (EmModule, "_write_file", (VALUE(*)(...))t__write_file, 1);