pymobiledevice3 4.21.4__py3-none-any.whl → 4.21.6__py3-none-any.whl

pymobiledevice3/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.21.4'
-__version_tuple__ = version_tuple = (4, 21, 4)
+__version__ = version = '4.21.6'
+__version_tuple__ = version_tuple = (4, 21, 6)

pymobiledevice3/remote/tunnel_service.py

@@ -21,7 +21,6 @@ from socket import create_connection
 from ssl import VerifyMode
 from typing import Optional, TextIO, cast
 
-import aiofiles
 from construct import Const, Container
 from construct import Enum as ConstructEnum
 from construct import GreedyBytes, GreedyRange, Int8ul, Int16ub, Int64ul, Prefixed, Struct
@@ -68,6 +67,7 @@ from pymobiledevice3.remote.xpc_message import XpcInt64Type, XpcUInt64Type
 from pymobiledevice3.service_connection import ServiceConnection
 from pymobiledevice3.utils import asyncio_print_traceback
 
+DEFAULT_INTERFACE_NAME = 'pymobiledevice3-tunnel'
 TIMEOUT = 1
 
 OSUTIL = get_os_utils()
@@ -160,24 +160,30 @@ class RemotePairingTunnel(ABC):
         read_size = self.tun.mtu + len(LOOPBACK_HEADER)
         try:
             if sys.platform != 'win32':
-                async with aiofiles.open(self.tun.fileno(), 'rb', opener=lambda path, flags: path, buffering=0) as f:
-                    while True:
-                        packet = await f.read(read_size)
-                        assert packet.startswith(LOOPBACK_HEADER)
-                        packet = packet[len(LOOPBACK_HEADER):]
-                        await self.send_packet_to_device(packet)
+                while True:
+                    packet = await asyncio.to_thread(self.tun.read, read_size)
+                    assert packet.startswith(LOOPBACK_HEADER)
+                    packet = packet[len(LOOPBACK_HEADER):]
+                    await self.send_packet_to_device(packet)
             else:
                 while True:
-                    packet = await asyncio.get_running_loop().run_in_executor(None, self.tun.read)
+                    packet = await self.tun.async_read()
                     if packet:
+                        if (packet[0] >> 4) != 6:
+                            # Make sure to output only IPv6 packets
+                            continue
                         await self.send_packet_to_device(packet)
         except ConnectionResetError:
             self._logger.warning(f'got connection reset in {asyncio.current_task().get_name()}')
         except OSError:
             self._logger.warning(f'got oserror in {asyncio.current_task().get_name()}')
 
-    def start_tunnel(self, address: str, mtu: int) -> None:
-        self.tun = TunTapDevice()
+    def start_tunnel(self, address: str, mtu: int, interface_name=DEFAULT_INTERFACE_NAME) -> None:
+        if 'win32' == sys.platform:
+            # Only win32 tunnel implementation supports interface name
+            self.tun = TunTapDevice(interface_name)
+        else:
+            self.tun = TunTapDevice()
         self.tun.addr = address
         self.tun.mtu = mtu
         self.tun.up()
@@ -232,8 +238,8 @@ class RemotePairingQuicTunnel(RemotePairingTunnel, QuicConnectionProtocol):
             await self.ping()
             await asyncio.sleep(self._quic.configuration.idle_timeout / 2)
 
-    def start_tunnel(self, address: str, mtu: int) -> None:
-        super().start_tunnel(address, mtu)
+    def start_tunnel(self, address: str, mtu: int, interface_name=DEFAULT_INTERFACE_NAME) -> None:
+        super().start_tunnel(address, mtu, interface_name=interface_name)
         self._keep_alive_task = asyncio.create_task(self.keep_alive_task())
 
     async def stop_tunnel(self) -> None:
@@ -295,21 +301,21 @@ class RemotePairingTcpTunnel(RemotePairingTunnel):
         await self._writer.drain()
         return json.loads(CDTunnelPacket.parse(await self._reader.read(self.REQUESTED_MTU)).body)
 
-    def start_tunnel(self, address: str, mtu: int) -> None:
-        super().start_tunnel(address, mtu)
+    def start_tunnel(self, address: str, mtu: int, interface_name=DEFAULT_INTERFACE_NAME) -> None:
+        super().start_tunnel(address, mtu, interface_name=interface_name)
         self._sock_read_task = asyncio.create_task(self.sock_read_task(), name=f'sock-read-task-{address}')
 
     async def stop_tunnel(self) -> None:
         self._sock_read_task.cancel()
         with suppress(CancelledError):
             await self._sock_read_task
+        await super().stop_tunnel()
         if not self._writer.is_closing():
             self._writer.close()
             try:
                 await self._writer.wait_closed()
             except OSError:
                 pass
-        await super().stop_tunnel()
 
 
 @dataclasses.dataclass
@@ -437,7 +443,8 @@ class RemotePairingProtocol(StartTcpTunnel):
                 await client.wait_connected()
                 handshake_response = await client.request_tunnel_establish()
                 client.start_tunnel(handshake_response['clientParameters']['address'],
-                                    handshake_response['clientParameters']['mtu'])
+                                    handshake_response['clientParameters']['mtu'],
+                                    interface_name=f'{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}')
                 try:
                     yield TunnelResult(
                         client.tun.name, handshake_response['serverAddress'], handshake_response['serverRSDPort'],
@@ -471,7 +478,8 @@ class RemotePairingProtocol(StartTcpTunnel):
         handshake_response = await tunnel.request_tunnel_establish()
 
         tunnel.start_tunnel(handshake_response['clientParameters']['address'],
-                            handshake_response['clientParameters']['mtu'])
+                            handshake_response['clientParameters']['mtu'],
+                            interface_name=f'{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}')
 
         try:
             yield TunnelResult(
@@ -945,7 +953,8 @@ class CoreDeviceTunnelProxy(StartTcpTunnel):
         tunnel = RemotePairingTcpTunnel(self._service.reader, self._service.writer)
         handshake_response = await tunnel.request_tunnel_establish()
         tunnel.start_tunnel(handshake_response['clientParameters']['address'],
-                            handshake_response['clientParameters']['mtu'])
+                            handshake_response['clientParameters']['mtu'],
+                            interface_name=f'{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}')
         try:
             yield TunnelResult(
                 tunnel.tun.name, handshake_response['serverAddress'], handshake_response['serverRSDPort'],

{pymobiledevice3-4.21.4.dist-info → pymobiledevice3-4.21.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.21.4
+Version: 4.21.6
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
@@ -58,8 +58,7 @@ Requires-Dist: qh3<2,>=1.0.0
 Requires-Dist: developer_disk_image>=0.0.2
 Requires-Dist: opack2
 Requires-Dist: psutil
-Requires-Dist: pytun-pmd3>=2.0.9
-Requires-Dist: aiofiles
+Requires-Dist: pytun-pmd3>=2.1.0
 Requires-Dist: prompt_toolkit
 Requires-Dist: sslpsk-pmd3>=1.0.3; python_version < "3.13"
 Requires-Dist: python-pcapng>=2.1.1

{pymobiledevice3-4.21.4.dist-info → pymobiledevice3-4.21.6.dist-info}/RECORD

@@ -8,7 +8,7 @@ misc/understanding_idevice_protocol_layers.md,sha256=8tEqRXWOUPoxOJLZVh7C7H9JGCh
 misc/usbmux_sniff.sh,sha256=iWtbucOEQ9_UEFXk9x-2VNt48Jg5zrPsnUbZ_LfZxwA,212
 pymobiledevice3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/__main__.py,sha256=nwUgfXBMii2MSXLUls2uMTG88uC13s4haPBM4LuGcaU,11530
-pymobiledevice3/_version.py,sha256=L0S9xHZAqvyvcVNRszketqOwbVGHMmww4Q5KcJSZP7E,513
+pymobiledevice3/_version.py,sha256=WjwQTI6LRzwsShpVvMPvi_IUxnnCUPhIGoX94CHWQTY,513
 pymobiledevice3/bonjour.py,sha256=FXa_x0Zdo6ims7N7F61hnnZEyn1tc2it3mQpHRMY0Kk,5560
 pymobiledevice3/ca.py,sha256=Ho0NaOtATe5hdruUSlVDRpfR9ltEYXjL3MoKwEvEJjw,2296
 pymobiledevice3/common.py,sha256=-PG6oaUkNFlB3jb7E0finMrX8wqhkS-cuTAfmLvZUmc,329
@@ -60,7 +60,7 @@ pymobiledevice3/remote/module_imports.py,sha256=DwExSL1r4kkFIWmXiQpqPo-cGl4duYd3
 pymobiledevice3/remote/remote_service.py,sha256=fCyzm4oT_WEorAXVHVLYnIOyTOuMGhX69Co3HkUdRYY,867
 pymobiledevice3/remote/remote_service_discovery.py,sha256=iqPE1PiDDB2ISK-ThuUPEiSU9ETZ-FGTcANhb6MrWmo,7156
 pymobiledevice3/remote/remotexpc.py,sha256=KbFHaH4D3RnaATve6kaIpJMHNF8H-kdhbRbEbxFmO6w,8082
-pymobiledevice3/remote/tunnel_service.py,sha256=a9s2pDnPfGCP166eb2CAeQEORwxNoUTn5OftjiODN7g,45761
+pymobiledevice3/remote/tunnel_service.py,sha256=zVg9t7Z_zzK4Rav8Xn_UEanIXTzBvcjEsd_-bBYs1CE,46451
 pymobiledevice3/remote/utils.py,sha256=BgUODRwkET5lyloZxJ-PrVZqTvyOlBuJ-MM7OCSqZ9g,2506
 pymobiledevice3/remote/xpc_message.py,sha256=-nVbf88ZN4ZNxLg6cOq4FfeKXYAoVRKnwGdfe7s-sZE,9336
 pymobiledevice3/remote/core_device/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -164,9 +164,9 @@ pymobiledevice3/services/web_protocol/switch_to.py,sha256=hDddJUEePbRN-8xlllOeGh
 pymobiledevice3/tunneld/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/tunneld/api.py,sha256=EfGKXEWhsMSB__menPmRmL9R6dpazVJDUy7B3pn05MM,2357
 pymobiledevice3/tunneld/server.py,sha256=SvC57AV_R8YQhA0fCwGNUdhfy8TKMFWwL_fp_FmXrBI,22715
-pymobiledevice3-4.21.4.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-pymobiledevice3-4.21.4.dist-info/METADATA,sha256=snPi-jeUNDZeBWNFCmjmxcQOFlesyeiqx-MEcumR7Tg,17500
-pymobiledevice3-4.21.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymobiledevice3-4.21.4.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
-pymobiledevice3-4.21.4.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
-pymobiledevice3-4.21.4.dist-info/RECORD,,
+pymobiledevice3-4.21.6.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+pymobiledevice3-4.21.6.dist-info/METADATA,sha256=lTExHG3NlhqzhJvwJ-C0w30OI2gNGI3dxWtohrWRRUE,17476
+pymobiledevice3-4.21.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymobiledevice3-4.21.6.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
+pymobiledevice3-4.21.6.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
+pymobiledevice3-4.21.6.dist-info/RECORD,,