Merge branch 'master' of github.com:rapid7/metasploit-framework

external/source/meterpreter/source/common/arch/posix/scheduler.c

@@ -243,6 +243,10 @@ scheduler_run(THREAD *thread)
 			//	&scheduler_cond, LIST_EMPTY(&WEHead), polltable == NULL);
 
 			pthread_cond_wait(&scheduler_cond, &scheduler_mutex);
+
+			// pthread_cond_wait still chews CPU in some cases, usleep to yield
+			// processor so we don't just spin.
+			usleep(1000);
 		}
 
 		LIST_FOREACH(current, &WEHead, link) {

lib/msf/base/sessions/meterpreter.rb

@@ -334,7 +334,7 @@ class Meterpreter < Rex::Post::Meterpreter::Client
 
 					# Find the first non-loopback address
 					if not nhost
-						iface = ifaces.select{|i| t.ip != "127.0.0.1" }
+						iface = ifaces.select{|i| i.ip != "127.0.0.1" }
 						if iface.length > 0
 							nhost = iface.first.ip
 						end