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

connect_socket: minor changes

Browse Source 
small code rewrite and clarification
This commit is contained in:
mickael
2019-01-04 00:00:52 +00:00
parent d8dd453bdf
commit 785b7c52a5
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
includes/proxywatchd.py
View File

@@ -76,25 +76,23 @@ class Proxywatchd(Thread):
else: return 1 else: return 1
def connect_socket(self, proxy, servers, proto = None): def connect_socket(self, proxy, servers, proto = None):
proto = ['http', 'socks5', 'socks4'] protos = ['http', 'socks5', 'socks4']
for p in proto: for proto in protos:
torhost = random.choice(self.torhosts) torhost = random.choice(self.torhosts)
duration = time.time() duration = time.time()
proxies = [ rocksock.RocksockProxyFromURL('socks4://%s' % torhost), proxies = [ rocksock.RocksockProxyFromURL('socks4://%s' % torhost),
rocksock.RocksockProxyFromURL('%s://%s' % (p, proxy[0])), rocksock.RocksockProxyFromURL('%s://%s' % (proto, proxy[0])),
] ]
tst = random.choice(servers).strip() srv = random.choice(servers).strip()
try: try:
sock = rocksock.Rocksock(host=tst, port=6697, ssl=True, proxies=proxies, timeout=self.timeout) sock = rocksock.Rocksock(host=srv, port=6697, ssl=True, proxies=proxies, timeout=self.timeout)
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, p, duration, torhost, tst return sock, proto, duration, torhost, srv
except: except: sock.disconnect()
#print('socket error, disconnecting')
sock.disconnect()
return False, False, False, False, False return False, False, False, False, False
@@ -124,7 +122,7 @@ class Proxywatchd(Thread):
time.sleep(0.1) time.sleep(0.1)
nextcheck = (time.time() + 1800 + ((1+int(proxy[1])) * 3600)) nextcheck = (time.time() + 1800 + ((1+int(proxy[1])) * 3600))
sock, proto, duration, tor, tst = self.connect_socket(proxy, servers, proto=proxy[3]) sock, proto, duration, tor, srv = self.connect_socket(proxy, servers, proto=proxy[3])
if not sock: if not sock:
sqlite_requests.append(((proxy[1]+1), nextcheck, 1, 'unknown', 'http', 0, proxy[0],)) sqlite_requests.append(((proxy[1]+1), nextcheck, 1, 'unknown', 'http', 0, proxy[0],))
continue continue
@@ -144,7 +142,7 @@ class Proxywatchd(Thread):
#dronebl = self.is_drone_bl(proxy[0]) #dronebl = self.is_drone_bl(proxy[0])
sqlite_requests.append( (0, time.time(), 1, match, proto, duration, proxy[0],)) sqlite_requests.append( (0, time.time(), 1, match, proto, duration, proxy[0],))
_log('%s://%s; c: %s; d: %d sec(s); tor: %s; irc: %s; recv: %s' % (proto, proxy[0], match, duration, tor, tst, recv), threadid) _log('%s://%s; c: %s; d: %d sec(s); tor: %s; srv: %s; recv: %s' % (proto, proxy[0], match, duration, tor, srv, recv), threadid)
# bad data # bad data
else: else: