eventmachine 1.2.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7803a93b533f7fa10bbc151ce1e8bbe11ed4925
-  data.tar.gz: cf2d3cfd4083b65b119959a2b0b6f4c7af712997
+  metadata.gz: 41547bb89b0711eee296557175b254fa3679448f
+  data.tar.gz: e76ab566210fc7c034f3ad23f0db583514462b43
 SHA512:
-  metadata.gz: a634095988905c93e04e588c0aad3da73c3211dcdaec626d399193d21c592f37b91c7478e09d8d15e58423eb61c04fbb73eab6c254871cb3a2f65c41dee0cb71
-  data.tar.gz: a3bcd4dd5e772ff931e016ce0908c0858b6510336092bd1ded11c59da5758599b03d4960a19e8aa95c086b526b2e3452ba4c7f6d34ddd4d2ce23c8f42490ce56
+  metadata.gz: 5c0338c33a125469f174e372c71a6142adf57af643846509e14f79cfac33b0b812f08390a1f651c45bf3357815014375a78685514c8bfcadd3a3514a5394783a
+  data.tar.gz: d2cd4be5a207f01003ed8ab928a6354178672702089b0da2a13ef0dbaf63f45221cfdbfdb753f5e318ac2decb2caeae7de3569540e2cfd1d5ffb7eba6d700a6b

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.2.1 (November 15, 2016)
+* Throw strerror(errno) when getsockname or getpeername fail [#683]
+* Use a single concrete implementation of getpeername/getsockname, the rest pure virtuals [#683]
+* Use gai_strerror to get the failure string from getaddrinfo [#744]
+* Fix deregistering descriptor when using KQUEUE [#728]
+* Fix to enable to work an example code in EM::Pool [#731]
+* LineText2: Add regular expression delimiter support [#706]
+* Pure Ruby: EM rescue ECONNREFUSED on initial TCP connect [#741]
+* Pure Ruby: EM SSL (working start_tls) [#712]
+* Pure Ruby: EM fixes [#707]
+* Java: Use Acceptors to get peer and sock names if not present in Connections [#743]
+
 ## 1.2.0.1 (March 15, 2016)
 * Fix crash when accepting IPv6 connections due to struct sockaddr_in [#698, #699]
 

data/README.md

@@ -32,7 +32,7 @@ EventMachine has been around since the early 2000s and is a mature and battle-te
 
 ## What platforms are supported by EventMachine? ##
 
-EventMachine supports Ruby >= 1.8.7 and <= 2.2 REE, JRuby and **works well on Windows** as well
+EventMachine supports Ruby 1.8.7 through 2.3, REE, JRuby and **works well on Windows** as well
 as many operating systems from the Unix family (Linux, Mac OS X, BSD flavors).
 
 
@@ -54,34 +54,36 @@ or add this to your Gemfile if you use [Bundler](http://gembundler.com/):
 For an introduction to EventMachine, check out:
 
  * [blog post about EventMachine by Ilya Grigorik](http://www.igvita.com/2008/05/27/ruby-eventmachine-the-speed-demon/).
- * [EventMachine Introductions by Dan Sinclair](http://everburning.com/news/eventmachine-introductions/).
+ * [EventMachine Introductions by Dan Sinclair](http://everburning.com/news/eventmachine-introductions.html).
 
 
 ### Server example: Echo server ###
 
 Here's a fully-functional echo server written with EventMachine:
 
-     require 'eventmachine'
-
-     module EchoServer
-       def post_init
-         puts "-- someone connected to the echo server!"
-       end
-
-       def receive_data data
-         send_data ">>>you sent: #{data}"
-         close_connection if data =~ /quit/i
-       end
-
-       def unbind
-         puts "-- someone disconnected from the echo server!"
-       end
-    end
-
-    # Note that this will block current thread.
-    EventMachine.run {
-      EventMachine.start_server "127.0.0.1", 8081, EchoServer
-    }
+```ruby
+ require 'eventmachine'
+
+ module EchoServer
+   def post_init
+     puts "-- someone connected to the echo server!"
+   end
+
+   def receive_data data
+     send_data ">>>you sent: #{data}"
+     close_connection if data =~ /quit/i
+   end
+
+   def unbind
+     puts "-- someone disconnected from the echo server!"
+   end
+end
+
+# Note that this will block current thread.
+EventMachine.run {
+  EventMachine.start_server "127.0.0.1", 8081, EchoServer
+}
+```
 
 
 ## EventMachine documentation ##

data/ext/ed.cpp

@@ -340,6 +340,45 @@ void EventableDescriptor::_GenericInboundDispatch(const char *buf, unsigned long
 }
 
 
+/*********************************
+EventableDescriptor::_GenericGetPeername
+*********************************/
+
+bool EventableDescriptor::_GenericGetPeername (struct sockaddr *s, socklen_t *len)
+{
+	if (!s)
+		return false;
+
+	int gp = getpeername (GetSocket(), s, len);
+	if (gp == -1) {
+		char buf[200];
+		snprintf (buf, sizeof(buf)-1, "unable to get peer name: %s", strerror(errno));
+		throw std::runtime_error (buf);
+	}
+
+	return true;
+}
+
+/*********************************
+EventableDescriptor::_GenericGetSockname
+*********************************/
+
+bool EventableDescriptor::_GenericGetSockname (struct sockaddr *s, socklen_t *len)
+{
+	if (!s)
+		return false;
+
+	int gp = getsockname (GetSocket(), s, len);
+	if (gp == -1) {
+		char buf[200];
+		snprintf (buf, sizeof(buf)-1, "unable to get sock name: %s", strerror(errno));
+		throw std::runtime_error (buf);
+	}
+
+	return true;
+}
+
+
 /*********************************************
 EventableDescriptor::GetPendingConnectTimeout
 *********************************************/
@@ -1628,23 +1667,6 @@ void AcceptorDescriptor::Heartbeat()
 }
 
 
-/*******************************
-AcceptorDescriptor::GetSockname
-*******************************/
-
-bool AcceptorDescriptor::GetSockname (struct sockaddr *s, socklen_t *len)
-{
-	bool ok = false;
-	if (s) {
-		int gp = getsockname (GetSocket(), s, len);
-		if (gp == 0)
-			ok = true;
-	}
-	return ok;
-}
-
-
-
 /**************************************
 DatagramDescriptor::DatagramDescriptor
 **************************************/
@@ -1922,7 +1944,7 @@ int DatagramDescriptor::SendOutboundDatagram (const char *data, unsigned long le
 
 	struct sockaddr_in6 addr_here;
 	size_t addr_here_len = sizeof addr_here;
-	if (!EventMachine_t::name2address (address, port, (struct sockaddr *)&addr_here, &addr_here_len))
+	if (0 != EventMachine_t::name2address (address, port, (struct sockaddr *)&addr_here, &addr_here_len))
 		return -1;
 
 	if (!data && (length > 0))
@@ -1950,37 +1972,6 @@ int DatagramDescriptor::SendOutboundDatagram (const char *data, unsigned long le
 }
 
 
-/*********************************
-ConnectionDescriptor::GetPeername
-*********************************/
-
-bool ConnectionDescriptor::GetPeername (struct sockaddr *s, socklen_t *len)
-{
-	bool ok = false;
-	if (s) {
-		int gp = getpeername (GetSocket(), s, len);
-		if (gp == 0)
-			ok = true;
-	}
-	return ok;
-}
-
-/*********************************
-ConnectionDescriptor::GetSockname
-*********************************/
-
-bool ConnectionDescriptor::GetSockname (struct sockaddr *s, socklen_t *len)
-{
-	bool ok = false;
-	if (s) {
-		int gp = getsockname (GetSocket(), s, len);
-		if (gp == 0)
-			ok = true;
-	}
-	return ok;
-}
-
-
 /**********************************************
 ConnectionDescriptor::GetCommInactivityTimeout
 **********************************************/
@@ -2018,22 +2009,6 @@ bool DatagramDescriptor::GetPeername (struct sockaddr *s, socklen_t *len)
 	return ok;
 }
 
-/*******************************
-DatagramDescriptor::GetSockname
-*******************************/
-
-bool DatagramDescriptor::GetSockname (struct sockaddr *s, socklen_t *len)
-{
-	bool ok = false;
-	if (s) {
-		int gp = getsockname (GetSocket(), s, len);
-		if (gp == 0)
-			ok = true;
-	}
-	return ok;
-}
-
-
 
 /********************************************
 DatagramDescriptor::GetCommInactivityTimeout

data/ext/ed.h

@@ -64,8 +64,8 @@ class EventableDescriptor: public Bindable_t
 
 		void SetEventCallback (EMCallback);
 
-		virtual bool GetPeername (struct sockaddr*, socklen_t*) {return false;}
-		virtual bool GetSockname (struct sockaddr*, socklen_t*) {return false;}
+		virtual bool GetPeername (struct sockaddr*, socklen_t*) = 0;
+		virtual bool GetSockname (struct sockaddr*, socklen_t*) = 0;
 		virtual bool GetSubprocessPid (pid_t*) {return false;}
 
 		virtual void StartTls() {}
@@ -117,7 +117,9 @@ class EventableDescriptor: public Bindable_t
 		bool bWatchOnly;
 
 		EMCallback EventCallback;
-		void _GenericInboundDispatch(const char *buffer, unsigned long size);
+		void _GenericInboundDispatch (const char *buffer, unsigned long size);
+		bool _GenericGetPeername (struct sockaddr*, socklen_t*);
+		bool _GenericGetSockname (struct sockaddr*, socklen_t*);
 
 		uint64_t CreatedAt;
 		bool bCallbackUnbind;
@@ -164,6 +166,9 @@ class LoopbreakDescriptor: public EventableDescriptor
 
 		virtual bool SelectForRead() {return true;}
 		virtual bool SelectForWrite() {return false;}
+
+		virtual bool GetPeername (struct sockaddr* s, socklen_t* len) { return _GenericGetPeername (s, len); }
+		virtual bool GetSockname (struct sockaddr* s, socklen_t* len) { return _GenericGetSockname (s, len); }
 };
 
 
@@ -219,8 +224,8 @@ class ConnectionDescriptor: public EventableDescriptor
 
 		void SetServerMode() {bIsServer = true;}
 
-		virtual bool GetPeername (struct sockaddr*, socklen_t*);
-		virtual bool GetSockname (struct sockaddr*, socklen_t*);
+		virtual bool GetPeername (struct sockaddr* s, socklen_t* len) { return _GenericGetPeername (s, len); }
+		virtual bool GetSockname (struct sockaddr* s, socklen_t* len) { return _GenericGetSockname (s, len); }
 
 		virtual uint64_t GetCommInactivityTimeout();
 		virtual int SetCommInactivityTimeout (uint64_t value);
@@ -305,8 +310,8 @@ class DatagramDescriptor: public EventableDescriptor
 		// Do we have any data to write? This is used by ShouldDelete.
 		virtual int GetOutboundDataSize() {return OutboundDataSize;}
 
-		virtual bool GetPeername (struct sockaddr*, socklen_t*);
-		virtual bool GetSockname (struct sockaddr*, socklen_t*);
+		virtual bool GetPeername (struct sockaddr* s, socklen_t* len);
+		virtual bool GetSockname (struct sockaddr* s, socklen_t* len) { return _GenericGetSockname (s, len); };
 
 		virtual uint64_t GetCommInactivityTimeout();
 		virtual int SetCommInactivityTimeout (uint64_t value);
@@ -345,7 +350,8 @@ class AcceptorDescriptor: public EventableDescriptor
 		virtual bool SelectForRead() {return true;}
 		virtual bool SelectForWrite() {return false;}
 
-		virtual bool GetSockname (struct sockaddr*, socklen_t*);
+		virtual bool GetPeername (struct sockaddr* s, socklen_t* len) { return _GenericGetPeername (s, len); }
+		virtual bool GetSockname (struct sockaddr* s, socklen_t* len) { return _GenericGetSockname (s, len); };
 
 		static void StopAcceptor (const uintptr_t binding);
 };
@@ -371,6 +377,9 @@ class PipeDescriptor: public EventableDescriptor
 		int SendOutboundData (const char*, unsigned long);
 		virtual int GetOutboundDataSize() {return OutboundDataSize;}
 
+		virtual bool GetPeername (struct sockaddr* s, socklen_t* len) { return _GenericGetPeername (s, len); }
+		virtual bool GetSockname (struct sockaddr* s, socklen_t* len) { return _GenericGetSockname (s, len); }
+
 		virtual bool GetSubprocessPid (pid_t*);
 
 	protected:
@@ -413,6 +422,9 @@ class KeyboardDescriptor: public EventableDescriptor
 		virtual bool SelectForRead() {return true;}
 		virtual bool SelectForWrite() {return false;}
 
+		virtual bool GetPeername (struct sockaddr* s, socklen_t* len) { return _GenericGetPeername (s, len); }
+		virtual bool GetSockname (struct sockaddr* s, socklen_t* len) { return _GenericGetSockname (s, len); }
+
 	protected:
 		bool bReadAttemptedAfterClose;
 
@@ -437,6 +449,9 @@ class InotifyDescriptor: public EventableDescriptor
 		virtual void Heartbeat() {}
 		virtual bool SelectForRead() {return true;}
 		virtual bool SelectForWrite() {return false;}
+
+		virtual bool GetPeername (struct sockaddr* s, socklen_t* len) { return false; }
+		virtual bool GetSockname (struct sockaddr* s, socklen_t* len) { return false; }
 };
 
 #endif // __EventableDescriptor__H_

data/ext/em.cpp

@@ -217,7 +217,7 @@ void EventMachine_t::ScheduleHalt()
 
 bool EventMachine_t::Stopping()
 {
-    return bTerminateSignalReceived;
+	return bTerminateSignalReceived;
 }
 
 /*******************************
@@ -1194,9 +1194,10 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 
 	struct sockaddr_storage bind_as;
 	size_t bind_as_len = sizeof bind_as;
-	if (!name2address (server, port, (struct sockaddr *)&bind_as, &bind_as_len)) {
+	int gai = name2address (server, port, (struct sockaddr *)&bind_as, &bind_as_len);
+	if (gai != 0) {
 		char buf [200];
-		snprintf (buf, sizeof(buf)-1, "unable to resolve server address: %s", strerror(errno));
+		snprintf (buf, sizeof(buf)-1, "unable to resolve address: %s", gai_strerror(gai));
 		throw std::runtime_error (buf);
 	}
 
@@ -1222,9 +1223,12 @@ const uintptr_t EventMachine_t::ConnectToServer (const char *bind_addr, int bind
 	if (bind_addr) {
 		struct sockaddr_storage bind_to;
 		size_t bind_to_len = sizeof bind_to;
-		if (!name2address (bind_addr, bind_port, (struct sockaddr *)&bind_to, &bind_to_len)) {
+		gai = name2address (bind_addr, bind_port, (struct sockaddr *)&bind_to, &bind_to_len);
+		if (gai != 0) {
 			close (sd);
-			throw std::runtime_error ("invalid bind address");
+			char buf [200];
+			snprintf (buf, sizeof(buf)-1, "invalid bind address: %s", gai_strerror(gai));
+			throw std::runtime_error (buf);
 		}
 		if (bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) {
 			close (sd);
@@ -1539,7 +1543,7 @@ int EventMachine_t::DetachFD (EventableDescriptor *ed)
 name2address
 ************/
 
-bool EventMachine_t::name2address (const char *server, int port, struct sockaddr *addr, size_t *addr_len)
+int EventMachine_t::name2address (const char *server, int port, struct sockaddr *addr, size_t *addr_len)
 {
 	if (!server || !*server)
 		server = "0.0.0.0";
@@ -1553,16 +1557,15 @@ bool EventMachine_t::name2address (const char *server, int port, struct sockaddr
 	char portstr[12];
 	snprintf(portstr, sizeof(portstr), "%u", port);
 
-	if (getaddrinfo (server, portstr, &hints, &ai) == 0) {
+	int gai = getaddrinfo (server, portstr, &hints, &ai);
+	if (gai == 0) {
 		assert (ai->ai_addrlen <= *addr_len);
 		memcpy (addr, ai->ai_addr, ai->ai_addrlen);
 		*addr_len = ai->ai_addrlen;
-
 		freeaddrinfo(ai);
-		return true;
 	}
 
-	return false;
+	return gai;
 }
 
 
@@ -1581,7 +1584,7 @@ const uintptr_t EventMachine_t::CreateTcpServer (const char *server, int port)
 
 	struct sockaddr_storage bind_here;
 	size_t bind_here_len = sizeof bind_here;
-	if (!name2address (server, port, (struct sockaddr *)&bind_here, &bind_here_len))
+	if (0 != name2address (server, port, (struct sockaddr *)&bind_here, &bind_here_len))
 		return 0;
 
 	SOCKET sd_accept = EmSocket (bind_here.ss_family, SOCK_STREAM, 0);
@@ -1636,7 +1639,7 @@ const uintptr_t EventMachine_t::OpenDatagramSocket (const char *address, int por
 
 	struct sockaddr_storage bind_here;
 	size_t bind_here_len = sizeof bind_here;
-	if (!name2address (address, port, (struct sockaddr *)&bind_here, &bind_here_len))
+	if (0 != name2address (address, port, (struct sockaddr *)&bind_here, &bind_here_len))
 		return 0;
 
 	// from here on, early returns must close the socket!
@@ -1889,6 +1892,14 @@ void EventMachine_t::Deregister (EventableDescriptor *ed)
 		ModifiedDescriptors.erase(ed);
 	}
 	#endif
+
+	#ifdef HAVE_KQUEUE
+	if (Poller == Poller_Kqueue) {
+		assert (ed->GetSocket() != INVALID_SOCKET);
+
+		ModifiedDescriptors.erase(ed);
+	}
+	#endif
 }
 
 

data/ext/em.h

@@ -201,7 +201,7 @@ class EventMachine_t
 
 		Poller_t GetPoller() { return Poller; }
 
-		static bool name2address (const char *server, int port, struct sockaddr *addr, size_t *addr_len);
+		static int name2address (const char *server, int port, struct sockaddr *addr, size_t *addr_len);
 
 	private:
 		void _RunTimers();

data/ext/rubymain.cpp

@@ -472,8 +472,12 @@ static VALUE t_get_peername (VALUE self UNUSED, VALUE signature)
 {
 	char buf[1024];
 	socklen_t len = sizeof buf;
-	if (evma_get_peername (NUM2BSIG (signature), (struct sockaddr*)buf, &len)) {
-		return rb_str_new (buf, len);
+	try {
+		if (evma_get_peername (NUM2BSIG (signature), (struct sockaddr*)buf, &len)) {
+			return rb_str_new (buf, len);
+		}
+	} catch (std::runtime_error e) {
+		rb_raise (rb_eRuntimeError, "%s", e.what());
 	}
 
 	return Qnil;
@@ -487,8 +491,12 @@ static VALUE t_get_sockname (VALUE self UNUSED, VALUE signature)
 {
 	char buf[1024];
 	socklen_t len = sizeof buf;
-	if (evma_get_sockname (NUM2BSIG (signature), (struct sockaddr*)buf, &len)) {
-		return rb_str_new (buf, len);
+	try {
+		if (evma_get_sockname (NUM2BSIG (signature), (struct sockaddr*)buf, &len)) {
+			return rb_str_new (buf, len);
+		}
+	} catch (std::runtime_error e) {
+		rb_raise (rb_eRuntimeError, "%s", e.what());
 	}
 
 	return Qnil;
@@ -534,7 +542,7 @@ static VALUE t_get_subprocess_status (VALUE self UNUSED, VALUE signature)
 				rb_iv_set(proc_status, "@status", INT2FIX(WEXITSTATUS(status)));
 			} else if (WIFSIGNALED(status)) {
 				rb_iv_set(proc_status, "@termsig", INT2FIX(WTERMSIG(status)));
-			} else if (WIFSTOPPED(status)){
+			} else if (WIFSTOPPED(status)) {
 				rb_iv_set(proc_status, "@stopsig", INT2FIX(WSTOPSIG(status)));
 			}
 #endif
@@ -1158,15 +1166,11 @@ t_stopping
 
 static VALUE t_stopping ()
 {
-    if (evma_stopping())
-    {
-        return Qtrue;
-    }
-    else
-    {
-        return Qfalse;
-    }
-
+	if (evma_stopping()) {
+		return Qtrue;
+	} else {
+		return Qfalse;
+	}
 }
 
 
@@ -1490,7 +1494,7 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_const (EmModule, "ConnectionNotifyReadable", INT2NUM(EM_CONNECTION_NOTIFY_READABLE));
 	rb_define_const (EmModule, "ConnectionNotifyWritable", INT2NUM(EM_CONNECTION_NOTIFY_WRITABLE));
 	rb_define_const (EmModule, "SslHandshakeCompleted",    INT2NUM(EM_SSL_HANDSHAKE_COMPLETED   ));
-	// EM_SSL_VERIFY = 109,
+	rb_define_const (EmModule, "SslVerify",                INT2NUM(EM_SSL_VERIFY                ));
 	// EM_PROXY_TARGET_UNBOUND = 110,
 	// EM_PROXY_COMPLETED = 111