StarMirror
/
py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

plaintext: use varint msg read/writer

pull/406/head
mhchia 2020-02-20 22:55:11 +08:00
parent 6016ea731b
commit f8240bd2cb
No known key found for this signature in database
GPG Key ID: 389EFBEA1362589A
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libp2p/security/insecure/transport.py
View File

@ -3,7 +3,7 @@ from libp2p.crypto.keys import PrivateKey, PublicKey
from libp2p.crypto.pb import crypto_pb2 from libp2p.crypto.pb import crypto_pb2
from libp2p.crypto.serialization import deserialize_public_key from libp2p.crypto.serialization import deserialize_public_key
from libp2p.io.abc import ReadWriteCloser from libp2p.io.abc import ReadWriteCloser
from libp2p.io.msgio import FixedSizeLenMsgReadWriter from libp2p.io.msgio import VarIntLengthMsgReadWriter
from libp2p.network.connection.exceptions import RawConnError from libp2p.network.connection.exceptions import RawConnError
from libp2p.network.connection.raw_connection_interface import IRawConnection from libp2p.network.connection.raw_connection_interface import IRawConnection
from libp2p.peer.id import ID from libp2p.peer.id import ID
@ -20,11 +20,9 @@ from .pb import plaintext_pb2
PLAINTEXT_PROTOCOL_ID = TProtocol("/plaintext/2.0.0") PLAINTEXT_PROTOCOL_ID = TProtocol("/plaintext/2.0.0")
SIZE_PLAINTEXT_LEN_BYTES = 4
class PlaintextHandshakeReadWriter(VarIntLengthMsgReadWriter):
class PlaintextHandshakeReadWriter(FixedSizeLenMsgReadWriter): max_msg_size = 1 << 16
size_len_bytes = SIZE_PLAINTEXT_LEN_BYTES
class InsecureSession(BaseSession): class InsecureSession(BaseSession):

7
libp2p/tools/interop/daemon.py
View File

@ -8,7 +8,6 @@ import trio
from libp2p.peer.id import ID from libp2p.peer.id import ID
from libp2p.peer.peerinfo import PeerInfo, info_from_p2p_addr from libp2p.peer.peerinfo import PeerInfo, info_from_p2p_addr
from libp2p.security.insecure.transport import PLAINTEXT_PROTOCOL_ID
from libp2p.typing import TProtocol from libp2p.typing import TProtocol
from .constants import LOCALHOST_IP from .constants import LOCALHOST_IP
@ -28,10 +27,8 @@ class P2PDProcess(BaseInteractiveProcess):
is_pubsub_signing: bool = False, is_pubsub_signing: bool = False,
is_pubsub_signing_strict: bool = False, is_pubsub_signing_strict: bool = False,
) -> None: ) -> None:
args = [f"-listen={control_maddr!s}"] # NOTE: To support `-security`, we need to hack `go-libp2p-daemon`.
# NOTE: To support `-insecure`, we need to hack `go-libp2p-daemon`. args = [f"-listen={control_maddr!s}", f"-security={security_protocol}"]
if security_protocol == PLAINTEXT_PROTOCOL_ID:
args.append("-insecure=true")
if is_pubsub_enabled: if is_pubsub_enabled:
args.append("-pubsub") args.append("-pubsub")
if is_gossipsub: if is_gossipsub:

1
tests_interop/test_echo.py
View File

@ -6,7 +6,6 @@ import pytest
import trio import trio
from libp2p.peer.peerinfo import PeerInfo, info_from_p2p_addr from libp2p.peer.peerinfo import PeerInfo, info_from_p2p_addr
from libp2p.security.insecure.transport import PLAINTEXT_PROTOCOL_ID
from libp2p.tools.factories import HostFactory from libp2p.tools.factories import HostFactory
from libp2p.tools.interop.envs import GO_BIN_PATH from libp2p.tools.interop.envs import GO_BIN_PATH
from libp2p.tools.interop.process import BaseInteractiveProcess from libp2p.tools.interop.process import BaseInteractiveProcess