fixes

Author: ESResearchDepartment

.gitignore

@@ -45,3 +45,6 @@ udev/39-usbmuxd.rules
 config.h.in~
 Build/
 configure~
+xcuserdata
+project.xcworkspace
+xcshareddata

autogen.sh

@@ -1,23 +1,29 @@
 #!/bin/sh
 
-#cleanup cache for correct versioning when run multiple times
-rm -rf autom4te.cache
+olddir=`pwd`
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-gprefix=`which glibtoolize 2>&1 >/dev/null`
-if [ $? -eq 0 ]; then
-  glibtoolize --force
-else
-  libtoolize --force
-fi
-aclocal -I m4
-autoheader
-automake --add-missing
-autoconf
-requires_pkgconfig=`which pkg-config 2>&1 >/dev/null`
-if [ $? -ne 0 ]; then
-  echo "Missing required pkg-config. Please install it on your system and run again."
-fi
+(
+  cd "$srcdir"
+
+  #cleanup cache for correct versioning when run multiple times
+  rm -rf autom4te.cache
+
+  gprefix=`which glibtoolize 2>&1 >/dev/null`
+  if [ $? -eq 0 ]; then
+    glibtoolize --force
+  else
+    libtoolize --force
+  fi
+  aclocal -I m4
+  autoheader
+  automake --add-missing
+  autoconf
+
+  cd "$olddir"
+)
 
 if [ -z "$NOCONFIGURE" ]; then
-    ./configure "$@"
-fi
+  $srcdir/configure "$@"
+fi

usbmuxd2/Devices/USBDevice.cpp

@@ -13,6 +13,8 @@
 
 #include <mutex>
 
+#include <string.h>
+
 #pragma mark libusb_callback implementations
 void tx_callback(struct libusb_transfer *xfer) noexcept{
     std::shared_ptr<USBDevice> dev = *(std::shared_ptr<USBDevice> *)xfer->user_data;
@@ -391,18 +393,19 @@ void USBDevice::device_data_input(unsigned char *buffer, uint32_t length){
                 _data_in_event.notifyAll();
             });
             uint16_t txseq = ntohs(mhdr->v2.tx_seq);
-//            debug("----- MUX txseq=%d rxseq=%d -- _muxdev.tx_seq=%d _muxdev.rx_seq=%d",txseq,rxseq,_muxdev.tx_seq,_muxdev.rx_seq);
+//            debug("----- MUX txseq=%d -- _muxdev.tx_seq=%d _muxdev.rx_seq=%d",txseq,_muxdev.tx_seq,_muxdev.rx_seq);
             if ((uint16_t)(_muxdev.rx_seq+1) != txseq) {
-                while ((uint16_t)(_muxdev.rx_seq+1) != txseq) {
+                while ((uint16_t)(_muxdev.rx_seq+1) < txseq || (uint16_t)(_muxdev.rx_seq+1+_rx_xfers.size()) < txseq + _rx_xfers.size()) {
                     uint64_t wevent = _data_in_event.getNextEvent();
                     ul.unlock();
                     _data_in_event.waitForEvent(wevent);
                     ul.lock();
                 }
             }
-#ifdef DEBUG
-            assert((uint16_t)(_muxdev.rx_seq+1) == txseq);
-#endif
+            if ((uint16_t)(_muxdev.rx_seq+1) != txseq){
+                debug("Discarding duplicated MUX packet txseq=%d -- _muxdev.tx_seq=%d _muxdev.rx_seq=%d",txseq,_muxdev.tx_seq,_muxdev.rx_seq);
+                return;
+            }
             _muxdev.rx_seq = txseq;
         }
 

usbmuxd2/Devices/WIFIDevice.hpp

@@ -9,13 +9,15 @@
 #define WIFIDevice_hpp
 
 #include "Device.hpp"
-#include <string>
 #include <libgeneral/Manager.hpp>
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/heartbeat.h>
 #include <libimobiledevice/lockdown.h>
 #include <plist/plist.h>
 
+#include <iostream>
+#include <vector>
+
 class WIFIDeviceManager;
 class WIFIDevice : public Device, tihmstar::Manager {
     WIFIDeviceManager *_parent;

usbmuxd2/Manager/USBDeviceManager.cpp

@@ -9,6 +9,7 @@
 #include "../Devices/USBDevice.hpp"
 
 #include <unistd.h>
+#include <string.h>
 
 #pragma mark libusb_callback definitions
 int usb_hotplug_cb(libusb_context *ctx, libusb_device *device, libusb_hotplug_event event, void *user_data) noexcept;

usbmuxd2/Muxer.cpp

@@ -22,6 +22,9 @@
 #endif //HAVE_AVAHI
 
 #include <arpa/inet.h>
+#include <netinet/in.h>
+
+#include <string.h>
 
 #define MAXID (INT_MAX/2)
 #define INVALID_ID (MAXID + 1)
@@ -479,12 +482,18 @@ plist_t Muxer::getDevicePlist(std::shared_ptr<Device> dev) noexcept{
                 plist_dict_set_item(p_props, "NetworkAddress", plist_new_data(buf, sizeof(buf)));
             }else{
                 //this is an IPv6 addr
-                struct sockaddr_in6 *ip6 = (struct sockaddr_in6 *)buf;
-                *ip6 ={
-                    .sin6_len = sizeof(sockaddr_in6),
-                    .sin6_family = 0x1E, //AF_INET6 (bsd)
-                    .sin6_scope_id = wifidev->_interfaceIndex
+                struct my_sockaddr_in6 { //this is not available on linux
+                    uint8_t         sin6_len;       /* length of this struct(sa_family_t) */
+                    uint8_t         sin6_family;    /* AF_INET6 (sa_family_t) */
+                    uint16_t        sin6_port;      /* Transport layer port # (in_port_t) */
+                    uint32_t        sin6_flowinfo;  /* IP6 flow information */
+                    uint8_t         sin6_addr[16];  /* IP6 address */
+                    uint32_t        sin6_scope_id;  /* scope zone index */
                 };
+                struct my_sockaddr_in6 *ip6 = (struct my_sockaddr_in6 *)buf;
+                ip6->sin6_len = sizeof(sockaddr_in6);
+                ip6->sin6_family = 0x1E; //AF_INET6 (bsd)
+                ip6->sin6_scope_id = wifidev->_interfaceIndex;
                 if (!inet_pton(AF_INET6, ipaddr.c_str(), &ip6->sin6_addr)) continue;
                 plist_dict_set_item(p_props, "NetworkAddress", plist_new_data(buf, sizeof(buf)));
             }

usbmuxd2/TCP.cpp

@@ -350,14 +350,17 @@ void TCP::handle_input(tcphdr* tcp_header, uint8_t* payload, uint32_t payload_le
             } else if (tcp_header->th_flags == TH_RST){
                 info("Connection reset by device, flags: %u sport=%u dport=%u", tcp_header->th_flags,_sPort,_dPort);
                 kill(__LINE__);
+                return;
             }else{
                 warning("unexpected flags=0x%02x",tcp_header->th_flags);
-    #ifdef XCODE
+#ifdef XCODE
             assert(0); //debug this in XCODE
-    #endif
+#endif
             }
         } else if (_connState == CONN_REFUSED) {
             return;
+        } else if (_connState == CONN_DYING) {
+            return;
         } else {
             warning("Data for unexpected connection state: %d",_connState);
     #ifdef XCODE
@@ -375,6 +378,7 @@ void TCP::handle_input(tcphdr* tcp_header, uint8_t* payload, uint32_t payload_le
             if (_connState != CONN_CONNECTED) return;
             ul.lock();
         }
+        if (_connState != CONN_CONNECTED) return;
         //forward to client without buffering
         ssize_t didSend = send(_pfd.fd, payload, payload_len, 0);
         if(didSend != payload_len){

usbmuxd2/main.cpp

@@ -181,8 +181,8 @@ static void usage(){
     printf("                  \t\tdevices connected (always works) and exit.\n");
     printf("      --debug\t\t\tEnable debug logging\n");
     printf("      --allow-heartless-wifi\tAllow WIFI devices without heartbeat to be listed (needed for WIFI pairing)\n");
-    printf("      --nousb\t\t\tDo not start USBDeviceManager\n");
-    printf("      --nowifi\t\t\tDo not start WIFIDeviceManager\n");
+    printf("      --no-usb\t\t\tDo not start USBDeviceManager\n");
+    printf("      --no-wifi\t\t\tDo not start WIFIDeviceManager\n");
     printf("\n");
 }
 
@@ -203,8 +203,8 @@ static void parse_opts(int argc, const char **argv){
 
         {"allow-heartless-wifi",    no_argument,        NULL,  0 },
         {"debug",                   no_argument,        NULL,  0 },
-        {"nousb",                   optional_argument,  NULL,  0 },
-        {"nowifi",                  optional_argument,  NULL,  0 },
+        {"no-usb",                   optional_argument,  NULL,  0 },
+        {"no-wifi",                  optional_argument,  NULL,  0 },
         {NULL,                      0,                  NULL,  0 }
     };
     int optindex = 0;
@@ -227,10 +227,10 @@ static void parse_opts(int argc, const char **argv){
                     gConfig->allowHeartlessWifi = true;
                 }else if (curopt == "debug") {
                     gConfig->debugLevel++;
-                }else if (curopt == "nousb") {
+                }else if (curopt == "no-usb") {
                     info("Manually disableing USBDeviceManager");
                     gConfig->enableUSBDeviceManager = (!optarg) ? false : atoi(optarg);
-                }else if (curopt == "nowifi") {
+                }else if (curopt == "no-wifi") {
                     info("Manually disabling WIFIDeviceManager");
                     gConfig->enableWifiDeviceManager = (!optarg) ? false : atoi(optarg);
                 }