infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

unstable
sinn3r 2012-02-29 10:14:11 -06:00
parent 74cdb5dabc f5e2d1c19b
commit 73ba8aca60
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/source/meterpreter/source/common/arch/posix/scheduler.c vendored
View File

@ -243,6 +243,10 @@ scheduler_run(THREAD *thread)
// &scheduler_cond, LIST_EMPTY(&WEHead), polltable == NULL); // &scheduler_cond, LIST_EMPTY(&WEHead), polltable == NULL);
pthread_cond_wait(&scheduler_cond, &scheduler_mutex); 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) { LIST_FOREACH(current, &WEHead, link) {

2
lib/msf/base/sessions/meterpreter.rb
View File

@ -334,7 +334,7 @@ class Meterpreter < Rex::Post::Meterpreter::Client
# Find the first non-loopback address # Find the first non-loopback address
if not nhost 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 if iface.length > 0
nhost = iface.first.ip nhost = iface.first.ip
end end