eventmachine 0.4.3 → 0.4.4

data/ext/binder.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: binder.cpp 2291 2006-04-14 03:56:18Z francis $
+$Id: binder.cpp 2381 2006-04-24 13:33:03Z francis $
 
 File:     binder.cpp
 Date:     07Apr06
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "project.h"
 
 #define DEV_URANDOM "/dev/urandom"
-#define DO_NOT_REQUIRE_UUID
 
 
 map<string, Bindable_t*> Bindable_t::BindingBag;
@@ -43,12 +42,6 @@ string Bindable_t::CreateBinding()
 	static string seed;
 
 	if ((index >= 1000000) || (seed.length() == 0)) {
-		#ifdef REQUIRE_UUID
-		uuid_t u;
-		uuid_generate (u);
-		#endif
-
-		#ifdef DO_NOT_REQUIRE_UUID
 		int fd = open (DEV_URANDOM, O_RDONLY);
 		if (fd < 0)
 			throw std::runtime_error ("No entropy device");
@@ -57,7 +50,6 @@ string Bindable_t::CreateBinding()
 		size_t r = read (fd, u, sizeof(u));
 		if (r < sizeof(u))
 			throw std::runtime_error ("Unable to read entropy device");
-		#endif
 
 		unsigned char *u1 = (unsigned char*)u;
 		char u2 [sizeof(u) * 2 + 1];

data/ext/ed.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.cpp 2363 2006-04-23 14:32:40Z francis $
+$Id: ed.cpp 2382 2006-04-25 03:03:53Z francis $
 
 File:     ed.cpp
 Date:     06Apr06
@@ -551,8 +551,10 @@ DatagramDescriptor::DatagramDescriptor
 **************************************/
 
 DatagramDescriptor::DatagramDescriptor (int sd):
-  EventableDescriptor (sd)
+	EventableDescriptor (sd),
+	OutboundDataSize (0)
 {
+	bzero (&ReturnAddress, sizeof(ReturnAddress));
 }
 
 
@@ -731,7 +733,7 @@ int DatagramDescriptor::SendOutboundDatagram (const char *data, int length, cons
 	unsigned long HostAddr;
 
 	HostAddr = inet_addr (address);
-	if (HostAddr == -1) {
+	if (HostAddr == INADDR_NONE) {
 		hostent *hp = gethostbyname (address);
 		if (!hp)
 			return 0;

data/ext/ed.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.h 2363 2006-04-23 14:32:40Z francis $
+$Id: ed.h 2378 2006-04-24 03:37:19Z francis $
 
 File:     ed.h
 Date:     06Apr06
@@ -154,7 +154,7 @@ class DatagramDescriptor: public EventableDescriptor
 
 	protected:
 		struct OutboundPage {
-			OutboundPage (const char *b, int l, struct sockaddr_in f, int o=0): Buffer(b), Length(l), From(f), Offset(o) {}
+			OutboundPage (const char *b, int l, struct sockaddr_in f, int o=0): Buffer(b), Length(l), Offset(o), From(f) {}
 			void Free() {if (Buffer) free ((char*)Buffer); }
 			const char *Buffer;
 			int Length;

data/ext/em.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.cpp 2363 2006-04-23 14:32:40Z francis $
+$Id: em.cpp 2378 2006-04-24 03:37:19Z francis $
 
 File:     ed.cpp
 Date:     06Apr06
@@ -281,7 +281,7 @@ const char *EventMachine_t::ConnectToServer (const char *server, int port)
 	unsigned long HostAddr;
 
 	HostAddr = inet_addr (server);
-	if (HostAddr == -1) {
+	if (HostAddr == INADDR_NONE) {
 		hostent *hp = gethostbyname (server);
 		if (!hp)
 			return NULL;
@@ -373,7 +373,7 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 
 	if (server && *server) {
 		sin.sin_addr.s_addr = inet_addr (server);
-		if (sin.sin_addr.s_addr == -1) {
+		if (sin.sin_addr.s_addr == INADDR_NONE) {
 			hostent *hp = gethostbyname (server);
 			if (hp == NULL) {
 				//__warning ("hostname not resolved: ", server);
@@ -457,7 +457,7 @@ const char *EventMachine_t::OpenDatagramSocket (const char *address, int port)
 
 	if (address && *address) {
 		sin.sin_addr.s_addr = inet_addr (address);
-		if (sin.sin_addr.s_addr == -1) {
+		if (sin.sin_addr.s_addr == INADDR_NONE) {
 			hostent *hp = gethostbyname (address);
 			if (hp == NULL)
 				goto fail;

data/ext/project.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: project.h 2355 2006-04-22 19:03:09Z francis $
+$Id: project.h 2381 2006-04-24 13:33:03Z francis $
 
 File:     project.h
 Date:     06Apr06
@@ -47,7 +47,6 @@ 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 <uuid/uuid.h>
 using namespace std;
 
 

data/ext/rubymain.cpp

@@ -71,6 +71,7 @@ void *TRunEvma (void *v)
 {
 	evma_run_machine();
 	write (SyncSockets[1], "$", 1);
+	return NULL;
 }
 
 
@@ -86,14 +87,15 @@ static VALUE t_initialize_event_machine (VALUE self)
 
 
 
-/*************
+/*****************************
 t_run_machine_without_threads
-*************/
+*****************************/
 
 static VALUE t_run_machine_without_threads (VALUE self)
 {
 	UseThreads = false;
 	evma_run_machine();
+	return Qnil;
 }
 
 
@@ -184,7 +186,7 @@ t_send_data
 static VALUE t_send_data (VALUE self, VALUE signature, VALUE data, VALUE data_length)
 {
 	int b = evma_send_data_to_connection (StringValuePtr (signature), StringValuePtr (data), FIX2INT (data_length));
-	return (b << 1) | 1;
+	return INT2NUM (b);
 }
 
 

data/lib/eventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine.rb 2364 2006-04-23 16:11:13Z francis $
+# $Id: eventmachine.rb 2380 2006-04-24 11:13:02Z francis $
 #
 # Author:: blackhedd (gmail address: garbagecat20).
 # Date:: 8 Apr 2006
@@ -14,7 +14,7 @@
 #
 # Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
 #
-# Gmail: garbagecat20
+# Gmail: garbagecat10
 #
 # 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
@@ -64,7 +64,7 @@ require 'rubyeventmachine'
 # Here's a fully-functional echo server implemented in EventMachine:
 # 
 #       require 'rubygems'
-#       require_gem 'eventmachine'
+#       require 'eventmachine'
 # 
 #       module EchoServer
 #         def receive_data data
@@ -209,7 +209,7 @@ module EventMachine
   # with Ctrl-C.
   #
   #  require 'rubygems'
-  #  require_gem 'eventmachine'
+  #  require 'eventmachine'
   #
   #  EventMachine::run {
   #    puts "Starting the run now: #{Time.now}"
@@ -272,7 +272,7 @@ module EventMachine
   # === Usage example
   #
   #  require 'rubygems'
-  #  require_gem 'eventmachine'
+  #  require 'eventmachine'
   #
   #  module Redmond
   #  
@@ -370,7 +370,7 @@ module EventMachine
   # to the start_server call to values appropriate for your environment.
   #
   #  require 'rubygems'
-  #  require_gem 'eventmachine'
+  #  require 'eventmachine'
   #
   #  module LineCounter
   #  
@@ -431,7 +431,7 @@ module EventMachine
   # (and incidentally calls the connection's unbind method).
   # 
   #  require 'rubygems'
-  #  require_gem 'eventmachine'
+  #  require 'eventmachine'
   #  
   #  module DumbHttpClient
   #  

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2006-04-23
+  version: 0.4.4
+date: 2006-04-24
 summary: Ruby/EventMachine socket engine library
 require_paths: 
   - lib