Merge the two development histories

23 files changed, 2001 insertions, 62 deletions

diff --git a/.gitignore b/.gitignore
index b25c15b..0784410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *~
+build
+
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..c196afd
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,5 @@
+Nikias Bassen
+Hector Martin
+Bastien Nocera
+Paul Sladen
+Martin Szulecki
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..ba1653f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,10 @@
+PROJECT(usbmuxd)
+
+cmake_minimum_required(VERSION 2.6)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/")
+
+add_subdirectory (libusbmuxd)
+add_subdirectory (usbmuxd)
+add_subdirectory (tools)
+add_subdirectory (udev)
diff --git a/COPYING.GPLv2 b/COPYING.GPLv2
new file mode 100644
index 0000000..08ddefd
--- /dev/null
+++ b/COPYING.GPLv2
@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
diff --git a/usbmuxd/COPYING b/COPYING.GPLv3
index 94a9ed0..94a9ed0 100644
--- a/usbmuxd/COPYING
+++ b/COPYING.GPLv3
diff --git a/COPYING.LGPLv2.1 b/COPYING.LGPLv2.1
new file mode 100644
index 0000000..732811e
--- /dev/null
+++ b/COPYING.LGPLv2.1
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/usbmuxd/Modules/FindUSB.cmake b/Modules/FindUSB.cmake
index d562b98..d562b98 100644
--- a/usbmuxd/Modules/FindUSB.cmake
+++ b/Modules/FindUSB.cmake
diff --git a/usbmuxd/Modules/LibFindMacros.cmake b/Modules/LibFindMacros.cmake
index 795d6b7..795d6b7 100644
--- a/usbmuxd/Modules/LibFindMacros.cmake
+++ b/Modules/LibFindMacros.cmake
diff --git a/README b/README
index 430f217..0490e1f 100644
--- a/README
+++ b/README
@@ -1,27 +1,103 @@
-This is an implementation of the iPhone/iPod Touch USB connection protocol.
-
-The server should be mostly compatible with the original Apple usbmuxd
-protocol. This means that a single client lib should be able to interoperate
-with both. Apple has now introduced a new plist-based version of the protocol
-which works in essentially the same way but uses XML-based plists as
-command/response payloads instead of binary blobs. The outer binary protocol is
-still the same used but now the only command/response format is 8 (plist).
-
-The server is under the usbmuxd directory. You'll need CMake and libusb 1.0 to
-build it. Due to a bug in zero-length packet handling, you'll need either the
-git version of libusb or 1.0.3, whenever it comes out.
-
-There is a Python client library in the python-client directory. It should be
-compatible with Windows, Linux, and OSX (using the Apple usbmuxd on Win and OSX)
-tcprelay.py implements a TCP connection forwarder that lets you pipe TCP
-connections to localhost to the phone. Run it with --help for usage. The Python
-client lib is also compatible with the new plist-based protocol and should
-automatically select it if it sees such a server. However, you need Python 2.6
-for Windows and Linux in this case, since the plistlib module doesn't come with
-older versions under these OSes (not that you'll have a server that supports
-this protocol under Linux. TODO: does Windows iTunes use this yet?)
-
-ARCHITECTURE
+Background
+==========
+
+'usbmuxd' stands for "USB multiplexing daemon".  To the user/developer what it
+actually does is to proxy requests over a USB cable on directly to a listening
+TCP port on the iPhone.
+
+Multiple connections to different TCP ports can happen in parallel. An example
+(and useful) tool called 'iproxy' is included that allows you to forward
+localhost ports to the device---allows SSH over USB on jailbroken devices, or
+allowing access the lockdown daemon (and then to all of the file access, sync,
+notification and backup services running on the device).
+
+This higher-level layers are handled by libiphone.  The version of libiphone
+compatible with the 'usbmuxd' infrastructure is called 'libiphone-usbmuxd'. 
+'ifuse' is then able to sit on top of this.
+
+There is also a Python implementation of the client library in the python-client
+library, and an example tcprelay.py which performs a similar function to iproxy.
+This implementation supports OSX and Windows and the new iTunes plist-based
+usbmuxd protocol, so it is portable and will run on those operating systems with
+no modification, using Apple's native usbmuxd. This is useful if you need to
+tunnel to your phone from another OS in a pinch. Run python tcpclient.py --help
+for usage information.
+
+Building
+========
+
+  mkdir build
+  cd build
+  cmake ..
+  make
+  sudo make install
+
+Running (with magic)
+====================
+
+  (Unplug + replug your iPhone)
+  ./iproxy 2222 22 &
+  ssh -p 2222 root@localhost
+
+Hopefully you get the normal SSH login prompt.  You may still lots of debugging
+output for the moment.  If this is getting in the way of your ssh login, then
+run the 'ssh' command from a different xterminal
+or virtual console.
+
+
+Running (without magic)
+=======================
+
+If 'udev' is _not_ automatically running on your machine and picking up the new
+.rules file, you will need to start usbmuxd by hand first. Check it's running
+and that there is only one copy with 'ps aux | grep
+usbmuxd'.
+
+  sudo usbmuxd -U -v -v &
+  ./iproxy 2222 22 &
+  ssh -p 2222 root@localhost
+
+
+Tip: Starting SSH if disabled
+=============================
+
+If your iphone is rooted, but SSH isn't started and you _cannot_ (for instance,
+cracked/broken screen) get to the Services control panel on the device, then you
+can start the SSH service over the USB by
+mounting the (jailbroken) filesystem.
+
+You will need to mount it usbing 'ifuse --afc2' (to access the root directory of
+the device), and then edit:
+
+  /Library/LaunchDaemons/com.openssh.sshd.plist
+
+to _remove_ the lines:
+
+  <key>Diabled</key>
+  <true/>
+
+Reboot the device and then sshd should be running.
+
+TODO
+====
+
+The server currently assumes that the phone is well-behaved and does not do a
+bunch of checks like looking for the expected SEQ and ACK numbers from it. This
+is normally not an issue, but it's annoying for debugging because lost packets
+(which shouldn't happen, but can happen if the code is buggy) mean that stuff
+gets out of sync and then might crash and burn dozens of packets later.
+
+The server needs more testing, and some optimizing.
+
+Someone should probably do some edge-case testing on the TCP stuff.
+
+The outgoing ACK handling on the server probably needs some thought. Currently,
+when there's an outstanding ACK, we send it after a timeout (to avoid sending
+a no-payload ACK packet for everything the phone sends us). However, there's
+probably a better way of doing this.
+
+Architecture information
+========================
 
 The iPhone / iPod Touch basically implements a rather strange USB networking
 system that operates at a higher level. It is of course completely proprietary.
@@ -90,9 +166,6 @@ Note that all normal packets need to have flags set to ACK (and only ACK). There
 is no support for, erm, not-acking. Keep the ack number field valid at all
 times.
 
-
-GOTCHAS AND ANNOYANCES
-
 The usbmuxd CONNECT request port field is byte-swapped (network-endian). This is
 even more annoying for the plist based protocol, since it's even true there
 (where the field is plain text). So even for the plain text int, you need to
@@ -123,26 +196,3 @@ at non-16k boundaries that are multiples of 512, but that seems to work fine. I
 guess the ZLPs might cause spurious 0-byte transfers to show up on RX if things
 line up right, but we ignore those. By the way, the maximum packet/transfer size
 is 65535 bytes due to the 16-bit length header of the usbmux protocol.
-
-TODO
-
-The server currently assumes that the phone is well-behaved and does not do a
-bunch of checks like looking for the expected SEQ and ACK numbers from it. This
-is normally not an issue, but it's annoying for debugging because lost packets
-(which shouldn't happen, but can happen if the code is buggy) mean that stuff
-gets out of sync and then might crash and burn dozens of packets later.
-
-The server needs a proper front-end (i.e. daemonizing, commandline options,
-etc), more testing, and some optimizing.
-
-Someone should probably do some edge-case testing on the TCP stuff.
-
-At some point we should probably write a C client lib.
-
-The outgoing ACK handling on the server probably needs some thought. Currently,
-when there's an outstanding ACK, we send it after a timeout (to avoid sending
-a no-payload ACK packet for everything the phone sends us). However, there's
-probably a better way of doing this.
-
-
-
diff --git a/README.devel b/README.devel
new file mode 100644
index 0000000..727e095
--- /dev/null
+++ b/README.devel
@@ -0,0 +1,50 @@
+Background
+==========
+
+'libusbmuxd' makes it really simple to talk to a running 'usbmuxd' and
+hides all the details for you.  There are two function calls:
+
+usbmuxd_scan()
+--------------
+
+This returns a list of all available iPhone-like devices that are
+available for talking to.  The returned array contains the USB
+product_id, hex formatted serial_number of any iPhones/iTouches and a
+non-descript 'handle' for all those devices that are within range (as
+of March 2009, that means a device directly plugged into the
+computer's USB port).
+
+Once you have found the device you want to communicate with, take its
+'handle' and pass this to usbmuxd_connect().
+
+usbmuxd_connect()
+-----------------
+
+This takes a handle, a destination port number and tries to setup
+a proxy a connection.  It returns a file-descriptor which you should
+be able to read(), write() and select() on like any other active network
+socket connection.
+
+
+Technical details
+=================
+
+When usbmuxd is running (normally started, or stopped as a result of
+'udev' auto-insertion messages), it provides a socket interface in
+'/var/run/usbmuxd' that is designed to be compatible with the socket
+interface that is provided on MacOSX.
+
+The structures for communicating over this device are documented
+in the 'usbmuxd-proto.h', but you shouldn't need to view them 
+directly if you are using the libusbmuxd.so library for easy access.
+
+
+Example
+=======
+
+#include <usbmuxd.h>
+
+...
+
+gcc -o leetphone leetphone.c -lusbmuxd
+
diff --git a/libusbmuxd/CMakeLists.txt b/libusbmuxd/CMakeLists.txt
new file mode 100644
index 0000000..61de1a8
--- /dev/null
+++ b/libusbmuxd/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library (libusbmuxd libusbmuxd.c sock_stuff.c)
+
+# 'lib' is a UNIXism, the proper CMake target is usbmuxd
+# But we can't use that due to the conflict with the usbmuxd daemon,
+# so instead change the library output base name to usbmuxd here
+set_target_properties(libusbmuxd PROPERTIES OUTPUT_NAME usbmuxd)
+
+install(TARGETS libusbmuxd
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib
+)
+install(FILES usbmuxd.h usbmuxd-proto.h DESTINATION include)
diff --git a/libusbmuxd/libusbmuxd.c b/libusbmuxd/libusbmuxd.c
new file mode 100644
index 0000000..090695f
--- /dev/null
+++ b/libusbmuxd/libusbmuxd.c
@@ -0,0 +1,248 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+// usbmuxd public interface
+#include "usbmuxd.h"
+// usbmuxd protocol 
+#include "usbmuxd-proto.h"
+// socket utility functions
+#include "sock_stuff.h"
+
+static int usbmuxd_get_result(int sfd, uint32_t tag, uint32_t * result)
+{
+        struct usbmuxd_result res;
+        int recv_len;
+
+        if (!result) {
+                return -EINVAL;
+        }
+
+        if ((recv_len = recv_buf(sfd, &res, sizeof(res))) <= 0) {
+                perror("recv");
+                return -errno;
+        } else {
+                if ((recv_len == sizeof(res))
+                        && (res.header.length == (uint32_t) recv_len)
+                        && (res.header.reserved == 0)
+                        && (res.header.type == USBMUXD_RESULT)
+                        ) {
+                        *result = res.result;
+                        if (res.header.tag == tag) {
+                                return 1;
+                        } else {
+                                return 0;
+                        }
+                }
+        }
+
+        return -1;
+}
+
+int usbmuxd_scan(usbmuxd_scan_result ** available_devices)
+{
+        struct usbmuxd_scan_request s_req;
+        int sfd;
+        int scan_success = 0;
+        uint32_t res;
+        uint32_t pktlen;
+        int recv_len;
+        usbmuxd_scan_result *newlist = NULL;
+        struct usbmuxd_device_info_record dev_info_pkt;
+        int dev_cnt = 0;
+
+        sfd = connect_unix_socket(USBMUXD_SOCKET_FILE);
+        if (sfd < 0) {
+                fprintf(stderr, "%s: error opening socket!\n", __func__);
+                return sfd;
+        }
+
+        s_req.header.length = sizeof(struct usbmuxd_scan_request);
+        s_req.header.reserved = 0;
+        s_req.header.type = USBMUXD_SCAN;
+        s_req.header.tag = 2;
+
+        // send scan request packet
+        if (send_buf(sfd, &s_req, s_req.header.length) ==
+                (int) s_req.header.length) {
+                res = -1;
+                // get response
+                if (usbmuxd_get_result(sfd, s_req.header.tag, &res) && (res == 0)) {
+                        scan_success = 1;
+                } else {
+                        fprintf(stderr,
+                                        "%s: Did not get response to scan request (with result=0)...\n",
+                                        __func__);
+                        close(sfd);
+                        return res;
+                }
+        }
+
+        if (!scan_success) {
+                fprintf(stderr, "%s: Could not send scan request!\n", __func__);
+                return -1;
+        }
+
+        *available_devices = NULL;
+        // receive device list
+        while (1) {
+                if (recv_buf_timeout(sfd, &pktlen, 4, MSG_PEEK, 1000) == 4) {
+                        if (pktlen != sizeof(dev_info_pkt)) {
+                                // invalid packet size received!
+                                fprintf(stderr,
+                                                "%s: Invalid packet size (%d) received when expecting a device info record.\n",
+                                                __func__, pktlen);
+                                break;
+                        }
+
+                        recv_len = recv_buf(sfd, &dev_info_pkt, pktlen);
+                        if (recv_len <= 0) {
+                                fprintf(stderr,
+                                                "%s: Error when receiving device info record\n",
+                                                __func__);
+                                break;
+                        } else if ((uint32_t) recv_len < pktlen) {
+                                fprintf(stderr,
+                                                "%s: received less data than specified in header!\n",
+                                                __func__);
+                        } else {
+                                //fprintf(stderr, "%s: got device record with id %d, UUID=%s\n", __func__, dev_info_pkt.device_info.device_id, dev_info_pkt.device_info.serial_number);
+                                newlist =
+                                        (usbmuxd_scan_result *) realloc(*available_devices,
+                                                                                                        sizeof
+                                                                                                        (usbmuxd_scan_result) *
+                                                                                                        (dev_cnt + 1));
+                                if (newlist) {
+                                        newlist[dev_cnt].handle =
+                                                (int) dev_info_pkt.device.device_id;
+                                        newlist[dev_cnt].product_id =
+                                                dev_info_pkt.device.product_id;
+                                        memset(newlist[dev_cnt].serial_number, '\0',
+                                                   sizeof(newlist[dev_cnt].serial_number));
+                                        memcpy(newlist[dev_cnt].serial_number,
+                                                   dev_info_pkt.device.serial_number,
+                                                   sizeof(dev_info_pkt.device.serial_number));
+                                        *available_devices = newlist;
+                                        dev_cnt++;
+                                } else {
+                                        fprintf(stderr,
+                                                        "%s: ERROR: out of memory when trying to realloc!\n",
+                                                        __func__);
+                                        break;
+                                }
+                        }
+                } else {
+                        // we _should_ have all of them now.
+                        // or perhaps an error occured.
+                        break;
+                }
+        }
+
+        // terminating zero record
+        newlist =
+                (usbmuxd_scan_result *) realloc(*available_devices,
+                                                                                sizeof(usbmuxd_scan_result) *
+                                                                                (dev_cnt + 1));
+        memset(newlist + dev_cnt, 0, sizeof(usbmuxd_scan_result));
+        *available_devices = newlist;
+
+        return dev_cnt;
+}
+
+int usbmuxd_connect(const int handle, const unsigned short tcp_port)
+{
+        int sfd;
+        struct usbmuxd_connect_request c_req;
+        int connected = 0;
+        uint32_t res = -1;
+
+        sfd = connect_unix_socket(USBMUXD_SOCKET_FILE);
+        if (sfd < 0) {
+                fprintf(stderr, "%s: Error: Connection to usbmuxd failed: %s\n",
+                                __func__, strerror(errno));
+                return sfd;
+        }
+
+        c_req.header.length = sizeof(c_req);
+        c_req.header.reserved = 0;
+        c_req.header.type = USBMUXD_CONNECT;
+        c_req.header.tag = 3;
+        c_req.device_id = (uint32_t) handle;
+        c_req.tcp_dport = htons(tcp_port);
+        c_req.reserved = 0;
+
+        if (send_buf(sfd, &c_req, sizeof(c_req)) < 0) {
+                perror("send");
+        } else {
+                // read ACK
+                //fprintf(stderr, "%s: Reading connect result...\n", __func__);
+                if (usbmuxd_get_result(sfd, c_req.header.tag, &res)) {
+                        if (res == 0) {
+                                //fprintf(stderr, "%s: Connect success!\n", __func__);
+                                connected = 1;
+                        } else {
+                                fprintf(stderr, "%s: Connect failed, Error code=%d\n",
+                                                __func__, res);
+                        }
+                }
+        }
+
+        if (connected) {
+                return sfd;
+        }
+
+        close(sfd);
+
+        return -1;
+}
+
+int usbmuxd_disconnect(int sfd)
+{
+        return close(sfd);
+}
+
+int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t *sent_bytes)
+{
+        int num_sent;
+
+        if (sfd < 0) {
+                return -EINVAL;
+        }
+        
+        num_sent = send(sfd, (void*)data, len, 0);
+        if (num_sent < 0) {
+                *sent_bytes = 0;
+                fprintf(stderr, "%s: Error %d when sending: %s\n", __func__, num_sent, strerror(errno));
+                return num_sent;
+        } else if ((uint32_t)num_sent < len) {
+                fprintf(stderr, "%s: Warning: Did not send enough (only %d of %d)\n", __func__, num_sent, len);
+        }
+
+        *sent_bytes = num_sent;
+
+        return 0;
+}
+
+int usbmuxd_recv_timeout(int sfd, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout)
+{
+        int num_recv = recv_buf_timeout(sfd, (void*)data, len, 0, timeout);
+        if (num_recv < 0) {
+                *recv_bytes = 0;
+                return num_recv;
+        }
+
+        *recv_bytes = num_recv;
+
+        return 0;
+}
+
+int usbmuxd_recv(int sfd, char *data, uint32_t len, uint32_t *recv_bytes)
+{
+        return usbmuxd_recv_timeout(sfd, data, len, recv_bytes, 5000);
+}
+
diff --git a/libusbmuxd/sock_stuff.c b/libusbmuxd/sock_stuff.c
new file mode 100644
index 0000000..137375d
--- /dev/null
+++ b/libusbmuxd/sock_stuff.c
@@ -0,0 +1,301 @@
+#include <stdio.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include "sock_stuff.h"
+
+#define RECV_TIMEOUT 20000
+
+static int verbose = 0;
+
+void sock_stuff_set_verbose(int level)
+{
+        verbose = level;
+}
+
+int create_unix_socket(const char *filename)
+{
+        struct sockaddr_un name;
+        int sock;
+        size_t size;
+
+        // remove if still present
+        unlink(filename);
+
+        /* Create the socket. */
+        sock = socket(PF_LOCAL, SOCK_STREAM, 0);
+        if (sock < 0) {
+                perror("socket");
+                return -1;
+        }
+
+        /* Bind a name to the socket. */
+        name.sun_family = AF_LOCAL;
+        strncpy(name.sun_path, filename, sizeof(name.sun_path));
+        name.sun_path[sizeof(name.sun_path) - 1] = '\0';
+
+        /* The size of the address is
+           the offset of the start of the filename,
+           plus its length,
+           plus one for the terminating null byte.
+           Alternatively you can just do:
+           size = SUN_LEN (&name);
+         */
+        size = (offsetof(struct sockaddr_un, sun_path)
+                        + strlen(name.sun_path) + 1);
+
+        if (bind(sock, (struct sockaddr *) &name, size) < 0) {
+                perror("bind");
+                close(sock);
+                return -1;
+        }
+
+        if (listen(sock, 10) < 0) {
+                perror("listen");
+                close(sock);
+                return -1;
+        }
+
+        return sock;
+}
+
+int connect_unix_socket(const char *filename)
+{
+        struct sockaddr_un name;
+        int sfd = -1;
+        size_t size;
+        struct stat fst;
+
+        // check if socket file exists...
+        if (stat(filename, &fst) != 0) {
+                if (verbose >= 2)
+                        fprintf(stderr, "%s: stat '%s': %s\n", __func__, filename,
+                                        strerror(errno));
+                return -1;
+        }
+        // ... and if it is a unix domain socket
+        if (!S_ISSOCK(fst.st_mode)) {
+                if (verbose >= 2)
+                        fprintf(stderr, "%s: File '%s' is not a socket!\n", __func__,
+                                        filename);
+                return -1;
+        }
+        // make a new socket
+        if ((sfd = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) {
+                if (verbose >= 2)
+                        fprintf(stderr, "%s: socket: %s\n", __func__, strerror(errno));
+                return -1;
+        }
+        // and connect to 'filename'
+        name.sun_family = AF_LOCAL;
+        strncpy(name.sun_path, filename, sizeof(name.sun_path));
+        name.sun_path[sizeof(name.sun_path) - 1] = 0;
+
+        size = (offsetof(struct sockaddr_un, sun_path)
+                        + strlen(name.sun_path) + 1);
+
+        if (connect(sfd, (struct sockaddr *) &name, size) < 0) {
+                close(sfd);
+                if (verbose >= 2)
+                        fprintf(stderr, "%s: connect: %s\n", __func__,
+                                        strerror(errno));
+                return -1;
+        }
+
+        return sfd;
+}
+
+int create_socket(uint16_t port)
+{
+        int sfd = -1;
+        int yes = 1;
+        struct sockaddr_in saddr;
+
+        if (0 > (sfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP))) {
+                perror("socket()");
+                return -1;
+        }
+
+        if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) {
+                perror("setsockopt()");
+                close(sfd);
+                return -1;
+        }
+
+        memset((void *) &saddr, 0, sizeof(saddr));
+        saddr.sin_family = AF_INET;
+        saddr.sin_addr.s_addr = htonl(INADDR_ANY);
+        saddr.sin_port = htons(port);
+
+        if (0 > bind(sfd, (struct sockaddr *) &saddr, sizeof(saddr))) {
+                perror("bind()");
+                close(sfd);
+                return -1;
+        }
+
+        if (listen(sfd, 1) == -1) {
+                perror("listen()");
+                close(sfd);
+                return -1;
+        }
+
+        return sfd;
+}
+
+int connect_socket(const char *addr, uint16_t port)
+{
+        int sfd = -1;
+        int yes = 1;
+        struct hostent *hp;
+        struct sockaddr_in saddr;
+
+        if (!addr) {
+                errno = EINVAL;
+                return -1;
+        }
+
+        if ((hp = gethostbyname(addr)) == NULL) {
+                if (verbose >= 2)
+                        fprintf(stderr, "%s: unknown host '%s'\n", __func__, addr);
+                return -1;
+        }
+
+        if (!hp->h_addr) {
+                if (verbose >= 2)
+                        fprintf(stderr, "%s: gethostbyname returned NULL address!\n",
+                                        __func__);
+                return -1;
+        }
+
+        if (0 > (sfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP))) {
+                perror("socket()");
+                return -1;
+        }
+
+        if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) {
+                perror("setsockopt()");
+                close(sfd);
+                return -1;
+        }
+
+        memset((void *) &saddr, 0, sizeof(saddr));
+        saddr.sin_family = AF_INET;
+        saddr.sin_addr.s_addr = *(uint32_t *) hp->h_addr;
+        saddr.sin_port = htons(port);
+
+        if (connect(sfd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
+                perror("connect");
+                close(sfd);
+                return -2;
+        }
+
+        return sfd;
+}
+
+int check_fd(int fd, fd_mode fdm, unsigned int timeout)
+{
+        fd_set fds;
+        int sret;
+        int eagain;
+        struct timeval to;
+
+        if (fd <= 0) {
+                if (verbose >= 2)
+                        fprintf(stderr, "ERROR: invalid fd in check_fd %d\n", fd);
+                return -1;
+        }
+
+        FD_ZERO(&fds);
+        FD_SET(fd, &fds);
+
+        to.tv_sec = (time_t) (timeout / 1000);
+        to.tv_usec = (time_t) ((timeout - (to.tv_sec * 1000)) * 1000);
+
+        sret = -1;
+
+        do {
+                eagain = 0;
+                switch (fdm) {
+                case FD_READ:
+                        sret = select(fd + 1, &fds, NULL, NULL, &to);
+                        break;
+                case FD_WRITE:
+                        sret = select(fd + 1, NULL, &fds, NULL, &to);
+                        break;
+                case FD_EXCEPT:
+                        sret = select(fd + 1, NULL, NULL, &fds, &to);
+                        break;
+                default:
+                        return -1;
+                }
+
+                if (sret < 0) {
+                        switch (errno) {
+                        case EINTR:
+                                // interrupt signal in select
+                                if (verbose >= 2)
+                                        fprintf(stderr, "%s: EINTR\n", __func__);
+                                eagain = 1;
+                                break;
+                        case EAGAIN:
+                                if (verbose >= 2)
+                                        fprintf(stderr, "%s: EAGAIN\n", __func__);
+                                break;
+                        default:
+                                if (verbose >= 2)
+                                        fprintf(stderr, "%s: select failed: %s\n", __func__,
+                                                        strerror(errno));
+                                return -1;
+                        }
+                }
+        } while (eagain);
+
+        return sret;
+}
+
+int recv_buf(int fd, void *data, size_t length)
+{
+        return recv_buf_timeout(fd, data, length, 0, RECV_TIMEOUT);
+}
+
+int peek_buf(int fd, void *data, size_t length)
+{
+        return recv_buf_timeout(fd, data, length, MSG_PEEK, RECV_TIMEOUT);
+}
+
+int recv_buf_timeout(int fd, void *data, size_t length, int flags,
+                                         unsigned int timeout)
+{
+        int res;
+        int result;
+
+        // check if data is available
+        res = check_fd(fd, FD_READ, timeout);
+        if (res <= 0) {
+                return res;
+        }
+        // if we get here, there _is_ data available
+        result = recv(fd, data, length, flags);
+        if (res > 0 && result == 0) {
+                // but this is an error condition
+                if (verbose >= 3)
+                        fprintf(stderr, "%s: fd=%d recv returned 0\n", __func__, fd);
+                return -EAGAIN;
+        }
+        if (result < 0) {
+                return -errno;
+        }
+        return result;
+}
+
+int send_buf(int fd, void *data, size_t length)
+{
+        return send(fd, data, length, 0);
+}
diff --git a/libusbmuxd/sock_stuff.h b/libusbmuxd/sock_stuff.h
new file mode 100644
index 0000000..190f7e1
--- /dev/null
+++ b/libusbmuxd/sock_stuff.h
@@ -0,0 +1,28 @@
+#ifndef __SOCK_STUFF_H
+#define __SOCK_STUFF_H
+
+#include <stdint.h>
+
+enum fd_mode {
+        FD_READ,
+        FD_WRITE,
+        FD_EXCEPT
+};
+typedef enum fd_mode fd_mode;
+
+int create_unix_socket(const char *filename);
+int connect_unix_socket(const char *filename);
+int create_socket(uint16_t port);
+int connect_socket(const char *addr, uint16_t port);
+int check_fd(int fd, fd_mode fdm, unsigned int timeout);
+
+int recv_buf(int fd, void *data, size_t size);
+int peek_buf(int fd, void *data, size_t size);
+int recv_buf_timeout(int fd, void *data, size_t size, int flags,
+                                         unsigned int timeout);
+
+int send_buf(int fd, void *data, size_t size);
+
+void sock_stuff_set_verbose(int level);
+
+#endif                                                  /* __SOCK_STUFF_H */
diff --git a/libusbmuxd/usbmuxd-proto.h b/libusbmuxd/usbmuxd-proto.h
new file mode 100644
index 0000000..7f8c2d6
--- /dev/null
+++ b/libusbmuxd/usbmuxd-proto.h
@@ -0,0 +1,52 @@
+/* Protocol defintion for usbmuxd proxy protocol */
+
+#ifndef __USBMUXD_PROTO_H
+#define __USBMUXD_PROTO_H
+
+#include <stdint.h>
+
+#define USBMUXD_SOCKET_FILE "/var/run/usbmuxd"
+
+struct usbmuxd_header {
+        uint32_t length;    // length of message, including header
+        uint32_t reserved;  // always zero
+        uint32_t type;      // message type
+        uint32_t tag;       // responses to this query will echo back this tag
+} __attribute__((__packed__));
+
+struct usbmuxd_result {
+        struct usbmuxd_header header;
+        uint32_t result;
+} __attribute__((__packed__));
+
+struct  usbmuxd_connect_request {
+        struct usbmuxd_header header;
+        uint32_t device_id;
+        uint16_t tcp_dport;   // TCP port number
+        uint16_t reserved;   // set to zero
+} __attribute__((__packed__));
+
+struct usbmuxd_device {
+        uint32_t device_id;
+        uint16_t product_id;
+        char serial_number[40];
+} __attribute__((__packed__));
+
+struct usbmuxd_device_info_record {
+        struct usbmuxd_header header;
+        struct usbmuxd_device device;
+        char padding[222];
+} __attribute__((__packed__));
+
+struct usbmuxd_scan_request {
+        struct usbmuxd_header header;
+} __attribute__((__packed__));
+
+enum {
+        USBMUXD_RESULT  = 1,
+        USBMUXD_CONNECT = 2,
+        USBMUXD_SCAN = 3,
+        USBMUXD_DEVICE_INFO = 4,
+};
+
+#endif /* __USBMUXD_PROTO_H */
diff --git a/libusbmuxd/usbmuxd.h b/libusbmuxd/usbmuxd.h
new file mode 100644
index 0000000..ba45ec3
--- /dev/null
+++ b/libusbmuxd/usbmuxd.h
@@ -0,0 +1,91 @@
+#ifndef __USBMUXD_H
+#define __USBMUXD_H
+
+/**
+ * Array entry returned by 'usbmuxd_scan()' scanning.
+ *
+ * If more than one device is available, 'product_id' and
+ * 'serial_number' and be analysed to help make a selection.
+ * The relevant 'handle' should be passed to 'usbmuxd_connect()', to
+ * start a proxy connection.  The value 'handle' should be considered
+ * opaque and no presumption made about the meaning of its value.
+ */
+typedef struct {
+        int handle;
+        int product_id;
+        char serial_number[41];
+} usbmuxd_scan_result;
+
+/**
+ * Contacts usbmuxd and performs a scan for connected devices.
+ *
+ * @param available_devices pointer to array of usbmuxd_scan_result.
+ *      Array of available devices.  The required 'handle'
+ *      should be passed to 'usbmuxd_connect()'.  The returned array
+ *      is zero-terminated for convenience; the final (unused)
+ *      entry containing handle == 0.  The returned array pointer
+ *      should be freed by passing to 'free()' after use.
+ *
+ * @return number of available devices, zero on no devices, or negative on error
+ */
+int usbmuxd_scan(usbmuxd_scan_result **available_devices);
+
+/**
+ * Request proxy connect to 
+ *
+ * @param handle returned by 'usbmuxd_scan()'
+ *
+ * @param tcp_port TCP port number on device, in range 0-65535.
+ *      common values are 62078 for lockdown, and 22 for SSH.
+ *
+ * @return file descriptor socket of the connection, or -1 on error
+ */
+int usbmuxd_connect(const int handle, const unsigned short tcp_port);
+
+/**
+ * Disconnect. For now, this just closes the socket file descriptor.
+ *
+ * @param sfd socker file descriptor returned by usbmuxd_connect()
+ *
+ * @return 0 on success, -1 on error.
+ */
+int usbmuxd_disconnect(int sfd);
+
+/**
+ * Send data to the specified socket.
+ *
+ * @param sfd socket file descriptor returned by usbmuxd_connect()
+ * @param data buffer to send
+ * @param len size of buffer to send
+ * @param sent_bytes how many bytes sent
+ *
+ * @return 0 on success, a negative errno value otherwise.
+ */
+int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t *sent_bytes);
+
+/**
+ * Receive data from the specified socket.
+ *
+ * @param sfd socket file descriptor returned by usbmuxd_connect()
+ * @param data buffer to put the data to
+ * @param len number of bytes to receive
+ * @param recv_bytes number of bytes received
+ * @param timeout how many milliseconds to wait for data
+ *
+ * @return 0 on success, a negative errno value otherwise.
+ */
+int usbmuxd_recv_timeout(int sfd, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout);
+
+/**
+ * Receive data from the specified socket with a default timeout.
+ *
+ * @param sfd socket file descriptor returned by usbmuxd_connect()
+ * @param data buffer to put the data to
+ * @param len number of bytes to receive
+ * @param recv_bytes number of bytes received
+ *
+ * @return 0 on success, a negative errno value otherwise.
+ */
+int usbmuxd_recv(int sfd, char *data, uint32_t len, uint32_t *recv_bytes);
+
+#endif /* __USBMUXD_H */
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..70ec3b3
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,8 @@
+include_directories (${CMAKE_SOURCE_DIR}/libusbmuxd)
+link_directories (${CMAKE_BINARY_DIR}/libusbmuxd)
+
+add_definitions(-Wall -O2 -g)
+add_executable(iproxy iproxy.c)
+target_link_libraries(iproxy libusbmuxd pthread)
+
+install(TARGETS iproxy RUNTIME DESTINATION bin)
\ No newline at end of file
diff --git a/tools/iproxy.c b/tools/iproxy.c
new file mode 100644
index 0000000..3cb2894
--- /dev/null
+++ b/tools/iproxy.c
@@ -0,0 +1,241 @@
+/*
+ * iproxy -- proxy that enables tcp service access to iPhone/iPod
+ *  via USB cable
+ * TODO: improve code...
+ * 
+ * Copyright (c) 2009 Nikias Bassen. All Rights Reserved.
+ * Based upon iTunnel source code, Copyright (c) 2008 Jing Su.
+ *  http://www.cs.toronto.edu/~jingsu/itunnel/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <stddef.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <pthread.h>
+#include "sock_stuff.h"
+#include "usbmuxd.h"
+
+static uint16_t listen_port = 0;
+static uint16_t device_port = 0;
+
+pthread_mutex_t smutex = PTHREAD_MUTEX_INITIALIZER;
+
+struct client_data {
+    int fd;
+    int sfd;
+    volatile int stop_ctos;
+    volatile int stop_stoc;
+};
+
+void *run_stoc_loop(void *arg)
+{
+    struct client_data *cdata = (struct client_data*)arg;
+    int recv_len;
+    int sent;
+    char buffer[131072];
+
+    printf("%s: fd = %d\n", __func__, cdata->fd);
+
+    while (!cdata->stop_stoc && cdata->fd>0 && cdata->sfd>0) {
+        recv_len = recv_buf_timeout(cdata->sfd, buffer, sizeof(buffer), 0, 5000);
+        if (recv_len <= 0) {
+            if (recv_len == 0) {
+                // try again
+                continue;
+            } else {
+                fprintf(stderr, "recv failed: %s\n", strerror(errno));
+                break;
+            }
+        } else {
+//          printf("received %d bytes from server\n", recv_len);
+            // send to socket
+            sent = send_buf(cdata->fd, buffer, recv_len);
+            if (sent < recv_len) {
+                if (sent <= 0) {
+                    fprintf(stderr, "send failed: %s\n", strerror(errno));
+                    break;
+                } else {
+                    fprintf(stderr, "only sent %d from %d bytes\n", sent, recv_len);
+                }
+            } else {
+                // sending succeeded, receive from device
+//              printf("pushed %d bytes to client\n", sent);
+            }
+        }
+    }
+    close(cdata->fd);
+    cdata->fd = -1;
+    cdata->stop_ctos = 1;
+
+    return NULL;
+}
+
+void *run_ctos_loop(void *arg)
+{
+    struct client_data *cdata = (struct client_data*)arg;
+    int recv_len;
+    int sent;
+    char buffer[131072];
+    pthread_t stoc = 0;
+
+    printf("%s: fd = %d\n", __func__, cdata->fd);
+
+    cdata->stop_stoc = 0;
+    pthread_create(&stoc, NULL, run_stoc_loop, cdata);
+
+    while (!cdata->stop_ctos && cdata->fd>0 && cdata->sfd>0) {
+        recv_len = recv_buf_timeout(cdata->fd, buffer, sizeof(buffer), 0, 5000);
+        if (recv_len <= 0) {
+            if (recv_len == 0) {
+                // try again
+                continue;
+            } else {
+                fprintf(stderr, "recv failed: %s\n", strerror(errno));
+                break;
+            }
+        } else {
+//          printf("pulled %d bytes from client\n", recv_len);
+            // send to local socket
+            sent = send_buf(cdata->sfd, buffer, recv_len);
+            if (sent < recv_len) {
+                if (sent <= 0) {
+                    fprintf(stderr, "send failed: %s\n", strerror(errno));
+                    break;
+                } else {
+                    fprintf(stderr, "only sent %d from %d bytes\n", sent, recv_len);
+                }
+            } else {
+                // sending succeeded, receive from device
+//              printf("sent %d bytes to server\n", sent);
+            }
+        }
+    }
+    close(cdata->fd);
+    cdata->fd = -1;
+    cdata->stop_stoc = 1;
+
+    pthread_join(stoc, NULL);
+
+    return NULL;
+}
+
+void *acceptor_thread(void *arg)
+{
+    struct client_data *cdata;
+    usbmuxd_scan_result *dev_list = NULL;
+    pthread_t ctos;
+    int count;
+
+    if (!arg) {
+        fprintf(stderr, "invalid client_data provided!\n");
+        return NULL;
+    }
+
+    cdata = (struct client_data*)arg;
+
+    if ((count = usbmuxd_scan(&dev_list)) < 0) {
+        printf("Connecting to usbmuxd failed, terminating.\n");
+        free(dev_list);
+        return NULL;
+    }
+
+    fprintf(stdout, "Number of available devices == %d\n", count);
+
+    if (dev_list == NULL || dev_list[0].handle == 0) {
+        printf("No connected device found, terminating.\n");
+        free(dev_list);
+        return NULL;
+    }
+
+    fprintf(stdout, "Requesting connecion to device handle == %d (serial: %s), port %d\n", dev_list[0].handle, dev_list[0].serial_number, device_port);
+
+    cdata->sfd = usbmuxd_connect(dev_list[0].handle, device_port);
+    free(dev_list);
+    if (cdata->sfd < 0) {
+        fprintf(stderr, "Error connecting to device!\n");
+    } else {
+        cdata->stop_ctos = 0;
+        pthread_create(&ctos, NULL, run_ctos_loop, cdata);
+        pthread_join(ctos, NULL);
+    }
+
+    if (cdata->fd > 0) {
+        close(cdata->fd);
+    }
+    if (cdata->sfd > 0) {
+        close(cdata->sfd);
+    }
+
+    return NULL;
+}
+
+int main(int argc, char **argv)
+{
+    int mysock = -1;
+
+    if (argc != 3) {
+        printf("usage: %s LOCAL_TCP_PORT DEVICE_TCP_PORT\n", argv[0]);
+        return 0;
+    }
+
+    listen_port = atoi(argv[1]);
+    device_port = atoi(argv[2]);
+
+    if (!listen_port) {
+        fprintf(stderr, "Invalid listen_port specified!\n");
+        return -EINVAL;
+    }
+
+    if (!device_port) {
+        fprintf(stderr, "Invalid device_port specified!\n");
+        return -EINVAL;
+    }
+
+    // first create the listening socket endpoint waiting for connections.
+    mysock = create_socket(listen_port);
+    if (mysock < 0) {
+        fprintf(stderr, "Error creating socket: %s\n", strerror(errno));
+        return -errno;
+    } else {
+        pthread_t acceptor;
+        struct sockaddr_in c_addr;
+        socklen_t len = sizeof(struct sockaddr_in);
+        struct client_data cdata;
+        int c_sock;
+        while (1) {
+            printf("waiting for connection\n");
+            c_sock = accept(mysock, (struct sockaddr*)&c_addr, &len);
+            if (c_sock) {
+                printf("accepted connection, fd = %d\n", c_sock);
+                cdata.fd = c_sock;
+                pthread_create(&acceptor, NULL, acceptor_thread, &cdata);
+                pthread_join(acceptor, NULL);
+            } else {
+                break;
+            }
+        }
+        close(c_sock);
+        close(mysock);
+    }
+
+    return 0;
+}
diff --git a/udev/85-usbmuxd.rules.in b/udev/85-usbmuxd.rules.in
new file mode 100644
index 0000000..3521ccb
--- /dev/null
+++ b/udev/85-usbmuxd.rules.in
@@ -0,0 +1,7 @@
+# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
+
+# Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3 and run usbmuxd
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-4]", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U"
+
+# Exit usbmuxd when the last phone is removed
+ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-4]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
diff --git a/udev/CMakeLists.txt b/udev/CMakeLists.txt
new file mode 100644
index 0000000..0f7042d
--- /dev/null
+++ b/udev/CMakeLists.txt
@@ -0,0 +1,2 @@
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/85-usbmuxd.rules.in ${CMAKE_CURRENT_BINARY_DIR}/85-usbmuxd.rules @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/85-usbmuxd.rules DESTINATION /lib/udev/rules.d/)
diff --git a/usbmuxd/.gitignore b/usbmuxd/.gitignore
deleted file mode 100644
index 0784410..0000000
--- a/usbmuxd/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-build
-
diff --git a/usbmuxd/CMakeLists.txt b/usbmuxd/CMakeLists.txt
index 8d22ef6..b982dc0 100644
--- a/usbmuxd/CMakeLists.txt
+++ b/usbmuxd/CMakeLists.txt
@@ -1,16 +1,9 @@
-PROJECT(usbmuxd)
-
-cmake_minimum_required(VERSION 2.6)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/")
-
 find_package(USB REQUIRED)
 include_directories(${USB_INCLUDE_DIRS})
 set(LIBS ${LIBS} ${USB_LIBRARIES})
 
-#set(CMAKE_VERBOSE_MAKEFILE ON)
-
 add_definitions(-Wall -O2 -g)
 add_executable(usbmuxd main.c usb-linux.c log.c utils.c device.c client.c)
 target_link_libraries(usbmuxd ${LIBS})
 
+install(TARGETS usbmuxd RUNTIME DESTINATION sbin)
\ No newline at end of file
diff --git a/usbmuxd/main.c b/usbmuxd/main.c
index 6fe6688..dde99c2 100644
--- a/usbmuxd/main.c
+++ b/usbmuxd/main.c
@@ -328,7 +328,7 @@ static void parse_opts(int argc, char **argv)
         int c;
 
         while (1) {
-                c = getopt_long(argc, argv, "hfvdu::xX", longopts, (int *) 0);
+                c = getopt_long(argc, argv, "hfvuU::xX", longopts, (int *) 0);
                 if (c == -1) {
                         break;
                 }