diff --git a/includes/proxywatchd.py b/includes/proxywatchd.py index 96d32af..63e016d 100644 --- a/includes/proxywatchd.py +++ b/includes/proxywatchd.py @@ -76,25 +76,23 @@ class Proxywatchd(Thread): else: return 1 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) duration = time.time() 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: - 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.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: - #print('socket error, disconnecting') - sock.disconnect() + except: sock.disconnect() return False, False, False, False, False @@ -124,7 +122,7 @@ class Proxywatchd(Thread): time.sleep(0.1) 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: sqlite_requests.append(((proxy[1]+1), nextcheck, 1, 'unknown', 'http', 0, proxy[0],)) continue @@ -144,7 +142,7 @@ class Proxywatchd(Thread): #dronebl = self.is_drone_bl(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 else: