staging: usbip: userspace code

new file mode 100644
index 0000000..2f73e65
@@ -0,0 +1,2 @@
+Takahiro Hirofuchi
+Robert Leibl

340 lines not on this page · raw message

new file mode 100644
index 0000000..e69de29

237 lines not on this page · raw message

new file mode 100644
index 0000000..964f005
@@ -0,0 +1,8 @@
+SUBDIRS = lib cmd
+includedir=@includedir@/usbip
+include_HEADERS = lib/usbip.h lib/usbip_common.h lib/vhci_driver.h lib/stub_driver.h
+
+if INSTALL_USBIDS
+pkgdata_DATA = usb.ids
+EXTRA_DIST = $(pkgdata_DATA)
+endif

new file mode 100644
index 0000000..428b406
@@ -0,0 +1 @@
+link ../NEWS
\ No newline at end of file

215 lines not on this page · raw message

new file mode 100755
index 0000000..e1112d3
@@ -0,0 +1,9 @@
+#!/bin/sh -x
+
+#aclocal
+#autoheader
+#libtoolize --copy --force
+#automake-1.9 -acf
+#autoconf
+
+autoreconf -i -f -v

new file mode 100755
index 0000000..da2f89b
@@ -0,0 +1,10 @@
+#!/bin/sh -x
+
+
+if [ -r Makefile ]; then
+	make distclean
+fi
+
+FILES="configure cscope.out Makefile.in depcomp compile config.guess config.sub config.h.in~ config.log config.status ltmain.sh libtool config.h.in autom4te.cache missing aclocal.m4 install-sh cmd/Makefile.in lib/Makefile.in Makefile lib/Makefile cmd/Makefile"
+
+rm -Rf $FILES

new file mode 100644
index 0000000..c923e49
@@ -0,0 +1,21 @@
+# $Id$
+
+sbin_PROGRAMS = usbip usbipd usbip_bind_driver
+
+usbip_SOURCES = usbip.c usbip_network.c usbip_network.h
+usbipd_SOURCES = usbipd.c usbip_network.c usbip_network.h
+usbip_bind_driver_SOURCES = bind-driver.c \
+		utils.c utils.h \
+		usbip_network.h usbip_network.c
+
+dist_man_MANS = usbip.8 usbipd.8 usbip_bind_driver.8
+
+#usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@
+#usbip_bind_driver_LDADD = @PACKAGE_LIBS@
+
+#AM_CPPFLAGS = -I../include -Wall -std=gnu99
+INCLUDES = -I$(top_srcdir)/lib
+LDADD = ../lib/libusbip.la @PACKAGE_LIBS@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
+AM_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) @PACKAGE_CFLAGS@ -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
+

71 lines not on this page · raw message

42 lines not on this page · raw message

62 lines not on this page · raw message

105 lines not on this page · raw message

new file mode 100644
index 0000000..10b919d

Lines of this file are not shown. View the raw message.

13,209 lines not on this page · raw message

index 964f005..c076952 100644
@@ -2,6 +2,8 @@ SUBDIRS = lib cmd
 includedir=@includedir@/usbip
 include_HEADERS = lib/usbip.h lib/usbip_common.h lib/vhci_driver.h lib/stub_driver.h
 
+dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
+
 if INSTALL_USBIDS
 pkgdata_DATA = usb.ids
 EXTRA_DIST = $(pkgdata_DATA)

index c923e49..5cc50fc 100644
@@ -8,8 +8,6 @@ usbip_bind_driver_SOURCES = bind-driver.c \
 		utils.c utils.h \
 		usbip_network.h usbip_network.c
 
-dist_man_MANS = usbip.8 usbipd.8 usbip_bind_driver.8
-
 #usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@
 #usbip_bind_driver_LDADD = @PACKAGE_LIBS@
 

71 lines not on this page · raw message

42 lines not on this page · raw message

62 lines not on this page · raw message

71 lines not on this page · raw message

42 lines not on this page · raw message

62 lines not on this page · raw message

index c076952..3be3060 100644
@@ -1,6 +1,7 @@
-SUBDIRS = lib cmd
+SUBDIRS = libsrc src
 includedir=@includedir@/usbip
-include_HEADERS = lib/usbip.h lib/usbip_common.h lib/vhci_driver.h lib/stub_driver.h
+include_HEADERS := $(addprefix libsrc/, \
+		     usbip.h usbip_common.h vhci_driver.h stub_driver.h)
 
 dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
 

deleted file mode 100644
index 5cc50fc..0000000
@@ -1,19 +0,0 @@
-# $Id$
-
-sbin_PROGRAMS = usbip usbipd usbip_bind_driver
-
-usbip_SOURCES = usbip.c usbip_network.c usbip_network.h
-usbipd_SOURCES = usbipd.c usbip_network.c usbip_network.h
-usbip_bind_driver_SOURCES = bind-driver.c \
-		utils.c utils.h \
-		usbip_network.h usbip_network.c
-
-#usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@
-#usbip_bind_driver_LDADD = @PACKAGE_LIBS@
-
-#AM_CPPFLAGS = -I../include -Wall -std=gnu99
-INCLUDES = -I$(top_srcdir)/lib
-LDADD = ../lib/libusbip.la @PACKAGE_LIBS@
-EXTRA_CFLAGS = @EXTRA_CFLAGS@
-AM_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) @PACKAGE_CFLAGS@ -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-

index 6de5bc7..24fd8ae 100644
@@ -101,5 +101,5 @@ PKG_CHECK_MODULES(PACKAGE, glib-2.0 >= $GLIB2_REQUIRED)
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
-AC_CONFIG_FILES([Makefile lib/Makefile cmd/Makefile])
+AC_CONFIG_FILES([Makefile libsrc/Makefile src/Makefile])
 AC_OUTPUT

deleted file mode 100644
index 10b919d..0000000
@@ -1,10 +0,0 @@
-# AM_CFLAGS = -Wall -std=gnu99
-lib_LTLIBRARIES = libusbip.la
-libusbip_la_SOURCES = names.c names.h stub_driver.c stub_driver.h usbip.h usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h
-#libusbip_la_SOURCES = names.c names.h stub_driver.c usbip_common.c vhci_driver.c
-#INCLUDES = -I../include
-#AM_CPPFLAGS = -I../include -Wall -std=gnu99
-libusbip_la_LDFLAGS = -version-info 0:1:0
-EXTRA_CFLAGS = @EXTRA_CFLAGS@
-libusbip_la_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-

new file mode 100644
index 0000000..10b919d

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..3717fc5

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index e69de29..0000000

deleted file mode 100644
index 428b406..0000000
@@ -1 +0,0 @@
-link ../NEWS
\ No newline at end of file

index 623b625..c5611e4 100644
@@ -55,7 +55,7 @@ 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
 

@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     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

@@ -168,7 +168,7 @@ 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

@@ -225,7 +225,7 @@ 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

@@ -278,7 +278,7 @@ 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

index b274b50..b0df5cb 100644
@@ -48,7 +48,7 @@
         - Bind usbip.ko to the device of busid 1-2.
         - A usb device 1-2 is now exportable to other hosts!
         - Use 'usbip_bind_driver --other 1-2' when you want to shutdown exporting
-          and use the device locally. 
+          and use the device locally.
 
 
     client:# insmod usbip_common_mod.ko

@@ -87,36 +87,36 @@ export a usb hub.
    List USB devices
    - busid 3-3.2 (04bb:0206)
        3-3.2:1.0 -> usb-storage
-   
+
    - busid 3-3.1 (08bb:2702)
        3-3.1:1.0 -> snd-usb-audio
        3-3.1:1.1 -> snd-usb-audio
-   
+
    - busid 3-3 (0409:0058)
        3-3:1.0 -> hub
-   
+
    - busid 3-2 (0711:0902)
        3-2:1.0 -> none
-   
+
    - busid 1-1 (05a9:a511)
        1-1:1.0 -> ov511
-   
+
    - busid 4-1 (046d:08b2)
        4-1:1.0 -> none
        4-1:1.1 -> none
        4-1:1.2 -> none
-   
+
    - busid 5-2 (058f:9254)
        5-2:1.0 -> hub
-   
+
 --------------------------------------------------------------------------------------------------------
 Mark the device of busid 3-3.2 as exportable.
 
    trois:# usbip_bind_driver --usbip 3-3.2
-   ** (process:24621): DEBUG:  3-3.2:1.0   -> none 
+   ** (process:24621): DEBUG:  3-3.2:1.0   -> none
    ** (process:24621): DEBUG: write "add 3-3.2" to /sys/bus/usb/drivers/usbip/match_busid
    ** Message: bind 3-3.2 to usbip, complete!
-   
+
    trois:# usbip_bind_driver --list
    List USB devices
    - busid 3-3.2 (04bb:0206)

@@ -141,41 +141,41 @@ the server host.
              : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-1
              : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
              :  0 - Mass Storage / SCSI / Bulk (Zip) (08/06/50)
-    
+
       1-2.2.1: Apple Computer, Inc. : unknown product (05ac:0203)
              : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-2/1-2.2/1-2.2.1
              : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
              :  0 - Human Interface Devices / Boot Interface Subclass / Keyboard (03/01/01)
-    
+
       1-2.2.3: OmniVision Technologies, Inc. : OV511+ WebCam (05a9:a511)
              : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-2/1-2.2/1-2.2.3
              : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
              :  0 - Vendor Specific Class / unknown subclass / unknown protocol (ff/00/00)
-    
+
           3-1: Logitech, Inc. : QuickCam Pro 4000 (046d:08b2)
              : /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0a.0/usb3/3-1
              : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
              :  0 - Data / unknown subclass / unknown protocol (0a/ff/00)
              :  1 - Audio / Control Device / unknown protocol (01/01/00)
              :  2 - Audio / Streaming / unknown protocol (01/02/00)
-    
+
           4-1: Logitech, Inc. : QuickCam Express (046d:0870)
              : /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0a.1/usb4/4-1
              : Vendor Specific Class / Vendor Specific Subclass / Vendor Specific Protocol (ff/ff/ff)
              :  0 - Vendor Specific Class / Vendor Specific Subclass / Vendor Specific Protocol (ff/ff/ff)
-    
+
           4-2: Texas Instruments Japan : unknown product (08bb:2702)
              : /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0a.1/usb4/4-2
              : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
              :  0 - Audio / Control Device / unknown protocol (01/01/00)
              :  1 - Audio / Streaming / unknown protocol (01/02/00)
-    
+
 --------------------------------------------------------------------------------------------------------
 Attach a remote usb device!
 
    deux:# usbip --attach 10.0.0.3 1-1
    port 0 attached
-   
+
 --------------------------------------------------------------------------------------------------------
 Show what devices are attached to this client.
 

@@ -183,17 +183,17 @@ Show what devices are attached to this client.
    Port 00: <Port in Use> at Full Speed(12Mbps)
           Prolific Technology, Inc. : unknown product (067b:3507)
           6-1 -> usbip://10.0.0.3:3240/1-1  (remote bus/dev 001/004)
-          6-1:1.0 used by usb-storage      
+          6-1:1.0 used by usb-storage
                          /sys/class/scsi_device/0:0:0:0/device
                          /sys/class/scsi_host/host0/device
                          /sys/block/sda/device
-   
+
 --------------------------------------------------------------------------------------------------------
 Detach the imported device.
 
    deux:# usbip --detach 0
    port 0 detached
-   
+
 --------------------------------------------------------------------------------------------------------
 
 

index 24fd8ae..144655e 100644
@@ -93,7 +93,7 @@ AC_ARG_ENABLE(usbids-install,
  *)   AC_MSG_ERROR(bad value ${enableval} for --enable-usbids-install) ;;
  esac])
 AM_CONDITIONAL(INSTALL_USBIDS, test x$usbids = xinstall)
-    	
+
 
 
 GLIB2_REQUIRED=2.6.0

index 8a8972d..b91df9b 100644
@@ -7,8 +7,8 @@ usbip_bind_driver \- change driver binding for USB/IP
 [\fIoptions\fR]
 
 .SH DESCRIPTION
-Driver bindings for USB devices can be changed using 
-this program. It is used to export and unexport USB 
+Driver bindings for USB devices can be changed using
+this program. It is used to export and unexport USB
 devices over USB/IP.
 
 .SH OPTIONS

@@ -34,7 +34,7 @@ Print usb devices and their drivers in parseable mode
         - Bind usbip.ko to the device of busid 1-2.
         - A usb device 1-2 is now exportable to other hosts!
 
-    server:# usbip_bind_driver --other 1-2 
+    server:# usbip_bind_driver --other 1-2
         - Shutdown exporting and use the device locally.
 
 .SH "SEE ALSO"

index b0df5cb..2ee84b9 100644
@@ -34,8 +34,8 @@
 [Usage]
     server:# (Attach your USB device physically.)
 
-    server:# insmod usbip_common_mod.ko
-    server:# insmod usbip.ko
+    server:# insmod usbip-core.ko
+    server:# insmod usbip-host.ko
         - It was formerly named as stub.ko.
 
     server:# usbipd -D

@@ -45,13 +45,13 @@
         - List driver assignments for usb devices.
 
     server:# usbip_bind_driver --usbip 1-2
-        - Bind usbip.ko to the device of busid 1-2.
+        - Bind usbip-host.ko to the device of busid 1-2.
         - A usb device 1-2 is now exportable to other hosts!
         - Use 'usbip_bind_driver --other 1-2' when you want to shutdown exporting
           and use the device locally.
 
 
-    client:# insmod usbip_common_mod.ko
+    client:# insmod usbip-core.ko
     client:# insmod vhci-hcd.ko
         - It was formerly named as vhci.ko.
 

@@ -72,8 +72,8 @@
 --------------------------------------------------------------------------------------------------------
 - SERVER SIDE (physically attach your USB devices to this host) ----------------------------------------
 --------------------------------------------------------------------------------------------------------
-trois:# insmod (somewhere)/usbip_common_mod.ko
-trois:# insmod (somewhere)/usbip.ko
+trois:# insmod (somewhere)/usbip-core.ko
+trois:# insmod (somewhere)/usbip-host.ko
 trois:# usbipd -D
 
 --------------------------------------------------------------------------------------------------------

@@ -132,7 +132,7 @@ Iterate the above operation for other devices if you like.
 First, let's list available remote devices which are marked as exportable in
 the server host.
 
-   deux:# insmod (somewhere)/usbip_common_mod.ko
+   deux:# insmod (somewhere)/usbip-core.ko
    deux:# insmod (somewhere)/vhci_hcd.ko
 
    deux:# usbip --list 10.0.0.3

@@ -200,7 +200,7 @@ Detach the imported device.
 [Check List]
     - See Debug Tips in the project wiki.
         - http://usbip.wiki.sourceforge.net/how-to-debug-usbip
-    - usbip.ko must be bound to the target device.
+    - usbip-host.ko must be bound to the target device.
         - See /proc/bus/usb/devices and find "Driver=..." lines of the device.
     - Shutdown firewall.
         - usbip now uses TCP port 3240.

index b91df9b..d43bbd6 100644
@@ -31,7 +31,7 @@ Print usb devices and their drivers in parseable mode
         - List driver assignments for usb devices.
 
     server:# usbip_bind_driver --usbip 1-2
-        - Bind usbip.ko to the device of busid 1-2.
+        - Bind usbip-host.ko to the device of busid 1-2.
         - A usb device 1-2 is now exportable to other hosts!
 
     server:# usbip_bind_driver --other 1-2

index 3c39520..006559f 100644
@@ -52,7 +52,7 @@ USB/IP client can connect and use exported devices.
         - List driver assignments for usb devices.
 
     server:# usbip_bind_driver --usbip 1-2
-        - Bind usbip.ko to the device of busid 1-2.
+        - Bind usbip-host.ko to the device of busid 1-2.
         - A usb device 1-2 is now exportable to other hosts!
         - Use 'usbip_bind_driver --other 1-2' when you want to shutdown exporting and use the device locally.
 

index 144655e..0b71329 100644
@@ -1,105 +1,109 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_REVISION($Id$)
-AC_INIT(usbip, 0.1.8, [email protected])
-AC_DEFINE(USBIP_VERSION, 0x000106, Numeric version number)
+AC_INIT([usbip], [0.1.8], [[email protected]])
+AC_DEFINE([USBIP_VERSION], [0x000106], [numeric version number])
+
+AC_CONFIG_SRCDIR([src/usbipd.c])
+AC_CONFIG_HEADERS([config.h])
 
-AC_CONFIG_SRCDIR([config.h.in])
 AM_INIT_AUTOMAKE([foreign])
+LT_INIT
 
 # Silent build for automake >= 1.11
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AM_CONFIG_HEADER(config.h)
-
-
 AC_SUBST([EXTRA_CFLAGS])
 
-AC_PROG_LIBTOOL
-
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
-
-# Checks for libraries.
+AC_PROG_MAKE_SET
 
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h netdb.h stdint.h stdlib.h string.h strings.h sys/socket.h syslog.h unistd.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h dnl
+		  string.h strings.h sys/socket.h syslog.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+AC_TYPE_INT32_T
 AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
 
 # Checks for library functions.
-AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([bzero memset strchr strerror strstr strtoul])
-
-AC_CHECK_HEADER(sysfs/libsysfs.h,
-	[AC_CHECK_LIB(sysfs, sysfs_open_directory_list,
-		[LIBS="$LIBS -lsysfs"],
-		[AC_MSG_ERROR([Missing sysfs2 library!])])],
-	[AC_MSG_ERROR([Missing /usr/include/sysfs/libsysfs.h])])
+AC_CHECK_FUNCS([bzero memset mkdir regcomp socket strchr strerror strstr dnl
+		strtoul])
 
+AC_CHECK_HEADER([sysfs/libsysfs.h],
+		[AC_CHECK_LIB([sysfs], [sysfs_open_directory_list],
+			      [LIBS="$LIBS -lsysfs"],
+			      [AC_MSG_ERROR([Missing sysfs2 library!])])],
+		[AC_MSG_ERROR([Missing /usr/include/sysfs/libsysfs.h])])
 
-# get from stunnel
-dnl Check for libwrap library.
+# Checks for libwrap library.
 AC_MSG_CHECKING([whether to use the libwrap (TCP wrappers) library])
-
-AC_ARG_WITH(tcp-wrappers,
-[  --with-tcp-wrappers     Use the libwrap (TCP wrappers) library ],
-[saved_LIBS="$LIBS"
- if test "$withval" = "yes"; then
-      AC_MSG_RESULT([yes])
-      AC_MSG_CHECKING([for hosts_access in -lwrap])
-      LIBS="-lwrap $LIBS"
-      AC_TRY_LINK(
-	[int hosts_access(); int allow_severity, deny_severity;],
-	[hosts_access()],
-	[AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_LIBWRAP, 1, use tcp wrapper) wrap_LIB="-lwrap"],
-	[AC_MSG_RESULT([not found]); exit 1])
- else
- 	     AC_MSG_RESULT([no])
- fi
- LIBS="$saved_LIBS"],
-[AC_MSG_RESULT([(default)])
- AC_MSG_CHECKING([for hosts_access in -lwrap])
- saved_LIBS="$LIBS"
- LIBS="-lwrap $saved_LIBS"
- AC_TRY_LINK(
-	[int hosts_access(); int allow_severity, deny_severity;],
- 	[hosts_access()],
- 	[AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_LIBWRAP, 1, use tcp wrapper)],
- 	[AC_MSG_RESULT([no]); LIBS="$saved_LIBS"])
-])
-
-
-
+AC_ARG_WITH([tcp-wrappers],
+	    [AS_HELP_STRING([--with-tcp-wrappers],
+			    [use the libwrap (TCP wrappers) library])],
+	    dnl [ACTION-IF-GIVEN]
+	    [saved_LIBS="$LIBS"
+	     if test "$withval" = "yes"; then
+		     AC_MSG_RESULT([yes])
+		     AC_MSG_CHECKING([for hosts_access in -lwrap])
+		     LIBS="-lwrap $LIBS"
+		     AC_TRY_LINK(
+		       [int hosts_access(); int allow_severity, deny_severity;],
+		       [hosts_access()],
+		       [AC_MSG_RESULT([yes]);
+			AC_DEFINE([HAVE_LIBWRAP], [1],
+				  [use tcp wrapper]) wrap_LIB="-lwrap"],
+		       [AC_MSG_RESULT([not found]); exit 1])
+	     else
+		     AC_MSG_RESULT([no])
+	     fi
+	     LIBS="$saved_LIBS"],
+	    dnl [ACTION-IF-NOT-GIVEN]
+	    [AC_MSG_RESULT([(default)])
+	     AC_MSG_CHECKING([for hosts_access in -lwrap])
+	     saved_LIBS="$LIBS"
+	     LIBS="-lwrap $saved_LIBS"
+	     AC_TRY_LINK(
+	       [int hosts_access(); int allow_severity, deny_severity;],
+	       [hosts_access()],
+	       [AC_MSG_RESULT([yes]);
+		AC_DEFINE([HAVE_LIBWRAP], [1], [use tcp wrapper])],
+	       [AC_MSG_RESULT([no]); LIBS="$saved_LIBS"])])
+
+# Sets directory containing usb.ids.
 USBIDS_DIR='${datadir}/usbip'
-AC_ARG_WITH(usbids-dir, [  --with-usbids-dir=DIR   where usb.ids is found (default ${datadir}/usbip)], [USBIDS_DIR=$withval])
-AC_SUBST(USBIDS_DIR)
+AC_ARG_WITH([usbids-dir],
+	    [AS_HELP_STRING([--with-usbids-dir=DIR],
+	       [where usb.ids is found (default ${datadir}/usbip)])],
+	    [USBIDS_DIR=$withval])
+AC_SUBST([USBIDS_DIR])
 
 dnl FIXME: when disabled, empty directry is created
 usbids=install
-AC_ARG_ENABLE(usbids-install,
-[  --enable-usbids-install     install usb.ids (default)],
-[case "${enableval}" in
- yes) usbids=install ;;
- no)  usbids=notinstall ;;
- *)   AC_MSG_ERROR(bad value ${enableval} for --enable-usbids-install) ;;
- esac])
-AM_CONDITIONAL(INSTALL_USBIDS, test x$usbids = xinstall)
-
-
+AC_ARG_ENABLE([usbids-install],
+	      [AS_HELP_STRING([--enable-usbids-install],
+			      [install usb.ids (default)])],
+	      [AS_CASE([$enableval],
+		       [yes], [usbids=install],
+		       [no], [usbids=notinstall],
+		       [AC_MSG_ERROR(
+			  [bad value ${enableval} for --enable-usbids-install])]
+		      )])
+AM_CONDITIONAL([INSTALL_USBIDS], [test x$usbids = xinstall])
 
 GLIB2_REQUIRED=2.6.0
-PKG_CHECK_MODULES(PACKAGE, glib-2.0 >= $GLIB2_REQUIRED)
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
+PKG_CHECK_MODULES([PACKAGE], [glib-2.0 >= $GLIB2_REQUIRED])
+AC_SUBST([PACKAGE_CFLAGS])
+AC_SUBST([PACKAGE_LIBS])
 
 AC_CONFIG_FILES([Makefile libsrc/Makefile src/Makefile])
 AC_OUTPUT

index 3be3060..83f51b8 100644
@@ -1,11 +1,11 @@
-SUBDIRS = libsrc src
-includedir=@includedir@/usbip
+SUBDIRS := libsrc src
+includedir := @includedir@/usbip
 include_HEADERS := $(addprefix libsrc/, \
 		     usbip.h usbip_common.h vhci_driver.h stub_driver.h)
 
 dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
 
 if INSTALL_USBIDS
-pkgdata_DATA = usb.ids
-EXTRA_DIST = $(pkgdata_DATA)
+pkgdata_DATA := usb.ids
+EXTRA_DIST := $(pkgdata_DATA)
 endif

index 10b919d..ed83666 100644
@@ -1,10 +1,7 @@
-# AM_CFLAGS = -Wall -std=gnu99
-lib_LTLIBRARIES = libusbip.la
-libusbip_la_SOURCES = names.c names.h stub_driver.c stub_driver.h usbip.h usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h
-#libusbip_la_SOURCES = names.c names.h stub_driver.c usbip_common.c vhci_driver.c
-#INCLUDES = -I../include
-#AM_CPPFLAGS = -I../include -Wall -std=gnu99
-libusbip_la_LDFLAGS = -version-info 0:1:0
-EXTRA_CFLAGS = @EXTRA_CFLAGS@
-libusbip_la_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
+libusbip_la_CPPFLAGS := -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
+libusbip_la_CFLAGS   := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99
+libusbip_la_LDFLAGS  := -version-info 0:1:0
 
+lib_LTLIBRARIES := libusbip.la
+libusbip_la_SOURCES := names.c names.h stub_driver.c stub_driver.h usbip.h \
+		       usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h

index 3717fc5..a2f0ab2 100644
@@ -1,19 +1,10 @@
-# $Id$
+AM_CPPFLAGS := -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
+AM_CFLAGS   := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99 @PACKAGE_CFLAGS@
+LDADD       := $(top_srcdir)/libsrc/libusbip.la @PACKAGE_LIBS@
 
-sbin_PROGRAMS = usbip usbipd usbip_bind_driver
-
-usbip_SOURCES = usbip.c usbip_network.c usbip_network.h
-usbipd_SOURCES = usbipd.c usbip_network.c usbip_network.h
-usbip_bind_driver_SOURCES = bind-driver.c \
-		utils.c utils.h \
-		usbip_network.h usbip_network.c
-
-#usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@
-#usbip_bind_driver_LDADD = @PACKAGE_LIBS@
-
-#AM_CPPFLAGS = -I../include -Wall -std=gnu99
-INCLUDES = -I$(top_srcdir)/libsrc
-LDADD = ../libsrc/libusbip.la @PACKAGE_LIBS@
-EXTRA_CFLAGS = @EXTRA_CFLAGS@
-AM_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) @PACKAGE_CFLAGS@ -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
+sbin_PROGRAMS := usbip usbipd usbip_bind_driver
 
+usbip_SOURCES := usbip.c usbip_network.c usbip_network.h
+usbipd_SOURCES := usbipd.c usbip_network.c usbip_network.h
+usbip_bind_driver_SOURCES := bind-driver.c utils.c utils.h \
+			     usbip_network.h usbip_network.c

index 0b71329..7b93d29 100644
@@ -4,6 +4,11 @@ AC_PREREQ(2.59)
 AC_INIT([usbip], [0.1.8], [[email protected]])
 AC_DEFINE([USBIP_VERSION], [0x000106], [numeric version number])
 
+CURRENT=0
+REVISION=1
+AGE=0
+AC_SUBST([LIBUSBIP_VERSION], [$CURRENT:$REVISION:$AGE], [library version])
+
 AC_CONFIG_SRCDIR([src/usbipd.c])
 AC_CONFIG_HEADERS([config.h])
 

index ed83666..6abe7fc 100644
@@ -1,6 +1,6 @@
 libusbip_la_CPPFLAGS := -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
 libusbip_la_CFLAGS   := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99
-libusbip_la_LDFLAGS  := -version-info 0:1:0
+libusbip_la_LDFLAGS  := -version-info @LIBUSBIP_VERSION@
 
 lib_LTLIBRARIES := libusbip.la
 libusbip_la_SOURCES := names.c names.h stub_driver.c stub_driver.h usbip.h \

index 7b93d29..d5f6d8e 100644
@@ -18,7 +18,7 @@ LT_INIT
 # Silent build for automake >= 1.11
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_SUBST([EXTRA_CFLAGS])
+AC_SUBST([EXTRA_CFLAGS], ["-Wall -W -Wstrict-prototypes -std=gnu99"])
 
 # Checks for programs.
 AC_PROG_CC

index 6abe7fc..77ecf6b 100644
@@ -1,5 +1,5 @@
 libusbip_la_CPPFLAGS := -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-libusbip_la_CFLAGS   := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99
+libusbip_la_CFLAGS   := @EXTRA_CFLAGS@
 libusbip_la_LDFLAGS  := -version-info @LIBUSBIP_VERSION@
 
 lib_LTLIBRARIES := libusbip.la

index a2f0ab2..05a7aa5 100644
@@ -1,5 +1,5 @@
 AM_CPPFLAGS := -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-AM_CFLAGS   := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99 @PACKAGE_CFLAGS@
+AM_CFLAGS   := @EXTRA_CFLAGS@ @PACKAGE_CFLAGS@
 LDADD       := $(top_srcdir)/libsrc/libusbip.la @PACKAGE_LIBS@
 
 sbin_PROGRAMS := usbip usbipd usbip_bind_driver

index d5f6d8e..e3afa15 100644
@@ -18,7 +18,7 @@ LT_INIT
 # Silent build for automake >= 1.11
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_SUBST([EXTRA_CFLAGS], ["-Wall -W -Wstrict-prototypes -std=gnu99"])
+AC_SUBST([EXTRA_CFLAGS], ["-Wall -Werror -Wextra -std=gnu99"])
 
 # Checks for programs.
 AC_PROG_CC

index a834b93..c736a12 100644
@@ -134,6 +134,19 @@ $(error unknown target $@))))                                       \
 perf-%pkg: FORCE
 	$(call cmd,perf_tar)
 
+# usbip-src-pkg - generate a source tarball of USB/IP userspace utilities
+# ---------------------------------------------------------------------------
+usbip-pkg := usbip-$(KERNELVERSION)
+usbip-userspace := $(srctree)/drivers/staging/usbip/userspace
+
+quiet_cmd_usbip_pkg = TAR  $(usbip-pkg)
+      cmd_usbip_pkg = \
+		tar czfP $(usbip-pkg).tar.gz $(usbip-userspace)	\
+			--transform="s:$(usbip-userspace):$(usbip-pkg):"
+
+usbip-src-pkg: FORCE
+	$(call cmd,usbip_pkg)
+
 # Help text displayed when executing 'make help'
 # ---------------------------------------------------------------------------
 help: FORCE

@@ -148,4 +161,4 @@ help: FORCE
 	@echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'
 	@echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
 	@echo '  perf-tarxz-src-pkg  - Build $(perf-tar).tar.xz source tarball'
-
+	@echo '  usbip-src-pkg       - Build source tarball of USB/IP userspace utilities'