pymobiledevice3 4.21.3__tar.gz → 4.21.5__tar.gz

{pymobiledevice3-4.21.3 → pymobiledevice3-4.21.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.21.3
+Version: 4.21.5
 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,7 +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: pytun-pmd3>=2.1.0
 Requires-Dist: aiofiles
 Requires-Dist: prompt_toolkit
 Requires-Dist: sslpsk-pmd3>=1.0.3; python_version < "3.13"

{pymobiledevice3-4.21.3 → pymobiledevice3-4.21.5}/pymobiledevice3/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.21.3'
-__version_tuple__ = version_tuple = (4, 21, 3)
+__version__ = version = '4.21.5'
+__version_tuple__ = version_tuple = (4, 21, 5)

{pymobiledevice3-4.21.3 → pymobiledevice3-4.21.5}/pymobiledevice3/remote/tunnel_service.py

@@ -68,6 +68,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()
@@ -168,16 +169,23 @@ class RemotePairingTunnel(ABC):
                         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 +240,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,8 +303,8 @@ 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:
@@ -437,7 +445,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 +480,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 +955,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.3 → pymobiledevice3-4.21.5}/pymobiledevice3/restore/restore.py

@@ -220,7 +220,7 @@ class Restore(BaseRestore):
         elif image_name == '__SystemVersion__':
             data = self.ipsw.system_version
         else:
-            data = self.get_personalized_data(component_name, data=data, tss=self.recovery.tss)
+            data = self.get_personalized_data(component_name, tss=self.recovery.tss)
 
         self.logger.info(f'Sending {component_name} now...')
         chunk_size = 8192

{pymobiledevice3-4.21.3 → pymobiledevice3-4.21.5}/pymobiledevice3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.21.3
+Version: 4.21.5
 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,7 +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: pytun-pmd3>=2.1.0
 Requires-Dist: aiofiles
 Requires-Dist: prompt_toolkit
 Requires-Dist: sslpsk-pmd3>=1.0.3; python_version < "3.13"

{pymobiledevice3-4.21.3 → pymobiledevice3-4.21.5}/pymobiledevice3.egg-info/requires.txt

@@ -36,7 +36,7 @@ qh3<2,>=1.0.0
 developer_disk_image>=0.0.2
 opack2
 psutil
-pytun-pmd3>=2.0.9
+pytun-pmd3>=2.1.0
 aiofiles
 prompt_toolkit
 python-pcapng>=2.1.1

{pymobiledevice3-4.21.3 → pymobiledevice3-4.21.5}/requirements.txt

@@ -36,7 +36,7 @@ qh3>=1.0.0,<2
 developer_disk_image>=0.0.2
 opack2
 psutil
-pytun-pmd3>=2.0.9
+pytun-pmd3>=2.1.0
 aiofiles
 prompt_toolkit
 sslpsk-pmd3>=1.0.3;python_version<'3.13'