diff options
| -rw-r--r-- | contrib/libusb-Fix-Zero-Length-Packet-issue.patch | 71 | ||||
| -rw-r--r-- | usbmuxd/usb-linux.c | 29 |
2 files changed, 100 insertions, 0 deletions
diff --git a/contrib/libusb-Fix-Zero-Length-Packet-issue.patch b/contrib/libusb-Fix-Zero-Length-Packet-issue.patch new file mode 100644 index 0000000..40fc2dc --- /dev/null +++ b/contrib/libusb-Fix-Zero-Length-Packet-issue.patch @@ -0,0 +1,71 @@ +>From e6a34fe2fcd69d05411d3a8d41c8e897c9c337e1 Mon Sep 17 00:00:00 2001 +From: Nikias Bassen <nikias@gmx.li> +Date: Mon, 17 Aug 2009 00:48:17 +0200 +Subject: [PATCH] Fix Zero Length Packet issue, new LIBUSB_TRANSFER_ZERO_PACKET flag. + +This patch fixes the Zero Length Packet issue by allowing the client +program to specify the LIBUSB_TRANSFER_ZERO_PACKET flag when calling +libusb_submit_transfer. This will pass the URB_ZERO_PACKET flag to the +appropriate ioctl and thus triggers zero-length packet processing +inside the kernel. This patch will also pass the URB_SHORT_NOT_OK flag +if LIBUSB_TRANSFER_SHORT_NOT_OK is specified. +--- + libusb/libusb.h | 5 ++++- + libusb/os/linux_usbfs.c | 5 +++++ + libusb/os/linux_usbfs.h | 8 +++++--- + 3 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/libusb/libusb.h b/libusb/libusb.h +index 1126380..1dc7ae0 100644 +--- a/libusb/libusb.h ++++ b/libusb/libusb.h +@@ -672,7 +672,10 @@ enum libusb_transfer_flags { + * If this flag is set, it is illegal to call libusb_free_transfer() + * from your transfer callback, as this will result in a double-free + * when this flag is acted upon. */ +- LIBUSB_TRANSFER_FREE_TRANSFER = 1<<2 ++ LIBUSB_TRANSFER_FREE_TRANSFER = 1<<2, ++ ++ /** zero-terminate a packet that is N*wMaxPacketSize bytes long */ ++ LIBUSB_TRANSFER_ZERO_PACKET = 1<<3 + }; + + /** \ingroup asyncio +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c +index 1280188..81a9498 100644 +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c +@@ -1307,6 +1307,11 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer, + else + urb->buffer_length = MAX_BULK_BUFFER_LENGTH; + ++ if (transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) ++ urb->flags |= USBFS_URB_SHORT_NOT_OK; ++ if (transfer->flags & LIBUSB_TRANSFER_ZERO_PACKET) ++ urb->flags |= USBFS_URB_ZERO_PACKET; ++ + r = ioctl(dpriv->fd, IOCTL_USBFS_SUBMITURB, urb); + if (r < 0) { + int j; +diff --git a/libusb/os/linux_usbfs.h b/libusb/os/linux_usbfs.h +index fdf5e9b..4660e3b 100644 +--- a/libusb/os/linux_usbfs.h ++++ b/libusb/os/linux_usbfs.h +@@ -60,9 +60,11 @@ struct usbfs_getdriver { + char driver[USBFS_MAXDRIVERNAME + 1]; + }; + +-#define USBFS_URB_DISABLE_SPD 1 +-#define USBFS_URB_ISO_ASAP 2 +-#define USBFS_URB_QUEUE_BULK 0x10 ++#define USBFS_URB_SHORT_NOT_OK 0x01 ++#define USBFS_URB_ISO_ASAP 0x02 ++#define USBFS_URB_NO_FSBR 0x20 ++#define USBFS_URB_ZERO_PACKET 0x40 ++#define USBFS_URB_NO_INTERRUPT 0x80 + + enum usbfs_urb_type { + USBFS_URB_TYPE_ISO = 0, +-- +1.6.0.4 + diff --git a/usbmuxd/usb-linux.c b/usbmuxd/usb-linux.c index fb22d03..2d6053e 100644 --- a/usbmuxd/usb-linux.c +++ b/usbmuxd/usb-linux.c @@ -33,6 +33,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "log.h" #include "device.h" +#ifndef LIBUSB_TRANSFER_ZERO_PACKET +#warning Your libusb is missing proper Zero Length Packet support! +#warning +#warning If you are using a recent libusb Git, things may or may not work. +#warning If you are using libusb 1.0.2 or earlier, things will definitely not work +#warning properly. +#warning +#warning Please apply the patch in the contrib/ directory to your libusb 1.0 tree. +#define EXPLICIT_ZLP_TRANSACTION +#endif + // interval for device connection/disconnection polling, in milliseconds // we need this because there is currently no asynchronous device discovery mechanism in libusb #define DEVICE_POLL_TIME 1000 @@ -134,15 +145,33 @@ int usb_send(struct usb_device *dev, const unsigned char *buf, int length) struct libusb_transfer *xfer = libusb_alloc_transfer(0); libusb_fill_bulk_transfer(xfer, dev->dev, BULK_OUT, (void*)buf, length, tx_callback, dev, 0); xfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK; +#ifndef EXPLICIT_ZLP_TRANSACTION if (length % dev->wMaxPacketSize == 0) { xfer->flags |= LIBUSB_TRANSFER_ZERO_PACKET; } +#endif if((res = libusb_submit_transfer(xfer)) < 0) { usbmuxd_log(LL_ERROR, "Failed to submit TX transfer %p len %d to device %d-%d: %d", buf, length, dev->bus, dev->address, res); libusb_free_transfer(xfer); return res; } collection_add(&dev->tx_xfers, xfer); +#ifdef EXPLICIT_ZLP_TRANSACTION + if (length % dev->wMaxPacketSize == 0) { + usbmuxd_log(LL_DEBUG, "Send ZLP"); + // Send Zero Length Packet + xfer = libusb_alloc_transfer(0); + void *buffer = malloc(1); + libusb_fill_bulk_transfer(xfer, dev->dev, BULK_OUT, buffer, 0, tx_callback, dev, 0); + xfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK; + if((res = libusb_submit_transfer(xfer)) < 0) { + usbmuxd_log(LL_ERROR, "Failed to submit TX ZLP transfer to device %d-%d: %d", dev->bus, dev->address, res); + libusb_free_transfer(xfer); + return res; + } + collection_add(&dev->tx_xfers, xfer); + } +#endif return 0; } |