remove useless code
This commit is contained in:
parent
eb98abbabf
commit
882aa9d970
|
@ -105,20 +105,11 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
|
||||||
count += 1
|
count += 1
|
||||||
if self.command == 'verack'.encode():
|
if self.command == 'verack'.encode():
|
||||||
addr_verack += 1
|
addr_verack += 1
|
||||||
# print('the addr_verack count are -{}'.format(addr_verack))
|
|
||||||
|
|
||||||
if self.command == 'version'.encode():
|
if self.command == 'version'.encode():
|
||||||
addr_version += 1
|
addr_version += 1
|
||||||
# print('the addr_version count are -{}'.format(addr_version))
|
|
||||||
|
|
||||||
if self.command == 'addr'.encode():
|
if self.command == 'addr'.encode():
|
||||||
addr_count += 1
|
addr_count += 1
|
||||||
# print('the addr_count count are -{}'.format(addr_count))
|
|
||||||
|
|
||||||
if self.magic != 0xE9BEB4D9:
|
if self.magic != 0xE9BEB4D9:
|
||||||
# skip 1 byte in order to sync
|
|
||||||
# in the advancedispatched and length commend's
|
|
||||||
# escape the 1 length
|
|
||||||
self.set_state("bm_header", length=1)
|
self.set_state("bm_header", length=1)
|
||||||
self.bm_proto_reset()
|
self.bm_proto_reset()
|
||||||
logger.debug('Bad magic')
|
logger.debug('Bad magic')
|
||||||
|
@ -186,7 +177,6 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
|
||||||
self.set_state("close")
|
self.set_state("close")
|
||||||
return False
|
return False
|
||||||
if retval:
|
if retval:
|
||||||
# print('if retval is true and inside the if ')
|
|
||||||
self.set_state("bm_header", length=self.payloadLength)
|
self.set_state("bm_header", length=self.payloadLength)
|
||||||
self.bm_proto_reset()
|
self.bm_proto_reset()
|
||||||
# else assume the command requires a different state to follow
|
# else assume the command requires a different state to follow
|
||||||
|
@ -451,7 +441,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
|
||||||
|
|
||||||
if self.object.inventoryHash in Inventory() and Dandelion().hasHash(self.object.inventoryHash):
|
if self.object.inventoryHash in Inventory() and Dandelion().hasHash(self.object.inventoryHash):
|
||||||
Dandelion().removeHash(self.object.inventoryHash, "cycle detection")
|
Dandelion().removeHash(self.object.inventoryHash, "cycle detection")
|
||||||
[self.object.inventoryHash] = (
|
Inventory()[self.object.inventoryHash] = (
|
||||||
self.object.objectType, self.object.streamNumber,
|
self.object.objectType, self.object.streamNumber,
|
||||||
memoryview(self.payload[objectOffset:]), self.object.expiresTime,
|
memoryview(self.payload[objectOffset:]), self.object.expiresTime,
|
||||||
memoryview(self.object.tag)
|
memoryview(self.object.tag)
|
||||||
|
@ -539,7 +529,6 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def bm_command_version(self):
|
def bm_command_version(self):
|
||||||
# print('inside the bmproto ')
|
|
||||||
"""
|
"""
|
||||||
Incoming version.
|
Incoming version.
|
||||||
Parse and log, remember important things, like streams, bitfields, etc.
|
Parse and log, remember important things, like streams, bitfields, etc.
|
||||||
|
|
|
@ -195,7 +195,6 @@ class BMConnectionPool(object):
|
||||||
port = int(BMConfigParser().safeGet("bitmessagesettings", "port"))
|
port = int(BMConfigParser().safeGet("bitmessagesettings", "port"))
|
||||||
# correct port even if it changed
|
# correct port even if it changed
|
||||||
ls = TCPServer(host=bind, port=port)
|
ls = TCPServer(host=bind, port=port)
|
||||||
print('inside the startListening method')
|
|
||||||
self.listeningSockets[ls.destination] = ls
|
self.listeningSockets[ls.destination] = ls
|
||||||
|
|
||||||
def startUDPSocket(self, bind=None):
|
def startUDPSocket(self, bind=None):
|
||||||
|
|
|
@ -150,7 +150,6 @@ class TCPConnection(BMProto, TLSDispatcher):
|
||||||
))
|
))
|
||||||
self.antiIntersectionDelay(True)
|
self.antiIntersectionDelay(True)
|
||||||
self.fullyEstablished = True
|
self.fullyEstablished = True
|
||||||
# print('inside the set_connection_fully_established in tcp file')
|
|
||||||
if self.isOutbound:
|
if self.isOutbound:
|
||||||
knownnodes.increaseRating(self.destination)
|
knownnodes.increaseRating(self.destination)
|
||||||
Dandelion().maybeAddStem(self)
|
Dandelion().maybeAddStem(self)
|
||||||
|
@ -378,7 +377,6 @@ class TCPServer(AdvancedDispatcher):
|
||||||
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
self.set_reuse_addr()
|
self.set_reuse_addr()
|
||||||
for attempt in range(50):
|
for attempt in range(50):
|
||||||
print('inside the attempt of line 371')
|
|
||||||
try:
|
try:
|
||||||
if attempt > 0:
|
if attempt > 0:
|
||||||
logger.warning('Failed to bind on port %s', port)
|
logger.warning('Failed to bind on port %s', port)
|
||||||
|
|
|
@ -68,7 +68,6 @@ class TLSDispatcher(AdvancedDispatcher):
|
||||||
self.isSSL = False
|
self.isSSL = False
|
||||||
|
|
||||||
def state_tls_init(self):
|
def state_tls_init(self):
|
||||||
# print()
|
|
||||||
"""Prepare sockets for TLS handshake"""
|
"""Prepare sockets for TLS handshake"""
|
||||||
# pylint: disable=attribute-defined-outside-init
|
# pylint: disable=attribute-defined-outside-init
|
||||||
self.isSSL = True
|
self.isSSL = True
|
||||||
|
@ -95,9 +94,7 @@ class TLSDispatcher(AdvancedDispatcher):
|
||||||
ciphers=self.ciphers, do_handshake_on_connect=False)
|
ciphers=self.ciphers, do_handshake_on_connect=False)
|
||||||
self.sslSocket.setblocking(0)
|
self.sslSocket.setblocking(0)
|
||||||
self.want_read = self.want_write = True
|
self.want_read = self.want_write = True
|
||||||
# print('before tls file python 98 state are :- {}'.format(self.state))
|
|
||||||
self.set_state("tls_handshake")
|
self.set_state("tls_handshake")
|
||||||
# print('after tls file python 100 state are :- {}'.format(self.state))
|
|
||||||
return False
|
return False
|
||||||
# if hasattr(self.socket, "context"):
|
# if hasattr(self.socket, "context"):
|
||||||
# self.socket.context.set_ecdh_curve("secp256k1")
|
# self.socket.context.set_ecdh_curve("secp256k1")
|
||||||
|
@ -186,23 +183,18 @@ class TLSDispatcher(AdvancedDispatcher):
|
||||||
return
|
return
|
||||||
|
|
||||||
def tls_handshake(self):
|
def tls_handshake(self):
|
||||||
# print('inside the tls_handshake')
|
|
||||||
"""Perform TLS handshake and handle its stages"""
|
"""Perform TLS handshake and handle its stages"""
|
||||||
# wait for flush
|
# wait for flush
|
||||||
if self.write_buf:
|
if self.write_buf:
|
||||||
return False
|
return False
|
||||||
# Perform the handshake.
|
# Perform the handshake.
|
||||||
try:
|
try:
|
||||||
# print "handshaking (internal)"
|
|
||||||
self.sslSocket.do_handshake()
|
self.sslSocket.do_handshake()
|
||||||
except ssl.SSLError as err:
|
except ssl.SSLError as err:
|
||||||
# print "%s:%i: handshake fail" % (self.destination.host, self.destination.port)
|
|
||||||
self.want_read = self.want_write = False
|
self.want_read = self.want_write = False
|
||||||
if err.args[0] == ssl.SSL_ERROR_WANT_READ:
|
if err.args[0] == ssl.SSL_ERROR_WANT_READ:
|
||||||
# print "want read"
|
|
||||||
self.want_read = True
|
self.want_read = True
|
||||||
if err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
|
if err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
|
||||||
# print "want write"
|
|
||||||
self.want_write = True
|
self.want_write = True
|
||||||
if not (self.want_write or self.want_read):
|
if not (self.want_write or self.want_read):
|
||||||
raise
|
raise
|
||||||
|
|
|
@ -65,19 +65,15 @@ class UDPSocket(BMProto): # pylint: disable=too-many-instance-attributes
|
||||||
# only addr (peer discovery), error and object are implemented
|
# only addr (peer discovery), error and object are implemented
|
||||||
|
|
||||||
def bm_command_getdata(self):
|
def bm_command_getdata(self):
|
||||||
# return BMProto.bm_command_getdata(self)
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def bm_command_inv(self):
|
def bm_command_inv(self):
|
||||||
# return BMProto.bm_command_inv(self)
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def bm_command_addr(self):
|
def bm_command_addr(self):
|
||||||
addresses = self._decode_addr()
|
addresses = self._decode_addr()
|
||||||
# only allow peer discovery from private IPs in order to avoid
|
# only allow peer discovery from private IPs in order to avoid
|
||||||
# attacks from random IPs on the internet
|
# attacks from random IPs on the internet
|
||||||
# if not self.local:
|
|
||||||
# return True
|
|
||||||
self.local = True
|
self.local = True
|
||||||
remoteport = False
|
remoteport = False
|
||||||
for seenTime, stream, services, ip, port in addresses:
|
for seenTime, stream, services, ip, port in addresses:
|
||||||
|
|
Reference in New Issue
Block a user