username/ppf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'changes5' into 'master'

Browse Source 
Changes5

See merge request mserneels/ppf!5
This commit is contained in:
mserneels
2019-01-06 16:38:44 +00:00
parent 41ce83a963 7d8583f7cc
commit 03a1c47ff2
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
proxywatchd.py
View File

@@ -47,6 +47,20 @@ class WorkerJob():
sock.connect() sock.connect()
sock.send('%s\n' % random.choice(['NICK', 'USER', 'JOIN', 'MODE', 'PART', 'INVITE', 'KNOCK', 'WHOIS', 'WHO', 'NOTICE', 'PRIVMSG', 'PING', 'QUIT'])) sock.send('%s\n' % random.choice(['NICK', 'USER', 'JOIN', 'MODE', 'PART', 'INVITE', 'KNOCK', 'WHOIS', 'WHO', 'NOTICE', 'PRIVMSG', 'PING', 'QUIT']))
return sock, proto, duration, torhost, srv, 0 return sock, proto, duration, torhost, srv, 0
except rocksock.RocksockException as e:
et = e.get_errortype()
err = e.get_error()
fp = e.get_failedproxy()
sock.disconnect()
if et == rocksock.RS_ET_OWN:
if fp == 1 and \
err == rocksock.RS_E_REMOTE_DISCONNECTED or \
err == rocksock.RS_E_HIT_TIMEOUT:
# proxy is not online, so don't waste time trying all possible protocols
break
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise(e) raise(e)
except: sock.disconnect() except: sock.disconnect()
@@ -126,7 +140,7 @@ class WorkerThread():
class Proxywatchd(): class Proxywatchd():
def stop(self): def stop(self):
_log('\rRequesting proxywatchd to halt (%d thread(s))' % len([item for item in self.threads if True])) _log('Requesting proxywatchd to halt (%d thread(s))' % len([item for item in self.threads if True]))
self.stopping.set() self.stopping.set()
def _cleanup(self): def _cleanup(self):
@@ -250,7 +264,7 @@ if __name__ == '__main__':
w.start() w.start()
w.run() w.run()
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e pass
finally: finally:
w.stop() w.stop()
w.finish() w.finish()