diff options
| author | Georgi Valkov <gvalkov@gmail.com> | 2024-04-21 02:12:49 +0300 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2024-04-21 13:45:57 -0700 |
| commit | a0c4d8a6fb975d00f3325ef22e1822682ee6bd17 (patch) | |
| tree | c844c440aa70a89e386a95d0ae3c602fd1318610 /utils | |
| parent | 66c237a78fe1b8ad84c232ce050bedddd622e51b (diff) | |
usbmuxd: fix tethering not working after iPhone restart
If the iPhone restarts while the USB cable is still connected,
tethering does not work. This can be fixed by reconnecting.
Fix: if the hotplug.d script detects that carrier is disabled
(no communication), the USB link is reset, and then the
usbmuxd service is restarted. Tethering starts even before
the iPhone is unlocked. As a side effect, if tethering is not
enabled, the iPhone will ding a second time after 5 seconds.
Add dependency on usbutils for usbreset, remove dependency on librt.
[1] https://github.com/libimobiledevice/usbmuxd/issues/218
[2] https://github.com/openwrt/openwrt/issues/12566#issuecomment-2066305622
Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/usbmuxd/Makefile | 6 | ||||
| -rw-r--r-- | utils/usbmuxd/files/usbmuxd.hotplug | 24 |
2 files changed, 28 insertions, 2 deletions
diff --git a/utils/usbmuxd/Makefile b/utils/usbmuxd/Makefile index 32fbc6857..e584d9106 100644 --- a/utils/usbmuxd/Makefile +++ b/utils/usbmuxd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbmuxd PKG_VERSION:=1.1.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads @@ -31,7 +31,7 @@ define Package/usbmuxd SUBMENU:=libimobiledevice TITLE:=USB multiplexing daemon URL:=https://www.libimobiledevice.org/ - DEPENDS:=+librt +libusb-1.0 +libusbmuxd +libopenssl +libimobiledevice + DEPENDS:=+libusb-1.0 +libusbmuxd +libopenssl +libimobiledevice +usbutils endef define Package/usbmuxd/description @@ -50,7 +50,9 @@ endef CONFIGURE_ARGS += --with-systemd define Package/usbmuxd/install + $(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/usbmuxd.hotplug $(1)/etc/hotplug.d/usb/40-usbmuxd $(INSTALL_BIN) ./files/usbmuxd.init $(1)/etc/init.d/usbmuxd $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/usbmuxd $(1)/usr/sbin/ diff --git a/utils/usbmuxd/files/usbmuxd.hotplug b/utils/usbmuxd/files/usbmuxd.hotplug new file mode 100644 index 000000000..84986cc96 --- /dev/null +++ b/utils/usbmuxd/files/usbmuxd.hotplug @@ -0,0 +1,24 @@ +case "$ACTION" in + bind) + dev=/sys$DEVPATH + + [ ! -f /tmp/iPhone.lock ] && [ -d ${dev}/net ] && + { + readlink ${dev}/driver | grep -q ipheth && + { + sleep 5 + carrier_path=${dev}/net/*/carrier + carrier=`cat ${carrier_path}` + + [ "${carrier}" = "0" ] && + { + touch /tmp/iPhone.lock + logger -p daemon.error -t iPhone ${carrier_path} = ${carrier} + logger -p daemon.error -t iPhone `/usr/bin/usbreset iPhone` + /etc/init.d/usbmuxd restart + sleep 5 && rm -f /tmp/iPhone.lock & + } + } + } + ;; +esac |