Skip to content

Commit 5e350f2

Browse files
authored
Change default protocol version to 0 (#419)
1 parent 80d7872 commit 5e350f2

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

snitun/client/client_peer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
)
1414
from ..multiplexer.core import Multiplexer
1515
from ..multiplexer.crypto import CryptoTransport
16-
from ..utils import PROTOCOL_VERSION
16+
from ..utils import DEFAULT_PROTOCOL_VERSION
1717
from ..utils.asyncio import asyncio_timeout, make_task_waiter_future
1818
from .connector import Connector
1919

@@ -53,7 +53,7 @@ async def start(
5353
aes_key: bytes,
5454
aes_iv: bytes,
5555
throttling: int | None = None,
56-
protocol_version: int = PROTOCOL_VERSION,
56+
protocol_version: int = DEFAULT_PROTOCOL_VERSION,
5757
) -> None:
5858
"""Connect an start ClientPeer."""
5959
if self._multiplexer:

snitun/utils/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Utils & function for implementations."""
22

3-
from .server import PROTOCOL_VERSION
3+
from .server import DEFAULT_PROTOCOL_VERSION, PROTOCOL_VERSION
44

5-
__all__ = ("PROTOCOL_VERSION",)
5+
__all__ = ("DEFAULT_PROTOCOL_VERSION", "PROTOCOL_VERSION")

snitun/utils/aiohttp_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from ..client.client_peer import ClientPeer
1616
from ..client.connector import Connector
17-
from . import PROTOCOL_VERSION
17+
from . import DEFAULT_PROTOCOL_VERSION
1818
from .asyncio import asyncio_timeout
1919

2020
_LOGGER = logging.getLogger(__name__)
@@ -102,7 +102,7 @@ async def connect(
102102
aes_key: bytes,
103103
aes_iv: bytes,
104104
throttling: int | None = None,
105-
protocol_version: int = PROTOCOL_VERSION,
105+
protocol_version: int = DEFAULT_PROTOCOL_VERSION,
106106
) -> None:
107107
"""Connect to SniTun server."""
108108
if self._client.is_connected:

snitun/utils/server.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
MAX_READ_SIZE = 4_096
1212
MAX_BUFFER_SIZE = 1_024_000
1313
PROTOCOL_VERSION = 1
14+
DEFAULT_PROTOCOL_VERSION = 0
1415

1516

1617
class TokenData(TypedDict):

tests/utils/test_aiohttp_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ async def test_client_connect_with_protocol_version() -> None:
5757
mock_client_peer.start.assert_called_once()
5858
args = mock_client_peer.start.call_args
5959
assert "protocol_version" in args.kwargs
60-
assert args.kwargs["protocol_version"] == 1 # Default PROTOCOL_VERSION
60+
assert args.kwargs["protocol_version"] == 0 # DEFAULT_PROTOCOL_VERSION
6161

6262
mock_client_peer.start.reset_mock()
6363
await client.connect(

0 commit comments

Comments
 (0)