mirror of
https://github.com/TeamPGM/pyrogram.git
synced 2024-11-23 23:34:28 +00:00
Lock the send method for every tcp mode, not only for tcp_full
This commit is contained in:
parent
dde01cc9b9
commit
b23b41bc7d
@ -17,6 +17,7 @@
|
||||
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import logging
|
||||
import threading
|
||||
import time
|
||||
|
||||
from .transport import *
|
||||
@ -34,6 +35,7 @@ class Connection:
|
||||
def __init__(self, ipv4: str, mode: int = 1):
|
||||
self.address = (ipv4, 80)
|
||||
self.mode = self.MODES.get(mode, TCPAbridged)
|
||||
self.lock = threading.Lock()
|
||||
self.connection = None
|
||||
|
||||
def connect(self):
|
||||
@ -53,7 +55,8 @@ class Connection:
|
||||
self.connection.close()
|
||||
|
||||
def send(self, data: bytes):
|
||||
self.connection.send(data)
|
||||
with self.lock:
|
||||
self.connection.send(data)
|
||||
|
||||
def recv(self) -> bytes or None:
|
||||
return self.connection.recv()
|
||||
|
@ -19,7 +19,6 @@
|
||||
import logging
|
||||
from binascii import crc32
|
||||
from struct import pack, unpack
|
||||
from threading import Lock
|
||||
|
||||
from .tcp import TCP
|
||||
|
||||
@ -30,7 +29,6 @@ class TCPFull(TCP):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.seq_no = None
|
||||
self.lock = Lock()
|
||||
|
||||
def connect(self, address: tuple):
|
||||
super().connect(address)
|
||||
@ -38,14 +36,12 @@ class TCPFull(TCP):
|
||||
log.info("Connected!")
|
||||
|
||||
def send(self, data: bytes):
|
||||
with self.lock:
|
||||
# 12 = packet_length (4), seq_no (4), crc32 (4) (at the end)
|
||||
data = pack("<II", len(data) + 12, self.seq_no) + data
|
||||
data += pack("<I", crc32(data))
|
||||
# 12 = packet_length (4), seq_no (4), crc32 (4) (at the end)
|
||||
data = pack("<II", len(data) + 12, self.seq_no) + data
|
||||
data += pack("<I", crc32(data))
|
||||
self.seq_no += 1
|
||||
|
||||
self.seq_no += 1
|
||||
|
||||
super().sendall(data)
|
||||
super().sendall(data)
|
||||
|
||||
def recv(self) -> bytes or None:
|
||||
length = self.recvall(4)
|
||||
|
Loading…
Reference in New Issue
Block a user