oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
HelloZeroNet 2016-04-25 02:20:55 +02:00
parent be49b6d35a
commit 2a8355dba7
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Connection/Connection.py
View file

@ -1,6 +1,5 @@
import socket import socket
import time import time
import hashlib
import gevent import gevent
import msgpack import msgpack
@ -9,7 +8,6 @@ from Config import config
from Debug import Debug from Debug import Debug
from util import StreamingMsgpack from util import StreamingMsgpack
from Crypt import CryptConnection from Crypt import CryptConnection
from Site import SiteManager
class Connection(object): class Connection(object):
@ -130,6 +128,7 @@ class Connection(object):
self.protocol = "v2" self.protocol = "v2"
self.updateName() self.updateName()
self.connected = True self.connected = True
buff_len = 0
self.unpacker = msgpack.Unpacker() self.unpacker = msgpack.Unpacker()
try: try:
@ -137,12 +136,13 @@ class Connection(object):
buff = self.sock.recv(16 * 1024) buff = self.sock.recv(16 * 1024)
if not buff: if not buff:
break # Connection closed break # Connection closed
buff_len = len(buff)
# Statistics # Statistics
self.last_recv_time = time.time() self.last_recv_time = time.time()
self.incomplete_buff_recv += 1 self.incomplete_buff_recv += 1
self.bytes_recv += len(buff) self.bytes_recv += buff_len
self.server.bytes_recv += len(buff) self.server.bytes_recv += buff_len
if not self.unpacker: if not self.unpacker:
self.unpacker = msgpack.Unpacker() self.unpacker = msgpack.Unpacker()
@ -202,7 +202,7 @@ class Connection(object):
def setHandshake(self, handshake): def setHandshake(self, handshake):
self.handshake = handshake self.handshake = handshake
if handshake.get("port_opened", None) is False and not "onion" in handshake: # Not connectable if handshake.get("port_opened", None) is False and "onion" not in handshake: # Not connectable
self.port = 0 self.port = 0
else: else:
self.port = handshake["fileserver_port"] # Set peer fileserver port self.port = handshake["fileserver_port"] # Set peer fileserver port
@ -296,8 +296,6 @@ class Connection(object):
# Stream socket directly to a file # Stream socket directly to a file
def handleStream(self, message): def handleStream(self, message):
if config.debug_socket:
self.log("Starting stream %s: %s bytes" % (message["to"], message["stream_bytes"]))
read_bytes = message["stream_bytes"] # Bytes left we have to read from socket read_bytes = message["stream_bytes"] # Bytes left we have to read from socket
try: try:
@ -309,6 +307,9 @@ class Connection(object):
read_bytes -= len(buff) read_bytes -= len(buff)
file.write(buff) file.write(buff)
if config.debug_socket:
self.log("Starting stream %s: %s bytes (%s from unpacker)" % (message["to"], message["stream_bytes"], len(buff)))
try: try:
while 1: while 1:
if read_bytes <= 0: if read_bytes <= 0: