OpenOBEX

From: Iain Hibbert <plunky@...>

---
 lib/obex.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index 165fcb8..5e5fb31 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -1058,7 +1058,7 @@ int CALLAPI IrOBEX_TransportConnect(obex_t *self, const char *service)
 	An easier server function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_ServerRegister(obex_t *self, bdaddr_t *src, uint8_t channel)
+int CALLAPI BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel)
 {
 	DEBUG(3, "\n");
 
@@ -1085,8 +1085,8 @@ int CALLAPI BtOBEX_ServerRegister(obex_t *self, bdaddr_t *src, uint8_t channel)
 	An easier connect function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_TransportConnect(obex_t *self, bdaddr_t *src,
-					bdaddr_t *dst, uint8_t channel)
+int CALLAPI BtOBEX_TransportConnect(obex_t *self, bt_addr_t *src,
+					bt_addr_t *dst, uint8_t channel)
 {
 	DEBUG(4, "\n");
 
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

(For NetBSD at least, the BDADDR_ANY that is passed to
these functions is defined as a const)
---
 include/openobex/obex.h |    4 ++--
 lib/obex.c              |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index f948113..1e9e0d7 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -141,8 +141,8 @@ OPENOBEX_SYMBOL(int) IrOBEX_TransportConnect(obex_t *self, const char *service);
 #    define bt_addr_t unsigned long
 #  endif
 #endif
-OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel);
-OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, bt_addr_t *src, bt_addr_t *dst, uint8_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint8_t channel);
 
 /*
  * OBEX File API
diff --git a/lib/obex.c b/lib/obex.c
index 5e5fb31..874cfcd 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -1058,7 +1058,7 @@ int CALLAPI IrOBEX_TransportConnect(obex_t *self, const char *service)
 	An easier server function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel)
+int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel)
 {
 	DEBUG(3, "\n");
 
@@ -1085,8 +1085,8 @@ int CALLAPI BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel)
 	An easier connect function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_TransportConnect(obex_t *self, bt_addr_t *src,
-					bt_addr_t *dst, uint8_t channel)
+int CALLAPI BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src,
+					const bt_addr_t *dst, uint8_t channel)
 {
 	DEBUG(4, "\n");
 
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

We need to detect the presence of "Bluetooth Device Address" type
in order to provide the BtOBEX_ function prototypes, which needs
to be from a header included prior to <openobex/obex.h>
---
 include/openobex/obex.h |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 1e9e0d7..6dda861 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -131,18 +131,25 @@ OPENOBEX_SYMBOL(int) IrOBEX_TransportConnect(obex_t *self, const char *service);
  * Bluetooth OBEX API
  */
 #if !defined(bt_addr_t)
-#  if defined(SOL_RFCOMM)
-#    if defined(_WIN32) /* Windows */
-#      define bt_addr_t BTH_ADDR
-#    else /* Linux, FreeBSD, NetBSD */
-#      define bt_addr_t bdaddr_t
+#  if defined(_WIN32)
+#    if defined(BTH_ADDR_NULL)
+#      define bt_addr_t	BTH_ADDR
+#    endif
+#  elif defined(__FreeBSD__)
+#    if defined(NG_HCI_BDADDR_ANY)
+#      define bt_addr_t	bdaddr_t
+#    endif
+#  else	/* Linux, NetBSD, etc.. */
+#    if defined(BDADDR_ANY)
+#      define bt_addr_t	bdaddr_t
 #    endif
-#  else /* no bluetooth stack available */
-#    define bt_addr_t unsigned long
 #  endif
 #endif
+
+#if defined(bt_addr_t)
 OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel);
 OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint8_t channel);
+#endif
 
 /*
  * OBEX File API
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

---
 lib/customtrans.c |    2 +-
 lib/inobex.c      |    2 +-
 lib/irobex.c      |    2 +-
 lib/obex_object.c |    2 +-
 lib/usb1obex.c    |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/customtrans.c b/lib/customtrans.c
index 0040550..20e264c 100644
--- a/lib/customtrans.c
+++ b/lib/customtrans.c
@@ -115,4 +115,4 @@ int custom_register(obex_t *self, const obex_ctrans_t *in)
 void custom_get_ops(struct obex_transport_ops* ops)
 {
 	ops->clone = &custom_clone;
-};
+}
diff --git a/lib/inobex.c b/lib/inobex.c
index d7a450a..4ae2b61 100644
--- a/lib/inobex.c
+++ b/lib/inobex.c
@@ -410,4 +410,4 @@ void inobex_get_ops(struct obex_transport_ops* ops)
 	ops->server.disconnect = &inobex_disconnect_server;
 	ops->client.connect = &inobex_connect_request;
 	ops->client.disconnect = &inobex_disconnect_request;
-};
+}
diff --git a/lib/irobex.c b/lib/irobex.c
index 3f15a93..b0aeaa2 100644
--- a/lib/irobex.c
+++ b/lib/irobex.c
@@ -594,6 +594,6 @@ void irobex_get_ops(struct obex_transport_ops* ops)
 	ops->client.find_interfaces = &irobex_find_interfaces;
 	ops->client.free_interface = &irobex_free_interface;
 	ops->client.select_interface = &irobex_select_interface;
-};
+}
 
 #endif /* HAVE_IRDA */
diff --git a/lib/obex_object.c b/lib/obex_object.c
index cbfd1f1..395c5ff 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -569,7 +569,7 @@ int obex_object_send(obex_t *self, obex_object_t *object,
 
 		if (tx_left == 0)
 			addmore = FALSE;
-	};
+	}
 
 	/* Decide which command to use, and if to use final-bit */
 	if (object->tx_headerq) {
diff --git a/lib/usb1obex.c b/lib/usb1obex.c
index f647212..c00b55a 100644
--- a/lib/usb1obex.c
+++ b/lib/usb1obex.c
@@ -581,6 +581,6 @@ void usbobex_get_ops(struct obex_transport_ops* ops)
 	ops->client.find_interfaces = &usbobex_find_interfaces;
 	ops->client.free_interface = &usbobex_free_interface;
 	ops->client.select_interface = &usbobex_select_interface;
-};
+}
 
 #endif /* HAVE_USB1 */
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

---
 lib/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0110db4..6efa6d0 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -106,7 +106,7 @@ if ( OPENOBEX_USB )
   list ( APPEND openobex_LIBRARIES
     ${LibUSB_LIBRARIES}
   )
-  include_directories ( BEFORE SYSTEM ${LibUSB_INCLUDE_DIRS} )
+  include_directories ( SYSTEM ${LibUSB_INCLUDE_DIRS} )
   if ( LibUSB_VERSION_1.0 )
     list ( APPEND SOURCES
       usb1obex.c
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

---
 CMakeModules/FindBluetooth.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/FindBluetooth.cmake b/CMakeModules/FindBluetooth.cmake
index a62032d..9d82a84 100644
--- a/CMakeModules/FindBluetooth.cmake
+++ b/CMakeModules/FindBluetooth.cmake
@@ -73,7 +73,7 @@ elseif ( CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" )
   mark_as_advanced ( Bluetooth_LIBRARIES )
 
   if ( Bluetooth_INCLUDE_DIRS )
-    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INLUDE_DIRS} )
+    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INCLUDE_DIRS} )
     CHECK_C_SOURCE_COMPILES (
       "#include <bluetooth.h>
        int main () {
@@ -102,7 +102,7 @@ elseif ( CMAKE_SYSTEM_NAME STREQUAL "NetBSD" )
   mark_as_advanced ( Bluetooth_LIBRARIES )
 
   if ( Bluetooth_INCLUDE_DIRS )
-    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INLUDE_DIRS} )
+    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INCLUDE_DIRS} )
     CHECK_C_SOURCE_COMPILES (
       "#include <bluetooth.h>
        int main () {
-- 
1.7.5.4

If non-blocking file descriptors or sockets are used, it can happen that
incomplete message get sent.
---
 lib/databuffer.c |    7 +++++++
 lib/databuffer.h |    1 +
 lib/obex_main.c  |    2 +-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lib/databuffer.c b/lib/databuffer.c
index 1c43324..72bd4ca 100644
--- a/lib/databuffer.c
+++ b/lib/databuffer.c
@@ -113,6 +113,13 @@ size_t buf_total_size(const buf_t *p)
 	return p->head_avail + p->data_avail + p->tail_avail + p->data_size;
 }
 
+int buf_empty(const buf_t *p)
+{
+	if (!p)
+		return 1;
+	return (p->data_size == 0);
+}
+
 void buf_resize(buf_t *p, size_t new_size)
 {
 	uint8_t *tmp;
diff --git a/lib/databuffer.h b/lib/databuffer.h
index f55a056..2ef8204 100644
--- a/lib/databuffer.h
+++ b/lib/databuffer.h
@@ -47,6 +47,7 @@ typedef struct databuffer buf_t;
 
 buf_t *buf_new(size_t default_size);
 size_t buf_total_size(const buf_t *p);
+int buf_empty(const buf_t *p);
 void buf_resize(buf_t *p, size_t new_size);
 buf_t *buf_reuse(buf_t *p);
 void *buf_reserve_begin(buf_t *p, size_t data_size);
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 387f271..14a5263 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -221,7 +221,7 @@ int obex_data_request(obex_t *self, buf_t *msg, int opcode)
 		status = obex_transport_write(self, msg);
 		if (status > 0)
 			buf_remove_begin(msg, status);
-	} while (status >= 0 && obex_get_buffer_status(msg));
+	} while (status >= 0 && !buf_empty(msg));
 	return status;
 }
 
-- 
1.7.5.4

---
 lib/obex_object.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/obex_object.c b/lib/obex_object.c
index 395c5ff..2773789 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -412,12 +412,14 @@ static int send_body(obex_object_t *object, struct obex_header_element *h,
 		/* We have completely filled the tx-buffer */
 		actual = tx_left;
 	} else {
-		DEBUG(4, "Add BODY_END header\n");
-
-		if (slist_has_more(object->tx_headerq))
-			hdr->hi = OBEX_HDR_BODY_END;
-		else
+		if (slist_has_more(object->tx_headerq)) {
+			DEBUG(4, "Add BODY header\n");
 			hdr->hi = OBEX_HDR_BODY;
+		} else {
+			DEBUG(4, "Add BODY_END header\n");
+			hdr->hi = OBEX_HDR_BODY_END;
+		}
+
 		hdr->hl = htons((uint16_t)(h->buf->data_size + sizeof(*hdr)));
 		buf_insert_end(txmsg, h->buf->data, h->buf->data_size);
 		actual = h->buf->data_size;
-- 
1.7.5.4

---
 lib/obex_object.c |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/obex_object.c b/lib/obex_object.c
index 2773789..3fcd10a 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -307,7 +307,7 @@ static int send_stream(obex_t *self,
 	actual = sizeof(*hdr);
 
 	do {
-		if (object->s_len == 0) {
+		if (object->s_len == 0 && !object->s_stop) {
 			/* Ask app for more data if no more */
 			object->s_offset = 0;
 			object->s_buf = NULL;
@@ -315,20 +315,9 @@ static int send_stream(obex_t *self,
 								0, FALSE);
 			DEBUG(4, "s_len=%d, s_stop = %d\n",
 						object->s_len, object->s_stop);
-			/* End of stream ?*/
-			if (object->s_stop)
-				break;
-
-			/* User suspended and didn't provide any new data */
-			if (object->suspend && object->s_buf == NULL)
-				break;
-
-			/* Error ?*/
-			if (object->s_buf == NULL) {
-				DEBUG(1, "Unexpected end-of-stream\n");
-				return -1;
-			}
 		}
+		if (object->s_len == 0)
+			break;
 
 		if (tx_left < object->s_len) {
 			/* There is more data left in buffer than tx_left */
@@ -359,13 +348,21 @@ static int send_stream(obex_t *self,
 	DEBUG(4, "txmsg full or no more stream-data. actual = %d\n", actual);
 	hdr->hi = OBEX_HDR_BODY;
 
-	if (object->s_stop && object->s_len == 0) {
+	if (object->s_len == 0) {
+		if (object->s_stop)
+			/* End of stream */
+			hdr->hi = OBEX_HDR_BODY_END;
+
+		else if (object->s_buf == NULL &&
+			 !slist_has_more(object->tx_headerq))
+			/* User didn't provide any new data but there are also
+			 * no more header. This is not correct as the
+			 * application should have signalled STREAM_DATAEND in
+			 * this case. */
+			return -1;
+
 		/* We are done. Remove header from tx-queue */
 		object->tx_headerq = slist_remove(object->tx_headerq, h);
-		if (slist_has_more(object->tx_headerq))
-			hdr->hi = OBEX_HDR_BODY;
-		else
-			hdr->hi = OBEX_HDR_BODY_END;
 		buf_free(h->buf);
 		free(h);
 	}
-- 
1.7.5.4

---
 INSTALL.txt       |   10 +++-----
 INSTALL_Win32.txt |   54 ++++++++++++++++++++++++++--------------------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index 25b4fcd..88f7b38 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,16 +1,15 @@
 How to compile OpenObex
 =======================
 
-
 The compilation of OpenObex is done using CMake.
 The following OBEX transports are available:
  * Bluetooth (not all systems, see below)
  * Irda (not all systems, see below)
  * TCP
+ * USB
  * Custom transport
  * File descriptor
 
-
 The following operating systems are supported:
  * Linux [Bluetooth, Irda]
  * FreeBSD [Bluetooth]
@@ -32,7 +31,6 @@ system, please see INSTALL_Win32.txt.
 [2]: at http://www.cmake.org
 
 
-
 2 Compilation
 =============
 
@@ -53,9 +51,9 @@ gives you lots of other options.
 ========================
 
 It is recommended to not build in the source directory. To build in any other
-directory, just run cmake with the path to the source directory as last argument.
-A mix of this is a 'build' subdirectory in the source tree. The example below uses
-this method.
+directory, just run cmake with the path to the source directory as last
+argument. A mix of this is a 'build' subdirectory in the source tree. The
+example below uses this method.
 
 At the command line, run:
   $ mkdir build
diff --git a/INSTALL_Win32.txt b/INSTALL_Win32.txt
index 1800854..69bea2f 100644
--- a/INSTALL_Win32.txt
+++ b/INSTALL_Win32.txt
@@ -13,12 +13,15 @@ The requirements to compile OpenObex on Windows are fairly low:
 4. CMake(>= 2.6)[2] or autoconf+automake
 
 The supported compilers are:
- * Microsoft Visual Studio 9 .NET 2008
- * Microsoft Visual Studio 8 .NET 2005
- * Microsoft Visual Studio 7.1 .NET 2003
+ * Microsoft Visual Studio 2010 (10)
+ * Microsoft Visual Studio 2008 (9)
+ * Microsoft Visual Studio 2005 (8)
+ * Microsoft Visual Studio .NET 2003 (7.1)
  * MinGW gcc
  * Cygwin gcc
 
+Visual Studio 2008 and 2010 already include the SDK.
+
 [1]: at http://libusb-win32.sf.net (if not compiling for cygwin)
 [2]: at http://www.cmake.org
 
@@ -45,19 +48,18 @@ You need to install the following extra packages from http://www.mingw.org:
   * msysDTK (1.0.1 works)
 
 Libtool from msysDTK in incomplete, it needs an additional 'file' utility. You
-can get this from http://gnuwin32.sf.net. Do NOT install it in the MSYS directory
-but somewhere else that is already mounted and in $PATH (e.g. into the mingw
-directory).
+can get this from http://gnuwin32.sf.net. Do NOT install it in the MSYS
+directory but somewhere else that is already mounted and in $PATH (e.g. into
+the mingw directory).
 
-Additionally, download the following packages from http://www.gtk.org/download-windows.html:
-  * glib
-  * glib-dev
+Additionally, download the following packages from e.g.
+http://www.gtk.org/download-windows.html:
   * pkg-config
 Unpack them all into the same directory!
 
 You need to prepare the build environment by editing /etc/fstab and mount the
-GLIB installation dir to /glib and the libusb-win32 installation dir to /libusb.
-MinGW should already be present unter /mingw.
+libusb-win32 installation dir to /libusb. MinGW should already be present under
+/mingw.
 Additionally, you create /pdsk/include and copy the following header files from
 the Platform SDK to there:
   ws2bth.h
@@ -66,20 +68,18 @@ the Platform SDK to there:
   af_irda.h
 
 If you check out from VCS and configure does not exist, you can create it with:
-  $ export ACLOCAL="aclocal -I /glib/share/aclocal"
   $ autoreconf -v -f -i
 
 Now you need some environment variables for configure:
-  $ export CFLAGS="-I/libusb/include -I/glib/include -I/psdk/include"
-  $ export LDFLAGS="-L/libusb/lib/gcc -L/glib/lib"
-  $ export PATH="$PATH:/glib/bin"
-  $ export PKG_CONFIG_PATH="/glib/lib/pkgconfig"
+  $ export CFLAGS="-I/libusb/include -I/psdk/include"
+  $ export LDFLAGS="-L/libusb/lib/gcc"
 
 Now you can finally run configure:
   $ ./configure --prefix=/mingw --disable-shared
 
 This will build a static library. Due to a bug in libtool, you cannot build the
-static and the shared version at the same time. To build the shared version, run:
+static and the shared version at the same time.
+To build the shared version, run:
   $ ./configure --prefix=/mingw --disable-static
 
 
@@ -89,11 +89,11 @@ static and the shared version at the same time. To build the shared version, run
 Visual Studio
 -------------
 
-Using Visual Studion >= 8 (EXpress versions are sufficient) is the recommended
-way of compiling under Windows.
-You must open the console link that runs the proper vcvars.bat (see Start menu).
-Then, you _MUST_ add the directories of the platform SDK include files, libraries
-and executables to the environment variables INCLUDE, LIB and PATH.
+Using Visual Studio >= 2008 (Express versions are sufficient) is the
+recommended way of compiling under Windows. You must open the console link that
+runs the proper vcvars.bat (see Start menu).
+Then, you _MUST_ add the directories of the platform SDK include files,
+libraries and executables to the environment variables INCLUDE, LIB and PATH.
 Now, your build environment is set up. You can now call cmake with the proper
 generator (see "cmake --help"). Using the "NMake Makefiles" generator, OpenObex
 can be compiled directly in the command prompt window:
@@ -148,12 +148,12 @@ shell command window:
 3 Installation
 ==============
 
-You can run the installation directly by calling the "install" make target. With
-the DESTDIR variable, you can add an additional prefix:
+You can run the installation directly by calling the "install" make target.
+With the DESTDIR variable, you can add an additional prefix:
   $ make install DESTDIR=/some/directory
 
-Additionally, when you used CMake, you can create installation packages but a few
-steps are needed:
+Additionally, when you used CMake, you can create installation packages but a
+few steps are needed:
   * install NSIS
   * install a ZIP program (e.g. info-zip)
-Now you are ready to run the "pacakge" make target.
+Now you are ready to run the "package" make target.
-- 
1.7.5.4

Now that the multi-level state machine is used, the resume function can be
simplified a lot. To actually continue now, you have to call the
OBEX_HandleInput() function.
---
 lib/obex.c        |    2 +-
 lib/obex_object.c |   45 +++++++--------------------------------------
 lib/obex_object.h |    2 +-
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index 5e16fc4..3aa6bac 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -575,7 +575,7 @@ LIB_SYMBOL
 int CALLAPI OBEX_ResumeRequest(obex_t *self)
 {
 	obex_return_val_if_fail(self->object != NULL, -1);
-	return obex_object_resume(self, self->object);
+	return obex_object_resume(self->object);
 }
 
 /**
diff --git a/lib/obex_object.c b/lib/obex_object.c
index f888a2d..a7d5cb3 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -1146,49 +1146,18 @@ int obex_object_readstream(obex_t *self, obex_object_t *object,
 
 int obex_object_suspend(obex_object_t *object)
 {
+	if (object->suspend == 1)
+		return 0;
+
 	object->suspend = 1;
-	return 0;
+	return 1;
 }
 
-int obex_object_resume(obex_t *self, obex_object_t *object)
+int obex_object_resume(obex_object_t *object)
 {
-	int ret;
-	uint8_t cmd = obex_object_getcmd(self, object);
-	int allowfinalcmd = TRUE, forcefinalbit = FALSE;
-
-	if (!object->suspend)
+	if (object->suspend == 0)
 		return 0;
 
 	object->suspend = 0;
-
-	if (object->first_packet_sent && !object->continue_received)
-		return 0;
-
-	if (self->mode == MODE_SRV) {
-		forcefinalbit = TRUE;
-		if (self->state == STATE_REC)
-			allowfinalcmd = FALSE;
-	}
-
-	ret = obex_object_send(self, object, allowfinalcmd, forcefinalbit);
-
-	if (ret < 0) {
-		obex_deliver_event(self, OBEX_EV_LINKERR, cmd, 0, TRUE);
-		return -1;
-	} else if (ret == 0) {
-		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
-		object->first_packet_sent = 1;
-		object->continue_received = 0;
-	} else {
-		if (self->mode == MODE_SRV) {
-			obex_deliver_event(self, OBEX_EV_REQDONE,
-							cmd, 0, TRUE);
-			self->state = STATE_IDLE;
-			return 0;
-		}
-	}
-
-	self->state = STATE_REC;
-
-	return 0;
+	return 1;
 }
diff --git a/lib/obex_object.h b/lib/obex_object.h
index 5bcbe0b..31a7d80 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -109,6 +109,6 @@ int obex_object_receive(struct obex *self, struct databuffer *msg);
 
 int obex_object_readstream(struct obex *self, struct obex_object *object, const uint8_t **buf);
 int obex_object_suspend(struct obex_object *object);
-int obex_object_resume(struct obex *self, struct obex_object *object);
+int obex_object_resume(struct obex_object *object);
 
 #endif
-- 
1.7.5.4

---
 apps/obex_test/obex_test.c        |   12 ++++---
 apps/obex_test/obex_test_client.c |   61 ++++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 4200f9b..350d808 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -153,8 +153,8 @@ static int inet_connect(obex_t *handle)
 //
 int main (int argc, char *argv[])
 {
-	char cmd[10];
-	int num, end = 0;
+	char cmd[3];
+	int end = 0;
 	int cobex = FALSE, tcpobex = FALSE, btobex = FALSE, r320 = FALSE, usbobex = FALSE;
 	obex_t *handle;
 #ifdef HAVE_BLUETOOTH
@@ -350,10 +350,12 @@ int main (int argc, char *argv[])
 
 	while (!end) {
 		printf("> ");
-		num = scanf("%s", cmd);
-		if (num == EOF)
+		fflush(stdout);
+		(void)fgets(cmd, sizeof(cmd), stdin);
+		if (cmd[0] == 0) /* EOF */
 			break;
-		switch (cmd[0] | 0x20)	{
+		cmd[strlen(cmd)-1] = 0; /* remove trailing newline */
+		switch(cmd[0]) {
 			case 'h':
 				printf("Commands:\n"
 				       " c - connect\n"
diff --git a/apps/obex_test/obex_test_client.c b/apps/obex_test/obex_test_client.c
index 8f0efc7..d9714b4 100644
--- a/apps/obex_test/obex_test_client.c
+++ b/apps/obex_test/obex_test_client.c
@@ -227,17 +227,19 @@ void push_client(obex_t *handle)
 	unsigned int uname_size;
 	char *bfname;
 	uint8_t *uname;
-	int num;
 
 	obex_headerdata_t hd;
 	
 	uint8_t *buf;
 	int file_size;
 
-	printf("PUSH filename> ");
-	memset(fname, 0, sizeof(fname));
-	num = scanf("%199c", fname);
-	if (num != 1) {
+	fprintf(stdout, "PUSH file> ");
+	fflush(stdout);
+	(void)fgets(fname, sizeof(fname), stdin);
+	if (fname[0] == 0) /* EOF */
+		return;
+	fname[strlen(fname)-1] = 0; /* remove trailing newline */
+	if (strlen(fname) == 0) {
 		perror("scanf");
 		return;
 	}
@@ -294,15 +296,17 @@ void put_client(obex_t *handle)
 	char rname[200];
 	unsigned int rname_size;
 	obex_headerdata_t hd;
-	int num;
 	
 	uint8_t *buf;
 	int file_size;
 
-	printf("PUT file (local)> ");
-	memset(lname, 0, sizeof(lname));
-	num = scanf("%199c", lname);
-	if (num != 1) {
+	fprintf(stdout, "PUT file (local)> ");
+	fflush(stdout);
+	(void)fgets(lname, sizeof(lname), stdin);
+	if (lname[0] == 0) /* EOF */
+		return;
+	lname[strlen(lname)-1] = 0; /* remove trailing newline */
+	if (strlen(lname) == 0) {
 		perror("scanf:");
 		return;
 	}
@@ -314,10 +318,13 @@ void put_client(obex_t *handle)
 		return;
 	}
 
-	printf("PUT remote filename (default: %s)> ", lname);
-	memset(rname, 0, sizeof(rname));
-	num = scanf("%199c", rname);
-	if (num == 0)
+	fprintf(stdout, "PUT remote filename (default: %s)> ", lname);
+	fflush(stdout);
+	(void)fgets(rname, sizeof(rname), stdin);
+	if (rname[0] == 0) /* EOF */
+		return;
+	rname[strlen(rname)-1] = 0; /* remove trailing newline */
+	if (strlen(rname) == 0)
 		strcpy(rname, lname);
 	printf("Going to send %d bytes\n", file_size);
 
@@ -362,13 +369,16 @@ void get_client(obex_t *handle, struct context *gt)
 	obex_object_t *object;
 	uint8_t rname[200];
 	char req_name[200];
-	int num, rname_size;
+	int rname_size;
 	obex_headerdata_t hd;
 
-	printf("GET File> ");
-	memset(req_name, 0, sizeof(req_name));
-	num = scanf("%199c", req_name);
-	if (num != 1) {
+	fprintf(stdout, "GET file> ");
+	fflush(stdout);
+	(void)fgets(req_name, sizeof(req_name), stdin);
+	if (req_name[0] == 0) /* EOF */
+		return;
+	req_name[strlen(req_name)-1] = 0; /* remove trailing newline */
+	if (strlen(req_name) == 0) {
 		perror("scanf:");
 		return;
 	}
@@ -438,13 +448,16 @@ void setpath_client(obex_t *handle)
 	uint8_t setpath_data[2] = { 0, 0 };
 	obex_object_t *object;
 	char path[200];
-	int num, path_size;
+	int path_size;
 	obex_headerdata_t hd;
 
-	printf("SETPATH> ");
-	memset(path, 0, sizeof(path));
-	num = scanf("%199c", path);
-	if (num != 1) {
+	fprintf(stdout, "SETPATH> ");
+	fflush(stdout);
+	(void)fgets(path, sizeof(path), stdin);
+	if (path[0] == 0) /* EOF */
+		return;
+	path[strlen(path)-1] = 0; /* remove trailing newline */
+	if (strlen(path) == 0) {
 		perror("scanf:");
 		return;
 	}
-- 
1.7.5.4

The cmake build files used some self-named variables or fixed value. Replace
them by the new GNUInstallDirs.cmake that introduces variables as defined for
GNU autotools.
---
 CMakeLists.txt                |   21 +++++----------------
 apps/CMakeLists.txt           |    2 +-
 apps/ircp/CMakeLists.txt      |    2 +-
 apps/obex_test/CMakeLists.txt |    2 +-
 doc/CMakeLists.txt            |    6 +++---
 lib/CMakeLists.txt            |    8 ++++----
 udev/CMakeLists.txt           |    8 ++++----
 7 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a2bde4..fe1d8d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required ( VERSION 2.6.3 FATAL_ERROR )
+cmake_minimum_required ( VERSION 2.8.5 FATAL_ERROR )
 
 project ( openobex C )
 
@@ -31,6 +31,7 @@ if ( NOT CMAKE_BUILD_TYPE )
 endif ( NOT CMAKE_BUILD_TYPE )
 
 include ( MaintainerMode )
+include ( GNUInstallDirs )
 
 #
 # define how to build libraries
@@ -112,8 +113,8 @@ endif ( OPENOBEX_BLUETOOTH )
 #
 set ( prefix      "${CMAKE_INSTALL_PREFIX}" )
 set ( exec_prefix "\${prefix}" )
-set ( libdir      "\${prefix}/lib${LIB_SUFFIX}" )
-set ( includedir  "\${prefix}/include" )
+set ( libdir      "\${prefix}/${CMAKE_INSTALL_LIBDIR}" )
+set ( includedir  "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" )
 set ( top_srcdir   "${CMAKE_SOURCE_DIR}" )
 set ( top_builddir "${CMAKE_BINARY_DIR}" )
 if ( OPENOBEX_BLUETOOTH AND UNIT AND NOT WIN32 )
@@ -141,7 +142,7 @@ configure_file (
 )
 
 if ( NOT PKGCONFIG_INSTALL_DIR )
-  set ( PKGCONFIG_INSTALL_DIR lib${LIB_SUFFIX}/pkgconfig
+  set ( PKGCONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig
         CACHE PATH "Where to install .pc files to" FORCE )
 endif ( NOT PKGCONFIG_INSTALL_DIR )
 mark_as_advanced ( PKGCONFIG_INSTALL_DIR )
@@ -179,18 +180,6 @@ add_subdirectory ( apps )
 #
 option ( BUILD_DOCUMENTATION "Build library and application documentation" ON)
 if ( BUILD_DOCUMENTATION )
-  if ( NOT DOCUMENTATION_INSTALL_DIR )
-    set ( DOCUMENTATION_INSTALL_DIR share/doc/openobex
-      CACHE PATH "Where to install generic documentation files to" FORCE )
-  endif ( NOT DOCUMENTATION_INSTALL_DIR )
-  mark_as_advanced ( DOCUMENTATION_INSTALL_DIR )
-
-  if ( NOT MANPAGE_INSTALL_DIR )
-    set ( MANPAGE_INSTALL_DIR share/man
-      CACHE PATH "Where to install manpage files to" FORCE )
-  endif ( NOT MANPAGE_INSTALL_DIR )
-  mark_as_advanced ( MANPAGE_INSTALL_DIR )
-
   add_subdirectory ( doc )
 endif ( BUILD_DOCUMENTATION )
 
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 0e27baf..55268ca 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -37,7 +37,7 @@ foreach ( prog ${OPENOBEX_APPS} )
   target_link_libraries ( ${prog} ${${prog}_LIBS} )
   get_target_property ( ${prog}_EXECUTABLE ${prog} LOCATION )
   install ( PROGRAMS ${${prog}_EXECUTABLE}
-    DESTINATION bin
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
     COMPONENT applications
     OPTIONAL
   )
diff --git a/apps/ircp/CMakeLists.txt b/apps/ircp/CMakeLists.txt
index 51b230b..ceef156 100644
--- a/apps/ircp/CMakeLists.txt
+++ b/apps/ircp/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable ( ircp EXCLUDE_FROM_ALL ${ircp_SOURCES} )
 target_link_libraries ( ircp openobex )
 get_target_property ( ircp_EXECUTABLE ircp LOCATION )
 install ( PROGRAMS ${ircp_EXECUTABLE}
-  DESTINATION bin
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
   COMPONENT applications
   OPTIONAL
 )
diff --git a/apps/obex_test/CMakeLists.txt b/apps/obex_test/CMakeLists.txt
index 4c12457..a920149 100644
--- a/apps/obex_test/CMakeLists.txt
+++ b/apps/obex_test/CMakeLists.txt
@@ -18,7 +18,7 @@ endif ( WIN32 )
 
 get_target_property ( obex_test_EXECUTABLE obex_test LOCATION )
 install ( PROGRAMS ${obex_test_EXECUTABLE}
-  DESTINATION bin
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
   COMPONENT applications
   OPTIONAL
 )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index bc0afae..2257410 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -48,7 +48,7 @@ if ( DOXYGEN_FOUND )
   add_dependencies ( doc apidoc_html )
 
   install ( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
-    DESTINATION ${DOCUMENTATION_INSTALL_DIR}
+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
     COMPONENT documentation
   )
 endif ( DOXYGEN_FOUND )
@@ -72,7 +72,7 @@ if ( Docbook_FOUND )
       string ( REGEX REPLACE "^[.]" "" fileExt ${fileExt} )
       install (
 	FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
-	DESTINATION ${MANPAGE_INSTALL_DIR}/man${fileExt}
+	DESTINATION ${CMAKE_INSTALL_MANDIR}/man${fileExt}
 	PERMISSIONS OWNER_READ OWNER_WRITE
                     GROUP_READ
                     WORLD_READ
@@ -89,7 +89,7 @@ if ( Docbook_FOUND )
       list ( APPEND OPENOBEX_HELP_FILES ${file} )
       install (
 	FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
-	DESTINATION ${DOCUMENTATION_INSTALL_DIR}
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}
 	PERMISSIONS OWNER_READ OWNER_WRITE
                     GROUP_READ
                     WORLD_READ
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f404529..90da714 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -193,10 +193,10 @@ set_property ( TARGET openobex PROPERTY
 )
 
 install ( TARGETS openobex
-  RUNTIME       DESTINATION bin
-  LIBRARY       DESTINATION lib${LIB_SUFFIX}
-  ARCHIVE       DESTINATION lib${LIB_SUFFIX}
-  PUBLIC_HEADER DESTINATION include/openobex
+  RUNTIME       DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openobex
   COMPONENT library
 )
 
diff --git a/udev/CMakeLists.txt b/udev/CMakeLists.txt
index 5185b44..69e2d80 100644
--- a/udev/CMakeLists.txt
+++ b/udev/CMakeLists.txt
@@ -2,18 +2,18 @@ if ( CMAKE_SYSTEM_NAME STREQUAL "Linux" AND OPENOBEX_USB )
   add_executable ( obex-check-device obex-check-device.c )
   target_link_libraries ( obex-check-device openobex )
   install ( TARGETS obex-check-device
-    DESTINATION sbin
+    DESTINATION ${CMAKE_INSTALL_SBINDIR}
     COMPONENT system
   )
 
   # The udev rules file needs to be configured to have the right
   # path to obex-check-device.
   configure_file ( openobex.rules.in openobex.rules @ONLY )
-  set ( UDEV_RULES_INSTALL_DIR /lib/udev/rules.d
+  set ( CMAKE_INSTALL_UDEVRULESDIR /lib/udev/rules.d
         CACHE PATH "Where to install udev rules" )
-  mark_as_advanced ( UDEV_RULES_INSTALL_DIR )
+  mark_as_advanced ( CMAKE_INSTALL_UDEVRULESDIR )
   install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/openobex.rules
-    DESTINATION ${UDEV_RULES_INSTALL_DIR}
+    DESTINATION ${CMAKE_INSTALL_UDEVRULESDIR}
     COMPONENT system
     RENAME 60-openobex.rules
   )
-- 
1.7.5.4

This is needed for obex_test to actually work.
---
 lib/obex_client.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/obex_client.c b/lib/obex_client.c
index 5107d62..0199fbf 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -61,10 +61,10 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 		/* Response of a CMD_CONNECT needs some special treatment.*/
 		DEBUG(2, "We expect a connect-rsp\n");
 		if (obex_parse_connect_header(self, msg) < 0) {
-			self->mode = MODE_SRV;
-			self->state = STATE_IDLE;
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
+			self->mode = MODE_SRV;
+			self->state = STATE_IDLE;
 			return -1;
 		}
 		self->object->headeroffset=4;
@@ -82,10 +82,10 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 	/* Receive any headers */
 	ret = obex_object_receive(self, msg);
 	if (ret < 0) {
-		self->mode = MODE_SRV;
-		self->state = STATE_IDLE;
 		obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
+		self->mode = MODE_SRV;
+		self->state = STATE_IDLE;
 		return -1;
 	}
 
@@ -123,8 +123,6 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 	} else {
 		/* Notify app that client-operation is done! */
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
-		self->mode = MODE_SRV;
-		self->state = STATE_IDLE;
 		if (self->object->abort) {
 			if (rsp == OBEX_RSP_SUCCESS)
 				obex_deliver_event(self, OBEX_EV_ABORT,
@@ -139,6 +137,8 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 			obex_deliver_event(self, OBEX_EV_REQDONE,
 							self->object->opcode,
 							rsp, TRUE);
+		self->mode = MODE_SRV;
+		self->state = STATE_IDLE;
 	}
 
 	return 0;
@@ -197,10 +197,10 @@ int obex_client_send(obex_t *self, buf_t *msg, int rsp)
 			if (self->object->opcode == OBEX_CMD_CONNECT)
 				ret = obex_object_receive(self, msg);
 			if (ret < 0) {
-				self->mode = MODE_SRV;
-				self->state = STATE_IDLE;
 				obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
+				self->mode = MODE_SRV;
+				self->state = STATE_IDLE;
 				return -1;
 			}
 
-- 
1.7.5.4

---
 include/openobex/obex_const.h |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index ff147df..18d698a 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -151,19 +151,33 @@ enum obex_mode {
 	OBEX_MODE_SERVER = 1, /**< server mode */
 };
 
-/* Possible events */
-#define OBEX_EV_PROGRESS	0	/* Progress has been made */
-#define OBEX_EV_REQHINT		1	/* An incoming request is about to come */
-#define OBEX_EV_REQ		2	/* An incoming request has arrived */
-#define OBEX_EV_REQDONE		3	/* Request has finished */
-#define OBEX_EV_LINKERR		4	/* Link has been disconnected */
-#define OBEX_EV_PARSEERR	5	/* Malformed data encountered */
-#define OBEX_EV_ACCEPTHINT	6	/* Connection accepted */
-#define OBEX_EV_ABORT		7	/* Request was aborted */
-#define OBEX_EV_STREAMEMPTY	8	/* Need to feed more data when sending a stream */
-#define OBEX_EV_STREAMAVAIL	9	/* Time to pick up data when receiving a stream */
-#define OBEX_EV_UNEXPECTED	10	/* Unexpected data, not fatal */
-#define OBEX_EV_REQCHECK	11	/* First packet of an incoming request has been parsed */
+/** Possible events */
+enum obex_event {
+	/** Progress has been made */
+	OBEX_EV_PROGRESS = 0,
+	/** An incoming request is about to come */
+	OBEX_EV_REQHINT = 1,
+	/** An incoming request has arrived */
+	OBEX_EV_REQ = 2,
+	/** Request has finished */
+	OBEX_EV_REQDONE = 3,
+	/** Link has been disconnected */
+	OBEX_EV_LINKERR = 4,
+	/** Malformed data encountered */
+	OBEX_EV_PARSEERR = 5,
+	/** Connection accepted */
+	OBEX_EV_ACCEPTHINT = 6,
+	/** Request was aborted */
+	OBEX_EV_ABORT = 7,
+	/** Need to feed more data when sending a stream */
+	OBEX_EV_STREAMEMPTY = 8,
+	/** Time to pick up data when receiving a stream */
+	OBEX_EV_STREAMAVAIL = 9,
+	/** Unexpected data, not fatal */
+	OBEX_EV_UNEXPECTED = 10,
+	/** First packet of an incoming request has been parsed */
+	OBEX_EV_REQCHECK = 11,
+};
 
 /* For OBEX_Init() */
 #define OBEX_FL_KEEPSERVER	(1 <<  1) /* Keep the server alive */
-- 
1.7.5.4

Additionally, it adds a small wrapper function for BAD_REQUEST which can be
used quite often. Still, this is the only case where an incomplete write/send
is not possible but adding more states for this seems overkill. After all its
only 3 bytes to send.
The abort cases are now using the STATE_ABORT with a small wrapper.
---
 lib/obex_main.c   |   21 ----------
 lib/obex_main.h   |    1 -
 lib/obex_server.c |  114 +++++++++++++++++++++++++---------------------------
 3 files changed, 55 insertions(+), 81 deletions(-)

diff --git a/lib/obex_main.c b/lib/obex_main.c
index bd18921..e089201 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -266,27 +266,6 @@ void obex_deliver_event(obex_t *self, int event, int cmd, int rsp, int del)
 }
 
 /*
- * Function obex_response_request (self, opcode)
- *
- *    Send a response to peer device
- *
- */
-void obex_response_request(obex_t *self, uint8_t opcode)
-{
-	buf_t *msg;
-
-	obex_return_if_fail(self != NULL);
-
-	msg = buf_reuse(self->tx_msg);
-	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
-	do {
-		int status = obex_data_request(self, msg);
-		if (status < 0)
-			break;
-	} while (!buf_empty(msg));
-}
-
-/*
  * Function obex_data_request_prepare (self, opcode, cmd)
  *
  *    Prepare response or command code along with optional headers/data
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 72ce3a3..f9f3bb7 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -77,7 +77,6 @@ buf_t* obex_data_receive(obex_t *self);
 void obex_data_receive_finished(obex_t *self);
 enum obex_data_direction obex_get_data_direction (obex_t *self);
 
-void obex_response_request(struct obex *self, uint8_t opcode);
 void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
 			       int opcode);
 int obex_data_request(struct obex *self, struct databuffer *msg);
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 3a8d179..4b701ba 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -58,27 +58,61 @@ static __inline int msg_get_final(const buf_t *msg)
 		return 0;
 }
 
+static void obex_response_request(obex_t *self, uint8_t opcode)
+{
+	buf_t *msg;
+
+	obex_return_if_fail(self != NULL);
+
+	msg = buf_reuse(self->tx_msg);
+	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
+	do {
+		int status = obex_data_request(self, msg);
+		if (status < 0)
+			break;
+	} while (!buf_empty(msg));
+}
+
+static int obex_server_bad_request(obex_t *self)
+{
+	int opcode = self->object->opcode;
+
+	obex_response_request(self, OBEX_RSP_BAD_REQUEST);
+	self->state = STATE_IDLE;
+	obex_deliver_event(self, OBEX_EV_PARSEERR, opcode, 0, TRUE);
+	return -1;
+}
+
 static int obex_server_abort_transmit(obex_t *self)
 {
 	int ret = 0;
 	int rsp = OBEX_RSP_CONTINUE;
+	int opcode = OBEX_CMD_ABORT;
 
 	DEBUG(4, "STATE: ABORT/TRANSMIT_TX\n");
 
 	ret = obex_object_send_transmit(self, NULL);
-	if (ret == -1) {
-		obex_deliver_event(self, OBEX_EV_LINKERR,
-				   self->object->opcode, rsp, TRUE);
-
-	} else if (ret == 1) {
-		obex_deliver_event(self, OBEX_EV_ABORT,
-				   self->object->opcode, rsp, FALSE);
-	}
+	if (self->object)
+		opcode = self->object->opcode;
+	if (ret == -1)
+		obex_deliver_event(self, OBEX_EV_LINKERR, opcode, rsp, TRUE);
+	else if (ret == 1)
+		obex_deliver_event(self, OBEX_EV_ABORT, opcode, rsp, FALSE);
 
 	self->state = STATE_IDLE;
 	return ret;
 }
 
+static int obex_server_abort_response(obex_t *self)
+{
+	buf_t *msg = buf_reuse(self->tx_msg);
+
+	obex_data_request_prepare(self, msg, OBEX_RSP_SUCCESS | OBEX_FINAL);
+	self->state = STATE_ABORT;
+	self->substate = SUBSTATE_TRANSMIT_TX;
+	return obex_server_abort_transmit(self);
+}
+
 static int obex_server_abort_prepare(obex_t *self)
 {
 	buf_t *msg = buf_reuse(self->tx_msg);
@@ -178,12 +212,7 @@ static int obex_server_send(obex_t *self)
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
 		DEBUG(1, "Got OBEX_ABORT request!\n");
-		obex_response_request(self, OBEX_RSP_SUCCESS);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode, 0, TRUE);
-		/* This is not an Obex error, it is just that the peer
-		 * aborted the request, so return 0 - Jean II */
-		return 0;
+		return obex_server_abort_response(self);
 	}
 
 	if (len > 3) {
@@ -215,13 +244,8 @@ static int obex_server_send(obex_t *self)
 		ret = -1;
 		if (cmd != OBEX_CMD_CONNECT)
 			ret = obex_object_receive(self, msg);
-		if (ret < 0) {
-			obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-			self->state = STATE_IDLE;
-			obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-			return -1;
-		}
+		if (ret < 0)
+			return obex_server_bad_request(self);
 
 		/* Note: we may want to get rid of received header, however they
 		 * are mixed with legitimate headers, and the user may expect to
@@ -300,25 +324,14 @@ static int obex_server_recv(obex_t *self, int first)
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
 		DEBUG(1, "Got OBEX_ABORT request!\n");
-		obex_response_request(self, OBEX_RSP_SUCCESS);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode,
-								0, TRUE);
-		/* This is not an Obex error, it is just that the peer
-		 * aborted the request, so return 0 - Jean II */
-		return 0;
+		return obex_server_abort_response(self);
 	}
 
 	/* Sanity check */
-	if (cmd != self->object->cmd) {
+	if (cmd != self->object->cmd)
 		/* The cmd-field of this packet is not the
 		 * same as int the first fragment. Bail out! */
-		obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_PARSEERR,
-					self->object->opcode, cmd, TRUE);
-		return -1;
-	}
+		return obex_server_bad_request(self);
 
 	/* Get the non-header data and look at all non-body headers.
 	 * Leaving the body headers out here has advantages:
@@ -331,13 +344,8 @@ static int obex_server_recv(obex_t *self, int first)
 	 */
 	filter = (1 << OBEX_HDR_ID_BODY | 1 << OBEX_HDR_ID_BODY_END);
 	if (obex_object_receive_nonhdr_data(self, msg) < 0 ||
-			obex_object_receive_headers(self, msg, filter) < 0) {
-		obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-		return -1;
-	}
+			obex_object_receive_headers(self, msg, filter) < 0)
+		return obex_server_bad_request(self);
 
 	/* Let the user decide whether to accept or deny a
 	 * multi-packet request by examining all headers in
@@ -353,13 +361,8 @@ static int obex_server_recv(obex_t *self, int first)
 	switch ((self->object->opcode & ~OBEX_FINAL) & 0xF0) {
 	case OBEX_RSP_CONTINUE:
 	case OBEX_RSP_SUCCESS:
-		if (obex_object_receive_headers(self, msg, ~filter) < 0) {
-			obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-			self->state = STATE_IDLE;
-			obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-			return -1;
-		}
+		if (obex_object_receive_headers(self, msg, ~filter) < 0)
+			return obex_server_bad_request(self);
 		break;
 
 	default:
@@ -415,11 +418,8 @@ static int obex_server_idle(obex_t *self)
 	 * we don't need to send a request hint to the application */
 	if (cmd == OBEX_CMD_ABORT) {
 		DEBUG(1, "Got OBEX_ABORT request!\n");
-		obex_response_request(self, OBEX_RSP_SUCCESS);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, cmd, 0, TRUE);
 		obex_data_receive_finished(self);
-		return 0;
+		return obex_server_abort_response(self);
 	}
 
 	self->object = obex_object_new();
@@ -442,12 +442,8 @@ static int obex_server_idle(obex_t *self)
 	case OBEX_CMD_CONNECT:
 		DEBUG(4, "Got CMD_CONNECT\n");
 		/* Connect needs some extra special treatment */
-		if (obex_parse_connect_header(self, msg) < 0) {
-			obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-			obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-			return -1;
-		}
+		if (obex_parse_connect_header(self, msg) < 0)
+			return obex_server_bad_request(self);
 		self->object->headeroffset = 4;
 		break;
 
-- 
1.7.5.4

---
 include/openobex/obex.h       |    1 +
 include/openobex/obex_const.h |    7 +++++++
 lib/obex.c                    |   16 ++++++++++++++++
 lib/obex.sym                  |    1 +
 lib/obex_main.c               |   16 +++++++++++++---
 lib/obex_main.h               |    1 +
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 0711c6d..b38cf93 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -111,6 +111,7 @@ OPENOBEX_SYMBOL(void *)   OBEX_GetUserData(obex_t *self);
 OPENOBEX_SYMBOL(void)     OBEX_SetEventCb(obex_t *self, obex_event_cb_t eventcb, void * data);
 OPENOBEX_SYMBOL(int)      OBEX_SetTransportMTU(obex_t *self, uint16_t mtu_rx, uint16_t mtu_tx_max);
 OPENOBEX_SYMBOL(int)      OBEX_GetFD(obex_t *self);
+OPENOBEX_SYMBOL(enum obex_data_direction) OBEX_GetDataDirection(obex_t *self);
 
 OPENOBEX_SYMBOL(int)    OBEX_RegisterCTransport(obex_t *self, obex_ctrans_t *ctrans);
 OPENOBEX_SYMBOL(int)    OBEX_SetCustomData(obex_t *self, void * data);
diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index cdcd823..c675802 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -204,6 +204,13 @@ enum obex_transport_type {
 	OBEX_TRANS_BT_L2CAP = 7,  /**< Bluetooth L2CAP */
 };
 
+/** Possible directions for data */
+enum obex_data_direction {
+	OBEX_DATA_DIR_NONE = 0, /**< No data */
+	OBEX_DATA_DIR_RX = 1, /**< Incoming data */
+	OBEX_DATA_DIR_TX = 2, /**< Outgoing data */
+};
+
 /* Standard headers */
 #define OBEX_HDR_TYPE_UNICODE	(0 << 6)  /* zero terminated unicode string (network byte order) */
 #define OBEX_HDR_TYPE_BYTES	(1 << 6)  /* byte array */
diff --git a/lib/obex.c b/lib/obex.c
index 9cffea2..b944a80 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -449,6 +449,22 @@ int CALLAPI OBEX_Work(obex_t *self, long timeout)
 }
 
 /**
+   	Find out the current data transfer direction
+	\param self OBEX handle
+	\return see #obex_data_direction
+
+	If you want to check externally if a socket is readable/writable, this
+	function together with OBEX_GetFD() gives you full control when to
+	call OBEX_Work().
+ */
+LIB_SYMBOL
+enum obex_data_direction OBEX_GetDataDirection(obex_t *self)
+{
+	DEBUG(4, "\n");
+	return obex_get_data_direction(self);
+}
+
+/**
 	Feed OBEX with data when using a custom transport.
 	\param self OBEX handle
 	\param inputbuf Pointer to custom data
diff --git a/lib/obex.sym b/lib/obex.sym
index 6483738..10aa377 100644
--- a/lib/obex.sym
+++ b/lib/obex.sym
@@ -7,6 +7,7 @@ OBEX_SetUserCallBack
 OBEX_SetEventCb
 OBEX_SetTransportMTU
 OBEX_GetFD
+OBEX_GetDataDirection
 OBEX_RegisterCTransport
 OBEX_SetCustomData
 OBEX_GetCustomData
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 733e190..bd18921 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -342,6 +342,18 @@ static int obex_mode(obex_t *self)
 	}
 }
 
+enum obex_data_direction obex_get_data_direction (obex_t *self)
+{
+	if (self == NULL)
+		return OBEX_DATA_DIR_NONE;
+
+	if (self->state == STATE_IDLE ||
+	    self->substate == SUBSTATE_RECEIVE_RX)
+		return OBEX_DATA_DIR_RX;
+	else
+		return OBEX_DATA_DIR_TX;
+}
+
 /*
  * Function obex_work (self, timeout)
  *
@@ -352,9 +364,7 @@ int obex_work(obex_t *self, long timeout)
 {
 	int ret;
 
-	if (self->state == STATE_IDLE ||
-	    self->substate == SUBSTATE_RECEIVE_RX)
-	{
+	if (obex_get_data_direction(self) == OBEX_DATA_DIR_RX) {
 		ret = obex_transport_handle_input(self, timeout);
 		if (ret <= 0)
 			return ret;
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 55eca62..72ce3a3 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -75,6 +75,7 @@ int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
 buf_t* obex_data_receive(obex_t *self);
 void obex_data_receive_finished(obex_t *self);
+enum obex_data_direction obex_get_data_direction (obex_t *self);
 
 void obex_response_request(struct obex *self, uint8_t opcode);
 void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
-- 
1.7.5.4

This also makes the public type an enum (like it was for the internal type) but
the names for the values stay the same.
---
 include/openobex/obex_const.h |    7 +++++--
 lib/defines.h                 |    5 -----
 lib/obex.c                    |    6 +++---
 lib/obex_client.c             |   12 ++++++------
 lib/obex_main.c               |    9 +++------
 lib/obex_object.c             |    2 +-
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index 8276aae..ff147df 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -145,8 +145,11 @@ typedef union {
 	//obex_bluetooth_intf_t bt; // to be added
 } obex_interface_t;
 
-#define OBEX_MODE_CLIENT	0
-#define OBEX_MODE_SERVER	1
+/** Possible modes */
+enum obex_mode {
+	OBEX_MODE_CLIENT = 0, /**< client mode */
+	OBEX_MODE_SERVER = 1, /**< server mode */
+};
 
 /* Possible events */
 #define OBEX_EV_PROGRESS	0	/* Progress has been made */
diff --git a/lib/defines.h b/lib/defines.h
index 5935930..051509a 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -18,11 +18,6 @@
 
 #define OBEX_VERSION	0x10      /* OBEX Protocol Version 1.1 */
 
-enum obex_mode {
-	MODE_SRV,
-	MODE_CLI,
-};
-
 enum obex_state {
 	STATE_IDLE,
 	STATE_SEND,
diff --git a/lib/obex.c b/lib/obex.c
index 49de8cd..229d09d 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -119,7 +119,7 @@ obex_t * CALLAPI OBEX_Init(int transport, obex_event_t eventcb,
 
 	self->eventcb = eventcb;
 	self->init_flags = flags;
-	self->mode = MODE_SRV;
+	self->mode = OBEX_MODE_SERVER;
 	self->state = STATE_IDLE;
 	self->rsp_mode = OBEX_RSP_MODE_NORMAL;
 
@@ -384,7 +384,7 @@ obex_t *CALLAPI OBEX_ServerAccept(obex_t *server, obex_event_t eventcb,
 		goto out_err;
 
 	obex_transport_split(self, server);
-	self->mode = MODE_SRV;
+	self->mode = OBEX_MODE_SERVER;
         self->state = STATE_IDLE;
 	self->rsp_mode = server->rsp_mode;
 
@@ -533,7 +533,7 @@ int CALLAPI OBEX_Request(obex_t *self, obex_object_t *object)
 
 	object->rsp_mode = self->rsp_mode;
 	self->object = object;
-	self->mode = MODE_CLI;
+	self->mode = OBEX_MODE_CLIENT;
         self->state = STATE_SEND;
 	self->substate = SUBSTATE_PREPARE_TX;
 
diff --git a/lib/obex_client.c b/lib/obex_client.c
index efaf9f3..0282886 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -99,7 +99,7 @@ static int obex_client_abort(obex_t *self)
 	if (event == OBEX_EV_LINKERR)
 		ret = -1;
 
-	self->mode = MODE_SRV;
+	self->mode = OBEX_MODE_SERVER;
 	self->state = STATE_IDLE;
 	return ret;
 }
@@ -176,7 +176,7 @@ static int obex_client_recv(obex_t *self)
 		if (obex_parse_connect_header(self, msg) < 0) {
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
-			self->mode = MODE_SRV;
+			self->mode = OBEX_MODE_SERVER;
 			self->state = STATE_IDLE;
 			return -1;
 		}
@@ -198,7 +198,7 @@ static int obex_client_recv(obex_t *self)
 		if (ret < 0) {
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
-			self->mode = MODE_SRV;
+			self->mode = OBEX_MODE_SERVER;
 			self->state = STATE_IDLE;
 			return -1;
 		}
@@ -216,7 +216,7 @@ static int obex_client_recv(obex_t *self)
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
 		obex_deliver_event(self, OBEX_EV_REQDONE, self->object->opcode,
 								     rsp, TRUE);
-		self->mode = MODE_SRV;
+		self->mode = OBEX_MODE_SERVER;
 		self->state = STATE_IDLE;
 		return 0;
 	}
@@ -234,7 +234,7 @@ static int obex_client_send_transmit_tx(obex_t *self)
 		/* Error while sending */
 		obex_deliver_event(self, OBEX_EV_LINKERR,
 					self->object->opcode, 0, TRUE);
-		self->mode = MODE_SRV;
+		self->mode = OBEX_MODE_SERVER;
 		self->state = STATE_IDLE;
 
 	} else if (ret == 1) {
@@ -344,7 +344,7 @@ static int obex_client_send(obex_t *self)
 		if (ret < 0) {
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						 self->object->opcode, 0, TRUE);
-			self->mode = MODE_SRV;
+			self->mode = OBEX_MODE_SERVER;
 			self->state = STATE_IDLE;
 			return -1;
 		}
diff --git a/lib/obex_main.c b/lib/obex_main.c
index cc24735..7444250 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -195,10 +195,7 @@ void obex_deliver_event(obex_t *self, int event, int cmd, int rsp, int del)
 	if (del == TRUE)
 		self->object = NULL;
 
-	if (self->mode == MODE_SRV)
-		self->eventcb(self, object, OBEX_MODE_SERVER, event, cmd, rsp);
-	else
-		self->eventcb(self, object, OBEX_MODE_CLIENT, event, cmd, rsp);
+	self->eventcb(self, object, self->mode, event, cmd, rsp);
 
 	if (del == TRUE)
 		obex_object_delete(object);
@@ -270,10 +267,10 @@ int obex_data_request(obex_t *self, buf_t *msg)
 static int obex_mode(obex_t *self)
 {
 	switch (self->mode) {
-	case MODE_SRV:
+	case OBEX_MODE_SERVER:
 		return obex_server(self);
 
-	case MODE_CLI:
+	case OBEX_MODE_CLIENT:
 		return obex_client(self);
 
 	default:
diff --git a/lib/obex_object.c b/lib/obex_object.c
index a7d5cb3..d1c47e8 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -278,7 +278,7 @@ int obex_object_addheader(obex_t *self, obex_object_t *object, uint8_t hi,
 static uint8_t obex_object_getcmd(const obex_t *self,
 						const obex_object_t *object)
 {
-	if (self->mode == MODE_SRV)
+	if (self->mode == OBEX_MODE_SERVER)
 		return object->cmd;
 	else
 		return (object->opcode & ~OBEX_FINAL);
-- 
1.7.5.4

---
 lib/bluez_compat.h |    2 +-
 lib/cloexec.h      |   20 ++++++++++++++++++++
 lib/customtrans.c  |   22 ++++++++++++++++++++++
 lib/customtrans.h  |   21 +++++++++++++++++++++
 lib/fdobex.c       |   22 ++++++++++++++++++++++
 lib/fdobex.h       |   21 +++++++++++++++++++++
 6 files changed, 107 insertions(+), 1 deletions(-)

diff --git a/lib/bluez_compat.h b/lib/bluez_compat.h
index 6bd7000..b72b94f 100644
--- a/lib/bluez_compat.h
+++ b/lib/bluez_compat.h
@@ -3,7 +3,7 @@
 	Provides the Bluez API on other platforms.
 	OpenOBEX library - Free implementation of the Object Exchange protocol.
 
-	Copyright (c) 2007 Hendrik Sattler, All Rights Reserved.
+	Copyright (c) 2007-2011 Hendrik Sattler, All Rights Reserved.
 
 	OpenOBEX is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as
diff --git a/lib/cloexec.h b/lib/cloexec.h
index 1c5c396..f2a77c0 100644
--- a/lib/cloexec.h
+++ b/lib/cloexec.h
@@ -1,3 +1,23 @@
+/**
+	\file cloexec.h
+	close-on-exec wrapper functions.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 2010 Hendrik Sattler, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
 
 #ifndef _WIN32
 #include <fcntl.h>
diff --git a/lib/customtrans.c b/lib/customtrans.c
index 20e264c..98a1423 100644
--- a/lib/customtrans.c
+++ b/lib/customtrans.c
@@ -1,3 +1,25 @@
+/**
+	\file customtrans.c
+	Custom OBEX, custom transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
+
 #include "obex_main.h"
 #include "customtrans.h"
 
diff --git a/lib/customtrans.h b/lib/customtrans.h
index fed7880..98290c7 100644
--- a/lib/customtrans.h
+++ b/lib/customtrans.h
@@ -1,3 +1,24 @@
+/**
+	\file customtrans.h
+	Custom OBEX, custom transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
 
 #ifndef CUSTOMTRANS_H
 #define CUSTOMTRANS_H
diff --git a/lib/fdobex.c b/lib/fdobex.c
index 45c56ff..fa2d64a 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -1,3 +1,25 @@
+/**
+	\file fdobex.c
+	FD OBEX, file descriptor transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
+
 #include <errno.h>
 
 #include "obex_main.h"
diff --git a/lib/fdobex.h b/lib/fdobex.h
index 07e33ab..7008fa5 100644
--- a/lib/fdobex.h
+++ b/lib/fdobex.h
@@ -1,3 +1,24 @@
+/**
+	\file fdobex.h
+	FD OBEX, file descriptor transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
 
 #ifndef FDOBEX_H
 #define FDOBEX_H
-- 
1.7.5.4

---
 apps/obex_test/obex_test.c |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 7527a51..4b9b0b2 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -167,9 +167,9 @@ int main (int argc, char *argv[])
 	struct context global_context = {0};
 
 #ifdef HAVE_BLUETOOTH
-	int btobex = FALSE;
+	int btobex = 0;
 	bdaddr_t bdaddr;
-	uint8_t channel = 0;
+	uint16_t channel = 0;
 #endif
 #ifdef HAVE_USB
 	int usbobex = FALSE;
@@ -192,6 +192,7 @@ int main (int argc, char *argv[])
 #endif
 #ifdef HAVE_BLUETOOTH
 			"    -b [addr] [chan]  Use bluetooth RFCOMM transport\n"
+			"    -B [addr] [psm]   Use bluetooth L2CAP transport\n"
 #endif
 #ifdef HAVE_USB
 			"    -u [interface]    Use USB transport\n"
@@ -214,7 +215,9 @@ int main (int argc, char *argv[])
 #endif
 #ifdef HAVE_BLUETOOTH
 	if (argc >= 2 && strcmp(argv[1], "-b") == 0)
-		btobex = TRUE;
+		btobex = 1;
+	if (argc >= 2 && strcmp(argv[1], "-B") == 0)
+		btobex = 2;
 #endif
 #ifdef HAVE_USB
 	if (argc >= 2 && strcmp(argv[1], "-u") == 0)
@@ -281,7 +284,7 @@ int main (int argc, char *argv[])
 		}
 
 		switch (btobex) {
-		case TRUE:
+		case 1:
 			printf("Using Bluetooth RFCOMM transport\n");
 			handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
 			if (channel_arg)
@@ -289,6 +292,14 @@ int main (int argc, char *argv[])
 			else
 				channel = BT_CHANNEL;
 			break;
+
+		case 2:
+			printf("Using Bluetooth L2CAP transport\n");
+			handle = OBEX_Init(OBEX_TRANS_BT_L2CAP, obex_event, 0);
+			if (channel_arg)
+				channel = atoi(channel_arg);
+			channel = (channel | 0x1001) & 0xFFFF;
+			break;
 		}
 
 		if (!handle) {
-- 
1.7.5.4

Note that the transport only works on Linux. Although it also compiles on
Windows, the operating system itself does not support it. FreeBSD and NetBSD do
not seem to support ERTM, yet. The code for the last two is not compile-tested.
---
 include/openobex/obex.h       |    4 +-
 include/openobex/obex_const.h |    3 +-
 lib/CMakeLists.txt            |    1 +
 lib/Makefile.am               |    3 +-
 lib/bluez_compat.h            |   16 ++-
 lib/btobex.c                  |   24 +++-
 lib/btobex.h                  |   11 ++-
 lib/btobex_l2cap.c            |  315 +++++++++++++++++++++++++++++++++++++++++
 lib/obex.c                    |   16 ++-
 lib/obex_main.c               |   20 +++
 lib/obex_main.h               |    1 +
 lib/obex_transport.c          |    4 +
 12 files changed, 401 insertions(+), 17 deletions(-)
 create mode 100644 lib/btobex_l2cap.c

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 6dda861..6bf91d4 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -147,8 +147,8 @@ OPENOBEX_SYMBOL(int) IrOBEX_TransportConnect(obex_t *self, const char *service);
 #endif
 
 #if defined(bt_addr_t)
-OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel);
-OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint8_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint16_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint16_t channel);
 #endif
 
 /*
diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index cb7afeb..b4bad7f 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -179,9 +179,10 @@ typedef union {
 #define OBEX_TRANS_IRDA		1
 #define OBEX_TRANS_INET		2
 #define OBEX_TRANS_CUSTOM	3
-#define OBEX_TRANS_BLUETOOTH	4
+#define OBEX_TRANS_BLUETOOTH	4 /* Bluetooth RFCOMM */
 #define OBEX_TRANS_FD		5
 #define OBEX_TRANS_USB		6
+#define OBEX_TRANS_BT_L2CAP	7 /* Bluetooth L2CAP */
 
 /* Standard headers */
 #define OBEX_HDR_TYPE_UNICODE	(0 << 6)  /* zero terminated unicode string (network byte order) */
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 6efa6d0..f404529 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -95,6 +95,7 @@ endif ( OPENOBEX_IRDA )
 if ( OPENOBEX_BLUETOOTH )
   list ( APPEND SOURCES
     btobex.c
+    btobex_l2cap.c
   )
   list ( APPEND HEADERS
     btobex.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 897450d..ae92239 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,14 +12,13 @@ libopenobex_la_SOURCES = \
 	obex_client.c obex_client.h \
 	irobex.c irobex.h \
 	inobex.c inobex.h \
-	btobex.c btobex.h \
+	btobex.c btobex.h btobex_l2cap.c bluez_compat.h \
 	fdobex.c fdobex.h \
 	customtrans.c customtrans.h \
 	databuffer.c databuffer.h \
 	irda_wrap.h \
 	usbutils.c usbutils.h \
 	usbobex.c usb1obex.c usbobex.h \
-	bluez_compat.h \
 	visibility.h defines.h debug.h cloexec.h
 
 libopenobex_la_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/lib/bluez_compat.h b/lib/bluez_compat.h
index c8b046c..6bd7000 100644
--- a/lib/bluez_compat.h
+++ b/lib/bluez_compat.h
@@ -32,13 +32,17 @@
 #include <ws2bth.h>
 #define bdaddr_t    BTH_ADDR
 #define sockaddr_rc _SOCKADDR_BTH
+#define sockaddr_l2 _SOCKADDR_BTH
 #define rc_family   addressFamily
 #define rc_bdaddr   btAddr
 #define rc_channel  port
+#define l2_family   addressFamily
+#define l2_bdaddr   btAddr
+#define l2_psm      port
 #define PF_BLUETOOTH   PF_BTH
 #define AF_BLUETOOTH   AF_BTH
 #define BTPROTO_RFCOMM BTHPROTO_RFCOMM
-/* TODO: should be const */
+#define BTPROTO_L2CAP  BTHPROTO_L2CAP
 extern bdaddr_t bluez_compat_bdaddr_any;
 #define BDADDR_ANY     &bluez_compat_bdaddr_any
 #define bacpy(dst,src) memcpy((dst),(src),sizeof(bdaddr_t))
@@ -47,23 +51,33 @@ extern bdaddr_t bluez_compat_bdaddr_any;
 #elif defined(HAVE_BLUETOOTH_LINUX)
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/rfcomm.h>
+#include <bluetooth/l2cap.h>
 
 #elif defined(HAVE_BLUETOOTH_FREEBSD)
 #include <bluetooth.h>
 #define sockaddr_rc sockaddr_rfcomm
+#define sockaddr_l2 sockaddr_l2cap
 #define rc_family   rfcomm_family
 #define rc_bdaddr   rfcomm_bdaddr
 #define rc_channel  rfcomm_channel
+#define l2_family   l2cap_family
+#define l2_bdaddr   l2cap_bdaddr
+#define l2_psm      l2cap_psm
 #define BDADDR_ANY  NG_HCI_BDADDR_ANY
 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
+#define BTPROTO_L2CAP  BLUETOOTH_PROTO_L2CAP
 
 #elif defined(HAVE_BLUETOOTH_NETBSD)
 #include <bluetooth.h>
 #include <netbt/rfcomm.h>
+#include <netbt/l2cap.h>
 #define sockaddr_rc sockaddr_bt
 #define rc_family   bt_family
 #define rc_bdaddr   bt_bdaddr
 #define rc_channel  bt_channel
+#define l2_family   bt_family
+#define l2_bdaddr   bt_bdaddr
+#define l2_psm      bt_psm
 #define bacpy(dst,src) memcpy((dst),(src),sizeof(bdaddr_t))
 #define bacmp(a,b)     memcmp((a),(b),sizeof(bdaddr_t))
 #define str2ba(str, ba)	(bt_aton((str), (ba)) == 1 ? 0 : -1)
diff --git a/lib/btobex.c b/lib/btobex.c
index 810ce91..8df237a 100644
--- a/lib/btobex.c
+++ b/lib/btobex.c
@@ -108,7 +108,7 @@ static int btobex_set_remote_addr(obex_t *self, struct sockaddr *addr, size_t le
  *
  */
 void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
-					const bdaddr_t *dst, uint8_t channel)
+					const bdaddr_t *dst, uint16_t channel)
 {
 	struct obex_transport *trans = &self->trans;
 
@@ -123,6 +123,16 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
 		addr.rc_channel = (uint8_t)(channel & 0xFF);
 		obex_transport_set_remote_addr(self, (struct sockaddr *) &addr,
 					       sizeof(addr));
+
+	} else if (trans->type == OBEX_TRANS_BT_L2CAP) {
+		struct sockaddr_l2 addr;
+
+		memset(&addr, 0, sizeof(addr));
+		addr.l2_family = AF_BLUETOOTH;
+		bacpy(&addr.l2_bdaddr, dst);
+		addr.l2_psm = channel;
+		obex_transport_set_remote_addr(self, (struct sockaddr *) &addr,
+					       sizeof(addr));
 	}
 }
 
@@ -132,7 +142,7 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
  *    Prepare for Bluetooth RFCOMM listen
  *
  */
-void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
+void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint16_t channel)
 {
 	struct obex_transport *trans = &self->trans;
 
@@ -145,6 +155,16 @@ void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
 		addr.rc_channel = (uint8_t)(channel & 0xFF);
 		obex_transport_set_local_addr(self, (struct sockaddr *) &addr,
 					      sizeof(addr));
+
+	} else if (trans->type == OBEX_TRANS_BT_L2CAP) {
+		struct sockaddr_l2 addr;
+
+		memset(&addr, 0, sizeof(addr));
+		addr.l2_family = AF_BLUETOOTH;
+		bacpy(&addr.l2_bdaddr, src);
+		addr.l2_psm = channel;
+		obex_transport_set_local_addr(self, (struct sockaddr *) &addr,
+					      sizeof(addr));
 	}
 }
 
diff --git a/lib/btobex.h b/lib/btobex.h
index 4375881..9c4d0c8 100644
--- a/lib/btobex.h
+++ b/lib/btobex.h
@@ -26,16 +26,23 @@
 #include "obex_transport.h"
 
 void btobex_get_ops(struct obex_transport_ops* ops);
+void btobex_l2cap_get_ops(struct obex_transport_ops *ops);
 void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
-			    const bdaddr_t *dst, uint8_t channel);
-void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel);
+			    const bdaddr_t *dst, uint16_t channel);
+void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint16_t channel);
 
 struct btobex_rfcomm_data {
 	struct sockaddr_rc self;
 	struct sockaddr_rc peer;
 };
 
+struct btobex_l2cap_data {
+	struct sockaddr_l2 self;
+	struct sockaddr_l2 peer;
+};
+
 union btobex_data {
 	struct btobex_rfcomm_data rfcomm;
+	struct btobex_l2cap_data l2cap;
 };
 #endif
diff --git a/lib/btobex_l2cap.c b/lib/btobex_l2cap.c
new file mode 100644
index 0000000..a170a42
--- /dev/null
+++ b/lib/btobex_l2cap.c
@@ -0,0 +1,315 @@
+/**
+	\file btobex_l2cap.c
+	Bluetooth L2CAP OBEX, Bluetooth L2CAP transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 2011 Hendrik Sattler, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_BLUETOOTH
+
+#ifdef _WIN32
+/* Windows does not support L2CAP transports, although it compiles, it will
+ * return an error code on runtime.
+ */
+#include <winsock2.h>
+
+#else /* _WIN32 */
+/* Linux/FreeBSD/NetBSD case */
+
+#include <string.h>
+#include <errno.h>
+#include <sys/socket.h>
+#endif /* _WIN32 */
+
+#include "obex_main.h"
+#include "btobex.h"
+
+#ifdef _WIN32
+#define WSA_VER_MAJOR 2
+#define WSA_VER_MINOR 2
+#endif
+
+#include "cloexec.h"
+
+static int btobex_l2cap_init(obex_t *self)
+{
+#ifdef _WIN32
+	WORD ver = MAKEWORD(WSA_VER_MAJOR,WSA_VER_MINOR);
+	WSADATA WSAData;
+	if (WSAStartup(ver, &WSAData) != 0) {
+		DEBUG(4, "WSAStartup failed (%d)\n",WSAGetLastError());
+		return -1;
+	}
+	if (LOBYTE(WSAData.wVersion) != WSA_VER_MAJOR ||
+				HIBYTE(WSAData.wVersion) != WSA_VER_MINOR) {
+		DEBUG(4, "WSA version mismatch\n");
+		WSACleanup();
+		return -1;
+	}
+#endif
+
+	return 0;
+}
+
+static void btobex_l2cap_cleanup(obex_t *self)
+{
+	DEBUG(3, "\n");
+
+#ifdef _WIN32
+	WSACleanup();
+#endif
+}
+
+static int btobex_l2cap_set_opts(obex_t *self, socket_t fd)
+{
+	int ret = 0;
+
+#ifdef HAVE_BLUETOOTH_LINUX
+	struct l2cap_options opts;
+	socklen_t optlen = sizeof(opts);
+
+	DEBUG(3, "\n");
+
+	memset(&opts, 0, sizeof(opts));
+	ret = getsockopt(fd, SOL_L2CAP, L2CAP_OPTIONS, &opts, &optlen);
+	if (ret < 0)
+		return -errno;
+
+	opts.imtu = self->mtu_rx;
+	opts.mode = L2CAP_MODE_ERTM;
+
+	ret = setsockopt(fd, SOL_L2CAP, L2CAP_OPTIONS, &opts, optlen);
+	if (ret < 0)
+		return -errno;
+
+#elif HAVE_BLUETOOTH_FREEBSD || HAVE_BLUETOOTH_NETBSD
+	uint16_t imtu_opt = self->mtu_rx;
+	socklen_t imtu_optlen = sizeof(imtu_opt);
+
+	DEBUG(3, "\n");
+	ret = setsockopt(fd, SOL_L2CAP, SO_L2CAP_IMTU, &imtu_opt, imtu_optlen);
+	if (ret < 0)
+		return -errno;
+
+	/* ERTM not available? */
+
+#endif /* HAVE_BLUETOOTH_* */
+
+	return 0;
+}
+
+static int btobex_l2cap_set_local_addr(obex_t *self, struct sockaddr *addr,
+				       size_t len)
+{
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	const struct sockaddr_l2 *local = (struct sockaddr_l2 *) addr;
+
+	DEBUG(3, "\n");
+
+	if (len == sizeof(*local) && local->l2_family == AF_BLUETOOTH) {
+		data->self = *local;
+		return 0;
+	}
+
+	return -1;
+}
+
+static int btobex_l2cap_set_remote_addr(obex_t *self, struct sockaddr *addr,
+					size_t len)
+{
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	const struct sockaddr_l2 *remote = (struct sockaddr_l2 *) addr;
+
+	DEBUG(3, "\n");
+
+	if (len == sizeof(*remote) && remote->l2_family == AF_BLUETOOTH) {
+		data->peer = *remote;
+		return 0;
+	}
+
+	return -1;
+}
+
+static int btobex_l2cap_listen(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	int ret = 0;
+
+	DEBUG(3, "\n");
+
+	trans->serverfd = obex_create_packet_socket(self, AF_BLUETOOTH);
+	if (trans->serverfd == INVALID_SOCKET) {
+		DEBUG(0, "Error creating socket\n");
+		return -1;
+	}
+
+	ret = bind(trans->serverfd, (struct sockaddr*) &data->self,
+		   sizeof(data->self));
+	if (ret < 0) {
+		DEBUG(0, "Error doing bind\n");
+		goto out_freesock;
+	}
+
+	ret = btobex_l2cap_set_opts(self, trans->serverfd);
+	if (ret) {
+		DEBUG(4, "Setting L2CAP socket options failed: %s\n",
+		      strerror(-ret));
+		goto out_freesock;
+	}
+
+	ret = listen(trans->serverfd, 1);
+	if (ret < 0) {
+		DEBUG(0, "Error doing listen\n");
+		goto out_freesock;
+	}
+
+	DEBUG(4, "We are now listening for connections\n");
+	return 1;
+
+out_freesock:
+	obex_delete_socket(self, trans->serverfd);
+	trans->serverfd = INVALID_SOCKET;
+	return -1;
+}
+
+static int btobex_l2cap_accept(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	struct sockaddr *addr = (struct sockaddr *) &data->peer;
+	socklen_t addrlen = sizeof(data->peer);
+
+	DEBUG(3, "\n");
+
+	// First accept the connection and get the new client socket.
+	if (self->init_flags & OBEX_FL_CLOEXEC)
+		trans->fd = accept_cloexec(trans->serverfd, addr, &addrlen);
+	else
+		trans->fd = accept(trans->serverfd, addr, &addrlen);
+
+	if (trans->fd == INVALID_SOCKET)
+		return -1;
+
+	trans->mtu = OBEX_DEFAULT_MTU;
+
+	return 0;
+}
+
+static int btobex_l2cap_connect_request(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	int ret = 0;
+
+	DEBUG(3, "\n");
+
+	if (trans->fd == INVALID_SOCKET) {
+		trans->fd = obex_create_packet_socket(self, AF_BLUETOOTH);
+		if (trans->fd == INVALID_SOCKET)
+			return -1;
+	}
+
+	ret = bind(trans->fd, (struct sockaddr*) &data->self,
+		   sizeof(data->self));
+	if (ret < 0) {
+		DEBUG(4, "bind(): error %d\n", errno);
+		goto out_freesock;
+	}
+
+	ret = btobex_l2cap_set_opts(self, trans->fd);
+	if (ret) {
+		DEBUG(4, "Setting L2CAP socket options failed: %s\n",
+		      strerror(-ret));
+		goto out_freesock;
+	}
+
+	ret = connect(trans->fd, (struct sockaddr*) &data->peer,
+		      sizeof(data->peer));
+	if (ret < 0) {
+		DEBUG(4, "connect(): error %d\n", errno);
+		goto out_freesock;
+	}
+
+	trans->mtu = OBEX_DEFAULT_MTU;
+
+	DEBUG(2, "transport mtu=%d\n", trans->mtu);
+
+	return 1;
+
+out_freesock:
+	obex_delete_socket(self, trans->fd);
+	trans->fd = INVALID_SOCKET;
+	return ret;
+}
+
+static int btobex_l2cap_disconnect_request(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	int ret;
+
+	DEBUG(4, "\n");
+
+	ret = obex_delete_socket(self, trans->fd);
+	if (ret < 0)
+		return ret;
+
+	trans->fd = INVALID_SOCKET;
+
+	return ret;
+}
+
+static int btobex_l2cap_disconnect_server(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	int ret;
+
+	DEBUG(4, "\n");
+
+	ret = obex_delete_socket(self, trans->serverfd);
+	trans->serverfd = INVALID_SOCKET;
+
+	return ret;
+}
+
+static int btobex_l2cap_read(obex_t *self, void *buf, int buflen)
+{
+	struct obex_transport *trans = &self->trans;
+
+	return recv(trans->fd, buf, self->mtu_rx, 0);
+}
+
+void btobex_l2cap_get_ops(struct obex_transport_ops *ops)
+{
+	ops->init = &btobex_l2cap_init;
+	ops->cleanup = &btobex_l2cap_cleanup;
+	ops->write = &obex_transport_do_send;
+	ops->read = &btobex_l2cap_read;
+	ops->set_local_addr = &btobex_l2cap_set_local_addr;
+	ops->set_remote_addr = &btobex_l2cap_set_remote_addr;
+	ops->server.listen = &btobex_l2cap_listen;
+	ops->server.accept = &btobex_l2cap_accept;
+	ops->server.disconnect = &btobex_l2cap_disconnect_server;
+	ops->client.connect = &btobex_l2cap_connect_request;
+	ops->client.disconnect = &btobex_l2cap_disconnect_request;
+}
+
+#endif /* HAVE_BLUETOOTH */
diff --git a/lib/obex.c b/lib/obex.c
index 874cfcd..a2409a2 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -73,6 +73,7 @@
 			- #OBEX_TRANS_CUSTOM : Use user provided transport, you must
 			register your own transport with #OBEX_RegisterCTransport()
 			- #OBEX_TRANS_BLUETOOTH: Use regular Bluetooth RFCOMM socket
+			- #OBEX_TRANS_BT_L2CAP: Use regular Bluetooth L2CAP socket
 			- #OBEX_TRANS_USB: Use USB transport (libusb needed)
 	\param eventcb Function pointer to your event callback.
 			See obex.h for prototype of this callback.
@@ -1051,14 +1052,15 @@ int CALLAPI IrOBEX_TransportConnect(obex_t *self, const char *service)
 /**
 	Start listening for incoming connections.
 	\param self OBEX handle
-	\param src source address to listen on
-	\param channel source channel to listen on
+	\param src bluetooth address to listen on
+	\param channel RFComm channel or L2CAP PSM to listen on
 	\return -1 or negative error code on error
 
 	An easier server function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel)
+int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src,
+				  uint16_t channel)
 {
 	DEBUG(3, "\n");
 
@@ -1077,16 +1079,16 @@ int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t ch
 /**
 	Connect Bluetooth transport.
 	\param self OBEX handle
-	\param src source address to connect from
-	\param dst destination address to connect to
-	\param channel destination channel to connect to
+	\param src bluetooth address of local adapter to use
+	\param dst bluetooth address to connect to
+	\param channel RFComm channel or L2CAP PSM to connect to
 	\return -1 or negative error code on error
 
 	An easier connect function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
 int CALLAPI BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src,
-					const bt_addr_t *dst, uint8_t channel)
+					const bt_addr_t *dst, uint16_t channel)
 {
 	DEBUG(4, "\n");
 
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 14a5263..1d39cd8 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -83,6 +83,26 @@ socket_t obex_create_socket(obex_t *self, int domain)
 	return fd;
 }
 
+socket_t obex_create_packet_socket(obex_t *self, int domain)
+{
+	socket_t fd;
+	int type = SOCK_SEQPACKET, proto = 0;
+
+	DEBUG(4, "\n");
+
+#ifdef HAVE_BLUETOOTH
+	if (domain == AF_BLUETOOTH)
+		proto = BTPROTO_L2CAP;
+#endif /*HAVE_BLUETOOTH*/
+
+	if (self->init_flags & OBEX_FL_CLOEXEC)
+		fd = socket_cloexec(domain, type, proto);
+	else
+		fd = socket(domain, type, proto);
+
+	return fd;
+}
+
 /*
  * Function obex_delete_socket()
  *
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 86474e5..3c3098c 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -62,6 +62,7 @@ struct obex {
 };
 
 socket_t obex_create_socket(struct obex *self, int domain);
+socket_t obex_create_packet_socket(obex_t *self, int domain);
 int obex_delete_socket(struct obex *self, socket_t fd);
 
 void obex_deliver_event(struct obex *self, int event, int cmd, int rsp, int del);
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index 695a712..aa113ed 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -87,6 +87,10 @@ int obex_transport_init(obex_t *self, int transport)
 	case OBEX_TRANS_BLUETOOTH:
 		btobex_get_ops(&trans->ops);
 		break;
+
+	case OBEX_TRANS_BT_L2CAP:
+		btobex_l2cap_get_ops(&trans->ops);
+		break;
 #endif /*HAVE_BLUETOOTH*/
 
 	case OBEX_TRANS_FD:
-- 
1.7.5.4

---
 include/openobex/obex_const.h |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index 18d698a..cdcd823 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -193,14 +193,16 @@ enum obex_event {
 #define OBEX_FL_STREAM_DATAEND	0x08	/* Body stream last data */
 #define OBEX_FL_SUSPEND		0x10	/* Suspend after sending this header */
 
-/* Transports */
-#define OBEX_TRANS_IRDA		1
-#define OBEX_TRANS_INET		2
-#define OBEX_TRANS_CUSTOM	3
-#define OBEX_TRANS_BLUETOOTH	4 /* Bluetooth RFCOMM */
-#define OBEX_TRANS_FD		5
-#define OBEX_TRANS_USB		6
-#define OBEX_TRANS_BT_L2CAP	7 /* Bluetooth L2CAP */
+/** Possible transports */
+enum obex_transport_type {
+	OBEX_TRANS_IRDA = 1,      /**< Infrared */
+	OBEX_TRANS_INET = 2,      /**< TCP over IPv4/v6 */
+	OBEX_TRANS_CUSTOM = 3,    /**< Custom transport with callbacks */
+	OBEX_TRANS_BLUETOOTH = 4, /**< Bluetooth RFCOMM */
+	OBEX_TRANS_FD = 5,        /**< file descriptors */
+	OBEX_TRANS_USB = 6,       /**< USB CDC OBEX */
+	OBEX_TRANS_BT_L2CAP = 7,  /**< Bluetooth L2CAP */
+};
 
 /* Standard headers */
 #define OBEX_HDR_TYPE_UNICODE	(0 << 6)  /* zero terminated unicode string (network byte order) */
-- 
1.7.5.4

We never actually shipped the result from glib/ to be easily compilable, it has
no known dependencies.
---
 .gitignore                  |    6 -
 CMakeLists.txt              |   22 +-
 CMakeModules/FindGlib.cmake |   94 ----
 Makefile.am                 |    8 +-
 acinclude.m4                |   14 -
 configure.ac                |    3 +-
 glib/CMakeLists.txt         |  139 ------
 glib/Makefile.am            |   42 --
 glib/obex-client.c          |  589 -------------------------
 glib/obex-client.h          |  163 -------
 glib/obex-debug.h           |   28 --
 glib/obex-error.c           |  226 ----------
 glib/obex-error.h           |   31 --
 glib/obex-lowlevel.c        | 1014 -------------------------------------------
 glib/obex-lowlevel.h        |   50 ---
 glib/obex-marshal.list      |    1 -
 glib/test-client.c          |  237 ----------
 glib/test-lowlevel.c        |  104 -----
 openobex-glib.pc.in         |   12 -
 19 files changed, 8 insertions(+), 2775 deletions(-)
 delete mode 100644 CMakeModules/FindGlib.cmake
 delete mode 100644 glib/CMakeLists.txt
 delete mode 100644 glib/Makefile.am
 delete mode 100644 glib/obex-client.c
 delete mode 100644 glib/obex-client.h
 delete mode 100644 glib/obex-debug.h
 delete mode 100644 glib/obex-error.c
 delete mode 100644 glib/obex-error.h
 delete mode 100644 glib/obex-lowlevel.c
 delete mode 100644 glib/obex-lowlevel.h
 delete mode 100644 glib/obex-marshal.list
 delete mode 100644 glib/test-client.c
 delete mode 100644 glib/test-lowlevel.c
 delete mode 100644 openobex-glib.pc.in

diff --git a/.gitignore b/.gitignore
index 643a070..2e6307f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,12 +24,6 @@ stamp-h1
 autom4te.cache
 
 openobex.pc
-openobex-glib.pc
-
-glib/obex-marshal.h
-glib/obex-marshal.c
-glib/test-lowlevel
-glib/test-client
 
 ircp/ircp
 apps/irxfer
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf312a6..5a2bde4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,13 +134,11 @@ if ( OPENOBEX_USB AND UNIX AND NOT WIN32 )
     endforeach ( lib )
   endif ( PKGCONFIG_LIBUSB_FOUND )
 endif ( OPENOBEX_USB AND UNIX AND NOT WIN32 )
-foreach ( file openobex openobex-glib )
-  configure_file (
-    ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${file}.pc
-    @ONLY
-  )
-endforeach ( file )
+configure_file (
+  ${CMAKE_CURRENT_SOURCE_DIR}/openobex.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/openobex.pc
+  @ONLY
+)
 
 if ( NOT PKGCONFIG_INSTALL_DIR )
   set ( PKGCONFIG_INSTALL_DIR lib${LIB_SUFFIX}/pkgconfig
@@ -198,16 +196,6 @@ endif ( BUILD_DOCUMENTATION )
 
 
 #
-# build the glib binding library
-# not enabled by default because it requires an additional dependency
-#
-#option ( BUILD_GLIB_BINDING "Build the glib binding library")
-#if ( BUILD_GLIB_BINDING )
-#  add_subdirectory ( glib )
-#endif ( BUILD_GLIB_BINDING )
-
-
-#
 # The following adds CPack support
 #
 set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenObex" )
diff --git a/CMakeModules/FindGlib.cmake b/CMakeModules/FindGlib.cmake
deleted file mode 100644
index 89a3eab..0000000
--- a/CMakeModules/FindGlib.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-
-set ( GLIB_COMPONENTS glib-2.0 )
-foreach ( c ${Glib_FIND_COMPONENTS} )
-  list ( APPEND GLIB_COMPONENTS "g${c}-2.0" )
-endforeach ( c ) 
-
-find_package ( PkgConfig )
-
-if ( PKG_CONFIG_FOUND )
-  pkg_check_modules ( PKGCONFIG_GLIB REQUIRED ${GLIB_COMPONENTS} )
-endif ( PKG_CONFIG_FOUND )
-
-if ( PKG_CONFIG_GLIB_FOUND )
-  set ( Glib_FOUND ${PKG_CONFIG_GLIB_FOUND} )
-  set ( Glib_INCLUDE_DIRS ${PKG_CONFIG_GLIB_INCLUDE_DIRS} )
-  foreach ( i ${PKGCONFIG_GLIB_LIBRARIES} )
-    find_library ( ${i}_LIBRARY
-      NAMES ${i}
-      PATHS ${PKGCONFIG_GLIB_LIBRARY_DIRS}
-    )
-    if ( ${i}_LIBRARY )
-      list ( APPEND Glib_LIBRARIES ${${i}_LIBRARY} )
-    endif ( ${i}_LIBRARY )
-    mark_as_advanced ( ${i}_LIBRARY )
-  endforeach ( i )
-  mark_as_advanced ( Glib_LIBRARIES )
-
-else ( PKG_CONFIG_GLIB_FOUND )
-  find_path ( GLIB_INCLUDE_PATH
-    NAMES
-      glib.h
-    PATHS
-      $ENV{GLIB_ROOT_DIR}/include
-    PATH_SUFFIXES
-      glib-2.0
-  )
-  mark_as_advanced ( GLIB_INCLUDE_PATH )
-
-  foreach ( i ${GLIB_COMPONENTS} )
-    find_library ( ${i}_LIBRARY
-      NAMES
-        ${i}
-      PATHS
-        $ENV{GLIB_ROOT_DIR}/lib
-    )
-    if ( ${i}_LIBRARY )
-      list ( APPEND Glib_LIBRARIES ${${i}_LIBRARY} )
-    endif ( ${i}_LIBRARY )
-    mark_as_advanced ( ${i}_LIBRARY )
-  endforeach ( i )
-  mark_as_advanced ( Glib_LIBRARIES )
-
-  if ( glib-2.0_LIBRARY )
-    get_filename_component ( glib-2.0_LIBRARY_PATH "${glib-2.0_LIBRARY}" PATH )
-    find_path ( GLIBCONFIG_INCLUDE_PATH
-      NAMES
-        glibconfig.h
-      PATHS
-        ${glib-2.0_LIBRARY_PATH}/glib-2.0/include   
-      NO_DEFAULT_PATH
-    )
-    mark_as_advanced ( GLIBCONFIG_INCLUDE_PATH )
-  endif ( glib-2.0_LIBRARY )
-
-  set ( Glib_INCLUDE_DIRS 
-    ${GLIB_INCLUDE_PATH}
-    ${GLIBCONFIG_INCLUDE_PATH}
-  )
-
-  if ( Glib_INCLUDE_DIRS AND Glib_LIBRARIES )
-    set ( Glib_FOUND true )
-  endif ( Glib_INCLUDE_DIRS AND Glib_LIBRARIES )
-endif ( PKG_CONFIG_GLIB_FOUND )
-
-if ( Glib_FOUND )
-  set ( CMAKE_REQUIRED_INCLUDES "${Glib_INCLUDE_DIRS}" )
-  check_include_file ( glib.h Glib_FOUND )
-endif ( Glib_FOUND )
-
-if ( NOT Glib_FOUND )
-  if ( NOT Glib_FIND_QUIETLY )
-    message ( STATUS "Glib not found, try setting GLIB_ROOT_DIR environment variable." )
-  endif ( NOT Glib_FIND_QUIETLY )
-  if ( Glib_FIND_REQUIRED )
-    message ( FATAL_ERROR "" )
-  endif ( Glib_FIND_REQUIRED )
-endif ( NOT Glib_FOUND )
-
-find_program ( GLIB_GENMARSHAL_EXECUTABLE
-  NAMES glib-genmarshal
-  PATHS ${GLIB2_PREFIX}
-  PATH_SUFFIXES bin
-)
-mark_as_advanced ( GLIB_GENMARSHAL_EXECUTABLE )
diff --git a/Makefile.am b/Makefile.am
index 76dc85e..f62077f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,16 @@
 
-SUBDIRS = include lib glib apps udev doc
+SUBDIRS = include lib apps udev doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-if GLIB
-pkgconfig_DATA = openobex.pc openobex-glib.pc
-else
 pkgconfig_DATA = openobex.pc
-endif
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-apps
 
 EXTRA_DIST = openobex.m4 \
 		INSTALL.txt INSTALL_Win32.txt \
 		CMakeLists.txt \
-		CMakeModules/FindBluetooth.cmake CMakeModules/FindGlib.cmake \
+		CMakeModules/FindBluetooth.cmake \
 		CMakeModules/FindIrda.cmake CMakeModules/FindLibUSB.cmake \
 		CMakeModules/FindXslt.cmake CMakeModules/UseXslt.cmake \
 		CMakeModules/FindDocbook.cmake CMakeModules/UseDocbook.cmake \
diff --git a/acinclude.m4 b/acinclude.m4
index 3da248a..e2009f9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -210,14 +210,6 @@ AC_DEFUN([AC_PATH_USB1], [
 	fi
 ])
 
-dnl AC_DEFUN([AC_PATH_GLIB], [
-dnl 	PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0 gthread-2.0, glib_found=yes, glib_found=no)
-dnl 	AC_SUBST(GLIB_CFLAGS)
-dnl 	AC_SUBST(GLIB_LIBS)
-dnl 	GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-dnl 	AC_SUBST(GLIB_GENMARSHAL)
-dnl ])
-
 AC_DEFUN([AC_VISIBILITY], [
 	case $host in
 	*-*-mingw32*)
@@ -238,7 +230,6 @@ AC_DEFUN([AC_ARG_OPENOBEX], [
 	irda_enable=yes
 	bluetooth_enable=yes
 	usb_enable=yes
-	glib_enable=no
 	apps_enable=no
 	apps_doc_enable=no
 	debug_enable=no
@@ -261,10 +252,6 @@ AC_DEFUN([AC_ARG_OPENOBEX], [
 		usb_enable=${enableval}
 	])
 
-	dnl AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], [enable GLib bindings]), [
-	dnl 	glib_enable=${enableval}
-	dnl ])
-
 	AC_ARG_ENABLE(apps, AC_HELP_STRING([--enable-apps], [enable test applications]), [
 		apps_enable=${enableval}
 		apps_doc_enable=${enableval}
@@ -334,7 +321,6 @@ AC_DEFUN([AC_ARG_OPENOBEX], [
 		apps_doc_enable=no
 	fi
 
-	AM_CONDITIONAL(GLIB, test "${glib_enable}" = "yes" && test "${glib_found}" = "yes")
 	AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
 	AM_CONDITIONAL(APPS_DOC, test "${apps_doc_enable}" = "yes")
 	case $host in
diff --git a/configure.ac b/configure.ac
index 34cf7cd..91909f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,9 +39,8 @@ AC_ARG_OPENOBEX
 AC_OUTPUT(Makefile
           include/Makefile include/openobex/Makefile
           lib/Makefile
-          glib/Makefile
           apps/Makefile apps/lib/Makefile apps/obex_test/Makefile
 	  apps/ircp/Makefile
 	  doc/Makefile doc/Doxyfile
 	  udev/Makefile udev/openobex.rules
-	  openobex.pc openobex-glib.pc)
+	  openobex.pc)
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
deleted file mode 100644
index ec5223e..0000000
--- a/glib/CMakeLists.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-
-set ( openobex-glib_VERSION 1.0.0 )
-set ( openobex-glib_SOVERSION 0 )
-
-find_package ( Glib REQUIRED object thread)
-
-set ( GENERATED_SOURCES
-  obex-marshal.c
-  obex-marshal.h
-)
-set_property ( SOURCE ${GENERATED_SOURCES} PROPERTY
-  GENERATED true
-)
-
-if ( GLIB_GENMARSHAL_EXECUTABLE )
-  add_custom_command (
-    OUTPUT            ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.c
-    COMMAND           ${GLIB_GENMARSHAL_EXECUTABLE}
-    ARGS              --prefix=obex_marshal obex-marshal.list --body
-                      > ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.c
-    MAIN_DEPENDENCY   ${CMAKE_CURRENT_SOURCE_DIR}/obex-marshal.list
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    VERBATIM
-  )
-  add_custom_command (
-    OUTPUT            ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.h
-    COMMAND           ${GLIB_GENMARSHAL_EXECUTABLE}
-    ARGS              --prefix=obex_marshal obex-marshal.list --header
-                      > ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.h
-    MAIN_DEPENDENCY   ${CMAKE_CURRENT_SOURCE_DIR}/obex-marshal.list
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    VERBATIM
-  )
-
-else ( GLIB_GENMARSHAL_EXECUTABLE )
-  message ( FATAL_ERROR "glib-genmarshal not found but needed." )
-endif ( GLIB_GENMARSHAL_EXECUTABLE )
-
-set ( SOURCES
-  obex-client.c
-  obex-error.c
-  obex-lowlevel.c
-  ${GENERATED_SOURCES}
-)
-
-set ( HEADERS
-  obex-client.h
-  obex-debug.h
-  obex-error.h
-  obex-lowlevel.h
-)
-
-set ( openobex-glib_PUBLIC_HEADER
-  obex-client.h
-)
-
-include_directories (
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${Glib_INCLUDE_DIRS}
-)
-
-if ( COMPILER_SUPPORT_NOUNDEFINED )
-  set ( openobex-glib_LINK_FLAGS
-    "${openobex-glib_LINK_FLAGS} ${LINKER_FLAG_NOUNDEFINED}"
-  )
-endif ( COMPILER_SUPPORT_NOUNDEFINED )
-
-add_library ( openobex-glib
-  ${SOURCES}
-)
-
-target_link_libraries ( openobex-glib
-  ${Glib_LIBRARIES}
-  openobex
-)
-
-foreach ( i VERSION SOVERSION PUBLIC_HEADER LINK_FLAGS )
-  if ( DEFINED openobex-glib_${i} )
-    set_property ( TARGET openobex-glib PROPERTY ${i} ${openobex-glib_${i}} )
-  endif ( DEFINED openobex-glib_${i} )
-endforeach ( i )
-
-set_property ( TARGET openobex-glib PROPERTY
-  DEFINE_SYMBOL OPENOBEX_GLIB_EXPORTS
-)
-
-if ( WIN32 )
-  target_link_libraries ( openobex-glib 
-    ws2_32
-  )
-endif ( WIN32 )
-
-install ( TARGETS openobex-glib
-  RUNTIME       DESTINATION bin
-  LIBRARY       DESTINATION lib
-  ARCHIVE       DESTINATION lib
-  PUBLIC_HEADER DESTINATION include/openobex
-  COMPONENT bindings
-)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/obex-client.h
-  DESTINATION include/openobex
-  COMPONENT bindings
-) 
-
-#
-# Copy the .pc file to install it only if the lib gets installed
-#
-add_custom_command ( TARGET openobex-glib
-  COMMAND ${CMAKE_COMMAND}
-  ARGS    -E copy_if_different ${CMAKE_BINARY_DIR}/openobex-glib.pc
-          ${CMAKE_CURRENT_BINARY_DIR}/openobex-glib.pc
-  VERBATIM
-)
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/openobex-glib.pc
-  DESTINATION ${PKGCONFIG_INSTALL_DIR}
-  OPTIONAL
-)
-
-
-
-#
-# These are some test apps for the library above.
-#
-set ( openobex-glib_TESTS
-  test-client
-  test-lowlevel
-)
-foreach ( prog ${openobex-glib_TESTS} )
-  add_executable ( openobex-glib-${prog} EXCLUDE_FROM_ALL
-    ${prog}.c
-  )
-  target_link_libraries ( openobex-glib-${prog}
-    openobex-glib
-    ${Glib_LIBRARIES}
-  )
-endforeach ( prog )
-add_custom_target ( openobex-glib-tests
-  DEPENDS ${openobex-glib_TESTS}
-)
diff --git a/glib/Makefile.am b/glib/Makefile.am
deleted file mode 100644
index ed46dc8..0000000
--- a/glib/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-
-includedir = @includedir@...
-
-if GLIB
-include_HEADERS = obex-client.h
-
-lib_LTLIBRARIES = libopenobex-glib.la
-
-libopenobex_glib_la_SOURCES = obex-lowlevel.h obex-lowlevel.c obex-client.c obex-debug.h obex-error.c obex-error.h
-
-libopenobex_glib_la_LDFLAGS = -no-undefined -version-info 1:0:0
-
-libopenobex_glib_la_LIBADD = @GLIB_LIBS@ $(top_builddir)/lib/libopenobex.la @EXTRA_LIBS@
-
-BUILT_SOURCES = obex-marshal.h obex-marshal.c
-
-nodist_libopenobex_glib_la_SOURCES = $(BUILT_SOURCES)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_PROGRAMS = test-lowlevel test-client
-
-test_lowlevel_LDADD = libopenobex-glib.la
-
-test_client_LDADD = @GLIB_LIBS@ libopenobex-glib.la
-endif
-
-AM_CFLAGS = @GLIB_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/include
-
-EXTRA_DIST = obex-marshal.list CMakeLists.txt
-
-MAINTAINERCLEANFILES = Makefile.in
-
-if GLIB
-obex-marshal.h: obex-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=obex_marshal $< --header > $@
-
-obex-marshal.c: obex-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=obex_marshal $< --body > $@
-endif
diff --git a/glib/obex-client.c b/glib/obex-client.c
deleted file mode 100644
index 6ab7cfe..0000000
--- a/glib/obex-client.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/**
-	\file glib/obex-client.c
-	OpenOBEX glib bindings client code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-
-#include "obex-debug.h"
-#include "obex-lowlevel.h"
-#include "obex-error.h"
-#include "obex-marshal.h"
-#include "obex-client.h"
-
-#define OBEX_CLIENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
-					OBEX_TYPE_CLIENT, ObexClientPrivate))
-
-typedef struct _ObexClientPrivate ObexClientPrivate;
-
-struct _ObexClientPrivate {
-	gboolean auto_connect;
-
-#ifdef G_THREADS_ENABLED
-	GMutex *mutex;
-#endif
-
-	GMainContext *context;
-	GIOChannel *channel;
-	obex_t *handle;
-
-	gpointer watch_data;
-	ObexClientFunc watch_func;
-	GDestroyNotify watch_destroy;
-
-	GSource *idle_source;
-
-	gboolean connected;
-};
-
-G_DEFINE_TYPE(ObexClient, obex_client, G_TYPE_OBJECT)
-
-static void obex_client_init(ObexClient *self)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-#ifdef G_THREADS_ENABLED
-	priv->mutex = g_mutex_new();
-#endif
-
-	priv->auto_connect = TRUE;
-
-	priv->context = g_main_context_default();
-	g_main_context_ref(priv->context);
-
-	priv->connected = FALSE;
-}
-
-static void obex_client_finalize(GObject *object)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(object);
-
-	if (priv->connected == TRUE && priv->auto_connect == TRUE)
-		obex_disconnect(priv->handle);
-
-	if (priv->idle_source) {
-		g_source_destroy(priv->idle_source);
-		priv->idle_source = NULL;
-	}
-
-	obex_close(priv->handle);
-	priv->handle = NULL;
-
-	g_main_context_unref(priv->context);
-	priv->context = NULL;
-
-#ifdef G_THREADS_ENABLED
-	g_mutex_free(priv->mutex);
-#endif
-}
-
-enum {
-	PROP_0,
-	PROP_AUTO_CONNECT
-};
-
-static void obex_client_set_property(GObject *object, guint prop_id,
-					const GValue *value, GParamSpec *pspec)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(object);
-
-	switch (prop_id) {
-	case PROP_AUTO_CONNECT:
-		priv->auto_connect = g_value_get_boolean(value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-		break;
-	}
-}
-
-static void obex_client_get_property(GObject *object, guint prop_id,
-					GValue *value, GParamSpec *pspec)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(object);
-
-	switch (prop_id) {
-	case PROP_AUTO_CONNECT:
-		g_value_set_boolean(value, priv->auto_connect);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-		break;
-	}
-}
-
-enum {
-	CONNECTED_SIGNAL,
-	DISCONNECT_SIGNAL,
-	CANCELED_SIGNAL,
-	PROGRESS_SIGNAL,
-	IDLE_SIGNAL,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static void obex_client_class_init(ObexClientClass *klass)
-{
-#ifdef G_THREADS_ENABLED
-	if (!g_thread_supported())
-		g_thread_init(NULL);
-#endif
-
-	g_type_class_add_private(klass, sizeof(ObexClientPrivate));
-
-	G_OBJECT_CLASS(klass)->finalize = obex_client_finalize;
-
-	G_OBJECT_CLASS(klass)->set_property = obex_client_set_property;
-	G_OBJECT_CLASS(klass)->get_property = obex_client_get_property;
-
-	g_object_class_install_property(G_OBJECT_CLASS(klass),
-			PROP_AUTO_CONNECT, g_param_spec_boolean("auto-connect",
-					NULL, NULL, TRUE, G_PARAM_READWRITE));
-
-	signals[CONNECTED_SIGNAL] = g_signal_new("connected",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, connected),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[DISCONNECT_SIGNAL] = g_signal_new("disconnect",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, disconnect),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[CANCELED_SIGNAL] = g_signal_new("canceled",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, canceled),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[PROGRESS_SIGNAL] = g_signal_new("progress",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, progress),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[IDLE_SIGNAL] = g_signal_new("idle",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, idle),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-}
-
-static gboolean obex_client_callback(GIOChannel *source,
-					GIOCondition cond, gpointer data)
-{
-	ObexClient *self = data;
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
-		debug("link error");
-		return FALSE;
-	}
-
-	if (OBEX_HandleInput(priv->handle, 1) < 0)
-		debug("input error");
-	else
-		obex_do_callback(priv->handle);
-
-	return TRUE;
-}
-
-static gboolean obex_client_put_idle(ObexClient *self)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	debug("obex_client_put_idle");
-
-	g_source_destroy(priv->idle_source);
-	priv->idle_source = NULL;
-
-	if (priv->watch_func)
-		priv->watch_func(self, OBEX_CLIENT_COND_OUT, priv->watch_data);
-
-	return FALSE;
-}
-
-ObexClient *obex_client_new(void)
-{
-	return OBEX_CLIENT(g_object_new(OBEX_TYPE_CLIENT, NULL));
-}
-
-void obex_client_destroy(ObexClient *self)
-{
-	g_object_unref(self);
-}
-
-void obex_client_set_auto_connect(ObexClient *self, gboolean auto_connect)
-{
-	g_object_set(self, "auto-connect", auto_connect, NULL);
-}
-
-gboolean obex_client_get_auto_connect(ObexClient *self)
-{
-	gboolean auto_connect;
-
-	g_object_get(self, "auto-connect", &auto_connect, NULL);
-
-	return auto_connect;
-}
-
-void obex_client_add_watch_full(ObexClient *self,
-			ObexClientCondition condition, ObexClientFunc func,
-					gpointer data, GDestroyNotify notify)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	priv->watch_data = data;
-	priv->watch_func = func;
-	priv->watch_destroy = notify;
-}
-
-void obex_client_add_watch(ObexClient *self, ObexClientCondition condition,
-				ObexClientFunc func, gpointer data)
-{
-	obex_client_add_watch_full(self, condition, func, data, NULL);
-}
-
-static void obex_connect_cfm(obex_t *handle, void *user_data)
-{
-	ObexClient *self = user_data;
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	debug("connected");
-
-	priv->connected = TRUE;
-
-	g_signal_emit(self, signals[CONNECTED_SIGNAL], 0, NULL);
-}
-
-static void obex_disconn_ind(obex_t *handle, void *user_data)
-{
-	ObexClient *self = user_data;
-
-	debug("disconnect");
-
-	g_signal_emit(self, signals[DISCONNECT_SIGNAL], 0, NULL);
-}
-
-static void obex_progress_ind(obex_t *handle, void *user_data)
-{
-	ObexClient *self = user_data;
-
-	debug("progress");
-
-	g_signal_emit(self, signals[PROGRESS_SIGNAL], 0, NULL);
-}
-
-static void obex_command_ind(obex_t *handle, int event, void *user_data)
-{
-	ObexClient *self = user_data;
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	if (!priv->watch_func)
-		return;
-
-	switch (event) {
-	case OBEX_EV_LINKERR:
-	case OBEX_EV_PARSEERR:
-		priv->watch_func(self, OBEX_CLIENT_COND_ERR, priv->watch_data);
-		break;
-
-	case OBEX_EV_STREAMAVAIL:
-		priv->watch_func(self, OBEX_CLIENT_COND_IN, priv->watch_data);
-		break;
-
-	case OBEX_EV_STREAMEMPTY:
-		priv->watch_func(self, OBEX_CLIENT_COND_OUT, priv->watch_data);
-		break;
-
-	case OBEX_EV_ABORT:
-	case OBEX_EV_REQDONE:
-		priv->watch_func(self, OBEX_CLIENT_COND_DONE, priv->watch_data);
-		break;
-		
-	default:
-		debug("unhandled event %d", event);
-		break;
-	}
-}
-
-static obex_callback_t callback = {
-	&obex_connect_cfm,
-	&obex_disconn_ind,
-	&obex_progress_ind,
-	&obex_command_ind,
-};
-
-gboolean obex_client_attach_fd(ObexClient *self, int fd, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	GSource *source;
-
-	priv->handle = obex_open(fd, &callback, self);
-	if (priv->handle == NULL) {
-		err2gerror(errno, error);
-		return FALSE;
-	}
-
-	priv->channel = g_io_channel_unix_new(fd);
-
-	source = g_io_create_watch(priv->channel,
-				G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL);
-
-	g_source_set_callback(source, (GSourceFunc) obex_client_callback,
-								self, NULL);
-
-	g_source_attach(source, priv->context);
-
-	g_source_unref(source);
-
-	return TRUE;
-}
-
-gboolean obex_client_connect(ObexClient *self, const guchar *target,
-						gsize size, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_connect(priv->handle, target, size);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_disconnect(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_disconnect(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_put_object(ObexClient *self, const gchar *type,
-					const gchar *name, gint size,
-					time_t mtime, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	gboolean add_idle = FALSE;
-	int err;
-
-	if (priv->connected == FALSE && priv->auto_connect == TRUE)
-		obex_connect(priv->handle, NULL, 0);
-	else
-		add_idle = TRUE;
-
-	err = obex_put(priv->handle, type, name, size, mtime);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	/* So the application gets OBEX_CLIENT_COND_OUT immediately when
-	 * returning to the mainloop */
-	if (add_idle) {
-		priv->idle_source = g_idle_source_new();
-		g_source_set_callback(priv->idle_source, (GSourceFunc) obex_client_put_idle,
-					self, NULL);
-		g_source_attach(priv->idle_source, priv->context);
-		g_source_unref(priv->idle_source);
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_get_object(ObexClient *self, const gchar *type,
-					const gchar *name, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	if (priv->connected == FALSE && priv->auto_connect == TRUE)
-		obex_connect(priv->handle, NULL, 0);
-
-	err = obex_get(priv->handle, type, name);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_read(ObexClient *self, gchar *buf, gsize count,
-					gsize *bytes_read, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_read(priv->handle, buf, count, bytes_read);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_write(ObexClient *self, const gchar *buf, gsize count,
-					gsize *bytes_written, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_write(priv->handle, buf, count, bytes_written);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_flush(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_flush(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_abort(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_abort(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_close(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_close_transfer(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_get_error(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int rsp;
-
-	rsp = obex_get_response(priv->handle);
-	if (rsp == OBEX_RSP_SUCCESS)
-		return TRUE;
-
-	rsp2gerror(rsp, error);
-
-	return FALSE;
-}
-
-gboolean obex_client_mkdir(ObexClient *self, const gchar *path, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_setpath(priv->handle, path, 1);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_chdir(ObexClient *self, const gchar *path, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_setpath(priv->handle, path, 0);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_delete(ObexClient *self, const gchar *name, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_delete(priv->handle, name);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
diff --git a/glib/obex-client.h b/glib/obex-client.h
deleted file mode 100644
index 28ebd1d..0000000
--- a/glib/obex-client.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
-	\file glib/obex-client.h
-	OpenOBEX glib bindings client code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifndef __OBEX_CLIENT_H
-#define __OBEX_CLIENT_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-GQuark obex_error_quark(void);
-
-#define OBEX_ERROR obex_error_quark()
-
-enum {
-	OBEX_ERROR_NO_MEMORY,
-	OBEX_ERROR_BUSY,
-	OBEX_ERROR_INVALID_PARAMS,
-	OBEX_ERROR_ALREADY_CONNECTED,
-	OBEX_ERROR_NOT_CONNECTED,
-	OBEX_ERROR_LINK_FAILURE,
-	OBEX_ERROR_ABORTED,
-
-	/* Errors derived from OBEX response codes */
-	OBEX_ERROR_BAD_REQUEST,
-	OBEX_ERROR_UNAUTHORIZED,
-	OBEX_ERROR_PAYMENT_REQUIRED,
-	OBEX_ERROR_FORBIDDEN,
-	OBEX_ERROR_NOT_FOUND,
-	OBEX_ERROR_NOT_ALLOWED,
-	OBEX_ERROR_NOT_ACCEPTABLE,
-	OBEX_ERROR_PROXY_AUTH_REQUIRED,
-	OBEX_ERROR_REQUEST_TIME_OUT,
-	OBEX_ERROR_CONFLICT,
-	OBEX_ERROR_GONE,
-	OBEX_ERROR_LENGTH_REQUIRED,
-	OBEX_ERROR_PRECONDITION_FAILED,
-	OBEX_ERROR_ENTITY_TOO_LARGE,
-	OBEX_ERROR_URL_TOO_LARGE,
-	OBEX_ERROR_UNSUPPORTED_MEDIA_TYPE,
-	OBEX_ERROR_INTERNAL_SERVER_ERROR,
-	OBEX_ERROR_NOT_IMPLEMENTED,
-	OBEX_ERROR_BAD_GATEWAY,
-	OBEX_ERROR_SERVICE_UNAVAILABLE,
-	OBEX_ERROR_GATEWAY_TIMEOUT,
-	OBEX_ERROR_VERSION_NOT_SUPPORTED,
-	OBEX_ERROR_DATABASE_FULL,
-	OBEX_ERROR_DATABASE_LOCKED,
-
-	OBEX_ERROR_FAILED
-};
-
-#define OBEX_TYPE_CLIENT (obex_client_get_type())
-#define OBEX_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-					OBEX_TYPE_CLIENT, ObexClient))
-#define OBEX_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-					OBEX_TYPE_CLIENT, ObexClientClass))
-#define OBEX_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-							OBEX_TYPE_CLIENT))
-#define OBEX_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \
-							OBEX_TYPE_CLIENT))
-#define OBEX_GET_CLIENT_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \
-					OBEX_TYPE_CLIENT, ObexClientClass))
-
-typedef struct _ObexClient ObexClient;
-typedef struct _ObexClientClass ObexClientClass;
-
-struct _ObexClient {
-	GObject parent;
-};
-
-struct _ObexClientClass {
-	GObjectClass parent_class;
-
-	void (*connected)(ObexClient *self);
-	void (*disconnect)(ObexClient *self);
-	void (*canceled)(ObexClient *self);
-	void (*progress)(ObexClient *self);
-	void (*idle)(ObexClient *self);
-};
-
-GType obex_client_get_type(void);
-
-ObexClient *obex_client_new(void);
-
-void obex_client_destroy(ObexClient *self);
-
-void obex_client_set_auto_connect(ObexClient *self, gboolean auto_connect);
-
-gboolean obex_client_get_auto_connect(ObexClient *self);
-
-typedef enum {
-	OBEX_CLIENT_COND_IN	= 1 << 0,
-	OBEX_CLIENT_COND_OUT 	= 1 << 1,
-	OBEX_CLIENT_COND_DONE 	= 1 << 2,
-	OBEX_CLIENT_COND_ERR 	= 1 << 3,
-} ObexClientCondition;
-
-typedef void (*ObexClientFunc)(ObexClient *client,
-				ObexClientCondition condition, gpointer data);
-
-void obex_client_add_watch(ObexClient *self, ObexClientCondition condition,
-				ObexClientFunc func, gpointer data);
-
-void obex_client_add_watch_full(ObexClient *self,
-			ObexClientCondition condition, ObexClientFunc func,
-					gpointer data, GDestroyNotify notify);
-
-gboolean obex_client_attach_fd(ObexClient *self, int fd, GError **error);
-
-gboolean obex_client_connect(ObexClient *self, const guchar *target,
-						gsize size, GError **error);
-
-gboolean obex_client_disconnect(ObexClient *self, GError **error);
-
-gboolean obex_client_put_object(ObexClient *self, const gchar *type,
-					const gchar *name, gint size,
-					time_t mtime, GError **error);
-
-gboolean obex_client_get_object(ObexClient *self, const gchar *type,
-					const gchar *name, GError **error);
-
-gboolean obex_client_read(ObexClient *self, gchar *buf, gsize count,
-					gsize *bytes_read, GError **error);
-
-gboolean obex_client_write(ObexClient *self, const gchar *buf, gsize count,
-					gsize *bytes_written, GError **error);
-
-gboolean obex_client_flush(ObexClient *self, GError **error);
-
-gboolean obex_client_abort(ObexClient *self, GError **error);
-
-gboolean obex_client_close(ObexClient *self, GError **error);
-
-gboolean obex_client_get_error(ObexClient *self, GError **error);
-
-gboolean obex_client_mkdir(ObexClient *self, const gchar *path, GError **error);
-
-gboolean obex_client_chdir(ObexClient *self, const gchar *path, GError **error);
-
-gboolean obex_client_delete(ObexClient *self, const gchar *name, GError **error);
-
-G_END_DECLS
-
-#endif /* __OBEX_CLIENT_H */
diff --git a/glib/obex-debug.h b/glib/obex-debug.h
deleted file mode 100644
index 7c1f3d9..0000000
--- a/glib/obex-debug.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
-	\file glib/obex-debug.h
-	OpenOBEX glib bindings debug code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#include <stdio.h>
-
-#if defined(_MSC_VER) && _MSC_VER < 1400
-static void debug (char *fmt, ...) {}
-#else
-#define debug(fmt, ...) fprintf(stderr, "== %s: " fmt "\n" , __FUNCTION__ , ## __VA_ARGS__)
-#endif
diff --git a/glib/obex-error.c b/glib/obex-error.c
deleted file mode 100644
index cba70b4..0000000
--- a/glib/obex-error.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
-	\file glib/obex-error.c
-	OpenOBEX glib bindings error handling code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef _WIN32
-#include <winsock2.h>
-#define EISCONN WSAEISCONN
-#define ENOTCONN WSAENOTCONN
-#endif
-
-#include <errno.h>
-
-#include "obex-debug.h"
-#include "obex-client.h"
-#include "obex-error.h"
-
-GQuark obex_error_quark(void)
-{
-	static GQuark q = 0;
-
-	if (q == 0)
-		q = g_quark_from_static_string("obex-error-quark");
-
-	return q;
-}
-
-void err2gerror(int err, GError **gerr)
-{
-	debug("%s", g_strerror(err));
-
-	if (!gerr)
-		return;
-
-	switch (err) {
-	case ENOMEM:
-            g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NO_MEMORY,
-			    "Out of memory");
-	    break;
-
-	case EBUSY:
-            g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_BUSY,
-			    "Busy performing another operation");
-	    break;
-
-	case EINVAL:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_INVALID_PARAMS,
-			    "Invalid parameters were given");
-	    break;
-
-	case EISCONN:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_ALREADY_CONNECTED,
-			    "Already connected");
-	    break;
-
-	case ENOTCONN:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_CONNECTED,
-			    "Not connected");
-	    break;
-
-	case EINTR:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_ABORTED,
-			    "The operation was aborted");
-	    break;
-
-	default:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_FAILED,
-			    "Failed");
-	    break;
-	}
-}
-
-void rsp2gerror(int rsp, GError **gerr)
-{
-	if (!gerr)
-		return;
-
-	switch (rsp) {
-	case 0x40:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_BAD_REQUEST,
-				"Bad Request - server couldn't understand request");
-		break;
-
-	case 0x41:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_UNAUTHORIZED,
-				"Unauthorized");
-		break;
-
-	case 0x42:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_PAYMENT_REQUIRED,
-				"Payment required");
-		break;
-
-	case 0x43:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_FORBIDDEN,
-				"Forbidden - operation is understood but refused");
-		break;
-
-	case 0x44:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_FOUND,
-				"Not Found");
-		break;
-
-	case 0x45:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_ALLOWED,
-				"Method not allowed");
-		break;
-
-	case 0x46:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_ACCEPTABLE,
-				"Not Acceptable");
-		break;
-
-	case 0x47:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_PROXY_AUTH_REQUIRED,
-				"Proxy Authentication required");
-		break;
-		
-	case 0x48:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_REQUEST_TIME_OUT,
-				"Request Time Out");
-		break;
-		
-	case 0x49:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_CONFLICT,
-				"Conflict");
-		break;
-
-	case 0x4A:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_GONE,
-				"Gone");
-		break;
-
-	case 0x4B:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_LENGTH_REQUIRED,
-				"Length Required");
-		break;
-
-	case 0x4C:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_PRECONDITION_FAILED,
-				"Precondition failed");
-		break;
-
-	case 0x4D:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_ENTITY_TOO_LARGE,
-				"Requested entity too large");
-		break;
-
-	case 0x4E:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_URL_TOO_LARGE,
-				"Request URL too large");
-		break;
-
-	case 0x4F:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_UNSUPPORTED_MEDIA_TYPE,
-				"Unsupported media type");
-		break;
-
-	case 0x50:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_INTERNAL_SERVER_ERROR,
-				"Internal Server Error");
-		break;
-
-	case 0x51:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_IMPLEMENTED,
-				"Not Implemented");
-		break;
-
-	case 0x52:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_BAD_GATEWAY,
-				"Bad Gateway");
-		break;
-
-	case 0x53:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_SERVICE_UNAVAILABLE,
-				"Service Unavailable");
-		break;
-
-	case 0x54:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_GATEWAY_TIMEOUT,
-				"Gateway Timeout");
-		break;
-
-	case 0x55:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_VERSION_NOT_SUPPORTED,
-				"HTTP version not supported");
-		break;
-
-	case 0x60:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_DATABASE_FULL,
-				"Database Full");
-		break;
-
-	case 0x61:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_DATABASE_LOCKED,
-				"Database Locked");
-		break;
-
-	default:
-		debug("Unmapped OBEX response: %d", rsp);
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_FAILED,
-				"Failed");
-		break;
-	}
-}
-
diff --git a/glib/obex-error.h b/glib/obex-error.h
deleted file mode 100644
index b6ec5ca..0000000
--- a/glib/obex-error.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
-	\file glib/obex-error.h
-	OpenOBEX glib bindings error handling code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
- 	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifndef __OBEX_ERROR_H
-#define __OBEX_ERROR_H
-
-#include <glib.h>
-
-void err2gerror(int err, GError **gerr);
-
-void rsp2gerror(int rsp, GError **gerr);
-
-#endif /* __OBEX_ERROR_H */
diff --git a/glib/obex-lowlevel.c b/glib/obex-lowlevel.c
deleted file mode 100644
index 65172fc..0000000
--- a/glib/obex-lowlevel.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/**
-	\file glib/obex-lowlevel.c
-	OpenOBEX glib bindings low level code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
-#include <time.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
-static struct tm * gmtime_r ( time_t *t, struct tm *result)
-{
-	if (result) {
-		const time_t t2 = *t;
-		struct tm *tmp = gmtime(&t2);
-		if (!tmp)
-			return NULL;
-		memcpy(result, &tmp, sizeof(result));
-	}
-	return result;
-}
-#define snprintf _snprintf
-#define EISCONN WSAEISCONN
-#define ENOTCONN WSAENOTCONN
-#else
-#include <arpa/inet.h>
-#endif
-
-#include <glib.h>
-
-#include "obex-debug.h"
-#include "obex-lowlevel.h"
-
-#define BUF_SIZE 32767
-
-#define CID_INVALID 0xFFFFFFFF
-
-#define OBEX_TIMEOUT 1
-
-enum {
-	OBEX_CONNECTED = 1,	/* Equal to TCP_ESTABLISHED */
-	OBEX_OPEN,
-	OBEX_BOUND,
-	OBEX_LISTEN,
-	OBEX_CONNECT,
-	OBEX_CONNECT2,
-	OBEX_CONFIG,
-	OBEX_DISCONN,
-	OBEX_CLOSED
-};
-
-#pragma pack(1)
-typedef struct obex_setpath_hdr {
-    uint8_t  flags;
-    uint8_t constants;
-} obex_setpath_hdr_t;
-#pragma pack()
-
-#pragma pack(1)
-typedef struct obex_connect_hdr {
-    uint8_t  version;
-    uint8_t  flags;
-    uint16_t mtu;
-} obex_connect_hdr_t;
-#pragma pack()
-
-typedef struct {
-	int event;
-} obex_ev_t;
-
-typedef struct {
-	unsigned long state;
-	uint32_t cid;
-
-	void *user_data;
-	obex_callback_t *callback;
-
-	obex_object_t *pending;
-
-	int obex_rsp;		/* Response to last OBEX command */
-
-	/* Transfer related variables */
-	char buf[BUF_SIZE];	/* Data buffer for put and get requests */
-	int data_start;		/* Offset of data in buffer */
-	int data_length;	/* Length of actual data in buffer */
-	int counter;		/* Total bytes transfered so far */
-	int target_size;	/* Final length of object under transfer */
-	time_t modtime;		/* Modification time of object under transfer */
-	int tx_max;		/* Maximum size for sent chunks of data */
-	int close;		/* If the user has called obex_close */
-	GSList *events;		/* Events to signal when HandleInput returns */
-} obex_context_t;
-
-static void queue_event(obex_context_t *context, int e)
-{
-	obex_ev_t *event;
-
-	event = malloc(sizeof(obex_ev_t));
-	if (!event)
-		return;
-
-	memset(event, 0, sizeof(obex_ev_t));
-
-	event->event = e;
-
-	context->events = g_slist_append(context->events, event);
-}
-
-static int make_iso8601(time_t time, char *str, int len) {
-    struct tm tm;
-#if defined(HAVE_TIMEZONE) && defined(USE_LOCALTIME)
-    time_t tz_offset = 0;
-
-    tzset();
-
-    tz_offset = -timezone;
-    if (daylight > 0)
-        tz_offset += 3600;
-    time += tz_offset;
-#endif
-
-    if (gmtime_r(&time, &tm) == NULL)
-        return -1;
-
-    tm.tm_year += 1900;
-    tm.tm_mon++;
-
-    return snprintf(str, len,
-#ifdef USE_LOCALTIME
-                    "%04u%02u%02uT%02u%02u%02u",
-#else
-                    "%04u%02u%02uT%02u%02u%02uZ",
-#endif
-                    tm.tm_year, tm.tm_mon, tm.tm_mday,
-                    tm.tm_hour, tm.tm_min, tm.tm_sec);
-}
-
-time_t parse_iso8601(const char *str, int len)
-{
-	char *tstr, tz;
-	struct tm tm;
-	int nr;
-	time_t time, tz_offset = 0;
-
-	memset(&tm, 0, sizeof(struct tm));
-
-	/* According to spec the time doesn't have to be null terminated */
-	tstr = malloc(len + 1);
-	if (!tstr)
-		return -1;
-
-	strncpy(tstr, str, len);
-	tstr[len] = '\0';
-
-	nr = sscanf(tstr, "%04u%02u%02uT%02u%02u%02u%c",
-			&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
-			&tm.tm_hour, &tm.tm_min, &tm.tm_sec,
-			&tz);
-
-	free(tstr);
-
-	/* Fixup the tm values */
-	tm.tm_year -= 1900;       /* Year since 1900 */
-	tm.tm_mon--;              /* Months since January, values 0-11 */
-	tm.tm_isdst = -1;         /* Daylight savings information not avail */
-
-	if (nr < 6) {
-		/* Invalid time format */
-		return -1;
-	} 
-
-	time = mktime(&tm);
-
-#if defined(HAVE_TM_GMTOFF)
-	tz_offset = tm.tm_gmtoff;
-#elif defined(HAVE_TIMEZONE)
-	tz_offset = -timezone;
-	if (tm.tm_isdst > 0)
-		tz_offset += 3600;
-#endif
-
-	if (nr == 7) { /* Date/Time was in localtime (to remote device)
-			* already. Since we don't know anything about the
-			* timezone on that one we won't try to apply UTC offset
-			*/
-		time += tz_offset;
-	}
-
-	return time;
-}
-
-static void get_target_size_and_time(obex_t *handle, obex_object_t *object,
-					obex_context_t *context) {
-    obex_headerdata_t hv;
-    uint8_t hi;
-    unsigned int hlen;
-
-    context->target_size = -1;
-    context->modtime = -1;
-
-    while (OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) {
-        switch (hi) {
-            case OBEX_HDR_LENGTH:
-                context->target_size = hv.bq4;
-                break;
-            case OBEX_HDR_TIME:
-                context->modtime = parse_iso8601((char *) hv.bs, hlen);
-                break;
-            default:
-                break;
-        }
-    }
-
-    OBEX_ObjectReParseHeaders(handle, object);
-}
-
-static void obex_progress(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (context->callback && context->callback->progress_ind)
-		context->callback->progress_ind(handle, context->user_data);
-}
-
-static void obex_connect_done(obex_t *handle,
-					obex_object_t *object, int response)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-        obex_headerdata_t hd;
-        uint32_t hl;
-        uint8_t hi, *ptr;
-
-	if (response != OBEX_RSP_SUCCESS)
-		return;
-
-	context->state = OBEX_CONNECTED;
-
-	if (OBEX_ObjectGetNonHdrData(object, &ptr) == sizeof(obex_connect_hdr_t)) {
-		obex_connect_hdr_t *chdr = (obex_connect_hdr_t *) ptr;
-		uint16_t mtu = ntohs(chdr->mtu);
-		int new_size;
-		
-		debug("Connect success. Version: 0x%02x. Flags: 0x%02x OBEX packet length: %d",
-				chdr->version, chdr->flags, mtu);
-
-		/* Leave space for headers */
-		new_size = mtu - 200;
-		if (new_size < context->tx_max) {
-			debug("Resizing stream chunks to %d", new_size);
-			context->tx_max = new_size;
-		}
-	}
-
-	while (OBEX_ObjectGetNextHeader(handle, object, &hi, &hd, &hl)) {
-		switch (hi) {
-		case OBEX_HDR_CONNECTION:
-			context->cid = hd.bq4;
-			break;
-		case OBEX_HDR_WHO:
-			break;
-		}
-	}
-
-	if (context->callback && context->callback->connect_cfm)
-		context->callback->connect_cfm(handle, context->user_data);
-}
-
-static void obex_disconnect_done(obex_t *handle,
-					obex_object_t *object, int response)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	context->state = OBEX_CLOSED;
-}
-
-void obex_do_callback(obex_t *handle)
-{
-	GSList *l;
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (!context->events || ! context->callback || ! context->callback->command_ind)
-		return;
-
-	for (l = context->events; l != NULL; l = l->next) {
-		obex_ev_t *event = l->data;
-		context->callback->command_ind(handle, event->event, context->user_data);
-		free(event);
-	}
-
-	g_slist_free(context->events);
-	context->events = NULL;
-}
-
-static void obex_readstream(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	const uint8_t *buf;
-	int actual, free_space;
-
-	if (context->counter == 0)
-		get_target_size_and_time(handle, object, context);
-
-	actual = OBEX_ObjectReadStream(handle, object, &buf);
-	if (actual <= 0) {
-		debug("Error or no data on OBEX stream");
-		return;
-	}
-
-	context->counter += actual;
-
-	debug("obex_readstream: got %d bytes (%d in total)", actual, context->counter);
-
-	free_space = sizeof(context->buf) - (context->data_start + context->data_length);
-	if (actual > free_space) {
-		/* This should never happen */
-		debug("Out of buffer space: actual=%d, free=%d", actual, free_space);
-		return;
-	}
-
-	memcpy(&context->buf[context->data_start], buf, actual);
-	context->data_length += actual;
-
-	debug("OBEX_SuspendRequest");
-	OBEX_SuspendRequest(handle, object);
-
-	queue_event(context, OBEX_EV_STREAMAVAIL);
-}
-
-static void obex_writestream(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_headerdata_t hv;
-
-	if (context->data_length > 0) {
-		int send_size = context->data_length > context->tx_max ?
-						context->tx_max : context->data_length;
-
-		hv.bs = (uint8_t *) &context->buf[context->data_start];
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_BODY,
-				hv, send_size, OBEX_FL_STREAM_DATA);
-
-		context->counter += send_size;
-		context->data_length -= send_size;
-
-		if (context->data_length == 0)
-			context->data_start = 0;
-		else
-			context->data_start += send_size;
-
-		if (!context->close && context->data_length == 0) {
-			debug("OBEX_SuspendRequest");
-			OBEX_SuspendRequest(handle, object);
-			queue_event(context, OBEX_EV_STREAMEMPTY);
-		}
-	}
-	else {
-		if (context->counter < context->target_size)
-			debug("Sending stream end but only %d/%d bytes sent",
-					context->counter, context->target_size);
-		hv.bs = NULL;
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_BODY, hv, 0,
-					OBEX_FL_STREAM_DATAEND);
-	}
-}
-
-static void obex_event(obex_t *handle, obex_object_t *object,
-			int mode, int event, int command, int response)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	switch (event) {
-	case OBEX_EV_PROGRESS:
-		obex_progress(handle, object);
-		break;
-
-	case OBEX_EV_REQHINT:
-		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, response);
-		break;
-
-	case OBEX_EV_REQ:
-		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, response);
-		break;
-
-	case OBEX_EV_REQDONE:
-		debug("OBEX_EV_REQDONE");
-
-		context->obex_rsp = response;
-		queue_event(context, OBEX_EV_REQDONE);
-
-		if (context->pending && OBEX_Request(handle, context->pending) == 0) {
-			if (OBEX_ObjectGetCommand(handle, context->pending) == OBEX_CMD_PUT)
-				queue_event(context, OBEX_EV_STREAMEMPTY);
-			context->pending = NULL;
-		}
-
-	        switch (command) {
-	        case OBEX_CMD_CONNECT:
-			obex_connect_done(handle, object, response);
-			break;
-		case OBEX_CMD_DISCONNECT:
-			obex_disconnect_done(handle, object, response);
-			break;
-		case OBEX_CMD_PUT:
-		case OBEX_CMD_GET:
-			break;
-		case OBEX_CMD_SETPATH:
-			break;
-		case OBEX_CMD_SESSION:
-			break;
-		case OBEX_CMD_ABORT:
-			break;
-		}
-		break;
-
-	case OBEX_EV_LINKERR:
-		OBEX_TransportDisconnect(handle);
-		break;
-
-	case OBEX_EV_PARSEERR:
-		OBEX_TransportDisconnect(handle);
-		break;
-
-	case OBEX_EV_ACCEPTHINT:
-		break;
-
-	case OBEX_EV_ABORT:
-		queue_event(context, OBEX_EV_ABORT);
-		break;
-
-	case OBEX_EV_STREAMEMPTY:
-		debug("OBEX_EV_STREAMEMPTY");
-		obex_writestream(handle, object);
-		break;
-
-	case OBEX_EV_STREAMAVAIL:
-		debug("OBEX_EV_STREAMAVAIL");
-		obex_readstream(handle, object);
-		break;
-
-	case OBEX_EV_UNEXPECTED:
-		break;
-
-	case OBEX_EV_REQCHECK:
-		break;
-	}
-}
-
-obex_t *obex_open(int fd, obex_callback_t *callback, void *data)
-{
-	obex_t *handle;
-	obex_context_t *context;
-
-	context = malloc(sizeof(*context));
-	if (!context)
-		return NULL;
-
-	memset(context, 0, sizeof(*context));
-
-	context->state = OBEX_OPEN;
-	context->cid = CID_INVALID;
-
-	handle = OBEX_Init(OBEX_TRANS_FD, obex_event, 0);
-	if (!handle) {
-		free(context);
-		return NULL;
-	}
-
-	context->user_data = data;
-	context->callback = callback;
-	context->tx_max = sizeof(context->buf);
-
-	OBEX_SetUserData(handle, context);
-
-	OBEX_SetTransportMTU(handle, sizeof(context->buf), sizeof(context->buf));
-
-	if (FdOBEX_TransportSetup(handle, fd, fd, 0) < 0) {
-		OBEX_Cleanup(handle);
-		return NULL;
-	}
-
-        return handle;
-}
-
-void obex_close(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	g_return_if_fail(context != NULL);
-
-	OBEX_SetUserData(handle, NULL);
-
-	if (context->pending)
-		OBEX_ObjectDelete(handle, context->pending);
-
-	free(context);
-
-	OBEX_Cleanup(handle);
-}
-
-void obex_poll(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	unsigned long state = context->state;
-
-	while (1) {
-		OBEX_HandleInput(handle, OBEX_TIMEOUT);
-		if (context->state != state)
-			break;
-        }
-
-	obex_do_callback(handle);
-}
-
-static int obex_send_or_queue(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int err;
-
-	err = OBEX_Request(handle, object);
-
-	if (err == -EBUSY && !context->pending) {
-		context->pending = object;
-		return 0;
-	}
-
-	return err;
-}
-
-int obex_connect(obex_t *handle, const unsigned char *target, size_t size)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err, ret;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CLOSED)
-		return -EISCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_CONNECT);
-	if (!object)
-		return -ENOMEM;
-
-	if (target) {
-                hd.bs = target;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_TARGET, hd, size, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			return err;
-                }
-	}
-
-	context->state = OBEX_CONNECT;
-
-	ret = obex_send_or_queue(handle, object);	
-	if (ret < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return ret;
-}
-
-int obex_disconnect(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	int ret;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_DISCONNECT);
-	if (!object)
-		return -ENOMEM;
-
-	context->state = OBEX_DISCONN;
-
-	if (context->callback && context->callback->disconn_ind)
-		context->callback->disconn_ind(handle, context->user_data);
-
-	ret = obex_send_or_queue(handle, object);
-	if (ret < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return ret;
-}
-
-int obex_delete(obex_t *handle, const char *name)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CONNECT
-					&& context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_PUT);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_CONNECTION, hd, 4, OBEX_FL_FIT_ONE_PACKET);
-	}
-
-	if (name) {
-		int len, ulen = (strlen(name) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) name, ulen);
-		hd.bs = unicode;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_NAME, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return err;
-                }
-
-                free(unicode);
-        }
-
-	err = obex_send_or_queue(handle, object);
-	if (err < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return err;
-}
-
-int obex_put(obex_t *handle, const char *type, const char *name, int size, time_t mtime)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err, cmd;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CONNECT
-					&& context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd == OBEX_CMD_GET || cmd == OBEX_CMD_PUT)
-		return -EBUSY;
-
-	/* Initialize transfer variables */
-	context->data_start = 0;
-	context->data_length = 0;
-	context->counter = 0;
-	context->target_size = size;
-	context->modtime = mtime;
-	context->close = 0;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_PUT);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_CONNECTION, hd, 4, OBEX_FL_FIT_ONE_PACKET);
-	}
-
-	if (type) {
-		int len = strlen(type) + 1;
-
-		hd.bs = (uint8_t *) type;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_TYPE, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			return err;
-                }
-        }
-
-	if (name) {
-		int len, ulen = (strlen(name) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) name, ulen);
-		hd.bs = unicode;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_NAME, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return err;
-                }
-
-                free(unicode);
-        }
-
-	/* Add a time header if possible */
-	if (context->modtime >= 0) {
-		char tstr[17];
-		int len;
-
-		len = make_iso8601(context->modtime, tstr, sizeof(tstr));
-
-		if (len >= 0) {
-			debug("Adding time header: %s", tstr);
-			hd.bs = (uint8_t *) tstr;
-			OBEX_ObjectAddHeader(handle, object, OBEX_HDR_TIME, hd, len, 0);
-		}
-	}
-
-	/* Add a length header if possible */
-	if (context->target_size > 0) {
-		debug("Adding length header: %d", context->target_size);
-		hd.bq4 = (uint32_t) context->target_size;
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_LENGTH, hd, 4, 0);
-	}
-
-	hd.bs = NULL;
-	OBEX_ObjectAddHeader(handle, object, OBEX_HDR_BODY, hd, 0, OBEX_FL_STREAM_START);
-
-	/* We need to suspend until the user has provided some data
-	 * by calling obex_client_write */
-	debug("OBEX_SuspendRequest");
-	OBEX_SuspendRequest(handle, object);
-
-	err = obex_send_or_queue(handle, object);
-	if (err < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return err;
-}
-
-int obex_get(obex_t *handle, const char *type, const char *name)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err, cmd;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CONNECT
-					&& context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd == OBEX_CMD_GET || cmd == OBEX_CMD_PUT)
-		return -EBUSY;
-
-	/* Initialize transfer variables */
-	context->data_start = 0;
-	context->data_length = 0;
-	context->counter = 0;
-	context->target_size = -1;
-	context->modtime = -1;
-	context->close = 0;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_GET);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_CONNECTION, hd, 4, OBEX_FL_FIT_ONE_PACKET);
-	}
-
-	if (type) {
-		int len = strlen(type) + 1;
-
-		hd.bs = (uint8_t *) type;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_TYPE, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			return err;
-                }
-        }
-
-	if (name) {
-		int len, ulen = (strlen(name) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) name, ulen);
-		hd.bs = unicode;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_NAME, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return err;
-                }
-
-                free(unicode);
-        }
-
-	OBEX_ObjectReadStream(handle, object, NULL);
-
-	err = obex_send_or_queue(handle, object);
-	if (err < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return err;
-}
-
-int obex_read(obex_t *handle, char *buf, size_t count, size_t *bytes_read)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (OBEX_ObjectGetCommand(handle, NULL) != OBEX_CMD_GET)
-		return -EINVAL;
-
-	if (context->data_length == 0)
-		return -EAGAIN;
-
-	*bytes_read = count < context->data_length ? count : context->data_length;
-
-	memcpy(buf, &context->buf[context->data_start], *bytes_read);
-
-	context->data_length -= *bytes_read;
-
-	if (context->data_length)
-		context->data_start += *bytes_read;
-	else {
-		context->data_start = 0;
-		debug("OBEX_ResumeRequest");
-		OBEX_ResumeRequest(handle);
-	}
-
-	return 0;
-}
-
-int obex_write(obex_t *handle, const char *buf, size_t count, size_t *bytes_written)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int free_space;
-
-	if (OBEX_ObjectGetCommand(handle, NULL) != OBEX_CMD_PUT)
-		return -EINVAL;
-
-	free_space = sizeof(context->buf) - (context->data_start + context->data_length);
-
-	*bytes_written = count > free_space ? free_space : count;
-
-	memcpy(&context->buf[context->data_start + context->data_length], buf, *bytes_written);
-
-	context->data_length += *bytes_written;
-
-	if (context->data_length >= context->tx_max || *bytes_written == free_space) {
-		debug("OBEX_ResumeRequest");
-		OBEX_ResumeRequest(handle);
-	}
-
-	return 0;
-}
-
-int obex_flush(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (OBEX_ObjectGetCommand(handle, NULL) != OBEX_CMD_PUT)
-		return -EINVAL;
-
-	if (context->data_length) {
-		debug("OBEX_ResumeRequest");
-		OBEX_ResumeRequest(handle);
-	}
-
-	return 0;
-}
-
-int obex_abort(obex_t *handle)
-{
-	int cmd;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd != OBEX_CMD_PUT || cmd != OBEX_CMD_GET)
-		return -EINVAL;
-
-	return OBEX_CancelRequest(handle, 1);
-}
-
-int obex_close_transfer(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int cmd;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd != OBEX_CMD_PUT && cmd != OBEX_CMD_GET)
-		return -EINVAL;
-
-	context->close = 1;
-
-	debug("OBEX_ResumeRequest");
-	OBEX_ResumeRequest(handle);
-
-	return 0;
-}
-
-int obex_get_response(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int rsp;
-
-	rsp = context->obex_rsp;
-	context->obex_rsp = OBEX_RSP_SUCCESS;
-
-	return rsp;
-}
-
-int obex_setpath(obex_t *handle, const char *path, int create)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	obex_setpath_hdr_t sphdr;
-	int ret;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_SETPATH);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_CONNECTION, hd, 4, 0);
-	}
-
-	memset(&sphdr, 0, sizeof(obex_setpath_hdr_t));
-
-	if (strcmp(path, "..") == 0) {
-		/* Can't create parent dir */
-		if (create)
-			return -EINVAL;
-		sphdr.flags = 0x03;
-	} else {
-		int len, ulen = (strlen(path) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!create)
-			sphdr.flags = 0x02;
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) path, ulen);
-		hd.bs = unicode;
-
-		ret = OBEX_ObjectAddHeader(handle, object, OBEX_HDR_NAME, hd, len, 0);
-		if (ret < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return ret;
-		}
-
-		free(unicode);
-	}
-
-	OBEX_ObjectSetNonHdrData(object, (uint8_t *) &sphdr, 2);
-
-	ret = obex_send_or_queue(handle, object);
-	if (ret < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return ret;
-}
diff --git a/glib/obex-lowlevel.h b/glib/obex-lowlevel.h
deleted file mode 100644
index 594b6fa..0000000
--- a/glib/obex-lowlevel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-	\file glib/obex-lowlevel.h
-	OpenOBEX glib bindings low level code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#include <openobex/obex.h>
-
-#ifdef OBEX_CLIENT
-#undef OBEX_CLIENT
-#endif
-
-typedef struct {
-	void (*connect_cfm)(obex_t *handle, void *data);
-	void (*disconn_ind)(obex_t *handle, void *data);
-	void (*progress_ind)(obex_t *handle, void *data);
-	void (*command_ind)(obex_t *handle, int event, void *data);
-} obex_callback_t;
-
-obex_t *obex_open(int fd, obex_callback_t *callback, void *data);
-void obex_close(obex_t *handle);
-void obex_poll(obex_t *handle);
-int obex_connect(obex_t *handle, const unsigned char *target, size_t size);
-int obex_disconnect(obex_t *handle);
-int obex_put(obex_t *handle, const char *type, const char *name, int size, time_t mtime);
-int obex_get(obex_t *handle, const char *type, const char *name);
-int obex_write(obex_t *handle, const char *buf, size_t count, size_t *bytes_written);
-int obex_read(obex_t *handle, char *buf, size_t count, size_t *bytes_read);
-int obex_abort(obex_t *handle);
-int obex_flush(obex_t *handle);
-int obex_close_transfer(obex_t *handle);
-int obex_get_response(obex_t *handle);
-void obex_do_callback(obex_t *handle);
-int obex_setpath(obex_t *handle, const char *path, int create);
-int obex_delete(obex_t *handle, const char *name);
diff --git a/glib/obex-marshal.list b/glib/obex-marshal.list
deleted file mode 100644
index 5b76282..0000000
--- a/glib/obex-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:VOID
diff --git a/glib/test-client.c b/glib/test-client.c
deleted file mode 100644
index ca93948..0000000
--- a/glib/test-client.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- 	\file glib/test-client.c
-	OpenOBEX glib bindings client test code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#include <io.h>
-#else
-#include <termios.h>
-#endif
-
-#include "obex-client.h"
-
-#define FTP_UUID (guchar *) \
-	"\xF9\xEC\x7B\xC4\x95\x3C\x11\xD2\x98\x4E\x52\x54\x00\xDC\x9E\x09"
-
-static GMainLoop *mainloop;
-
-static void sig_term(int sig)
-{
-	g_main_loop_quit(mainloop);
-}
-
-static int open_device(const char *device)
-{
-	int fd;
-#ifdef _WIN32
-	HANDLE h;
-	DCB ti;
-
-	h = CreateFile(device,
-			GENERIC_READ|GENERIC_WRITE,
-			0,NULL,OPEN_EXISTING,0,NULL);
-	if (h == INVALID_HANDLE_VALUE)
-		return -1;
-
-	//TODO: tcflush-equivalent function?
-	ti.StopBits = ONESTOPBIT;
-	ti.Parity = NOPARITY;
-	ti.ByteSize = 8;
-	ti.fNull = FALSE;
-	SetCommState(h,&ti);
-	fd = _open_osfhandle((intptr_t)h,0);
-#else
-	struct termios ti;
-
-	fd = open(device, O_RDWR | O_NOCTTY);
-	if (fd < 0)
-		return fd;
-
-	tcflush(fd, TCIOFLUSH);
-
-	cfmakeraw(&ti);
-	tcsetattr(fd, TCSANOW, &ti);
-#endif
-	return fd;
-}
-
-static void transfer(ObexClient *client, ObexClientCondition cond, gpointer data)
-{
-	GError *gerr = NULL;
-	int err, *io = data;
-
-	if (cond & OBEX_CLIENT_COND_IN) {
-		gchar buf[1024];
-		gsize len;
-
-		printf("OBEX_CLIENT_COND_IN\n");
-
-		do {
-			obex_client_read(client, buf, sizeof(buf), &len, &gerr);
-
-			if (gerr != NULL) {
-				printf("obex_client_read failed: %s\n", gerr->message);
-				g_error_free(gerr);
-				gerr = NULL;
-				break;
-			}
-
-			printf("Data buffer with size %zd available\n", len);
-
-			if (len > 0 && *io >= 0)
-				err = write(*io, buf, len);	
-
-		} while (len == sizeof(buf));
-	}
-
-	if (cond & OBEX_CLIENT_COND_OUT) {
-		char buf[10000];
-		ssize_t actual;
-
-		printf("OBEX_CLIENT_COND_OUT\n");
-
-		if (*io < 0) {
-			printf("No data to send!\n");
-			return;
-		}
-
-		actual = read(*io, buf, sizeof(buf));
-		if (actual == 0) {
-			obex_client_close(client, &gerr);
-			if (gerr != NULL) {
-				printf("obex_client_close failed: %s\n",
-						gerr->message);
-				g_error_free(gerr);
-				gerr = NULL;
-			}
-			close(*io);
-			*io = -1;
-		} else if (actual > 0) {
-			gsize written;
-
-			obex_client_write(client, buf, actual, &written, &gerr);
-
-			if (gerr != NULL) {
-				printf("writing data failed: %s\n", gerr->message);
-				g_error_free(gerr);
-				gerr = NULL;
-			} else if (written < actual)
-				printf("Only %zd/%zd bytes were accepted by obex_client_write!\n",
-						written, actual);
-			else
-				obex_client_flush(client, NULL);
-
-		}
-		else
-			fprintf(stderr, "read: %s\n", strerror(errno));
-	}
-	
-	if (cond & OBEX_CLIENT_COND_DONE) {
-		obex_client_get_error(client, &gerr);
-		if (gerr != NULL) {
-			printf("Operation failed: %s\n", gerr->message);
-			g_error_free(gerr);
-			gerr = NULL;
-		}
-		else
-			printf("Operation completed with success\n");
-	}
-		
-	if (cond & OBEX_CLIENT_COND_ERR)
-		printf("Error in transfer\n");
-}
-
-int main(int argc, char *argv[])
-{
-	ObexClient *client;
-	int fd, io = -1;
-#ifndef _WIN32
-	struct sigaction sa;
-#endif
-
-	g_type_init();
-
-	fd = open_device("/dev/rfcomm42");
-	if (fd < 0) {
-		perror("Can't open device");
-		exit(EXIT_FAILURE);
-	}
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-
-	client = obex_client_new();
-
-	obex_client_add_watch(client, 0, transfer, &io);
-
-	obex_client_attach_fd(client, fd, NULL);
-
-	if (argc > 1) {
-		struct stat s;
-
-		if (stat(argv[1], &s) < 0) {
-			fprintf(stderr, "stat(%s): %s\n", argv[1], strerror(errno));
-			return 1;
-		}
-
-		io = open(argv[1], O_RDONLY);
-		if (io < 0) {
-			fprintf(stderr, "open(%s): %s\n", argv[1], strerror(errno));
-			return 1;
-		}
-
-		obex_client_put_object(client, NULL, argv[1], s.st_size, s.st_mtime, NULL);
-	}
-	else
-		obex_client_get_object(client, NULL, "telecom/devinfo.txt", NULL);
-
-
-#ifndef _WIN32
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = sig_term;
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGINT,  &sa, NULL);
-#endif
-
-	g_main_loop_run(mainloop);
-
-	obex_client_destroy(client);
-
-	if (io >= 0)
-		close(io);
-
-	close(fd);
-
-	return 0;
-}
diff --git a/glib/test-lowlevel.c b/glib/test-lowlevel.c
deleted file mode 100644
index d0bf80b..0000000
--- a/glib/test-lowlevel.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
-	\file glib/test-lowlevel.c
-	OpenOBEX glib bindings low level test code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#ifdef _WIN32
-#include <io.h>
-#define SOME_TTY "COM4"
-#else
-#include <termios.h>
-#define SOME_TTY "/dev/rfcomm42"
-#endif
-
-#include "obex-lowlevel.h"
-
-static int open_device(const char *device)
-{
-	int fd;
-#ifdef _WIN32
-	HANDLE h;
-	DCB ti;
-
-	h = CreateFile(device,
-			GENERIC_READ|GENERIC_WRITE,
-			0,NULL,OPEN_EXISTING,0,NULL);
-	if (h == INVALID_HANDLE_VALUE)
-		return -1;
-
-	//TODO: tcflush-equivalent function?
-	ti.StopBits = ONESTOPBIT;
-	ti.Parity = NOPARITY;
-	ti.ByteSize = 8;
-	ti.fNull = FALSE;
-	SetCommState(h,&ti);
-	fd = _open_osfhandle((intptr_t)h,0);
-#else
-	struct termios ti;
-
-	fd = open(device, O_RDWR | O_NOCTTY);
-	if (fd < 0)
-		return fd;
-
-	tcflush(fd, TCIOFLUSH);
-
-	cfmakeraw(&ti);
-	tcsetattr(fd, TCSANOW, &ti);
-#endif
-	return fd;
-}
-
-int main(int argc, char *argv[])
-{
-	obex_t *handle;
-	int fd;
-
-	fd = open_device(SOME_TTY);
-	if (fd < 0) {
-		perror("Can't open device");
-		exit(EXIT_FAILURE);
-	}
-
-	handle = obex_open(fd, NULL, NULL);
-
-	obex_connect(handle, NULL, 0);
-	obex_poll(handle);
-
-	obex_get(handle, NULL, "telecom/devinfo.txt");
-	obex_poll(handle);
-
-	obex_disconnect(handle);
-	obex_poll(handle);
-
-	obex_close(handle);
-
-	close(fd);
-
-	return 0;
-}
diff --git a/openobex-glib.pc.in b/openobex-glib.pc.in
deleted file mode 100644
index 9ee3e87..0000000
--- a/openobex-glib.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
- 
-Name: OpenOBEX
-Description: GLib integration of the Object Exchange protocol
-Version: @VERSION@
-Requires: glib-2.0
-Requires.private: openobex
-Libs: -L${libdir} -lopenobex-glib
-Cflags: -I${includedir}
-- 
1.7.5.4

One step is triggered the transport handle_input function: this one fills the
rx_msg buffer. It also used to read from that rx_msg buffer right again and
trigger the state machine. This patch decouples the second part and is needed
for further splitting into substates.
---
 lib/obex.c           |    2 +-
 lib/obex_client.c    |   13 +++++++--
 lib/obex_client.h    |    2 +-
 lib/obex_main.c      |   73 ++++++++++++++++++++++++++++++++-----------------
 lib/obex_main.h      |    2 +
 lib/obex_server.c    |   18 +++++++++---
 lib/obex_server.h    |    2 +-
 lib/obex_transport.c |    2 +-
 8 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index bf2b71b..e56ef74 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -535,7 +535,7 @@ int CALLAPI OBEX_Request(obex_t *self, obex_object_t *object)
 	self->mode = MODE_CLI;
         self->state = STATE_SEND;
 
-	return obex_client(self, NULL, 0);
+	return obex_client_send(self, NULL, 0);
 }
 
 /**
diff --git a/lib/obex_client.c b/lib/obex_client.c
index 0199fbf..e17528a 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -238,22 +238,29 @@ int obex_client_send(obex_t *self, buf_t *msg, int rsp)
  *    Handle client operations
  *
  */
-int obex_client(obex_t *self, buf_t *msg, int final)
+int obex_client(obex_t *self)
 {
+	int ret = -1;
+	buf_t *msg = obex_data_receive(self);
 	int rsp = msg_get_rsp(msg);
 
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_SEND:
-		return obex_client_send(self, msg, rsp);
+		ret = obex_client_send(self, msg, rsp);
+		break;
 
 	case STATE_REC:
-		return obex_client_recv(self, msg, rsp);
+		ret = obex_client_recv(self, msg, rsp);
+		break;
 
 	default:
 		DEBUG(0, "Unknown state\n");
 		obex_deliver_event(self, OBEX_EV_PARSEERR, rsp, 0, TRUE);
 		return -1;
 	}
+
+	obex_data_receive_finished(self);
+	return ret;
 }
diff --git a/lib/obex_client.h b/lib/obex_client.h
index bed3593..d1ae8fd 100644
--- a/lib/obex_client.h
+++ b/lib/obex_client.h
@@ -25,7 +25,7 @@
 struct obex;
 struct databuffer;
 
-int obex_client(struct obex *self, struct databuffer *msg, int final);
+int obex_client(struct obex *self);
 int obex_client_send(obex_t *self, buf_t *msg, int rsp);
 
 #endif
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 884c9e3..5337208 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -257,6 +257,20 @@ int obex_data_request(obex_t *self, buf_t *msg)
 	return status;
 }
 
+static int obex_mode(obex_t *self)
+{
+	switch (self->mode) {
+	case MODE_SRV:
+		return obex_server(self);
+
+	case MODE_CLI:
+		return obex_client(self);
+
+	default:
+		return -1;
+	}
+}
+
 /*
  * Function obex_work (self, timeout)
  *
@@ -265,6 +279,8 @@ int obex_data_request(obex_t *self, buf_t *msg)
  */
 int obex_work(obex_t *self, int timeout)
 {
+	int ret;
+
 	/* Waiting for an incoming packet will not work for single response mode
 	 * as the client is not supposed to send any when we (as server) are
 	 * sending the response.
@@ -273,8 +289,6 @@ int obex_work(obex_t *self, int timeout)
 			self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
 			self->state == STATE_SEND &&
 			!(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
-		int ret;
-
 		/* Still, we need to do a zero-wait check for an ABORT
 		 * and for connection errors. */
 		ret = obex_transport_handle_input(self, 0);
@@ -298,7 +312,10 @@ int obex_work(obex_t *self, int timeout)
 			return sizeof(obex_common_hdr_t);
 	}
 
-	return obex_transport_handle_input(self, timeout);
+	ret = obex_transport_handle_input(self, timeout);
+	if (ret == 1)
+		ret = obex_mode(self);
+	return ret;
 }
 
 /*
@@ -314,15 +331,14 @@ int obex_get_buffer_status(buf_t *msg) {
 /*
  * Function obex_data_indication (self)
  *
- *    Read/Feed some input from device and find out which packet it is
+ *    Read some input from device and find out which packet it is
  *
  */
 int obex_data_indication(obex_t *self)
 {
 	obex_common_hdr_t *hdr;
 	buf_t *msg;
-	uint8_t opcode;
-	int final, ret, actual = 0;
+	int actual;
 	unsigned int size;
 
 	DEBUG(4, "\n");
@@ -342,7 +358,7 @@ int obex_data_indication(obex_t *self)
 		 * partial buffer (custom transport) */
 		if (actual < 0) {
 			obex_deliver_event(self, OBEX_EV_LINKERR, 0, 0, TRUE);
-			return actual;
+			return -1;
 		}
 	}
 
@@ -366,14 +382,14 @@ int obex_data_indication(obex_t *self)
 			if (actual < 0) {
 				obex_deliver_event(self, OBEX_EV_LINKERR,
 								0, 0, TRUE);
-				return actual;
+				return -1;
 			}
 		}
 	} else {
 		/* Wait until we have at least 3 bytes data */
 		DEBUG(3, "Need at least 3 bytes got only %lu!\n",
 					(unsigned long) msg->data_size);
-		return actual;
+		return 0;
         }
 
 	/* New data has been inserted at the end of message */
@@ -392,16 +408,20 @@ int obex_data_indication(obex_t *self)
 				size, (unsigned long)msg->data_size);
 
 		/* I'll be back! */
-		return msg->data_size;
+		return 0;
 	}
 
 	DUMPBUFFER(2, "Rx", msg);
 
-	actual = msg->data_size;
-	opcode = hdr->opcode & ~OBEX_FINAL;
-	final = hdr->opcode & OBEX_FINAL; /* Extract final bit */
+	return 1;
+}
+
+buf_t* obex_data_receive(obex_t *self)
+{
+	buf_t *msg = self->rx_msg;
+	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
+	uint8_t opcode = hdr->opcode & ~OBEX_FINAL;
 
-	/* Dispatch to the mode we are in */
 	if (self->mode == MODE_SRV) {
 		/* Single response mode makes it possible for the client to send
 		 * the next request (e.g. PUT) while still receiving the last
@@ -411,23 +431,26 @@ int obex_data_indication(obex_t *self)
 				self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
 				self->state == STATE_SEND &&
 				!(opcode == OBEX_CMD_ABORT || opcode == self->object->cmd))
-			return 0;
+			return NULL;
+	}
 
-		self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_LOCAL;
-		ret = obex_server(self, msg, final);
-	} else
-		ret = obex_client(self, msg, final);
+	if (!obex_get_buffer_status(msg))
+		return NULL;
+
+	self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_LOCAL;
+	return msg;
+}
+
+void obex_data_receive_finished(obex_t *self)
+{
+	buf_t *msg = self->rx_msg;
+	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
+	unsigned int size = ntohs(hdr->len);
 
 	DEBUG(4, "Pulling %u bytes\n", size);
 	buf_remove_begin(msg, size);
 	if (msg->data_size == 0)
 		buf_reuse(msg);
-
-	/* Check parse errors */
-	if (ret < 0)
-		actual = ret;
-
-	return actual;
 }
 
 /*
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 53d2768..8a3e975 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -69,6 +69,8 @@ void obex_deliver_event(struct obex *self, int event, int cmd, int rsp, int del)
 int obex_work(struct obex *self, int timeout);
 int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
+buf_t* obex_data_receive(obex_t *self);
+void obex_data_receive_finished(obex_t *self);
 
 void obex_response_request(struct obex *self, uint8_t opcode);
 void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 52f490e..1902e4f 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -324,22 +324,29 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
  *    Handle server-operations
  *
  */
-int obex_server(obex_t *self, buf_t *msg, int final)
+int obex_server(obex_t *self)
 {
+	int ret = -1;
+	buf_t *msg = obex_data_receive(self);
+	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
 	int cmd = msg_get_cmd(msg);
 	uint16_t len = msg_get_len(msg);
+	int final = hdr->opcode & OBEX_FINAL; /* Extract final bit */
 
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_IDLE:
-		return obex_server_idle(self, msg, final, cmd, len);
+		ret = obex_server_idle(self, msg, final, cmd, len);
+		break;
 
 	case STATE_REC:
-		return obex_server_recv(self, msg, final, cmd, len);
+		ret = obex_server_recv(self, msg, final, cmd, len);
+		break;
 
 	case STATE_SEND:
-		return obex_server_send(self, msg, cmd, len);
+		ret = obex_server_send(self, msg, cmd, len);
+		break;
 
 	default:
 		DEBUG(0, "Unknown state\n");
@@ -347,4 +354,7 @@ int obex_server(obex_t *self, buf_t *msg, int final)
 		obex_deliver_event(self, OBEX_EV_PARSEERR, cmd, 0, TRUE);
 		return -1;
 	}
+
+	obex_data_receive_finished(self);
+	return ret;
 }
diff --git a/lib/obex_server.h b/lib/obex_server.h
index 3906e6f..2d4bc18 100644
--- a/lib/obex_server.h
+++ b/lib/obex_server.h
@@ -25,7 +25,7 @@
 struct obex;
 struct databuffer;
 
-int obex_server(struct obex *self, struct databuffer *msg, int final);
+int obex_server(struct obex *self);
 int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len);
 
 #endif
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index aa113ed..6207279 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -251,7 +251,7 @@ int obex_transport_handle_input(obex_t *self, int timeout)
 	self->trans.timeout = timeout;
 	if (obex_get_buffer_status(self->rx_msg)) {
 		DEBUG(4, "full message already in buffer\n");
-		return obex_data_indication(self);
+		return 1;
 	}
 
 	if (self->trans.ops.handle_input)
-- 
1.7.5.4

---
 lib/obex_client.c |   11 ++++++-----
 lib/obex_server.c |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/obex_client.c b/lib/obex_client.c
index dc7502e..efaf9f3 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -130,17 +130,18 @@ static int obex_client_recv_prepare_tx(obex_t *self)
 {
 	DEBUG(4, "STATE: RECV/PREPARE_TX\n");
 
+	/* Sending ABORT is allowed even during SRM */
+	if (self->object->abort == 1) {
+		self->state = STATE_ABORT;
+		return obex_client_abort_prepare(self);
+	}
+
 	if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
 	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
 	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
 	{
 		int ret;
 
-		if (self->object->abort == 1) {
-			self->state = STATE_ABORT;
-			return obex_client_abort_prepare(self);
-		}
-
 		ret = obex_object_prepare_send(self, self->object, TRUE, FALSE);
 		if (ret == 1) {
 			self->substate = SUBSTATE_TRANSMIT_TX;
diff --git a/lib/obex_server.c b/lib/obex_server.c
index ecad161..3a8d179 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -180,7 +180,7 @@ static int obex_server_send(obex_t *self)
 		DEBUG(1, "Got OBEX_ABORT request!\n");
 		obex_response_request(self, OBEX_RSP_SUCCESS);
 		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode, cmd, TRUE);
+		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode, 0, TRUE);
 		/* This is not an Obex error, it is just that the peer
 		 * aborted the request, so return 0 - Jean II */
 		return 0;
@@ -303,7 +303,7 @@ static int obex_server_recv(obex_t *self, int first)
 		obex_response_request(self, OBEX_RSP_SUCCESS);
 		self->state = STATE_IDLE;
 		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode,
-								cmd, TRUE);
+								0, TRUE);
 		/* This is not an Obex error, it is just that the peer
 		 * aborted the request, so return 0 - Jean II */
 		return 0;
-- 
1.7.5.4

To be backward compatible, the old obex_event_t callback type is still
supported but the documentation only refers to the new type and its functions.
---
 doc/openobex.coverpage  |   20 +-----
 include/openobex/obex.h |   44 +++++++++++++--
 lib/obex.c              |  143 +++++++++++++++++++++++++++-------------------
 lib/obex.sym            |    3 +
 lib/obex_main.c         |   70 ++++++++++++++++++++++-
 lib/obex_main.h         |    5 +-
 6 files changed, 201 insertions(+), 84 deletions(-)

diff --git a/doc/openobex.coverpage b/doc/openobex.coverpage
index 1f75eb4..1f7715b 100644
--- a/doc/openobex.coverpage
+++ b/doc/openobex.coverpage
@@ -31,9 +31,9 @@ You might also find the OpenOBEX test applications useful.
 
 To be able to use the OpenOBEX API you must include the files openobex/obex_const.h and openobex/obex.h.
 
-First of all you must create an OBEX instance by calling #OBEX_Init.
+First of all you must create an OBEX instance by calling #OBEX_New.
 In this call you specify what transport you want to use, an event callback, and optional flags.
-#OBEX_Init will return a handle which shall be passed to almost all other functions.
+#OBEX_New will return a handle which shall be passed to almost all other functions.
 
 To let the parser do some work you must call #OBEX_HandleInput.
 It will block for at-most the specified timeout for read and write actions.
@@ -41,19 +41,7 @@ You can call #OBEX_GetFD if you want to do select() yourself (this may not work
 
 	\subsection callback_sec The event callback
 
-The event callback shall be a function with the #obex_event_t prototype:
-	\code
-void *obex_event_t(obex_t *handle, obex_object_t *obj, int mode, int event, int obex_cmd, int obex_rsp)
-	\endcode
-
-Arguments:
-  - handle : OBEX handle
-  - obj : OBEX object
-  - mode : OBEX_MODE_CLIENT for client event or OBEX_MODE_SERVER, for server event
-  - event : The event. See obex_const.h for possible events (OBEX_EV_*)
-  - obex_cmd : Command if any (depending on event type). See obex_const.h for commands (OBEX_CMD_*)
-  - obex_rsp : Response if any (depending on event type). See obex_const.h for responses (OBEX_RSP_*)
-
+The event callback shall be a function with the #obex_event_cb_t prototype.
 To this function events from the library will be passed to you, for example when an operation finishes.
 #OBEX_SetUserData and #OBEX_GetUserData are useful if you need to access your own private data from inside the event callback.
 
@@ -125,7 +113,7 @@ generic function #OBEX_ServerRegister or one of the specialized:
   - #BtOBEX_ServerRegister.
 
 When an incoming connection is coming you'll get an #OBEX_EV_ACCEPTHINT event.
-If you ignore this event no more incoming connections will be accepted but if you call #OBEX_ServerAccept,
+If you ignore this event no more incoming connections will be accepted but if you call #OBEX_Accept,
 you'll get back a new OBEX handle and the old handle will still be listening to connections.
 
 When an incoming request comes, you will first get an #OBEX_EV_REQHINT event. The supplied
diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 6bf91d4..315601d 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -60,18 +60,52 @@ struct obex_object;
 typedef struct obex obex_t;
 typedef struct obex_object obex_object_t;
 
-typedef void (*obex_event_t)(obex_t *handle, obex_object_t *obj, int mode, int event, int obex_cmd, int obex_rsp);
-
 #include <openobex/obex_const.h>
 
 /*
+ *  OBEX API (deprecated)
+ */
+/** The user event callback.
+ *  \deprecated Use #obex_event_cb_t and its functions instead.
+ *  \param handle the obex handle
+ *  \param obj the object that this callback is about
+ *  \param mode one of the OBEX_MODE_*
+ *  \param event one of the OBEX_EVE_*
+ *  \param obex_cmd the current OBEX command code
+ *  \param obex_rsp the current OBEX response code (client only)
+ */
+typedef void (*obex_event_t)(obex_t *handle, obex_object_t *obj, int mode,
+			     int event, int obex_cmd, int obex_rsp);
+
+OPENOBEX_SYMBOL(obex_t *) OBEX_Init(int transport, obex_event_t eventcb,
+				    unsigned int flags);
+OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self,
+					       obex_event_t eventcb,
+					       void * data);
+OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server,
+					    obex_event_t eventcb, void * data);
+
+/*
  *  OBEX API
  */
-OPENOBEX_SYMBOL(obex_t *) OBEX_Init(int transport, obex_event_t eventcb, unsigned int flags);
+/** The user event callback.
+ *  \param handle the obex handle
+ *  \param obj the object that this callback is about
+ *  \param mode the current #obex_mode
+ *  \param event the current #obex_event
+ *  \param obex_cmd the current OBEX command code
+ *  \param obex_rsp the current OBEX response code (client only)
+ */
+typedef void (*obex_event_cb_t)(obex_t *handle, obex_object_t *obj,
+				enum obex_mode mode, enum obex_event event,
+				uint8_t cmd, uint8_t rsp);
+
+OPENOBEX_SYMBOL(obex_t *) OBEX_New(enum obex_transport_type transport,
+				   obex_event_cb_t eventcb, unsigned int flags);
 OPENOBEX_SYMBOL(void)     OBEX_Cleanup(obex_t *self);
 OPENOBEX_SYMBOL(void)     OBEX_SetUserData(obex_t *self, void * data);
 OPENOBEX_SYMBOL(void *)   OBEX_GetUserData(obex_t *self);
-OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self, obex_event_t eventcb, void * data);
+OPENOBEX_SYMBOL(void)     OBEX_SetEventCb(obex_t *self, obex_event_cb_t eventcb, void * data);
 OPENOBEX_SYMBOL(int)      OBEX_SetTransportMTU(obex_t *self, uint16_t mtu_rx, uint16_t mtu_tx_max);
 OPENOBEX_SYMBOL(int)      OBEX_GetFD(obex_t *self);
 
@@ -85,7 +119,7 @@ OPENOBEX_SYMBOL(int) OBEX_CustomDataFeed(obex_t *self, uint8_t *inputbuf, int ac
 OPENOBEX_SYMBOL(int) OBEX_HandleInput(obex_t *self, int timeout);
 
 OPENOBEX_SYMBOL(int)      OBEX_ServerRegister(obex_t *self, struct sockaddr *saddr, int addrlen);
-OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server, obex_event_t eventcb, void * data);
+OPENOBEX_SYMBOL(obex_t *) OBEX_Accept(obex_t *server);
 
 OPENOBEX_SYMBOL(int) OBEX_Request(obex_t *self, obex_object_t *object);
 OPENOBEX_SYMBOL(int) OBEX_CancelRequest(obex_t *self, int nice);
diff --git a/lib/obex.c b/lib/obex.c
index 229d09d..0522bef 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -67,6 +67,7 @@
 
 /**
 	Initialize OBEX.
+	\deprecated Use OBEX_New() instead of this function.
 	\param transport Which transport to use. The following transports are available :
 			- #OBEX_TRANS_IRDA : Use regular IrDA socket (need an IrDA stack)
 			- #OBEX_TRANS_INET : Use regular TCP/IP socket
@@ -90,65 +91,41 @@ obex_t * CALLAPI OBEX_Init(int transport, obex_event_t eventcb,
 							unsigned int flags)
 {
 	obex_t *self;
-	char *env;
-
-#if OBEX_DEBUG
-	obex_debug = OBEX_DEBUG;
-#else
-	obex_debug = -1;
-#endif
-#if OBEX_DUMP
-	obex_dump = OBEX_DUMP;
-#else
-	obex_dump = 0;
-#endif
-
-	env = getenv("OBEX_DEBUG");
-	if (env)
-		obex_debug = atoi(env);
-
-	env = getenv("OBEX_DUMP");
-	if (env)
-		obex_dump = atoi(env);
 
 	obex_return_val_if_fail(eventcb != NULL, NULL);
 
-	self = calloc(1, sizeof(*self));
-	if (self == NULL)
-		return NULL;
-
-	self->eventcb = eventcb;
-	self->init_flags = flags;
-	self->mode = OBEX_MODE_SERVER;
-	self->state = STATE_IDLE;
-	self->rsp_mode = OBEX_RSP_MODE_NORMAL;
+	self = obex_new((enum obex_transport_type)transport, flags);
+	if (self)
+		self->old_eventcb = eventcb;
 
-	/* Safe values.
-	 * Both self->mtu_rx and self->mtu_tx_max can be increased by app
-	 * self->mtu_tx will be whatever the other end sends us - Jean II */
-	self->mtu_rx = OBEX_DEFAULT_MTU;
-	self->mtu_tx = OBEX_MINIMUM_MTU;
-	self->mtu_tx_max = OBEX_DEFAULT_MTU;
+	return self;
+}
 
-	if (obex_transport_init(self, transport) < 0)
-		goto out_err;
+/**
+	Create a new OBEX instance
+	\param transport Which transport to use.
+	\param eventcb Function pointer to your event callback.
+	\param flags Bitmask of flags. The following flags can be used here:
+			- #OBEX_FL_KEEPSERVER : Keep the server alive after incomming request
+			- #OBEX_FL_FILTERHINT : Filter target devices based on Obex hint bit
+			- #OBEX_FL_FILTERIAS  : Filter target devices based on IAS entry
+			- #OBEX_FL_CLOEXEC   : Open all sockets with SO_CLOEXEC set
+			- #OBEX_FL_NONBLOCK   : Open all sockets non-blocking
+	\return an OBEX handle or NULL on error.
+ */
+LIB_SYMBOL
+obex_t * CALLAPI OBEX_New(enum obex_transport_type transport,
+			  obex_event_cb_t eventcb, unsigned int flags)
+{
+	obex_t *self;
 
-	/* Allocate message buffers */
-	/* It's safe to allocate them smaller than OBEX_MAXIMUM_MTU
-	 * because buf_t will realloc data as needed. - Jean II */
-	self->rx_msg = buf_new(self->mtu_rx);
-	if (self->rx_msg == NULL)
-		goto out_err;
+	obex_return_val_if_fail(eventcb != NULL, NULL);
 
-	self->tx_msg = buf_new(self->mtu_tx_max);
-	if (self->tx_msg == NULL)
-		goto out_err;
+	self = obex_new((enum obex_transport_type)transport, flags);
+	if (self)
+		self->eventcb = eventcb;
 
 	return self;
-
-out_err:
-	OBEX_Cleanup(self);
-	return NULL;
 }
 
 /**
@@ -223,6 +200,7 @@ void * CALLAPI OBEX_GetUserData(obex_t *self)
 
 /**
 	Change user callback on an OBEX handle.
+	\deprecated Use OBEX_SetEventCb() instead.
 	\param self OBEX handle
 	\param eventcb Function pointer to your new event callback.
 	\param data Pointer to the new user data to pass to the new
@@ -235,6 +213,27 @@ void CALLAPI OBEX_SetUserCallBack(obex_t *self, obex_event_t eventcb,
 	obex_return_if_fail(self != NULL);
 	/* The callback can't be NULL */
 	if (eventcb != NULL) {
+		self->old_eventcb = eventcb;
+		/* Optionaly change the user data */
+		if (data != NULL)
+			self->userdata = data;
+	}
+}
+
+/**
+	Change event callback on an OBEX handle.
+	\param self OBEX handle
+	\param eventcb Function pointer to your new event callback.
+	\param data Pointer to the new user data to pass to the new
+	callback (optional)
+ */
+LIB_SYMBOL
+void CALLAPI OBEX_SetEventCb(obex_t *self, obex_event_cb_t eventcb,
+								void *data)
+{
+	obex_return_if_fail(self != NULL);
+	/* The callback can't be NULL */
+	if (eventcb != NULL) {
 		self->eventcb = eventcb;
 		/* Optionaly change the user data */
 		if (data != NULL)
@@ -313,6 +312,7 @@ int CALLAPI OBEX_ServerRegister(obex_t *self, struct sockaddr *saddr, int addrle
 
 /**
 	Accept an incoming connection.
+	\deprecated
 	\param server OBEX handle
 	\param eventcb Event callback for client (use NULL for same as server)
 	\param data Userdata for client (use NULL for same as server)
@@ -333,6 +333,38 @@ LIB_SYMBOL
 obex_t *CALLAPI OBEX_ServerAccept(obex_t *server, obex_event_t eventcb,
 								void *data)
 {
+	obex_t * client = OBEX_Accept(server);
+
+	if (client) {
+		if (eventcb == NULL)
+			eventcb = client->old_eventcb;
+		if (data == NULL)
+			data = client->userdata;
+		OBEX_SetUserCallBack(client, eventcb, data);
+	}
+
+	return client;
+}
+
+/**
+	Accept an incoming connection.
+	\param server OBEX handle
+	\return the client instance or NULL on error
+
+	Create a new OBEX instance to handle the incomming connection.
+	The old OBEX instance will continue to listen for new connections.
+	The two OBEX instances become totally independant from each other.
+
+	This function should be called after the library generates
+	an #OBEX_EV_ACCEPTHINT event to the user, but before the user
+	start to pull data out of the incomming connection.
+
+	Using this function also requires that the OBEX handle was created
+	with the #OBEX_FL_KEEPSERVER flag set while calling #OBEX_New().
+ */
+LIB_SYMBOL
+obex_t *CALLAPI OBEX_Accept(obex_t *server)
+{
 	obex_t *self;
 
 	DEBUG(3, "\n");
@@ -355,15 +387,8 @@ obex_t *CALLAPI OBEX_ServerAccept(obex_t *server, obex_event_t eventcb,
 		return NULL;
 
 	/* Set callback and callback data as needed */
-	if (eventcb != NULL)
-		self->eventcb = eventcb;
-	else
-		self->eventcb = server->eventcb;
-
-	if (data != NULL)
-		self->userdata = data;
-	else
-		self->userdata = server->userdata;
+	self->eventcb = server->eventcb;
+	self->userdata = server->userdata;
 
 	self->init_flags = server->init_flags;
 
diff --git a/lib/obex.sym b/lib/obex.sym
index 0c33b63..6483738 100644
--- a/lib/obex.sym
+++ b/lib/obex.sym
@@ -1,8 +1,10 @@
 OBEX_Init
+OBEX_New
 OBEX_Cleanup
 OBEX_SetUserData
 OBEX_GetUserData
 OBEX_SetUserCallBack
+OBEX_SetEventCb
 OBEX_SetTransportMTU
 OBEX_GetFD
 OBEX_RegisterCTransport
@@ -14,6 +16,7 @@ OBEX_CustomDataFeed
 OBEX_HandleInput
 OBEX_ServerRegister
 OBEX_ServerAccept
+OBEX_Accept
 OBEX_Request
 OBEX_CancelRequest
 OBEX_SuspendRequest
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 7444250..a009275 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 
 #endif /* _WIN32 */
+#include <stdlib.h>
 
 #ifdef HAVE_BLUETOOTH
 #include "bluez_compat.h"
@@ -52,11 +53,68 @@
 
 #include <openobex/obex_const.h>
 
-int obex_debug;
-int obex_dump;
+#ifndef OBEX_DEBUG
+#define OBEX_DEBUG -1
+#endif
+#ifndef OBEX_DUMP
+#define OBEX_DUMP 0
+#endif
+
+int obex_debug = OBEX_DEBUG;
+int obex_dump = OBEX_DUMP;
 
 #include "cloexec.h"
 
+obex_t * obex_new(enum obex_transport_type transport, unsigned int flags)
+{
+	obex_t *self;
+	char *env;
+
+	env = getenv("OBEX_DEBUG");
+	if (env)
+		obex_debug = atoi(env);
+
+	env = getenv("OBEX_DUMP");
+	if (env)
+		obex_dump = atoi(env);
+
+	self = calloc(1, sizeof(*self));
+	if (self == NULL)
+		return NULL;
+
+	self->init_flags = flags;
+	self->mode = OBEX_MODE_SERVER;
+	self->state = STATE_IDLE;
+	self->rsp_mode = OBEX_RSP_MODE_NORMAL;
+
+	/* Safe values.
+	 * Both self->mtu_rx and self->mtu_tx_max can be increased by app
+	 * self->mtu_tx will be whatever the other end sends us - Jean II */
+	self->mtu_rx = OBEX_DEFAULT_MTU;
+	self->mtu_tx = OBEX_MINIMUM_MTU;
+	self->mtu_tx_max = OBEX_DEFAULT_MTU;
+
+	if (obex_transport_init(self, transport) < 0)
+		goto out_err;
+
+	/* Allocate message buffers */
+	/* It's safe to allocate them smaller than OBEX_MAXIMUM_MTU
+	 * because buf_t will realloc data as needed. - Jean II */
+	self->rx_msg = buf_new(self->mtu_rx);
+	if (self->rx_msg == NULL)
+		goto out_err;
+
+	self->tx_msg = buf_new(self->mtu_tx_max);
+	if (self->tx_msg == NULL)
+		goto out_err;
+
+	return self;
+
+out_err:
+	OBEX_Cleanup(self);
+	return NULL;
+}
+
 /*
  * Function obex_create_socket()
  *
@@ -195,7 +253,13 @@ void obex_deliver_event(obex_t *self, int event, int cmd, int rsp, int del)
 	if (del == TRUE)
 		self->object = NULL;
 
-	self->eventcb(self, object, self->mode, event, cmd, rsp);
+	if (self->eventcb)
+		self->eventcb(self, object, self->mode, event, cmd, rsp);
+
+	else if (self->old_eventcb)
+		self->old_eventcb(self, object, (int)self->mode, (int)event,
+				  (int)cmd, (int)rsp);
+
 
 	if (del == TRUE)
 		obex_object_delete(object);
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 24d37c5..82fea37 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -52,7 +52,9 @@ struct obex {
 	struct databuffer *rx_msg;	/* Reusable receive message */
 
 	struct obex_object *object;	/* Current object being transfered */
-	obex_event_t eventcb;		/* Event-callback */
+
+	obex_event_t old_eventcb;	/* Old, deprecated event-callback */
+	obex_event_cb_t eventcb;	/* Event-callback */
 
 	obex_transport_t trans;		/* Transport being used */
 
@@ -62,6 +64,7 @@ struct obex {
 	void * userdata;		/* For user */
 };
 
+obex_t * obex_new(enum obex_transport_type transport, unsigned int flags);
 socket_t obex_create_socket(struct obex *self, int domain);
 socket_t obex_create_packet_socket(obex_t *self, int domain);
 int obex_delete_socket(struct obex *self, socket_t fd);
-- 
1.7.5.4

---
 include/openobex/obex_const.h |    1 +
 lib/obex.c                    |    1 +
 lib/obex_main.c               |   22 ++++++++++++++++------
 lib/obex_transport.c          |   19 +++++++++++++++++--
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index b4bad7f..8276aae 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -167,6 +167,7 @@ typedef union {
 #define OBEX_FL_FILTERHINT	(1 <<  2) /* Filter devices based on hint bit */
 #define OBEX_FL_FILTERIAS	(1 <<  3) /* Filter devices based on IAS entry */
 #define OBEX_FL_CLOEXEC		(1 <<  4) /* Set CLOEXEC flag on file descriptors */
+#define OBEX_FL_NONBLOCK	(1 <<  5) /* Set the NONBLOCK flag on file descriptors */ 
 
 /* For OBEX_ObjectAddHeader */
 #define OBEX_FL_FIT_ONE_PACKET	0x01	/* This header must fit in one packet */
diff --git a/lib/obex.c b/lib/obex.c
index 3aa6bac..49de8cd 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -82,6 +82,7 @@
 			- #OBEX_FL_FILTERHINT : Filter target devices based on Obex hint bit
 			- #OBEX_FL_FILTERIAS  : Filter target devices based on IAS entry
 			- #OBEX_FL_CLOEXEC   : Open all sockets with SO_CLOEXEC set
+			- #OBEX_FL_NONBLOCK   : Open all sockets non-blocking
 	\return an OBEX handle or NULL on error.
  */
 LIB_SYMBOL
diff --git a/lib/obex_main.c b/lib/obex_main.c
index b3a8a45..cc24735 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -67,6 +67,7 @@ socket_t obex_create_socket(obex_t *self, int domain)
 {
 	socket_t fd;
 	int type = SOCK_STREAM, proto = 0;
+	long status;
 
 	DEBUG(4, "\n");
 
@@ -80,6 +81,12 @@ socket_t obex_create_socket(obex_t *self, int domain)
 	else
 		fd = socket(domain, type, proto);
 
+	if (self->init_flags & OBEX_FL_NONBLOCK) {
+		status = fcntl(fd, F_GETFL);
+		status |= O_NONBLOCK;
+		fcntl(fd, F_SETFL, status);
+	}
+
 	return fd;
 }
 
@@ -211,7 +218,11 @@ void obex_response_request(obex_t *self, uint8_t opcode)
 
 	msg = buf_reuse(self->tx_msg);
 	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
-	obex_data_request(self, msg);
+	do {
+		int status = obex_data_request(self, msg);
+		if (status < 0)
+			break;
+	} while (!buf_empty(msg));
 }
 
 /*
@@ -249,11 +260,10 @@ int obex_data_request(obex_t *self, buf_t *msg)
 
 	DEBUG(1, "len = %lu bytes\n", (unsigned long) msg->data_size);
 
-	do {
-		status = obex_transport_write(self, msg);
-		if (status > 0)
-			buf_remove_begin(msg, status);
-	} while (status >= 0 && !buf_empty(msg));
+	status = obex_transport_write(self, msg);
+	if (status > 0)
+		buf_remove_begin(msg, status);
+
 	return status;
 }
 
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index 6207279..2ca461e 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -366,6 +366,7 @@ int obex_transport_do_send (obex_t *self, buf_t *msg)
 	struct obex_transport *trans = &self->trans;
 	int fd = trans->fd;
 	size_t size = msg->data_size;
+	int status;
 
 	if (size == 0)
 		return 0;
@@ -388,7 +389,14 @@ int obex_transport_do_send (obex_t *self, buf_t *msg)
 	}
 
 	/* call send() if no error */
-	return send(fd, msg->data, size, 0);
+	status = send(fd, msg->data, size, 0);
+
+	/* The following are not really transport errors. */
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
+
+	return status;
 }
 
 /*
@@ -408,7 +416,14 @@ int obex_transport_write(obex_t *self, buf_t *msg)
 int obex_transport_do_recv (obex_t *self, void *buf, int buflen)
 {
 	struct obex_transport *trans = &self->trans;
-	return recv(trans->fd, buf, buflen, 0);
+	int status = recv(trans->fd, buf, buflen, 0);
+
+	/* The following are not really transport errors. */
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
+
+	return status;
 }
 
 /*
-- 
1.7.5.4

---
 doc/openobex.coverpage |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/openobex.coverpage b/doc/openobex.coverpage
index 1f7715b..e13cc8c 100644
--- a/doc/openobex.coverpage
+++ b/doc/openobex.coverpage
@@ -29,7 +29,7 @@ You might also find the OpenOBEX test applications useful.
 
 	\subsection preparations_sec Preparations
 
-To be able to use the OpenOBEX API you must include the files openobex/obex_const.h and openobex/obex.h.
+To be able to use the OpenOBEX API you must include the files openobex/obex_const.h or openobex/obex.h.
 
 First of all you must create an OBEX instance by calling #OBEX_New.
 In this call you specify what transport you want to use, an event callback, and optional flags.
-- 
1.7.5.4

---
 lib/obex_object.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/lib/obex_object.h b/lib/obex_object.h
index 31a7d80..914b405 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -74,8 +74,6 @@ struct obex_object {
 	enum obex_rsp_mode rsp_mode;	/* OBEX_RSP_MODE_* */
 
 	int suspend;			/* Temporarily stop transfering object */
-	int continue_received;		/* CONTINUE received after sending last command */
-	int first_packet_sent;		/* Whether we've sent the first packet */
 
 	const uint8_t *s_buf;		/* Pointer to streaming data */
 	unsigned int s_len;		/* Length of stream-data */
-- 
1.7.5.4

---
 lib/obex.c        |    3 +-
 lib/obex_client.c |  207 ++++++++++++++++++++++++++++++++--------------------
 lib/obex_client.h |    2 -
 lib/obex_main.c   |   36 +++++-----
 4 files changed, 146 insertions(+), 102 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index e56ef74..5e16fc4 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -534,8 +534,9 @@ int CALLAPI OBEX_Request(obex_t *self, obex_object_t *object)
 	self->object = object;
 	self->mode = MODE_CLI;
         self->state = STATE_SEND;
+	self->substate = SUBSTATE_PREPARE_TX;
 
-	return obex_client_send(self, NULL, 0);
+	return obex_client(self);
 }
 
 /**
diff --git a/lib/obex_client.c b/lib/obex_client.c
index fd9962b..c8dc843 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -178,91 +178,135 @@ static int obex_client_recv(obex_t *self)
 
 }
 
-int obex_client_send(obex_t *self, buf_t *msg, int rsp)
+static int obex_client_send_transmit_tx(obex_t *self)
 {
 	int ret;
 
-	/* In progress of sending request */
-	DEBUG(4, "STATE_SEND\n");
+	DEBUG(4, "STATE: SEND/TRANSMIT_TX\n");
 
-	if (self->object->first_packet_sent == 1) {
-		/* Any errors from peer? Win2k will send RSP_SUCCESS after
-		 * every fragment sent so we have to accept that too.*/
-		switch (rsp) {
-		case OBEX_RSP_SUCCESS:
-		case OBEX_RSP_CONTINUE:
-			break;
-
-		default:
-			DEBUG(0, "STATE_SEND. request not accepted.\n");
-			obex_deliver_event(self, OBEX_EV_REQDONE,
-						self->object->opcode, rsp, TRUE);
-			/* This is not an Obex error, it is just that the peer
-			 * doesn't accept the request, so return 0 - Jean II */
-			return 0;
-		}
-
-		if (msg_get_len(msg) > 3) {
-			/* For Single Response Mode, this is actually not
-			 * unexpected. */
-			if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL) {
-				DEBUG(1, "STATE_SEND. Didn't excpect data from "
-						"peer (%u)\n", msg_get_len(msg));
-				DUMPBUFFER(4, "unexpected data", msg);
-				obex_deliver_event(self, OBEX_EV_UNEXPECTED,
-						self->object->opcode, 0, FALSE);
-			}
-
-			/* At this point, we are in the middle of sending our
-			 * request to the server, and it is already sending us
-			 * some data! This breaks the whole Request/Response
-			 * model! Most often, the server is sending some out of
-			 * band progress information for a PUT.
-			 * This is the way we will handle that:
-			 * Save this header in our Rx header list. We can have
-			 * duplicated headers, so no problem. User can check the
-			 * header in the next EV_PROGRESS, doing so will hide
-			 * the header (until reparse). If not, header will be
-			 * parsed at 'final', or just ignored (common case for
-			 * PUT).
-			 * No headeroffset needed because 'connect' is single
-			 * packet (or we deny it). */
-			ret = -1;
-			if (self->object->opcode == OBEX_CMD_CONNECT)
-				ret = obex_object_receive(self, msg);
-			if (ret < 0) {
-				obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-				self->mode = MODE_SRV;
-				self->state = STATE_IDLE;
-				return -1;
-			}
-
-			/* Note : we may want to get rid of received header,
-			 * however they are mixed with legitimate headers,
-			 * and the user may expect to consult them later.
-			 * So, leave them here (== overhead). */
-		}
-	}
-
-	ret = obex_object_send(self, self->object, TRUE, FALSE);
+	ret = obex_object_send_transmit(self, self->object);
 	if (ret < 0) {
 		/* Error while sending */
 		obex_deliver_event(self, OBEX_EV_LINKERR,
 					self->object->opcode, 0, TRUE);
 		self->mode = MODE_SRV;
 		self->state = STATE_IDLE;
-		return -1;
 
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_PROGRESS, self->object->opcode,
+								      0, FALSE);
+		if (obex_object_finished(self, self->object, TRUE)) {
+			self->state = STATE_REC;
+			self->substate = SUBSTATE_RECEIVE_RX;
+
+		} else {
+			int check = 0;
+			if (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+			    !(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
+				/* Still, we need to do a zero-wait check for an
+				 * negative response or for connection errors. */
+				check = obex_transport_handle_input(self, 0);
+				if (check <= 0) /* no input */
+					self->substate = SUBSTATE_RECEIVE_RX;
+				else
+					self->substate = SUBSTATE_PREPARE_TX;
+
+			} else
+				self->substate = SUBSTATE_RECEIVE_RX;
+		}
 	}
 
-	self->object->first_packet_sent = 1;
-	obex_deliver_event(self, OBEX_EV_PROGRESS, self->object->opcode,
-								0, FALSE);
-	if (ret > 0)
-		self->state = STATE_REC;
+	return ret;
+}
 
-	return 0;
+static int obex_client_send_prepare_tx(obex_t *self)
+{
+	int ret;
+
+	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
+
+	ret = obex_object_prepare_send(self, self->object, TRUE, FALSE);
+	if (ret == 1) {
+		self->substate = SUBSTATE_TRANSMIT_TX;
+		return obex_client_send_transmit_tx(self);
+
+	} else
+		return ret;
+}
+
+static int obex_client_send(obex_t *self)
+{
+	int ret;
+	buf_t *msg = obex_data_receive(self);
+	int rsp;
+
+	DEBUG(4, "STATE: SEND/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	rsp = msg_get_rsp(msg);
+
+	/* Any errors from peer? Win2k will send RSP_SUCCESS after
+	 * every fragment sent so we have to accept that too.*/
+	switch (rsp) {
+	case OBEX_RSP_SUCCESS:
+	case OBEX_RSP_CONTINUE:
+		break;
+
+	default:
+		DEBUG(0, "STATE_SEND. request not accepted.\n");
+		obex_deliver_event(self, OBEX_EV_REQDONE, self->object->opcode,
+								     rsp, TRUE);
+		/* This is not an Obex error, it is just that the peer
+		 * doesn't accept the request, so return 0 - Jean II */
+		return 0;
+	}
+
+	if (msg_get_len(msg) > 3) {
+		/* For Single Response Mode, this is actually not
+		 * unexpected. */
+		if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL) {
+			DEBUG(1, "STATE_SEND. Didn't excpect data from "
+			      "peer (%u)\n", msg_get_len(msg));
+			DUMPBUFFER(4, "unexpected data", msg);
+			obex_deliver_event(self, OBEX_EV_UNEXPECTED,
+						self->object->opcode, 0, FALSE);
+		}
+
+		/* At this point, we are in the middle of sending our
+		 * request to the server, and it is already sending us
+		 * some data! This breaks the whole Request/Response
+		 * model! Most often, the server is sending some out of
+		 * band progress information for a PUT.
+		 * This is the way we will handle that:
+		 * Save this header in our Rx header list. We can have
+		 * duplicated headers, so no problem. User can check the
+		 * header in the next EV_PROGRESS, doing so will hide
+		 * the header (until reparse). If not, header will be
+		 * parsed at 'final', or just ignored (common case for
+		 * PUT).
+		 * No headeroffset needed because 'connect' is single
+		 * packet (or we deny it). */
+		ret = -1;
+		if (self->object->opcode == OBEX_CMD_CONNECT)
+			ret = obex_object_receive(self, msg);
+		if (ret < 0) {
+			obex_deliver_event(self, OBEX_EV_PARSEERR,
+						 self->object->opcode, 0, TRUE);
+			self->mode = MODE_SRV;
+			self->state = STATE_IDLE;
+			return -1;
+		}
+
+		/* Note : we may want to get rid of received header,
+		 * however they are mixed with legitimate headers,
+		 * and the user may expect to consult them later.
+		 * So, leave them here (== overhead). */
+	}
+
+	obex_data_receive_finished(self);
+	self->substate = SUBSTATE_PREPARE_TX;
+	return obex_client_send_prepare_tx(self);
 }
 
 
@@ -274,15 +318,20 @@ int obex_client_send(obex_t *self, buf_t *msg, int rsp)
  */
 int obex_client(obex_t *self)
 {
-	int ret = -1;
-	buf_t *msg = obex_data_receive(self);
-	int rsp = msg_get_rsp(msg);
-
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_SEND:
-		ret = obex_client_send(self, msg, rsp);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_client_send(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_client_send_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_client_send_transmit_tx(self);
+		}
 		break;
 
 	case STATE_REC:
@@ -300,10 +349,8 @@ int obex_client(obex_t *self)
 
 	default:
 		DEBUG(0, "Unknown state\n");
-		obex_deliver_event(self, OBEX_EV_PARSEERR, rsp, 0, TRUE);
-		return -1;
+		break;
 	}
 
-	obex_data_receive_finished(self);
-	return ret;
+	return -1;
 }
diff --git a/lib/obex_client.h b/lib/obex_client.h
index d1ae8fd..6f0d0fa 100644
--- a/lib/obex_client.h
+++ b/lib/obex_client.h
@@ -23,9 +23,7 @@
 #define OBEX_CLIENT_H
 
 struct obex;
-struct databuffer;
 
 int obex_client(struct obex *self);
-int obex_client_send(obex_t *self, buf_t *msg, int rsp);
 
 #endif
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 5337208..d3f0612 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -285,37 +285,35 @@ int obex_work(obex_t *self, int timeout)
 	 * as the client is not supposed to send any when we (as server) are
 	 * sending the response.
 	 * For request reception, this is handled above */
-	if (self->object &&
+	if (self->mode == MODE_SRV &&
+			self->object &&
 			self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
 			self->state == STATE_SEND &&
 			!(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
 		/* Still, we need to do a zero-wait check for an ABORT
 		 * and for connection errors. */
 		ret = obex_transport_handle_input(self, 0);
-		if (ret == 0) { /* timeout: no error, no input */
-			switch (self->mode) {
-			case MODE_SRV:
-				ret = obex_server_send(self, NULL, self->object->cmd, 0);
-				break;
-
-			case MODE_CLI:
-				ret = obex_client_send(self, NULL, OBEX_RSP_CONTINUE);
-				break;
-
-			default:
-				return -1;
-			}
-		}
+		if (ret == 0) /* timeout: no error, no input */
+			ret = obex_server_send(self, NULL, self->object->cmd, 0);
 		if (ret < 0)
 			return -1;
 		else
 			return sizeof(obex_common_hdr_t);
+
+		ret = obex_transport_handle_input(self, timeout);
+		if (ret <= 0)
+			return ret;
+
+	} else if (self->mode == MODE_CLI) {
+		if (self->substate == SUBSTATE_RECEIVE_RX) {
+			ret = obex_transport_handle_input(self, timeout);
+			if (ret <= 0)
+				return ret;
+		}
+
 	}
 
-	ret = obex_transport_handle_input(self, timeout);
-	if (ret == 1)
-		ret = obex_mode(self);
-	return ret;
+	return obex_mode(self);
 }
 
 /*
-- 
1.7.5.4

The old way of aborting objects does not work anymore, neither with SRM nor
with the new possibilities of incomplete writes, as that may break the
synchronisation between server and client.
This patch integrates the abort action right within the affected states.
---
 lib/defines.h     |    1 +
 lib/obex_client.c |  125 ++++++++++++++++++++++++++++++++++++++++-------------
 lib/obex_main.c   |   35 ++-------------
 lib/obex_server.c |   87 ++++++++++++++++++++++++++++++++----
 4 files changed, 176 insertions(+), 72 deletions(-)

diff --git a/lib/defines.h b/lib/defines.h
index eb2257b..5935930 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -27,6 +27,7 @@ enum obex_state {
 	STATE_IDLE,
 	STATE_SEND,
 	STATE_REC,
+	STATE_ABORT,
 };
 
 enum obex_substate {
diff --git a/lib/obex_client.c b/lib/obex_client.c
index c8dc843..dc7502e 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -49,6 +49,61 @@ static __inline uint16_t msg_get_len(const buf_t *msg)
 		return 0;
 }
 
+static int obex_client_abort_transmit(obex_t *self)
+{
+	int ret = 0;
+	int rsp = OBEX_RSP_CONTINUE;
+
+	DEBUG(4, "STATE: ABORT/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, NULL);
+	if (ret == -1) {
+		obex_deliver_event(self, OBEX_EV_LINKERR,
+				   self->object->opcode, rsp, TRUE);
+		self->state = STATE_IDLE;
+
+	} else if (ret == 1) {
+		self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return ret;
+}
+
+static int obex_client_abort_prepare(obex_t *self)
+{
+	buf_t *msg = buf_reuse(self->tx_msg);
+
+	DEBUG(4, "STATE: ABORT/PREPARE_TX\n");
+
+	obex_data_request_prepare(self, msg, OBEX_CMD_ABORT);
+	self->substate = SUBSTATE_TRANSMIT_TX;
+	return obex_client_abort_transmit(self);
+}
+
+static int obex_client_abort(obex_t *self)
+{
+	int ret = 0;
+	buf_t *msg = obex_data_receive(self);
+	int rsp;
+	int event = OBEX_EV_LINKERR;
+
+	DEBUG(4, "STATE: ABORT/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	rsp = msg_get_rsp(msg);
+
+	if (rsp == OBEX_RSP_SUCCESS)
+		event = OBEX_EV_ABORT;
+	obex_deliver_event(self, event, self->object->opcode, rsp, TRUE);
+	if (event == OBEX_EV_LINKERR)
+		ret = -1;
+
+	self->mode = MODE_SRV;
+	self->state = STATE_IDLE;
+	return ret;
+}
+
 static int obex_client_recv_transmit_tx(obex_t *self)
 {
 	int ret = 0;
@@ -79,8 +134,14 @@ static int obex_client_recv_prepare_tx(obex_t *self)
 	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
 	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
 	{
-		int ret = obex_object_prepare_send(self, self->object, TRUE,
-						   FALSE);
+		int ret;
+
+		if (self->object->abort == 1) {
+			self->state = STATE_ABORT;
+			return obex_client_abort_prepare(self);
+		}
+
+		ret = obex_object_prepare_send(self, self->object, TRUE, FALSE);
 		if (ret == 1) {
 			self->substate = SUBSTATE_TRANSMIT_TX;
 			return obex_client_recv_transmit_tx(self);
@@ -130,50 +191,33 @@ static int obex_client_recv(obex_t *self)
 		break;
 	}
 
-	/* Receive any headers */
-	ret = obex_object_receive(self, msg);
-	if (ret < 0) {
-		obex_deliver_event(self, OBEX_EV_PARSEERR,
+	if (self->object->abort == 0) {
+		/* Receive any headers */
+		ret = obex_object_receive(self, msg);
+		if (ret < 0) {
+			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
-		self->mode = MODE_SRV;
-		self->state = STATE_IDLE;
-		return -1;
+			self->mode = MODE_SRV;
+			self->state = STATE_IDLE;
+			return -1;
+		}
 	}
 	obex_data_receive_finished(self);
 
 	/* Are we done yet? */
 	if (rsp == OBEX_RSP_CONTINUE) {
 		DEBUG(3, "Continue...\n");
-		if (self->object->abort) {
-			DEBUG(3, "Ignoring CONTINUE because request was aborted\n");
-			return 0;
-		}
 		self->substate = SUBSTATE_PREPARE_TX;
 		return obex_client_recv_prepare_tx(self);
 
 	} else {
 		/* Notify app that client-operation is done! */
-		ret = 0;
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
-		if (self->object->abort) {
-			if (rsp == OBEX_RSP_SUCCESS)
-				obex_deliver_event(self, OBEX_EV_ABORT,
-							self->object->opcode,
-							rsp, TRUE);
-			else {
-				obex_deliver_event(self, OBEX_EV_LINKERR,
-							self->object->opcode,
-							rsp, TRUE);
-				ret = -1;
-			}
-
-		} else
-			obex_deliver_event(self, OBEX_EV_REQDONE,
-							self->object->opcode,
-							rsp, TRUE);
+		obex_deliver_event(self, OBEX_EV_REQDONE, self->object->opcode,
+								     rsp, TRUE);
 		self->mode = MODE_SRV;
 		self->state = STATE_IDLE;
-		return ret;
+		return 0;
 	}
 
 }
@@ -225,6 +269,12 @@ static int obex_client_send_prepare_tx(obex_t *self)
 
 	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
 
+	if (self->object->abort == 1) {
+		self->state = STATE_ABORT;
+		return obex_client_abort_prepare(self);
+	}
+
+
 	ret = obex_object_prepare_send(self, self->object, TRUE, FALSE);
 	if (ret == 1) {
 		self->substate = SUBSTATE_TRANSMIT_TX;
@@ -347,6 +397,19 @@ int obex_client(obex_t *self)
 		}
 		break;
 
+	case STATE_ABORT:
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_client_abort(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_client_abort_prepare(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_client_abort_transmit(self);
+		}
+		break;
+
 	default:
 		DEBUG(0, "Unknown state\n");
 		break;
diff --git a/lib/obex_main.c b/lib/obex_main.c
index bc55661..b3a8a45 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -436,39 +436,12 @@ int obex_cancelrequest(obex_t *self, int nice)
 		 * signal link error to app */
 		obex_deliver_event(self, OBEX_EV_LINKERR, 0, 0, FALSE);
 		return 1;
-	} else {
-		obex_object_t *object;
-
-		object = obex_object_new();
-		if (object == NULL)
-			return -1;
-
-		if (self->mode == MODE_SRV) {
-			/* Do not send continue */
-			if (self->object->opcode != OBEX_RSP_CONTINUE)
-				obex_object_setrsp(object, self->object->opcode,
-							self->object->lastopcode);
-			else
-				obex_object_setrsp(object,
-						OBEX_RSP_INTERNAL_SERVER_ERROR,
-						OBEX_RSP_INTERNAL_SERVER_ERROR);
-		} else
-			obex_object_setcmd(object, OBEX_CMD_ABORT);
-
-		if (obex_object_send(self, object, TRUE, TRUE) < 0) {
-			obex_object_delete(object);
-			return -1;
-		}
-
-		obex_object_delete(object);
 
+	} else {
+		/* The client or server code will take action at the
+		 * right time. */
 		self->object->abort = TRUE;
-		self->state = self->mode == MODE_SRV ? STATE_IDLE : STATE_REC;
 
-		if (self->state == STATE_IDLE)
-			/* Deliver event will delete the object */
-			obex_deliver_event(self, OBEX_EV_ABORT, 0, 0, TRUE);
-
-		return 0;
+		return 1;
 	}
 }
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 351d710..ecad161 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -58,6 +58,42 @@ static __inline int msg_get_final(const buf_t *msg)
 		return 0;
 }
 
+static int obex_server_abort_transmit(obex_t *self)
+{
+	int ret = 0;
+	int rsp = OBEX_RSP_CONTINUE;
+
+	DEBUG(4, "STATE: ABORT/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, NULL);
+	if (ret == -1) {
+		obex_deliver_event(self, OBEX_EV_LINKERR,
+				   self->object->opcode, rsp, TRUE);
+
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_ABORT,
+				   self->object->opcode, rsp, FALSE);
+	}
+
+	self->state = STATE_IDLE;
+	return ret;
+}
+
+static int obex_server_abort_prepare(obex_t *self)
+{
+	buf_t *msg = buf_reuse(self->tx_msg);
+	int opcode = OBEX_RSP_INTERNAL_SERVER_ERROR;
+
+	DEBUG(4, "STATE: ABORT/PREPARE_TX\n");
+
+	/* Do not send continue */
+	if (self->object->opcode != OBEX_RSP_CONTINUE)
+		opcode = self->object->lastopcode;
+	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
+	self->substate = SUBSTATE_TRANSMIT_TX;
+	return obex_server_abort_transmit(self);
+}
+
 static int obex_server_send_transmit_tx(obex_t *self)
 {
 	int ret;
@@ -102,6 +138,11 @@ static int obex_server_send_prepare_tx(obex_t *self)
 
 	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
 
+	if (self->object->abort == 1) {
+		self->state = STATE_ABORT;
+		return obex_server_abort_prepare(self);
+	}
+
 	/* As a server, the final bit is always SET, and the "real final" packet
 	 * is distinguished by being SUCCESS instead of CONTINUE.
 	 * So, force the final bit here. */
@@ -220,8 +261,14 @@ static int obex_server_recv_prepare_tx(obex_t *self)
 	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
 	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
 	{
-		int ret = obex_object_prepare_send(self, self->object,
-						   FALSE, TRUE);
+		int ret;
+
+		if (self->object->abort == 1) {
+			self->state = STATE_ABORT;
+			return obex_server_abort_prepare(self);
+		}
+
+		ret = obex_object_prepare_send(self, self->object, FALSE, TRUE);
 		if (ret == 1) {
 			self->substate = SUBSTATE_TRANSMIT_TX;
 			return obex_server_recv_transmit_tx(self);
@@ -364,6 +411,17 @@ static int obex_server_idle(obex_t *self)
 		return -1;
 	}
 
+	/* If ABORT command is done while we are not handling another command,
+	 * we don't need to send a request hint to the application */
+	if (cmd == OBEX_CMD_ABORT) {
+		DEBUG(1, "Got OBEX_ABORT request!\n");
+		obex_response_request(self, OBEX_RSP_SUCCESS);
+		self->state = STATE_IDLE;
+		obex_deliver_event(self, OBEX_EV_ABORT, cmd, 0, TRUE);
+		obex_data_receive_finished(self);
+		return 0;
+	}
+
 	self->object = obex_object_new();
 	if (self->object == NULL) {
 		DEBUG(1, "Allocation of object failed!\n");
@@ -374,14 +432,10 @@ static int obex_server_idle(obex_t *self)
 	self->object->cmd = cmd;
 	self->object->rsp_mode = self->rsp_mode;
 
-	/* If ABORT command is done while we are not handling another command,
-	 * we don't need to send a request hint to the application */
-	if (cmd != OBEX_CMD_ABORT) {
-		/* Hint app that something is about to come so that
-		 * the app can deny a PUT-like request early, or
-		 * set the header-offset */
-		obex_deliver_event(self, OBEX_EV_REQHINT, cmd, 0, FALSE);
-	}
+	/* Hint app that something is about to come so that
+	 * the app can deny a PUT-like request early, or
+	 * set the header-offset */
+	obex_deliver_event(self, OBEX_EV_REQHINT, cmd, 0, FALSE);
 
 	/* Some commands needs special treatment (data outside headers) */
 	switch (cmd) {
@@ -458,6 +512,19 @@ int obex_server(obex_t *self)
 		}
 		break;
 
+	case STATE_ABORT:
+		switch (self->substate) {
+		case SUBSTATE_PREPARE_TX:
+			return obex_server_abort_prepare(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_server_abort_transmit(self);
+
+		default:
+			break;
+		}
+		break;
+
 	default:
 		DEBUG(0, "Unknown state\n");
 		break;
-- 
1.7.5.4

---
 lib/obex.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index a2409a2..bf2b71b 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -81,7 +81,7 @@
 			- #OBEX_FL_KEEPSERVER : Keep the server alive after incomming request
 			- #OBEX_FL_FILTERHINT : Filter target devices based on Obex hint bit
 			- #OBEX_FL_FILTERIAS  : Filter target devices based on IAS entry
-			- #OBEX_FL_CLOSEXEC   : Open all sockets with SO_CLOEXEC set
+			- #OBEX_FL_CLOEXEC   : Open all sockets with SO_CLOEXEC set
 	\return an OBEX handle or NULL on error.
  */
 LIB_SYMBOL
-- 
1.7.5.4

---
 lib/obex_client.c |  101 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/lib/obex_client.c b/lib/obex_client.c
index e17528a..fd9962b 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -49,12 +49,63 @@ static __inline uint16_t msg_get_len(const buf_t *msg)
 		return 0;
 }
 
-static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
+static int obex_client_recv_transmit_tx(obex_t *self)
+{
+	int ret = 0;
+	int rsp = OBEX_RSP_CONTINUE;
+
+	DEBUG(4, "STATE: RECV/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, self->object);
+	if (ret == -1) {
+		obex_deliver_event(self, OBEX_EV_LINKERR,
+				   self->object->opcode, rsp, TRUE);
+		self->state = STATE_IDLE;
+
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_PROGRESS,
+				   self->object->opcode, rsp, FALSE);
+		self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return ret;
+}
+
+static int obex_client_recv_prepare_tx(obex_t *self)
+{
+	DEBUG(4, "STATE: RECV/PREPARE_TX\n");
+
+	if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
+	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
+	{
+		int ret = obex_object_prepare_send(self, self->object, TRUE,
+						   FALSE);
+		if (ret == 1) {
+			self->substate = SUBSTATE_TRANSMIT_TX;
+			return obex_client_recv_transmit_tx(self);
+
+		} else
+			return ret;
+
+	} else {
+		self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return 0;
+}
+
+static int obex_client_recv(obex_t *self)
 {
 	int ret;
+	buf_t *msg = obex_data_receive(self);
+	int rsp;
 
-	/* Receiving answer of request */
-	DEBUG(4, "STATE_REC\n");
+	DEBUG(4, "STATE: RECV/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	rsp = msg_get_rsp(msg);
 
 	switch (self->object->opcode) {
 	case OBEX_CMD_CONNECT:
@@ -88,50 +139,33 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 		self->state = STATE_IDLE;
 		return -1;
 	}
+	obex_data_receive_finished(self);
 
 	/* Are we done yet? */
 	if (rsp == OBEX_RSP_CONTINUE) {
 		DEBUG(3, "Continue...\n");
-
-		self->object->continue_received = 1;
-
 		if (self->object->abort) {
 			DEBUG(3, "Ignoring CONTINUE because request was aborted\n");
 			return 0;
 		}
-
-		if (self->object->suspend) {
-			DEBUG(3, "Not sending new request because transfer is suspended\n");
-			return 0;
-		}
-
-		if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
-				(self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE)) {
-			ret = obex_object_send(self, self->object, TRUE, FALSE);
-			if (ret < 0)
-				obex_deliver_event(self, OBEX_EV_LINKERR,
-						self->object->opcode, rsp,
-						TRUE);
-		}
-		if (ret >= 0)
-			obex_deliver_event(self, OBEX_EV_PROGRESS,
-						self->object->opcode, rsp, FALSE);
-
-		if (self->object)
-			self->object->continue_received = 0;
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_client_recv_prepare_tx(self);
 
 	} else {
 		/* Notify app that client-operation is done! */
+		ret = 0;
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
 		if (self->object->abort) {
 			if (rsp == OBEX_RSP_SUCCESS)
 				obex_deliver_event(self, OBEX_EV_ABORT,
 							self->object->opcode,
 							rsp, TRUE);
-			else
+			else {
 				obex_deliver_event(self, OBEX_EV_LINKERR,
 							self->object->opcode,
 							rsp, TRUE);
+				ret = -1;
+			}
 
 		} else
 			obex_deliver_event(self, OBEX_EV_REQDONE,
@@ -139,9 +173,9 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 							rsp, TRUE);
 		self->mode = MODE_SRV;
 		self->state = STATE_IDLE;
+		return ret;
 	}
 
-	return 0;
 }
 
 int obex_client_send(obex_t *self, buf_t *msg, int rsp)
@@ -252,7 +286,16 @@ int obex_client(obex_t *self)
 		break;
 
 	case STATE_REC:
-		ret = obex_client_recv(self, msg, rsp);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_client_recv(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_client_recv_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_client_recv_transmit_tx(self);
+		}
 		break;
 
 	default:
-- 
1.7.5.4

The substates create situations where this function name doesn't fit anymore.
To avoid confusion, it is renamed to OBEX_Work(). The timeout argument is
now in milliseconds, the previous argument was in seconds which may be not
fine enough.
---
 include/openobex/obex.h |    3 ++-
 lib/fdobex.c            |   10 ++++++++--
 lib/obex.c              |    4 ++--
 lib/obex_main.c         |    2 +-
 lib/obex_main.h         |    2 +-
 lib/obex_transport.c    |   12 +++++++++---
 lib/obex_transport.h    |    4 ++--
 lib/usb1obex.c          |    6 +++---
 lib/usbobex.c           |    6 +++---
 9 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 315601d..1f7c916 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -84,6 +84,7 @@ OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self,
 					       void * data);
 OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server,
 					    obex_event_t eventcb, void * data);
+#define OBEX_HandleInput(self, timeout) OBEX_Work((self), ((timeout)*1000))
 
 /*
  *  OBEX API
@@ -116,7 +117,7 @@ OPENOBEX_SYMBOL(void *) OBEX_GetCustomData(obex_t *self);
 OPENOBEX_SYMBOL(int) OBEX_TransportConnect(obex_t *self, struct sockaddr *saddr, int addlen);
 OPENOBEX_SYMBOL(int) OBEX_TransportDisconnect(obex_t *self);
 OPENOBEX_SYMBOL(int) OBEX_CustomDataFeed(obex_t *self, uint8_t *inputbuf, int actual);
-OPENOBEX_SYMBOL(int) OBEX_HandleInput(obex_t *self, int timeout);
+OPENOBEX_SYMBOL(int) OBEX_Work(obex_t *self, long timeout);
 
 OPENOBEX_SYMBOL(int)      OBEX_ServerRegister(obex_t *self, struct sockaddr *saddr, int addrlen);
 OPENOBEX_SYMBOL(obex_t *) OBEX_Accept(obex_t *server);
diff --git a/lib/fdobex.c b/lib/fdobex.c
index cdbc26a..0131fc3 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -70,7 +70,10 @@ static int fdobex_write(obex_t *self, buf_t *msg)
 	size_t size = msg->data_size;
 	int status;
 	fd_set fdset;
-	struct timeval time = {trans->timeout, 0};
+	struct timeval time = {
+		trans->timeout / 1000,
+		(trans->timeout % 1000) * 1000
+	};
 
 	if (size == 0)
 		return 0;
@@ -109,7 +112,10 @@ static int fdobex_read(obex_t *self, void *buf, int buflen)
 	int fd = trans->fd;
 	int status;
 	fd_set fdset;
-	struct timeval time = {trans->timeout, 0};
+	struct timeval time = {
+		trans->timeout / 1000,
+		(trans->timeout % 1000) * 1000
+	};
 
 	FD_ZERO(&fdset);
 	FD_SET(fd, &fdset);
diff --git a/lib/obex.c b/lib/obex.c
index 0522bef..9cffea2 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -427,7 +427,7 @@ out_err:
 /**
 	Let the OBEX parser do some work.
 	\param self OBEX handle
-	\param timeout Maximum time to wait in seconds (-1 for infinite)
+	\param timeout Maximum time to wait in milliseconds (-1 for infinite)
 	\return -1 on error, 0 on timeout, positive on success
 
 	Let the OBEX parser read and process incoming data. If no data
@@ -441,7 +441,7 @@ out_err:
 	positive on success.
  */
 LIB_SYMBOL
-int CALLAPI OBEX_HandleInput(obex_t *self, int timeout)
+int CALLAPI OBEX_Work(obex_t *self, long timeout)
 {
 	DEBUG(4, "\n");
 	obex_return_val_if_fail(self != NULL, -1);
diff --git a/lib/obex_main.c b/lib/obex_main.c
index a009275..733e190 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -348,7 +348,7 @@ static int obex_mode(obex_t *self)
  *    Do some work on the current transferred object.
  *
  */
-int obex_work(obex_t *self, int timeout)
+int obex_work(obex_t *self, long timeout)
 {
 	int ret;
 
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 82fea37..55eca62 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -70,7 +70,7 @@ socket_t obex_create_packet_socket(obex_t *self, int domain);
 int obex_delete_socket(struct obex *self, socket_t fd);
 
 void obex_deliver_event(struct obex *self, int event, int cmd, int rsp, int del);
-int obex_work(struct obex *self, int timeout);
+int obex_work(struct obex *self, long timeout);
 int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
 buf_t* obex_data_receive(obex_t *self);
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index 2ca461e..277a8a7 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -207,7 +207,10 @@ int obex_transport_standard_handle_input(obex_t *self)
 
 	/* Wait for input */
 	if (trans->timeout >= 0) {
-		struct timeval time = { trans->timeout, 0 };
+		struct timeval time = {
+			trans->timeout / 1000,
+			(trans->timeout % 1000) * 1000
+		};
 		ret = select((int) highestfd + 1, &fdset, NULL, NULL, &time);
 	} else {
 		ret = select((int) highestfd + 1, &fdset, NULL, NULL, NULL);
@@ -245,7 +248,7 @@ int obex_transport_standard_handle_input(obex_t *self)
  *    Used when working in synchronous mode.
  *
  */
-int obex_transport_handle_input(obex_t *self, int timeout)
+int obex_transport_handle_input(obex_t *self, long timeout)
 {
 	DEBUG(4, "\n");
 	self->trans.timeout = timeout;
@@ -378,7 +381,10 @@ int obex_transport_do_send (obex_t *self, buf_t *msg)
 	if (trans->timeout >= 0) {
 		/* setup everything to check for blocking writes */
 		fd_set fdset;
-		struct timeval time = {trans->timeout, 0};
+		struct timeval time = {
+			trans->timeout / 1000,
+			(trans->timeout % 1000) * 1000
+		};
 		int status;
 
 		FD_ZERO(&fdset);
diff --git a/lib/obex_transport.h b/lib/obex_transport.h
index b7a4423..8c3d7cb 100644
--- a/lib/obex_transport.h
+++ b/lib/obex_transport.h
@@ -110,7 +110,7 @@ typedef struct obex_transport {
 	socket_t fd;		/* Socket descriptor */
 	socket_t serverfd;
 
-	int timeout;		/* set timeout */
+	long timeout;		/* timeout in milliseconds */
 
 	int connected;		/* Link connection state */
 	unsigned int mtu;	/* Tx MTU of the link */
@@ -122,7 +122,7 @@ void obex_transport_cleanup(obex_t *self);
 void obex_transport_clone(obex_t *self, obex_t *old);
 void obex_transport_split(obex_t *self, obex_t *server);
 
-int obex_transport_handle_input(struct obex *self, int timeout);
+int obex_transport_handle_input(struct obex *self, long timeout);
 int obex_transport_connect_request(struct obex *self);
 void obex_transport_disconnect_request(struct obex *self);
 int obex_transport_listen(struct obex *self);
diff --git a/lib/usb1obex.c b/lib/usb1obex.c
index c00b55a..26f0c41 100644
--- a/lib/usb1obex.c
+++ b/lib/usb1obex.c
@@ -479,17 +479,17 @@ static int usbobex_disconnect_request(obex_t *self)
 	return 1;
 }
 
-static unsigned int usbobex_get_timeout(int timeout)
+static unsigned int usbobex_get_timeout(long timeout)
 {
 	/* uses closest to zero, 0 itself means infinite */
 	if (timeout == 0) {
 		return 1;
 
 	} else if (timeout > 0) {
-		if ((unsigned int)timeout > UINT_MAX/1000)
+		if ((unsigned int)timeout > UINT_MAX)
 			return UINT_MAX;
 		else
-			return timeout * 1000;
+			return timeout;
 
 	}
 	return 0;
diff --git a/lib/usbobex.c b/lib/usbobex.c
index 2ed26e1..a5f63f0 100644
--- a/lib/usbobex.c
+++ b/lib/usbobex.c
@@ -448,15 +448,15 @@ static int usbobex_disconnect_request(obex_t *self)
 	return ret;
 }
 
-static int usbobex_get_timeout(int timeout)
+static int usbobex_get_timeout(long timeout)
 {
-	if (timeout < 0 || timeout > INT_MAX/1000) {
+	if (timeout < 0 || timeout > INT_MAX) {
 		/* libusb-0.x doesn't know about waiting infinitely
 		 * so we try with the largest value possible
 		 */
 		return INT_MAX;
 	}
-	return timeout*1000;
+	return timeout;
 }
 
 static int usbobex_write(obex_t *self, buf_t *msg)
-- 
1.7.5.4

---
 include/openobex/obex.h |    2 ++
 lib/obex_incl.h         |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 1f7c916..0711c6d 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -65,6 +65,7 @@ typedef struct obex_object obex_object_t;
 /*
  *  OBEX API (deprecated)
  */
+#if defined(OPENOBEX_DEPRECATED)
 /** The user event callback.
  *  \deprecated Use #obex_event_cb_t and its functions instead.
  *  \param handle the obex handle
@@ -85,6 +86,7 @@ OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self,
 OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server,
 					    obex_event_t eventcb, void * data);
 #define OBEX_HandleInput(self, timeout) OBEX_Work((self), ((timeout)*1000))
+#endif
 
 /*
  *  OBEX API
diff --git a/lib/obex_incl.h b/lib/obex_incl.h
index ae95e59..dbca28e 100644
--- a/lib/obex_incl.h
+++ b/lib/obex_incl.h
@@ -6,6 +6,10 @@
 
 /* This overides the define in openobex/obex.h */
 #define OPENOBEX_SYMBOL(retval) LIB_SYMBOL retval CALLAPI
+
+/* This add the deprecated API items */
+#define OPENOBEX_DEPRECATED 1
+
 #include <openobex/obex.h>
 
 #endif
-- 
1.7.5.4

There are now three steps for sending an object: a prepare step where a new
TX message is written to the TX buffer, a transmit step where the object
is transmitted and the decision step on wether the whole object is finished.
The goal is to allow sending incomplete message buffers on non-blocking sockets.
---
 lib/obex_main.c   |   30 +++++++---
 lib/obex_main.h   |    4 +-
 lib/obex_object.c |  154 +++++++++++++++++++++++++++++++++++++----------------
 lib/obex_object.h |    5 ++
 4 files changed, 136 insertions(+), 57 deletions(-)

diff --git a/lib/obex_main.c b/lib/obex_main.c
index 1d39cd8..884c9e3 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -210,23 +210,20 @@ void obex_response_request(obex_t *self, uint8_t opcode)
 	obex_return_if_fail(self != NULL);
 
 	msg = buf_reuse(self->tx_msg);
-
-	obex_data_request(self, msg, opcode | OBEX_FINAL);
+	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
+	obex_data_request(self, msg);
 }
 
 /*
- * Function obex_data_request (self, opcode, cmd)
+ * Function obex_data_request_prepare (self, opcode, cmd)
  *
- *    Send response or command code along with optional headers/data.
+ *    Prepare response or command code along with optional headers/data
+ *    to send.
  *
  */
-int obex_data_request(obex_t *self, buf_t *msg, int opcode)
+void obex_data_request_prepare(obex_t *self, buf_t *msg, int opcode)
 {
 	obex_common_hdr_t *hdr;
-	int status;
-
-	obex_return_val_if_fail(self != NULL, -1);
-	obex_return_val_if_fail(msg != NULL, -1);
 
 	/* Insert common header */
 	hdr = buf_reserve_begin(msg, sizeof(*hdr));
@@ -235,6 +232,21 @@ int obex_data_request(obex_t *self, buf_t *msg, int opcode)
 	hdr->len = htons((uint16_t) msg->data_size);
 
 	DUMPBUFFER(1, "Tx", msg);
+}
+
+/*
+ * Function obex_data_request (self, opcode)
+ *
+ *    Send message.
+ *
+ */
+int obex_data_request(obex_t *self, buf_t *msg)
+{
+	int status;
+
+	obex_return_val_if_fail(self != NULL, -1);
+	obex_return_val_if_fail(msg != NULL, -1);
+
 	DEBUG(1, "len = %lu bytes\n", (unsigned long) msg->data_size);
 
 	do {
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 3c3098c..53d2768 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -71,7 +71,9 @@ int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
 
 void obex_response_request(struct obex *self, uint8_t opcode);
-int obex_data_request(struct obex *self, struct databuffer *msg, int opcode);
+void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
+			       int opcode);
+int obex_data_request(struct obex *self, struct databuffer *msg);
 int obex_cancelrequest(struct obex *self, int nice);
 
 char *obex_response_to_string(int rsp);
diff --git a/lib/obex_object.c b/lib/obex_object.c
index 3fcd10a..f888a2d 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -446,30 +446,54 @@ static unsigned int obex_object_send_srm_flags (uint8_t flag)
 	}
 }
 
+static int obex_object_get_real_opcode(obex_object_t *object,
+				       int allowfinalcmd, int forcefinalbit)
+{
+	int real_opcode = object->opcode;
+
+	/* Decide which command to use, and if to use final-bit */
+	DEBUG(4, "allowfinalcmd: %d forcefinalbit:%d\n", allowfinalcmd,
+	      forcefinalbit);
+
+	/* Have more headers (or body) to send? */
+	if (!slist_is_empty(object->tx_headerq)) {
+		/* In server, final bit is always set.
+		 * In client, final bit is set only when we finish sending. */
+		if (forcefinalbit)
+			real_opcode |= OBEX_FINAL;
+
+	} else {
+		/* Have no more headers to send */
+		if (allowfinalcmd != FALSE) {
+			/* Allowed to send final command (== end data we are
+			 * sending) */
+			real_opcode = object->lastopcode;
+		}
+
+		real_opcode |= OBEX_FINAL;
+	}
+
+	return real_opcode;
+}
+
 /*
- * Function obex_object_send()
+ * Function obex_object_prepare_send()
  *
- *    Send away all headers attached to an object. Returns:
- *       1 on sucessfully done
- *       0 on progress made
- *     < 0 on error
+ *    Prepare to send away all headers attached to an object.
+ *    Returns:
+ *       1 when a message was created
+ *       0 when no message was created
+ *      -1 on error
  */
-int obex_object_send(obex_t *self, obex_object_t *object,
-					int allowfinalcmd, int forcefinalbit)
+int obex_object_prepare_send(obex_t *self, obex_object_t *object,
+			     int allowfinalcmd, int forcefinalbit)
 {
 	buf_t *txmsg;
-	int actual, real_opcode, finished = 0, addmore = TRUE;
+	int actual, real_opcode, addmore = TRUE;
 	uint16_t tx_left;
 	unsigned int srm_flags = 0;
 
-	DEBUG(4, "allowfinalcmd: %d forcefinalbit:%d\n", allowfinalcmd,
-			forcefinalbit);
-
-	/* Return finished if aborted */
-	if (object->abort)
-		return 1;
-
-	/* Don't do anything of object is suspended */
+	/* Don't do anything if object is suspended */
 	if (object->suspend)
 		return 0;
 
@@ -539,8 +563,8 @@ int obex_object_send(obex_t *self, obex_object_t *object,
 					object->suspend = 1;
 
 				if (h->hi == OBEX_HDR_SRM_FLAGS)
-					srm_flags =
-						obex_object_send_srm_flags(h->buf->data[0]);
+					srm_flags = obex_object_send_srm_flags(
+							       h->buf->data[0]);
 
 				/* Remove from tx-queue */
 				object->tx_headerq =
@@ -570,46 +594,82 @@ int obex_object_send(obex_t *self, obex_object_t *object,
 			addmore = FALSE;
 	}
 
-	/* Decide which command to use, and if to use final-bit */
-	if (object->tx_headerq) {
-		/* Have more headers (or body) to send */
-		real_opcode = object->opcode;
+	real_opcode = obex_object_get_real_opcode(self->object, allowfinalcmd,
+						  forcefinalbit);
+	DEBUG(4, "Generating packet with opcode %d\n", real_opcode);
+	obex_data_request_prepare(self, self->tx_msg, real_opcode);
 
-		/* In server, final bit is always set.
-		 * In client, final bit is set only when we finish sending. */
-		if (forcefinalbit)
-			real_opcode |= OBEX_FINAL;
+	self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_REMOTE;
+	self->srm_flags |= srm_flags;
 
-		finished = 0;
-	} else {
-		/* Have no more headers to send */
-		if (allowfinalcmd == FALSE) {
-			/* Not allowed to send final command (== server,
-			 * receiving incomming request) */
-			real_opcode = object->opcode;
+	return 1;
+}
 
-		} else {
-			/* Allowed to send final command (== end data we are
-			 * sending) */
-			real_opcode = object->lastopcode;
-		}
+int obex_object_finished(obex_t *self, obex_object_t *object, int allowfinalcmd)
+{
+	int finished = 0;
 
-		real_opcode |= OBEX_FINAL;
+	if (object->abort)
+		return 1;
+
+	if (object->suspend)
+		return 0;
+
+	if (slist_is_empty(object->tx_headerq))
 		finished = !!allowfinalcmd;
+
+	return finished;
+}
+
+int obex_object_send_transmit(obex_t *self, obex_object_t *object)
+{
+	int ret;
+
+	if (!buf_empty(self->tx_msg)) {
+		ret = obex_data_request(self, self->tx_msg);
+		if (ret < 0) {
+			DEBUG(4, "Send error\n");
+			return -1;
+		}
 	}
 
-	DEBUG(4, "Sending package with opcode %d\n", real_opcode);
-	actual = obex_data_request(self, txmsg, real_opcode);
+	return buf_empty(self->tx_msg);
+}
 
-	if (actual < 0) {
-		DEBUG(4, "Send error\n");
-		return -1;
+/*
+ * Function obex_object_send()
+ *
+ *    Send away an object packet.
+ *    Returns:
+ *       1 complete
+ *       0 incomplete but no error
+ *      -1 error
+ */
+int obex_object_send(obex_t *self, obex_object_t *object, int allowfinalcmd,
+		     int forcefinalbit)
+{
+	int ret;
+
+	/* Return finished if aborted */
+	if (object->abort) {
+		(void)buf_reuse(self->tx_msg);
+		return 1;
 	}
 
-	self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_REMOTE;
-	self->srm_flags |= srm_flags;
+	if (buf_empty(self->tx_msg)) {
+		ret = obex_object_prepare_send(self, object, allowfinalcmd,
+					       forcefinalbit);
+		if (ret == -1) {
+			DEBUG(4, "Packet prepare error\n");
+			return -1;
+		} else if (ret == 0)
+			return 0;
+	}
 
-	return finished;
+	ret = obex_object_send_transmit(self, object);
+	if (ret == 1)
+		ret = obex_object_finished(self, object, allowfinalcmd);
+	return ret;
 }
 
 /*
diff --git a/lib/obex_object.h b/lib/obex_object.h
index fd2904a..eef3458 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -96,6 +96,11 @@ int obex_object_getnextheader(struct obex *self, struct obex_object *object, uin
 int obex_object_reparseheaders(struct obex *self, struct obex_object *object);
 void obex_object_setcmd(struct obex_object *object, uint8_t cmd);
 int obex_object_setrsp(struct obex_object *object, uint8_t rsp, uint8_t lastrsp);
+int obex_object_prepare_send(obex_t *self, obex_object_t *object,
+			     int allowfinalcmd, int forcefinalbit);
+int obex_object_finished(obex_t *self, obex_object_t *object,
+			 int allowfinalcmd);
+int obex_object_send_transmit(obex_t *self, obex_object_t *object);
 int obex_object_send(struct obex *self, struct obex_object *object,
 		     int allowfinalcmd, int forcefinalbit);
 
-- 
1.7.5.4

---
 lib/bluez_compat.h   |    2 +-
 lib/btobex.c         |   45 +++++++++++++++++++++++++++------------------
 lib/btobex.h         |    6 +++++-
 lib/obex_transport.h |    2 +-
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/lib/bluez_compat.h b/lib/bluez_compat.h
index 3f36cd7..c8b046c 100644
--- a/lib/bluez_compat.h
+++ b/lib/bluez_compat.h
@@ -36,7 +36,7 @@
 #define rc_bdaddr   btAddr
 #define rc_channel  port
 #define PF_BLUETOOTH   PF_BTH
-#define AF_BLUETOOTH   PF_BLUETOOTH
+#define AF_BLUETOOTH   AF_BTH
 #define BTPROTO_RFCOMM BTHPROTO_RFCOMM
 /* TODO: should be const */
 extern bdaddr_t bluez_compat_bdaddr_any;
diff --git a/lib/btobex.c b/lib/btobex.c
index 749fefb..810ce91 100644
--- a/lib/btobex.c
+++ b/lib/btobex.c
@@ -32,10 +32,7 @@
 /* Linux/FreeBSD/NetBSD case */
 
 #include <string.h>
-#include <unistd.h>
-#include <stdio.h>		/* perror */
 #include <errno.h>		/* errno and EADDRNOTAVAIL */
-#include <netinet/in.h>
 #include <sys/socket.h>
 #endif /* _WIN32 */
 
@@ -80,7 +77,7 @@ static void btobex_cleanup (obex_t *self)
 static int btobex_set_local_addr(obex_t *self, struct sockaddr *addr,
 								size_t len)
 {
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	const struct sockaddr_rc *local = (struct sockaddr_rc *) addr;
 
 	if (len == sizeof(*local) && local->rc_family == AF_BLUETOOTH) {
@@ -93,7 +90,7 @@ static int btobex_set_local_addr(obex_t *self, struct sockaddr *addr,
 
 static int btobex_set_remote_addr(obex_t *self, struct sockaddr *addr, size_t len)
 {
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	const struct sockaddr_rc *remote = (struct sockaddr_rc *)addr;
 
 	if (len == sizeof(*remote) && remote->rc_family == AF_BLUETOOTH) {
@@ -113,14 +110,20 @@ static int btobex_set_remote_addr(obex_t *self, struct sockaddr *addr, size_t le
 void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
 					const bdaddr_t *dst, uint8_t channel)
 {
-	struct sockaddr_rc addr;
+	struct obex_transport *trans = &self->trans;
 
 	btobex_prepare_listen(self, src, 0);
 
-	addr.rc_family = AF_BLUETOOTH;
-	bacpy(&addr.rc_bdaddr, dst);
-	addr.rc_channel = channel;
-	btobex_set_remote_addr(self, (struct sockaddr *) &addr, sizeof(addr));
+	if (trans->type == OBEX_TRANS_BLUETOOTH) {
+		struct sockaddr_rc addr;
+
+		memset(&addr, 0, sizeof(addr));
+		addr.rc_family = AF_BLUETOOTH;
+		bacpy(&addr.rc_bdaddr, dst);
+		addr.rc_channel = (uint8_t)(channel & 0xFF);
+		obex_transport_set_remote_addr(self, (struct sockaddr *) &addr,
+					       sizeof(addr));
+	}
 }
 
 /*
@@ -131,12 +134,18 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
  */
 void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
 {
-	struct sockaddr_rc addr;
+	struct obex_transport *trans = &self->trans;
+
+	if (trans->type == OBEX_TRANS_BLUETOOTH) {
+		struct sockaddr_rc addr;
 
-	addr.rc_family = AF_BLUETOOTH;
-	bacpy(&addr.rc_bdaddr, src);
-	addr.rc_channel = channel;
-	btobex_set_local_addr(self, (struct sockaddr *) &addr, sizeof(addr));
+		memset(&addr, 0, sizeof(addr));
+		addr.rc_family = AF_BLUETOOTH;
+		bacpy(&addr.rc_bdaddr, src);
+		addr.rc_channel = (uint8_t)(channel & 0xFF);
+		obex_transport_set_local_addr(self, (struct sockaddr *) &addr,
+					      sizeof(addr));
+	}
 }
 
 /*
@@ -148,7 +157,7 @@ void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
 static int btobex_listen(obex_t *self)
 {
 	struct obex_transport *trans = &self->trans;
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 
 	DEBUG(3, "\n");
 
@@ -190,7 +199,7 @@ out_freesock:
 static int btobex_accept(obex_t *self)
 {
 	struct obex_transport *trans = &self->trans;
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	struct sockaddr *addr = (struct sockaddr *) &data->peer;
 	socklen_t addrlen = sizeof(data->peer);
 
@@ -217,7 +226,7 @@ static int btobex_accept(obex_t *self)
 static int btobex_connect_request(obex_t *self)
 {
 	struct obex_transport *trans = &self->trans;
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	int ret;
 	int mtu = 0;
 
diff --git a/lib/btobex.h b/lib/btobex.h
index d863ecb..4375881 100644
--- a/lib/btobex.h
+++ b/lib/btobex.h
@@ -30,8 +30,12 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
 			    const bdaddr_t *dst, uint8_t channel);
 void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel);
 
-struct btobex_data {
+struct btobex_rfcomm_data {
 	struct sockaddr_rc self;
 	struct sockaddr_rc peer;
 };
+
+union btobex_data {
+	struct btobex_rfcomm_data rfcomm;
+};
 #endif
diff --git a/lib/obex_transport.h b/lib/obex_transport.h
index a39f563..b7a4423 100644
--- a/lib/obex_transport.h
+++ b/lib/obex_transport.h
@@ -93,7 +93,7 @@ union obex_transport_data {
 #endif /*HAVE_IRDA*/
 	struct inobex_data inet;
 #ifdef HAVE_BLUETOOTH
-	struct btobex_data rfcomm;
+	union btobex_data bt;
 #endif /*HAVE_BLUETOOTH*/
 	obex_ctrans_t custom;
 #ifdef HAVE_USB
-- 
1.7.5.4

---
 apps/ircp/ircp_client.c           |   10 ++++++----
 apps/ircp/ircp_server.c           |   11 ++++++-----
 apps/irobex_palm3.c               |    4 ++--
 apps/irxfer.c                     |    4 ++--
 apps/lib/obex_put_common.c        |    5 +++--
 apps/lib/obex_put_common.h        |    4 ++--
 apps/obex_find.c                  |    7 ++++---
 apps/obex_tcp.c                   |    4 ++--
 apps/obex_test/obex_test.c        |   19 ++++++++++---------
 apps/obex_test/obex_test_client.c |    2 +-
 apps/obex_test/obex_test_server.c |    2 +-
 udev/obex-check-device.c          |    7 ++++---
 12 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/apps/ircp/ircp_client.c b/apps/ircp/ircp_client.c
index 9035c2c..ed49096 100644
--- a/apps/ircp/ircp_client.c
+++ b/apps/ircp/ircp_client.c
@@ -87,7 +87,9 @@ static int cli_fillstream(ircp_client_t *cli, obex_object_t *object)
 //
 // Incoming event from OpenOBEX.
 //
-static void cli_obex_event(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp)
+static void cli_obex_event(obex_t *handle, obex_object_t *object,
+			   enum obex_mode mode, enum obex_event event,
+			   uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	ircp_client_t *cli;
 
@@ -132,7 +134,7 @@ static int cli_sync_request(ircp_client_t *cli, obex_object_t *object)
 	OBEX_Request(cli->obexhandle, object);
 
 	while(cli->finished == FALSE) {
-		ret = OBEX_HandleInput(cli->obexhandle, 20);
+		ret = OBEX_Work(cli->obexhandle, 20*1000);
 		DEBUG(4, "ret = %d\n", ret);
 
 		if (ret <= 0)
@@ -164,9 +166,9 @@ ircp_client_t *ircp_cli_open(ircp_info_cb_t infocb)
 	cli->fd = -1;
 
 #ifdef DEBUG_TCP
-	cli->obexhandle = OBEX_Init(OBEX_TRANS_INET, cli_obex_event, 0);
+	cli->obexhandle = OBEX_New(OBEX_TRANS_INET, cli_obex_event, 0);
 #else
-	cli->obexhandle = OBEX_Init(OBEX_TRANS_IRDA, cli_obex_event, 0);
+	cli->obexhandle = OBEX_New(OBEX_TRANS_IRDA, cli_obex_event, 0);
 #endif
 
 	if(cli->obexhandle == NULL) {
diff --git a/apps/ircp/ircp_server.c b/apps/ircp/ircp_server.c
index 749a84e..41bbe83 100644
--- a/apps/ircp/ircp_server.c
+++ b/apps/ircp/ircp_server.c
@@ -27,8 +27,9 @@
 //
 // Incoming event from OpenOBEX
 //
-static void srv_obex_event(obex_t *handle, obex_object_t *object, int mode,
-					int event, int obex_cmd, int obex_rsp)
+static void srv_obex_event(obex_t *handle, obex_object_t *object,
+			   enum obex_mode mode, enum obex_event event,
+			   uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	ircp_server_t *srv;
 	int ret;
@@ -125,7 +126,7 @@ static int ircp_srv_sync_wait(ircp_server_t *srv)
 {
 	int ret;
 	while(srv->finished == FALSE) {
-		ret = OBEX_HandleInput(srv->obexhandle, 1);
+		ret = OBEX_Work(srv->obexhandle, 1000);
 		if (ret < 0)
 			return -1;
 	}
@@ -314,9 +315,9 @@ ircp_server_t *ircp_srv_open(ircp_info_cb_t infocb)
 	srv->infocb = infocb;
 
 #ifdef DEBUG_TCP
-	srv->obexhandle = OBEX_Init(OBEX_TRANS_INET, srv_obex_event, 0);
+	srv->obexhandle = OBEX_New(OBEX_TRANS_INET, srv_obex_event, 0);
 #else
-	srv->obexhandle = OBEX_Init(OBEX_TRANS_IRDA, srv_obex_event, 0);
+	srv->obexhandle = OBEX_New(OBEX_TRANS_IRDA, srv_obex_event, 0);
 #endif
 
 	if(srv->obexhandle == NULL) {
diff --git a/apps/irobex_palm3.c b/apps/irobex_palm3.c
index a819363..e06fe6c 100644
--- a/apps/irobex_palm3.c
+++ b/apps/irobex_palm3.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 	if ((argc < 1) || (argc > 4))	{
 		return usage(argv);
 	}
-	handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+	handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
 
 	if (argc == 1)	{
 		/* We are server*/
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 		IrOBEX_ServerRegister(handle, "OBEX");
 
 		while (!finished)
-			OBEX_HandleInput(handle, 1);
+			OBEX_Work(handle, 1000);
 	}
 	else {
 		/* We are a client */
diff --git a/apps/irxfer.c b/apps/irxfer.c
index c42bca1..99d54cb 100644
--- a/apps/irxfer.c
+++ b/apps/irxfer.c
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+	handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
 	obex_protocol_type = OBEX_PROTOCOL_WIN95_IRXFER;
 
 	if (argc == 1) {
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 		IrOBEX_ServerRegister(handle, "OBEX:IrXfer");
 
 		while (!finished) {
-			OBEX_HandleInput(handle, 1);
+			OBEX_Work(handle, 1000);
 		}
 	} else {
 		/* We are a client */
diff --git a/apps/lib/obex_put_common.c b/apps/lib/obex_put_common.c
index cb48910..e18bf1e 100644
--- a/apps/lib/obex_put_common.c
+++ b/apps/lib/obex_put_common.c
@@ -158,7 +158,8 @@ static void client_done(obex_object_t *object, int obex_cmd, int obex_rsp)
  *    Called by the obex-layer when some event occurs.
  *
  */
-void obex_event(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp)
+void obex_event(obex_t *handle, obex_object_t *object, enum obex_mode mode,
+		enum obex_event event, uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	switch (event)	{
 	case OBEX_EV_PROGRESS:
@@ -212,7 +213,7 @@ static int wait_for_rsp()
 
 	while(!finished) {
 		//printf("wait_for_rsp()\n");
-		ret = OBEX_HandleInput(handle, 10);
+		ret = OBEX_Work(handle, 10*1000);
 		if (ret < 0)
 			return ret;
 	}
diff --git a/apps/lib/obex_put_common.h b/apps/lib/obex_put_common.h
index 92e45cb..8383502 100644
--- a/apps/lib/obex_put_common.h
+++ b/apps/lib/obex_put_common.h
@@ -23,6 +23,6 @@
 #define OBEX_PUT_COMMON_H
 
 int do_sync_request(obex_t *handle, obex_object_t *object, int async);
-void obex_event(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp);
-
+void obex_event(obex_t *handle, obex_object_t *object, enum obex_mode mode,
+		enum obex_event event, uint8_t obex_cmd, uint8_t obex_rsp);
 #endif
diff --git a/apps/obex_find.c b/apps/obex_find.c
index 598ce7d..9198bb1 100644
--- a/apps/obex_find.c
+++ b/apps/obex_find.c
@@ -34,8 +34,9 @@
 
 static int verbose = 0;
 
-static void obex_event_cb(obex_t *handle, obex_object_t *obj, int mode,
-			  int event, int obex_cmd, int obex_rsp)
+static void obex_event_cb(obex_t *handle, obex_object_t *obj,
+			  enum obex_mode mode, enum obex_event event,
+			  uint8_t obex_cmd, uint8_t obex_rsp)
 {
 }
 
@@ -103,7 +104,7 @@ static void find_devices(int trans, int flags)
 		return;
 	}
   
-	handle = OBEX_Init(trans, obex_event_cb, flags);
+	handle = OBEX_New(trans, obex_event_cb, flags);
 	found = OBEX_EnumerateInterfaces(handle);
 	printf("Found %d %s devices.\n", found, descr);
 	for (; i < found; ++i) {
diff --git a/apps/obex_tcp.c b/apps/obex_tcp.c
index a9036ff..058eb2b 100644
--- a/apps/obex_tcp.c
+++ b/apps/obex_tcp.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+	handle = OBEX_New(OBEX_TRANS_INET, obex_event, 0);
 
 	if (argc == 1)	{
 		printf("Waiting for files\n");
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 		}
 
 		while (!finished) {
-			ret = OBEX_HandleInput(handle, 10);
+			ret = OBEX_Work(handle, 10*1000);
 			if (ret == 0) {
 				printf("Timeout waiting for connection\n");
 				break;
diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 4b9b0b2..8142d4b 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -70,8 +70,9 @@ int str2ba(const char *str, bdaddr_t *ba) {
 //
 // Called by the obex-layer when some event occurs.
 //
-static void obex_event(obex_t *handle, obex_object_t *object, int mode,
-					int event, int obex_cmd, int obex_rsp)
+static void obex_event(obex_t *handle, obex_object_t *object,
+		       enum obex_mode mode, enum obex_event event,
+		       uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	switch (event)	{
 	case OBEX_EV_PROGRESS:
@@ -245,7 +246,7 @@ int main (int argc, char *argv[])
 			return -1;
 		}
 
-		handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_CUSTOM, obex_event, 0);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			return -1;
@@ -286,7 +287,7 @@ int main (int argc, char *argv[])
 		switch (btobex) {
 		case 1:
 			printf("Using Bluetooth RFCOMM transport\n");
-			handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_BLUETOOTH, obex_event, 0);
 			if (channel_arg)
 				channel = (atoi(channel_arg) & 0xFF);
 			else
@@ -295,7 +296,7 @@ int main (int argc, char *argv[])
 
 		case 2:
 			printf("Using Bluetooth L2CAP transport\n");
-			handle = OBEX_Init(OBEX_TRANS_BT_L2CAP, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_BT_L2CAP, obex_event, 0);
 			if (channel_arg)
 				channel = atoi(channel_arg);
 			channel = (channel | 0x1001) & 0xFFFF;
@@ -315,7 +316,7 @@ int main (int argc, char *argv[])
 		case 2:
 			printf("Using USB transport, "
 			       "querying available interfaces\n");
-			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
 			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
@@ -343,7 +344,7 @@ int main (int argc, char *argv[])
 		case 3:
 			intf_num = atoi(argv[2]);
 			printf("Using USB transport \n");
-			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
 			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
@@ -366,7 +367,7 @@ int main (int argc, char *argv[])
 
 	if (tcpobex) {
 		printf("Using TCP transport\n");
-		handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_INET, obex_event, 0);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
@@ -374,7 +375,7 @@ int main (int argc, char *argv[])
 
 	} else {
 		printf("Using IrDA transport\n");
-		handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
diff --git a/apps/obex_test/obex_test_client.c b/apps/obex_test/obex_test_client.c
index d9714b4..cf2dab4 100644
--- a/apps/obex_test/obex_test_client.c
+++ b/apps/obex_test/obex_test_client.c
@@ -72,7 +72,7 @@ static void syncwait(obex_t *handle)
 
 	while(!gt->clientdone) {
 		//printf("syncwait()\n");
-		ret = OBEX_HandleInput(handle, 10);
+		ret = OBEX_Work(handle, 10*1000);
 		if(ret < 0) {
 			printf("Error while doing OBEX_HandleInput()\n");
 			break;
diff --git a/apps/obex_test/obex_test_server.c b/apps/obex_test/obex_test_server.c
index 38014da..b2fb41f 100644
--- a/apps/obex_test/obex_test_server.c
+++ b/apps/obex_test/obex_test_server.c
@@ -238,7 +238,7 @@ void server_do(obex_t *handle)
 
 	gt->serverdone = FALSE;
 	while(!gt->serverdone) {
-	        ret = OBEX_HandleInput(handle, 60);
+	        ret = OBEX_Work(handle, 60*1000);
 		if(ret < 0) {
 			printf("Error while doing OBEX_HandleInput()\n");
 			break;
diff --git a/udev/obex-check-device.c b/udev/obex-check-device.c
index 9eb4769..2ab6ad8 100644
--- a/udev/obex-check-device.c
+++ b/udev/obex-check-device.c
@@ -24,8 +24,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-static void obex_event_cb(obex_t *handle, obex_object_t *obj, int mode,
-			  int event, int obex_cmd, int obex_rsp)
+static void obex_event_cb(obex_t *handle, obex_object_t *obj,
+			  enum obex_mode mode, enum obex_event event,
+			  uint8_t cmd, uint8_t rsp)
 {
 }
 
@@ -42,7 +43,7 @@ static int find_usb_device(uint16_t vendor, uint16_t product)
 	int matched = 0;
 	int i = 0;
 
-	handle = OBEX_Init(OBEX_TRANS_USB, obex_event_cb, 0);
+	handle = OBEX_New(OBEX_TRANS_USB, obex_event_cb, 0);
 	if (!handle)
 		return 0;
 
-- 
1.7.5.4

---
 lib/obex_main.c   |   44 +---------
 lib/obex_server.c |  259 +++++++++++++++++++++++++++++++++++++---------------
 lib/obex_server.h |    2 -
 3 files changed, 187 insertions(+), 118 deletions(-)

diff --git a/lib/obex_main.c b/lib/obex_main.c
index d3f0612..bc55661 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -281,36 +281,12 @@ int obex_work(obex_t *self, int timeout)
 {
 	int ret;
 
-	/* Waiting for an incoming packet will not work for single response mode
-	 * as the client is not supposed to send any when we (as server) are
-	 * sending the response.
-	 * For request reception, this is handled above */
-	if (self->mode == MODE_SRV &&
-			self->object &&
-			self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
-			self->state == STATE_SEND &&
-			!(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
-		/* Still, we need to do a zero-wait check for an ABORT
-		 * and for connection errors. */
-		ret = obex_transport_handle_input(self, 0);
-		if (ret == 0) /* timeout: no error, no input */
-			ret = obex_server_send(self, NULL, self->object->cmd, 0);
-		if (ret < 0)
-			return -1;
-		else
-			return sizeof(obex_common_hdr_t);
-
+	if (self->state == STATE_IDLE ||
+	    self->substate == SUBSTATE_RECEIVE_RX)
+	{
 		ret = obex_transport_handle_input(self, timeout);
 		if (ret <= 0)
 			return ret;
-
-	} else if (self->mode == MODE_CLI) {
-		if (self->substate == SUBSTATE_RECEIVE_RX) {
-			ret = obex_transport_handle_input(self, timeout);
-			if (ret <= 0)
-				return ret;
-		}
-
 	}
 
 	return obex_mode(self);
@@ -417,20 +393,6 @@ int obex_data_indication(obex_t *self)
 buf_t* obex_data_receive(obex_t *self)
 {
 	buf_t *msg = self->rx_msg;
-	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
-	uint8_t opcode = hdr->opcode & ~OBEX_FINAL;
-
-	if (self->mode == MODE_SRV) {
-		/* Single response mode makes it possible for the client to send
-		 * the next request (e.g. PUT) while still receiving the last
-		 * multi-packet response. So we must not consume any request
-		 * except ABORT. */
-		if (self->object &&
-				self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
-				self->state == STATE_SEND &&
-				!(opcode == OBEX_CMD_ABORT || opcode == self->object->cmd))
-			return NULL;
-	}
 
 	if (!obex_get_buffer_status(msg))
 		return NULL;
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 401a98d..351d710 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -36,20 +36,103 @@
 
 static __inline int msg_get_cmd(const buf_t *msg)
 {
-	return ((obex_common_hdr_t *) msg->data)->opcode & ~OBEX_FINAL;
+	if (msg)
+		return ((obex_common_hdr_t *) msg->data)->opcode & ~OBEX_FINAL;
+	else
+		return 0;
 }
 
 static __inline uint16_t msg_get_len(const buf_t *msg)
 {
-	return ntohs(((obex_common_hdr_t *) msg->data)->len);
+	if (msg)
+		return ntohs(((obex_common_hdr_t *) msg->data)->len);
+	else
+		return 0;
+}
+
+static __inline int msg_get_final(const buf_t *msg)
+{
+	if (msg)
+		return ((obex_common_hdr_t *) msg->data)->opcode & OBEX_FINAL;
+	else
+		return 0;
+}
+
+static int obex_server_send_transmit_tx(obex_t *self)
+{
+	int ret;
+	int cmd = self->object->cmd;
+
+	DEBUG(4, "STATE: SEND/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, self->object);
+	if (ret == -1) {
+		/* Error sending response */
+		obex_deliver_event(self, OBEX_EV_LINKERR, cmd, 0, TRUE);
+		self->state = STATE_IDLE;
+
+	} else if (ret == 1) {
+		/* Made some progress */
+		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
+		if (obex_object_finished(self, self->object, TRUE)) {
+			self->state = STATE_IDLE;
+			/* Response sent and object finished! */
+			if (cmd == OBEX_CMD_DISCONNECT) {
+				DEBUG(2, "CMD_DISCONNECT done. Resetting MTU!\n");
+				self->mtu_tx = OBEX_MINIMUM_MTU;
+				self->rsp_mode = OBEX_RSP_MODE_NORMAL;
+				self->srm_flags = 0;
+			}
+			obex_deliver_event(self, OBEX_EV_REQDONE, cmd, 0, TRUE);
+
+		} else if (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+			   !(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
+			self->substate = SUBSTATE_PREPARE_TX;
+
+		} else
+			self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return ret;
 }
 
-int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len)
+static int obex_server_send_prepare_tx(obex_t *self)
 {
 	int ret;
 
-	/* Send back response */
-	DEBUG(4, "STATE_SEND\n");
+	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
+
+	/* As a server, the final bit is always SET, and the "real final" packet
+	 * is distinguished by being SUCCESS instead of CONTINUE.
+	 * So, force the final bit here. */
+	ret = obex_object_prepare_send(self, self->object, TRUE, TRUE);
+	if (ret == 1) {
+		self->substate = SUBSTATE_TRANSMIT_TX;
+		return obex_server_send_transmit_tx(self);
+
+	} else
+		return ret;
+}
+
+static int obex_server_send(obex_t *self)
+{
+	int ret;
+	buf_t *msg = obex_data_receive(self);
+	int cmd = msg_get_cmd(msg);
+	uint16_t len = msg_get_len(msg);
+
+	DEBUG(4, "STATE: SEND/RECEIVE_RX\n");
+
+	/* Single response mode makes it possible for the client to send
+	 * the next request (e.g. PUT) while still receiving the last
+	 * multi-packet response. So we must not consume any request
+	 * except ABORT. */
+	if (self->object &&
+	    self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+	    !(cmd == OBEX_CMD_ABORT || cmd == self->object->cmd)) {
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_send_prepare_tx(self);
+	}
 
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
@@ -104,47 +187,68 @@ int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len)
 		 * consult them later. So, leave them here (== overhead). */
 	}
 
-	/* As a server, the final bit is always SET, and the "real final" packet
-	 * is distinguish by beeing SUCCESS instead of CONTINUE.
-	 * So, force the final bit here. */
-	self->object->continue_received = 1;
+	obex_data_receive_finished(self);
+	self->substate = SUBSTATE_PREPARE_TX;
+	return obex_server_send_prepare_tx(self);
+}
 
-	if (self->object->suspend)
-		return 0;
+static int obex_server_recv_transmit_tx(obex_t *self)
+{
+	int ret = 0;
+	int cmd = self->object->cmd;
 
-	ret = obex_object_send(self, self->object, TRUE, TRUE);
-	if (ret == 0) {
-		/* Made some progress */
-		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
-		self->object->first_packet_sent = 1;
-		self->object->continue_received = 0;
-	} else if (ret < 0) {
-		/* Error sending response */
+	DEBUG(4, "STATE: RECV/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, self->object);
+	if (ret == -1) {
 		obex_deliver_event(self, OBEX_EV_LINKERR, cmd, 0, TRUE);
-		return -1;
-	} else {
-		/* Response sent! */
-		if (cmd == OBEX_CMD_DISCONNECT) {
-			DEBUG(2, "CMD_DISCONNECT done. Resetting MTU!\n");
-			self->mtu_tx = OBEX_MINIMUM_MTU;
-			self->rsp_mode = OBEX_RSP_MODE_NORMAL;
-			self->srm_flags = 0;
-		}
 		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_REQDONE, cmd, 0, TRUE);
+
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
+		self->substate = SUBSTATE_RECEIVE_RX;
 	}
 
-	return 0;
+	return ret;
+}
+
+static int obex_server_recv_prepare_tx(obex_t *self)
+{
+	DEBUG(4, "STATE: RECV/PREPARE_TX\n");
+
+	if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
+	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
+	{
+		int ret = obex_object_prepare_send(self, self->object,
+						   FALSE, TRUE);
+		if (ret == 1) {
+			self->substate = SUBSTATE_TRANSMIT_TX;
+			return obex_server_recv_transmit_tx(self);
+
+		} else
+			return ret;
+
+	} else {
+		self->substate = SUBSTATE_RECEIVE_RX;
+		return 0;
+	}
 }
 
-static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
-							int cmd, uint16_t len)
+static int obex_server_recv(obex_t *self, int first)
 {
 	int deny = 0;
 	uint64_t filter;
+	buf_t *msg = obex_data_receive(self);
+	int cmd;
+	int final;
 
-	DEBUG(4, "STATE_REC\n");
-	/* In progress of receiving a request */
+	DEBUG(4, "STATE: RECV/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	cmd = msg_get_cmd(msg);
+	final = msg_get_final(msg);
 
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
@@ -217,23 +321,12 @@ static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
 		break;
 	}
 
+	obex_data_receive_finished(self);
 	if (!final) {
-		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
-		if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
-				(self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE)) {
-			int ret = obex_object_send(self, self->object, FALSE,
-									TRUE);
-			if (ret < 0) {
-				obex_deliver_event(self, OBEX_EV_LINKERR,
-								cmd, 0, TRUE);
-				return -1;
-			}
-		}
-
-		return 0;
-	}
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_recv_prepare_tx(self);
 
-	if (!self->object->first_packet_sent) {
+	} else {
 		/* Tell the app that a whole request has
 		 * arrived. While this event is delivered the
 		 * app should append the headers that should be
@@ -245,19 +338,24 @@ static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
 		/* More connect-magic woodoo stuff */
 		if (cmd == OBEX_CMD_CONNECT)
 			obex_insert_connectframe(self, self->object);
-		/* Otherwise sanitycheck later will fail */
-		len = 3;
-	}
 
-	self->state = STATE_SEND;
-	return obex_server_send(self, msg, cmd, len);
+		self->state = STATE_SEND;
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_send_prepare_tx(self);
+	}
 }
 
-static int obex_server_idle(obex_t *self, buf_t *msg, int final,
-							int cmd, uint16_t len)
+static int obex_server_idle(obex_t *self)
 {
+	buf_t *msg = obex_data_receive(self);
+	int cmd;
+
 	/* Nothing has been recieved yet, so this is probably a new request */
-	DEBUG(4, "STATE_IDLE\n");
+	DEBUG(4, "STATE: IDLE\n");
+
+	if (msg == NULL)
+		return 0;
+	cmd = msg_get_cmd(msg);
 
 	if (self->object) {
 		/* What shall we do here? I don't know!*/
@@ -304,15 +402,19 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
 		break;
 	}
 
+	/* Check the response from the REQHINT event */
 	switch ((self->object->opcode & ~OBEX_FINAL) & 0xF0) {
 	case OBEX_RSP_CONTINUE:
 	case OBEX_RSP_SUCCESS:
 		self->state = STATE_REC;
-		return obex_server_recv(self, msg, 1, final, cmd, len);
+		self->substate = SUBSTATE_RECEIVE_RX;
+		return obex_server_recv(self, 1);
 
 	default:
+		obex_data_receive_finished(self);
 		self->state = STATE_SEND;
-		return obex_server_send(self, msg, cmd, 3);
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_send_prepare_tx(self);
 	}
 }
 
@@ -324,35 +426,42 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
  */
 int obex_server(obex_t *self)
 {
-	int ret = -1;
-	buf_t *msg = obex_data_receive(self);
-	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
-	int cmd = msg_get_cmd(msg);
-	uint16_t len = msg_get_len(msg);
-	int final = hdr->opcode & OBEX_FINAL; /* Extract final bit */
-
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_IDLE:
-		ret = obex_server_idle(self, msg, final, cmd, len);
-		break;
+		return obex_server_idle(self);
 
 	case STATE_REC:
-		ret = obex_server_recv(self, msg, 0, final, cmd, len);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_server_recv(self, 0);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_server_recv_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_server_recv_transmit_tx(self);
+		}
 		break;
 
 	case STATE_SEND:
-		ret = obex_server_send(self, msg, cmd, len);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_server_send(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_server_send_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_server_send_transmit_tx(self);
+		}
 		break;
 
 	default:
 		DEBUG(0, "Unknown state\n");
-		obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-		obex_deliver_event(self, OBEX_EV_PARSEERR, cmd, 0, TRUE);
-		return -1;
+		break;
 	}
 
-	obex_data_receive_finished(self);
-	return ret;
+	return -1;
 }
diff --git a/lib/obex_server.h b/lib/obex_server.h
index 2d4bc18..fc9f115 100644
--- a/lib/obex_server.h
+++ b/lib/obex_server.h
@@ -23,9 +23,7 @@
 #define OBEX_SERVER_H
 
 struct obex;
-struct databuffer;
 
 int obex_server(struct obex *self);
-int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len);
 
 #endif
-- 
1.7.5.4

We don't need install instruction in the (usually installed by distributions)
README file, that's what the INSTALL* files are for. The copyright information
in this file is non-sense, it belongs to the source files.
---
 README |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/README b/README
index ddbe0ab..e46e521 100644
--- a/README
+++ b/README
@@ -1,27 +1,6 @@
 OpenOBEX - Free implementation of the Object Exchange protocol
 **************************************************************
 
-Copyright (C) 1998-2000  Dag Brattli <dagb@...>
-Copyright (C) 1999-2000  Pontus Fuchs <pontus.fuchs@...>
-Copyright (C) 2001-2002  Jean Tourrilhes <jt@...>
-Copyright (C) 2002-2008  Marcel Holtmann <marcel@...>
-
-
-Compilation and installation
-============================
-
-In order to compile OpenOBEX you need following software packages:
-	- GCC compiler
-
-To configure run:
-	./configure --prefix=/usr
- 
-Configure automatically searches for all required components and packages. 
-
-To compile and install run:
-	make && make install
-
-
 Information
 ===========
 
-- 
1.7.5.4

---
 CMakeLists.txt |    4 ++--
 ChangeLog      |   18 ++++++++++++++++++
 configure.ac   |    2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe1d8d5..6a98870 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ project ( openobex C )
 #
 # The project version
 #
-set ( VERSION_MAJOR 1 )
-set ( VERSION_MINOR 6 )
+set ( VERSION_MAJOR 2 )
+set ( VERSION_MINOR 0 )
 set ( VERSION_PATCH 0 )
 set ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" )
 if ( VERSION_PATCH GREATER 0 )
diff --git a/ChangeLog b/ChangeLog
index fccdd41..c6d3bee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+ver 2.0:
+	Add support for Obex-over-L2CAP (experimental)
+	Add support for Single Response Mode (experimental)
+	Add manpages for the example applications
+	Add udev helper (Linux only)
+	Extend USB support with support for libusb-1.x and updated CDC spec
+	Add function to get free object space
+	Add new custom transport read() callback
+	Add flag OBEX_FL_CLOEXEC to better support multi-threading
+	Add flag OBEX_FL_NONBLOCK to create non-blocking sockets
+	Add new definitions from OBEX 1.3 errata: ACTION command and headers
+	Updated discovery API
+	Add support for discovery of IrDA devices
+	Add a new stricter even callback
+	Remove deprecated functions and definitions
+	Add support for compiling with gcc-4.6 and Microsoft Visual C++ 10
+	Lots of internal fixes, cleanups and improvements
+
 ver 1.5:
 	Revert USB changes that broke the ABI.
 	Add more documentation and update manual pages.
diff --git a/configure.ac b/configure.ac
index 91909f3..b14b10c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(openobex, 1.5)
+AM_INIT_AUTOMAKE(openobex, 2.0)
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-- 
1.7.5.4

The member can be replaced by a rather static usage of a new parameter to
obex_server_recv().
---
 lib/obex_object.h |    1 -
 lib/obex_server.c |   10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/obex_object.h b/lib/obex_object.h
index eef3458..5bcbe0b 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -71,7 +71,6 @@ struct obex_object {
 	int totallen;			/* Size of all headers */
 	int abort;			/* Request shall be aborted */
 
-	int checked;			/* OBEX_EV_REQCHECK has been signaled */
 	enum obex_rsp_mode rsp_mode;	/* OBEX_RSP_MODE_* */
 
 	int suspend;			/* Temporarily stop transfering object */
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 1902e4f..401a98d 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -137,7 +137,7 @@ int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len)
 	return 0;
 }
 
-static int obex_server_recv(obex_t *self, buf_t *msg, int final,
+static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
 							int cmd, uint16_t len)
 {
 	int deny = 0;
@@ -191,10 +191,8 @@ static int obex_server_recv(obex_t *self, buf_t *msg, int final,
 	/* Let the user decide whether to accept or deny a
 	 * multi-packet request by examining all headers in
 	 * the first packet */
-	if (!self->object->checked) {
+	if (first)
 		obex_deliver_event(self, OBEX_EV_REQCHECK, cmd, 0, FALSE);
-		self->object->checked = 1;
-	}
 
 	/* Everything except 0x1X and 0x2X means that the user
 	 * callback denied the request. In the denied cases
@@ -310,7 +308,7 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
 	case OBEX_RSP_CONTINUE:
 	case OBEX_RSP_SUCCESS:
 		self->state = STATE_REC;
-		return obex_server_recv(self, msg, final, cmd, len);
+		return obex_server_recv(self, msg, 1, final, cmd, len);
 
 	default:
 		self->state = STATE_SEND;
@@ -341,7 +339,7 @@ int obex_server(obex_t *self)
 		break;
 
 	case STATE_REC:
-		ret = obex_server_recv(self, msg, final, cmd, len);
+		ret = obex_server_recv(self, msg, 0, final, cmd, len);
 		break;
 
 	case STATE_SEND:
-- 
1.7.5.4

---
 lib/fdobex.c |   58 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/lib/fdobex.c b/lib/fdobex.c
index fa2d64a..cdbc26a 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -68,6 +68,9 @@ static int fdobex_write(obex_t *self, buf_t *msg)
 	struct obex_transport *trans = &self->trans;
 	int fd = trans->data.fd.writefd;
 	size_t size = msg->data_size;
+	int status;
+	fd_set fdset;
+	struct timeval time = {trans->timeout, 0};
 
 	if (size == 0)
 		return 0;
@@ -76,35 +79,60 @@ static int fdobex_write(obex_t *self, buf_t *msg)
 		size = trans->mtu;
 	DEBUG(1, "sending %zu bytes\n", size);
 
-	if (trans->timeout >= 0) {
-		/* setup everything to check for blocking writes */
-		fd_set fdset;
-		struct timeval time = {trans->timeout, 0};
-		int status;
-
-		FD_ZERO(&fdset);
-		FD_SET(fd, &fdset);
+	FD_ZERO(&fdset);
+	FD_SET(fd, &fdset);
+	if (trans->timeout >= 0)
 		status = select((int)fd+1, NULL, &fdset, NULL, &time);
-		if (status == 0)
-			return 0;
-	}
+	else
+		status = select((int)fd+1, NULL, &fdset, NULL, NULL);
+
+	if (status == 0)
+		return 0;
 
 #ifdef _WIN32
-	return _write(fd, msg->data, size);
+	status = _write(fd, msg->data, size);
 #else
-	return write(fd, msg->data, size);
+	status = write(fd, msg->data, size);
 #endif
+
+	/* The following are not really transport errors. */
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
+
+	return status;
 }
 
 static int fdobex_read(obex_t *self, void *buf, int buflen)
 {
 	struct obex_transport *trans = &self->trans;
+	int fd = trans->fd;
+	int status;
+	fd_set fdset;
+	struct timeval time = {trans->timeout, 0};
+
+	FD_ZERO(&fdset);
+	FD_SET(fd, &fdset);
+	if (trans->timeout >= 0)
+		status = select((int)fd+1, NULL, &fdset, NULL, &time);
+	else
+		status = select((int)fd+1, NULL, &fdset, NULL, NULL);
+
+	if (status == 0)
+		return 0;
 
 #ifdef _WIN32
-	return  _read(trans->fd, buf, buflen);
+	status = _read(fd, buf, buflen);
 #else
-	return read(trans->fd, buf, buflen);
+	status = read(fd, buf, buflen);
 #endif
+
+	/* The following are not really transport errors */
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
+
+	return status;
 }
 
 void fdobex_get_ops(struct obex_transport_ops* ops)
-- 
1.7.5.4

This additional level of the state machine is used by the states SEND and REC
and will help to remove some work-arounds that are currently only there because
this additional level is missing.
---
 lib/defines.h   |    6 ++++++
 lib/obex_main.h |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lib/defines.h b/lib/defines.h
index 4169911..eb2257b 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -29,6 +29,12 @@ enum obex_state {
 	STATE_REC,
 };
 
+enum obex_substate {
+	SUBSTATE_RECEIVE_RX,
+	SUBSTATE_PREPARE_TX,
+	SUBSTATE_TRANSMIT_TX,
+};
+
 #define OBEX_SRM_FLAG_WAIT_LOCAL  (1 << 0)
 #define OBEX_SRM_FLAG_WAIT_REMOTE (1 << 1)
 
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 8a3e975..24d37c5 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -41,6 +41,7 @@ struct obex {
 	uint16_t mtu_tx_max;		/* Maximum TX we can accept */
 
 	enum obex_state state;
+	enum obex_substate substate;
 	enum obex_mode mode;
 	enum obex_rsp_mode rsp_mode;	/* OBEX_RSP_MODE_* */
 
-- 
1.7.5.4

Change obex_test so that only the compiled-in parts are visible. Prepare the
bluetooth part for addition of L2CAP usage.
---
 apps/obex_test/obex_test.c |  247 ++++++++++++++++++++++++--------------------
 1 files changed, 136 insertions(+), 111 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 350d808..7527a51 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -27,6 +27,11 @@
 #include "../lib/bluez_compat.h"
 #ifdef _WIN32
 bdaddr_t bluez_compat_bdaddr_any = { BTH_ADDR_NULL };
+int str2ba(const char *str, bdaddr_t *ba) {
+	//TODO
+	*ba = *BDADDR_ANY;
+	return 0;
+}
 #endif
 #endif
 
@@ -36,9 +41,11 @@ bdaddr_t bluez_compat_bdaddr_any = { BTH_ADDR_NULL };
 #include "obex_test_client.h"
 #include "obex_test_server.h"
 
-#ifndef _WIN32
+#if defined(_WIN32)
+#undef HAVE_CABLE_OBEX
+#else
 #include "obex_test_cable.h"
-
+#define HAVE_CABLE_OBEX 1
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -76,7 +83,7 @@ static void obex_event(obex_t *handle, obex_object_t *object, int mode,
 		break;
 
 	case OBEX_EV_REQDONE:
-		if(mode == OBEX_MODE_CLIENT) {
+		if (mode == OBEX_MODE_CLIENT) {
 			client_done(handle, object, obex_cmd, obex_rsp);
 		}
 		else	{
@@ -155,76 +162,88 @@ int main (int argc, char *argv[])
 {
 	char cmd[3];
 	int end = 0;
-	int cobex = FALSE, tcpobex = FALSE, btobex = FALSE, r320 = FALSE, usbobex = FALSE;
-	obex_t *handle;
+	int tcpobex = FALSE;
+	obex_t *handle = NULL;
+	struct context global_context = {0};
+
 #ifdef HAVE_BLUETOOTH
+	int btobex = FALSE;
 	bdaddr_t bdaddr;
 	uint8_t channel = 0;
 #endif
-
 #ifdef HAVE_USB
+	int usbobex = FALSE;
 	obex_interface_t *obex_intf = NULL;
 #endif
-
-	struct context global_context = {0,};
-
-#ifndef _WIN32
-
+#ifdef HAVE_CABLE_OBEX
+	int cobex = FALSE, r320 = FALSE;
 	char *port;
 	obex_ctrans_t custfunc;
+#endif
 
-	if( (argc == 2) && (strcmp(argv[1], "-h") == 0 ) ) {
+	if (argc == 2 && strcmp(argv[1], "-h") == 0) {
 		printf(
 			"Usage: obex_test [options]\n"
 			"\n"
 			"Options:\n"
-			"    -s [tty]           Use cable transport (Sony-Ericsson phones/DCU-11 cable)\n"
-			"    -r [tty]           Use cable transport for R320\n"
-			"    -i                 Use IP/TCP transport\n"
-			"    -b [addr] [chan]   Use bluetooth  transport\n"
-			"    -u [interface]     Use USB transport\n"
-			"    -h                 Print this help message\n"
+#ifdef HAVE_CABLE_OBEX
+			"    -s [tty]          Use cable transport (Sony-Ericsson phones/DCU-11 cable)\n"
+			"    -r [tty]          Use cable transport for R320\n"
+#endif
+#ifdef HAVE_BLUETOOTH
+			"    -b [addr] [chan]  Use bluetooth RFCOMM transport\n"
+#endif
+#ifdef HAVE_USB
+			"    -u [interface]    Use USB transport\n"
+#endif
+			"    -i                Use IP/TCP transport\n"
+			"    -h                Print this help message\n"
 			"\n"
 			"If no transport is selected, IrDA is used.\n"
 		);
 		return 0;
 	}
 
-	if( (argc == 2 || argc ==3) && (strcmp(argv[1], "-s") == 0 ) )
+#ifdef HAVE_CABLE_OBEX
+	if ((argc == 2 || argc ==3) && strcmp(argv[1], "-s") == 0)
 		cobex = TRUE;
-	if( (argc == 2 || argc ==3) && (strcmp(argv[1], "-r") == 0 ) ) {
+	if ((argc == 2 || argc ==3) && strcmp(argv[1], "-r") == 0) {
 		cobex = TRUE;
 		r320 = TRUE;
 	}
 #endif
-
-	if( (argc == 2) && (strcmp(argv[1], "-i") == 0 ) )
-		tcpobex = TRUE;
-	if( (argc >= 2) && (strcmp(argv[1], "-b") == 0 ) )
+#ifdef HAVE_BLUETOOTH
+	if (argc >= 2 && strcmp(argv[1], "-b") == 0)
 		btobex = TRUE;
-	if( (argc >= 2) && (strcmp(argv[1], "-u") == 0 ) )
+#endif
+#ifdef HAVE_USB
+	if (argc >= 2 && strcmp(argv[1], "-u") == 0)
 		usbobex = TRUE;
+#endif
+	if (argc == 2 && strcmp(argv[1], "-i") == 0)
+		tcpobex = TRUE;
 
-	if(cobex)	{
-#ifndef _WIN32
-		if(argc == 3)
+#ifdef HAVE_CABLE_OBEX
+	if (cobex) {
+		if (argc == 3)
 			port = argv[2];
 		else
 			port = "/dev/ttyS0";
 
-		if(r320)
+		if (r320)
 			printf("OBEX to R320 on %s!\n", port);
 		else
 			printf("OBEX on %s!\n", port);
 
 		custfunc.customdata = cobex_open(port, r320);
 
-		if(custfunc.customdata == NULL) {
+		if (custfunc.customdata == NULL) {
 			printf("cobex_open() failed\n");
 			return -1;
 		}
 
-		if(! (handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0)))	{
+		handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0);
+		if (!handle) {
 			perror( "OBEX_Init failed");
 			return -1;
 		}
@@ -235,69 +254,67 @@ int main (int argc, char *argv[])
 		custfunc.handleinput = cobex_handle_input;
 		custfunc.listen = cobex_connect;	// Listen and connect is 100% same on cable
 
-		if(OBEX_RegisterCTransport(handle, &custfunc) < 0)	{
+		if (OBEX_RegisterCTransport(handle, &custfunc) < 0)
 			printf("Custom transport callback-registration failed\n");
-		}
-#else
-		printf("Not implemented in Win32 yet.\n");
-#endif	// _WIN32
-	}
 
-	else if(tcpobex) {
-		printf("Using TCP transport\n");
-		if(! (handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0)))	{
-			perror( "OBEX_Init failed");
-			exit(0);
-		}
-	}
-	else if(btobex) {
-#ifndef _WIN32
-		switch (argc) {
+	} else
+#endif
 #ifdef HAVE_BLUETOOTH
+	if (btobex) {
+		const char *channel_arg = NULL;
+		switch (argc) {
 		case 4:
 			str2ba(argv[2], &bdaddr);
-			channel = atoi(argv[3]);
+			channel_arg = argv[3];
 			break;
 		case 3:
 			str2ba(argv[2], &bdaddr);
 			if (bacmp(&bdaddr, BDADDR_ANY) == 0)
-				channel = atoi(argv[2]);
-			else
-				channel = BT_CHANNEL;
+				channel_arg = argv[2];
 			break;
 		case 2:
 			bacpy(&bdaddr, BDADDR_ANY);
-			channel = BT_CHANNEL;
 			break;
-#endif
 		default:
 			printf("Wrong number of arguments\n");
 			exit(0);
 		}
 
-		printf("Using Bluetooth RFCOMM transport\n");
-		if(! (handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0)))      {
+		switch (btobex) {
+		case TRUE:
+			printf("Using Bluetooth RFCOMM transport\n");
+			handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+			if (channel_arg)
+				channel = (atoi(channel_arg) & 0xFF);
+			else
+				channel = BT_CHANNEL;
+			break;
+		}
+
+		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
 		}
-#else
-		printf("Not implemented in Win32 yet.\n");
-#endif	// _WIN32
-	}
-	else if(usbobex) {
+	} else
+#endif
 #ifdef HAVE_USB
+	if (usbobex) {
 		int i, interfaces_number, intf_num;
 		switch (argc) {
 		case 2:
-			printf("Using USB transport, querying available interfaces\n");
-			if(! (handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0)))      {
+			printf("Using USB transport, "
+			       "querying available interfaces\n");
+			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
 			}
 			interfaces_number = OBEX_EnumerateInterfaces(handle);
-			for (i=0; i < interfaces_number; i++) {
+			for (i = 0; i < interfaces_number; i++) {
 				obex_intf = OBEX_GetInterfaceByIndex(handle, i);
-				printf("Interface %d: idVendor: %#x, idProduct: %#x, bus %d, dev %d, intf %d, %s %s %s\n", i,
+				printf("Interface %d: idVendor: %#x, "
+				       "idProduct: %#x, bus %d, dev %d, "
+				       "intf %d, %s %s %s\n", i,
 					obex_intf->usb.idVendor,
 					obex_intf->usb.idProduct,
 					obex_intf->usb.bus_number,
@@ -307,14 +324,16 @@ int main (int argc, char *argv[])
 					obex_intf->usb.product,
 					obex_intf->usb.control_interface);
 			}
-			printf("Use '%s -u interface_number' to run interactive OBEX test client\n", argv[0]);
+			printf("Use '%s -u interface_number' to run "
+			       "interactive OBEX test client\n", argv[0]);
 			OBEX_Cleanup(handle);
 			exit(0);
 			break;
 		case 3:
 			intf_num = atoi(argv[2]);
 			printf("Using USB transport \n");
-			if(! (handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0)))      {
+			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
 			}
@@ -331,14 +350,21 @@ int main (int argc, char *argv[])
 			printf("Wrong number of arguments\n");
 			exit(0);
 		}
-#else
-		printf("Not compiled with USB support\n");
-		exit(0);
+	} else
 #endif
-	}
-	else	{
+
+	if (tcpobex) {
+		printf("Using TCP transport\n");
+		handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+		if (!handle) {
+			perror( "OBEX_Init failed");
+			exit(0);
+		}
+
+	} else {
 		printf("Using IrDA transport\n");
-		if(! (handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0)))	{
+		handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
 		}
@@ -386,44 +412,41 @@ int main (int argc, char *argv[])
 			break;
 			case 'c':
 				/* First connect transport */
-				if(tcpobex) {
-					if(TcpOBEX_TransportConnect(handle, NULL, 0) < 0) {
-						printf("Transport connect error! (TCP)\n");
-						break;
-					}
-				}
-				if(cobex) {
-					if(OBEX_TransportConnect(handle, (void*) 1, 0) < 0) {
+#ifdef HAVE_CABLE_OBEX
+				if (cobex) {
+					if (OBEX_TransportConnect(handle, (void*) 1, 0) < 0) {
 						printf("Transport connect error! (Serial)\n");
 						break;
 					}
-				}
-				if(btobex) {
+				} else
+#endif
 #ifdef HAVE_BLUETOOTH
+				if (btobex) {
 					if (bacmp(&bdaddr, BDADDR_ANY) == 0) {
 						printf("Device address error! (Bluetooth)\n");
 						break;
 					}
-					if(BtOBEX_TransportConnect(handle, BDADDR_ANY, &bdaddr, channel) <0) {
+					if (BtOBEX_TransportConnect(handle, BDADDR_ANY, &bdaddr, channel) <0) {
 						printf("Transport connect error! (Bluetooth)\n");
 						break;
 					}
-#else
-					printf("Transport not found! (Bluetooth)\n");
+				} else
 #endif
-				}
-				if (usbobex) {
 #ifdef HAVE_USB
+				if (usbobex) {
 					if (OBEX_InterfaceConnect(handle, obex_intf) < 0) {
 						printf("Transport connect error! (USB)\n");
 						break;
 					}
-#else
-					printf("Transport not found! (USB)\n");
+				} else
 #endif
-				}	
-				if (!tcpobex && !cobex && !btobex && !usbobex) {
-					if(IrOBEX_TransportConnect(handle, IR_SERVICE) < 0) {
+				if (tcpobex) {
+					if (TcpOBEX_TransportConnect(handle, NULL, 0) < 0) {
+						printf("Transport connect error! (TCP)\n");
+						break;
+					}
+				} else {
+					if (IrOBEX_TransportConnect(handle, IR_SERVICE) < 0) {
 						printf("Transport connect error! (IrDA)\n");
 						break;
 					}
@@ -436,33 +459,35 @@ int main (int argc, char *argv[])
 			break;
 			case 's':
 				/* First register server */
-				if(tcpobex) {
-					if(TcpOBEX_ServerRegister(handle, NULL, 0) < 0) {
-						printf("Server register error! (TCP)\n");
-						break;
-					}
-				}
-				if(cobex) {
-					if(OBEX_ServerRegister(handle, (void*) 1, 0) < 0) {
+#ifdef HAVE_CABLE_OBEX
+				if (cobex) {
+					if (OBEX_ServerRegister(handle, (void*) 1, 0) < 0) {
 						printf("Server register error! (Serial)\n");
 						break;
 					}
-				}
-				if(btobex) {
+				} else
+#endif
 #ifdef HAVE_BLUETOOTH
-					if(BtOBEX_ServerRegister(handle, BDADDR_ANY, channel) < 0) {
+				if (btobex) {
+					if (BtOBEX_ServerRegister(handle, BDADDR_ANY, channel) < 0) {
 						printf("Server register error! (Bluetooth)\n");
 						break;
 					}
-#else
-					printf("Transport not found! (Bluetooth)\n");
+				} else
 #endif
-				}
+#ifdef HAVE_USB
 				if (usbobex) {
 					printf("Transport not found! (USB)\n");
-				}
-				if (!tcpobex && !cobex && !btobex && !usbobex) {
-					if(IrOBEX_ServerRegister(handle, IR_SERVICE) < 0)	{
+				} else
+#endif
+				if (tcpobex) {
+					if (TcpOBEX_ServerRegister(handle, NULL, 0) < 0) {
+						printf("Server register error! (TCP)\n");
+						break;
+					}
+
+				} else {
+					if (IrOBEX_ServerRegister(handle, IR_SERVICE) < 0) {
 						printf("Server register error! (IrDA)\n");
 						break;
 					}
@@ -475,8 +500,8 @@ int main (int argc, char *argv[])
 				printf("Unknown command %s\n", cmd);
 		}
 	}
-#ifndef _WIN32
-	if(cobex)
+#ifdef HAVE_CABLE_OBEX
+	if (cobex)
 		cobex_close(custfunc.customdata);
 #endif
 
-- 
1.7.5.4

The ./bootstrap (or autoreconf -i) will automatically copy the file to its
place but there is no need to keep that in the repository (it is not the one
that's shipped in releases anyway).
---
 .gitignore |    1 +
 INSTALL    |  236 ------------------------------------------------------------
 2 files changed, 1 insertions(+), 236 deletions(-)
 delete mode 100644 INSTALL

diff --git a/.gitignore b/.gitignore
index 2e6307f..5bd619f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.so
 .deps
 .libs
+INSTALL
 Makefile
 Makefile.in
 aclocal.m4
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 56b077d..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
-- 
1.7.5.4

On Fri, 15 Jul 2011, Hendrik Sattler wrote:

> Note that the transport only works on Linux. Although it also compiles on
> Windows, the operating system itself does not support it. FreeBSD and NetBSD do
> not seem to support ERTM, yet. The code for the last two is not compile-tested.

The only change I needed to build on NetBSD was addition of two lines as
per below. (the FreeBSD build should be ok I think)

I only tried bootstrap-configure though, my cmake 2.8.4 is too old :)

iain

--- bluez_compat.h.orig	2011-07-15 19:58:02.000000000 +0100
+++ bluez_compat.h	2011-07-15 19:53:40.000000000 +0100
@@ -75,9 +75,11 @@
 #define rc_family   bt_family
 #define rc_bdaddr   bt_bdaddr
 #define rc_channel  bt_channel
+#define sockaddr_l2 sockaddr_bt
 #define l2_family   bt_family
 #define l2_bdaddr   bt_bdaddr
 #define l2_psm      bt_psm
+#define SOL_L2CAP   BTPROTO_L2CAP
 #define bacpy(dst,src) memcpy((dst),(src),sizeof(bdaddr_t))
 #define bacmp(a,b)     memcmp((a),(b),sizeof(bdaddr_t))
 #define str2ba(str, ba)	(bt_aton((str), (ba)) == 1 ? 0 : -1)

Am Freitag, 15. Juli 2011, 21:02:15 schrieb Iain Hibbert:
> On Fri, 15 Jul 2011, Hendrik Sattler wrote:
> > Note that the transport only works on Linux. Although it also compiles on
> > Windows, the operating system itself does not support it. FreeBSD and
> > NetBSD do not seem to support ERTM, yet. The code for the last two is
> > not compile-tested.
> 
> The only change I needed to build on NetBSD was addition of two lines as
> per below. (the FreeBSD build should be ok I think)

Great. So I was very close.. :-)

> I only tried bootstrap-configure though, my cmake 2.8.4 is too old :)

Never mind. That should then work as well, no real major changes there...

Thanks,

HS

Am Freitag, 15. Juli 2011, 18:45:58 schrieb Hendrik Sattler:
> ---
>  include/openobex/obex_const.h |    1 +
>  lib/obex.c                    |    1 +
>  lib/obex_main.c               |   22 ++++++++++++++++------
>  lib/obex_transport.c          |   19 +++++++++++++++++--
>  4 files changed, 35 insertions(+), 8 deletions(-)

This patch got some fixes now and is now followed by another patch with extends 
obex_test to make this testable.

Updates will show up in the next resend or in my repository...

HS

Hi,

this is a list of all the patches pending on my side. It also include Iain's
patches to make it easier.

@Johan:
You can find all of these patches in my gitorious repository in the "testing"
branch and I really recommend pull from there! (git am has its issues when
files with DOS-style line-endings are involved). I will not be available almost
all of August, so can be get this in before then?

Patches 1-11 and 50 are strictly needed.

Patches 22-46 are the rework of the state machine. The intention is to utilize
non-blocking sockets and remove a lot of internal hacks (e.g. the current abort
and resume code).

With small adaptions, there is nothing that prevents an application being able
to support v1.5 and v2.0.

HS

From: Iain Hibbert <plunky@...>

---
 lib/obex.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index 165fcb8..5e5fb31 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -1058,7 +1058,7 @@ int CALLAPI IrOBEX_TransportConnect(obex_t *self, const char *service)
 	An easier server function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_ServerRegister(obex_t *self, bdaddr_t *src, uint8_t channel)
+int CALLAPI BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel)
 {
 	DEBUG(3, "\n");
 
@@ -1085,8 +1085,8 @@ int CALLAPI BtOBEX_ServerRegister(obex_t *self, bdaddr_t *src, uint8_t channel)
 	An easier connect function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_TransportConnect(obex_t *self, bdaddr_t *src,
-					bdaddr_t *dst, uint8_t channel)
+int CALLAPI BtOBEX_TransportConnect(obex_t *self, bt_addr_t *src,
+					bt_addr_t *dst, uint8_t channel)
 {
 	DEBUG(4, "\n");
 
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

(For NetBSD at least, the BDADDR_ANY that is passed to
these functions is defined as a const)
---
 include/openobex/obex.h |    4 ++--
 lib/obex.c              |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index f948113..1e9e0d7 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -141,8 +141,8 @@ OPENOBEX_SYMBOL(int) IrOBEX_TransportConnect(obex_t *self, const char *service);
 #    define bt_addr_t unsigned long
 #  endif
 #endif
-OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel);
-OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, bt_addr_t *src, bt_addr_t *dst, uint8_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint8_t channel);
 
 /*
  * OBEX File API
diff --git a/lib/obex.c b/lib/obex.c
index 5e5fb31..874cfcd 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -1058,7 +1058,7 @@ int CALLAPI IrOBEX_TransportConnect(obex_t *self, const char *service)
 	An easier server function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel)
+int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel)
 {
 	DEBUG(3, "\n");
 
@@ -1085,8 +1085,8 @@ int CALLAPI BtOBEX_ServerRegister(obex_t *self, bt_addr_t *src, uint8_t channel)
 	An easier connect function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_TransportConnect(obex_t *self, bt_addr_t *src,
-					bt_addr_t *dst, uint8_t channel)
+int CALLAPI BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src,
+					const bt_addr_t *dst, uint8_t channel)
 {
 	DEBUG(4, "\n");
 
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

We need to detect the presence of "Bluetooth Device Address" type
in order to provide the BtOBEX_ function prototypes, which needs
to be from a header included prior to <openobex/obex.h>
---
 include/openobex/obex.h |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 1e9e0d7..6dda861 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -131,18 +131,25 @@ OPENOBEX_SYMBOL(int) IrOBEX_TransportConnect(obex_t *self, const char *service);
  * Bluetooth OBEX API
  */
 #if !defined(bt_addr_t)
-#  if defined(SOL_RFCOMM)
-#    if defined(_WIN32) /* Windows */
-#      define bt_addr_t BTH_ADDR
-#    else /* Linux, FreeBSD, NetBSD */
-#      define bt_addr_t bdaddr_t
+#  if defined(_WIN32)
+#    if defined(BTH_ADDR_NULL)
+#      define bt_addr_t	BTH_ADDR
+#    endif
+#  elif defined(__FreeBSD__)
+#    if defined(NG_HCI_BDADDR_ANY)
+#      define bt_addr_t	bdaddr_t
+#    endif
+#  else	/* Linux, NetBSD, etc.. */
+#    if defined(BDADDR_ANY)
+#      define bt_addr_t	bdaddr_t
 #    endif
-#  else /* no bluetooth stack available */
-#    define bt_addr_t unsigned long
 #  endif
 #endif
+
+#if defined(bt_addr_t)
 OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel);
 OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint8_t channel);
+#endif
 
 /*
  * OBEX File API
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

---
 lib/customtrans.c |    2 +-
 lib/inobex.c      |    2 +-
 lib/irobex.c      |    2 +-
 lib/obex_object.c |    2 +-
 lib/usb1obex.c    |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/customtrans.c b/lib/customtrans.c
index 0040550..20e264c 100644
--- a/lib/customtrans.c
+++ b/lib/customtrans.c
@@ -115,4 +115,4 @@ int custom_register(obex_t *self, const obex_ctrans_t *in)
 void custom_get_ops(struct obex_transport_ops* ops)
 {
 	ops->clone = &custom_clone;
-};
+}
diff --git a/lib/inobex.c b/lib/inobex.c
index d7a450a..4ae2b61 100644
--- a/lib/inobex.c
+++ b/lib/inobex.c
@@ -410,4 +410,4 @@ void inobex_get_ops(struct obex_transport_ops* ops)
 	ops->server.disconnect = &inobex_disconnect_server;
 	ops->client.connect = &inobex_connect_request;
 	ops->client.disconnect = &inobex_disconnect_request;
-};
+}
diff --git a/lib/irobex.c b/lib/irobex.c
index 3f15a93..b0aeaa2 100644
--- a/lib/irobex.c
+++ b/lib/irobex.c
@@ -594,6 +594,6 @@ void irobex_get_ops(struct obex_transport_ops* ops)
 	ops->client.find_interfaces = &irobex_find_interfaces;
 	ops->client.free_interface = &irobex_free_interface;
 	ops->client.select_interface = &irobex_select_interface;
-};
+}
 
 #endif /* HAVE_IRDA */
diff --git a/lib/obex_object.c b/lib/obex_object.c
index cbfd1f1..395c5ff 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -569,7 +569,7 @@ int obex_object_send(obex_t *self, obex_object_t *object,
 
 		if (tx_left == 0)
 			addmore = FALSE;
-	};
+	}
 
 	/* Decide which command to use, and if to use final-bit */
 	if (object->tx_headerq) {
diff --git a/lib/usb1obex.c b/lib/usb1obex.c
index f647212..c00b55a 100644
--- a/lib/usb1obex.c
+++ b/lib/usb1obex.c
@@ -581,6 +581,6 @@ void usbobex_get_ops(struct obex_transport_ops* ops)
 	ops->client.find_interfaces = &usbobex_find_interfaces;
 	ops->client.free_interface = &usbobex_free_interface;
 	ops->client.select_interface = &usbobex_select_interface;
-};
+}
 
 #endif /* HAVE_USB1 */
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

---
 lib/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0110db4..6efa6d0 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -106,7 +106,7 @@ if ( OPENOBEX_USB )
   list ( APPEND openobex_LIBRARIES
     ${LibUSB_LIBRARIES}
   )
-  include_directories ( BEFORE SYSTEM ${LibUSB_INCLUDE_DIRS} )
+  include_directories ( SYSTEM ${LibUSB_INCLUDE_DIRS} )
   if ( LibUSB_VERSION_1.0 )
     list ( APPEND SOURCES
       usb1obex.c
-- 
1.7.5.4

From: Iain Hibbert <plunky@...>

---
 CMakeModules/FindBluetooth.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/FindBluetooth.cmake b/CMakeModules/FindBluetooth.cmake
index a62032d..9d82a84 100644
--- a/CMakeModules/FindBluetooth.cmake
+++ b/CMakeModules/FindBluetooth.cmake
@@ -73,7 +73,7 @@ elseif ( CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" )
   mark_as_advanced ( Bluetooth_LIBRARIES )
 
   if ( Bluetooth_INCLUDE_DIRS )
-    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INLUDE_DIRS} )
+    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INCLUDE_DIRS} )
     CHECK_C_SOURCE_COMPILES (
       "#include <bluetooth.h>
        int main () {
@@ -102,7 +102,7 @@ elseif ( CMAKE_SYSTEM_NAME STREQUAL "NetBSD" )
   mark_as_advanced ( Bluetooth_LIBRARIES )
 
   if ( Bluetooth_INCLUDE_DIRS )
-    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INLUDE_DIRS} )
+    set ( CMAKE_REQUIRED_INCLUDES ${Bluetooth_INCLUDE_DIRS} )
     CHECK_C_SOURCE_COMPILES (
       "#include <bluetooth.h>
        int main () {
-- 
1.7.5.4

---
 lib/obex_object.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/obex_object.c b/lib/obex_object.c
index 395c5ff..2773789 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -412,12 +412,14 @@ static int send_body(obex_object_t *object, struct obex_header_element *h,
 		/* We have completely filled the tx-buffer */
 		actual = tx_left;
 	} else {
-		DEBUG(4, "Add BODY_END header\n");
-
-		if (slist_has_more(object->tx_headerq))
-			hdr->hi = OBEX_HDR_BODY_END;
-		else
+		if (slist_has_more(object->tx_headerq)) {
+			DEBUG(4, "Add BODY header\n");
 			hdr->hi = OBEX_HDR_BODY;
+		} else {
+			DEBUG(4, "Add BODY_END header\n");
+			hdr->hi = OBEX_HDR_BODY_END;
+		}
+
 		hdr->hl = htons((uint16_t)(h->buf->data_size + sizeof(*hdr)));
 		buf_insert_end(txmsg, h->buf->data, h->buf->data_size);
 		actual = h->buf->data_size;
-- 
1.7.5.4

If non-blocking file descriptors or sockets are used, it can happen that
incomplete message get sent.
---
 lib/databuffer.c |    7 +++++++
 lib/databuffer.h |    1 +
 lib/obex_main.c  |    2 +-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lib/databuffer.c b/lib/databuffer.c
index 1c43324..72bd4ca 100644
--- a/lib/databuffer.c
+++ b/lib/databuffer.c
@@ -113,6 +113,13 @@ size_t buf_total_size(const buf_t *p)
 	return p->head_avail + p->data_avail + p->tail_avail + p->data_size;
 }
 
+int buf_empty(const buf_t *p)
+{
+	if (!p)
+		return 1;
+	return (p->data_size == 0);
+}
+
 void buf_resize(buf_t *p, size_t new_size)
 {
 	uint8_t *tmp;
diff --git a/lib/databuffer.h b/lib/databuffer.h
index f55a056..2ef8204 100644
--- a/lib/databuffer.h
+++ b/lib/databuffer.h
@@ -47,6 +47,7 @@ typedef struct databuffer buf_t;
 
 buf_t *buf_new(size_t default_size);
 size_t buf_total_size(const buf_t *p);
+int buf_empty(const buf_t *p);
 void buf_resize(buf_t *p, size_t new_size);
 buf_t *buf_reuse(buf_t *p);
 void *buf_reserve_begin(buf_t *p, size_t data_size);
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 387f271..14a5263 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -221,7 +221,7 @@ int obex_data_request(obex_t *self, buf_t *msg, int opcode)
 		status = obex_transport_write(self, msg);
 		if (status > 0)
 			buf_remove_begin(msg, status);
-	} while (status >= 0 && obex_get_buffer_status(msg));
+	} while (status >= 0 && !buf_empty(msg));
 	return status;
 }
 
-- 
1.7.5.4

---
 lib/obex_object.c |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/obex_object.c b/lib/obex_object.c
index 2773789..3fcd10a 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -307,7 +307,7 @@ static int send_stream(obex_t *self,
 	actual = sizeof(*hdr);
 
 	do {
-		if (object->s_len == 0) {
+		if (object->s_len == 0 && !object->s_stop) {
 			/* Ask app for more data if no more */
 			object->s_offset = 0;
 			object->s_buf = NULL;
@@ -315,20 +315,9 @@ static int send_stream(obex_t *self,
 								0, FALSE);
 			DEBUG(4, "s_len=%d, s_stop = %d\n",
 						object->s_len, object->s_stop);
-			/* End of stream ?*/
-			if (object->s_stop)
-				break;
-
-			/* User suspended and didn't provide any new data */
-			if (object->suspend && object->s_buf == NULL)
-				break;
-
-			/* Error ?*/
-			if (object->s_buf == NULL) {
-				DEBUG(1, "Unexpected end-of-stream\n");
-				return -1;
-			}
 		}
+		if (object->s_len == 0)
+			break;
 
 		if (tx_left < object->s_len) {
 			/* There is more data left in buffer than tx_left */
@@ -359,13 +348,21 @@ static int send_stream(obex_t *self,
 	DEBUG(4, "txmsg full or no more stream-data. actual = %d\n", actual);
 	hdr->hi = OBEX_HDR_BODY;
 
-	if (object->s_stop && object->s_len == 0) {
+	if (object->s_len == 0) {
+		if (object->s_stop)
+			/* End of stream */
+			hdr->hi = OBEX_HDR_BODY_END;
+
+		else if (object->s_buf == NULL &&
+			 !slist_has_more(object->tx_headerq))
+			/* User didn't provide any new data but there are also
+			 * no more header. This is not correct as the
+			 * application should have signalled STREAM_DATAEND in
+			 * this case. */
+			return -1;
+
 		/* We are done. Remove header from tx-queue */
 		object->tx_headerq = slist_remove(object->tx_headerq, h);
-		if (slist_has_more(object->tx_headerq))
-			hdr->hi = OBEX_HDR_BODY;
-		else
-			hdr->hi = OBEX_HDR_BODY_END;
 		buf_free(h->buf);
 		free(h);
 	}
-- 
1.7.5.4

---
 lib/fdobex.c         |    3 ---
 lib/obex_transport.c |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/lib/fdobex.c b/lib/fdobex.c
index e057562..356b5a9 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -28,9 +28,6 @@
 #include <unistd.h>
 #if defined(_WIN32)
 #include <io.h>
-#ifndef ETIMEDOUT
-#define ETIMEDOUT WSAETIMEDOUT
-#endif
 #endif
 
 static int fdobex_init(obex_t *self)
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index 1c03baa..b25539e 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -35,9 +35,6 @@
 
 #if defined(_WIN32)
 #include <io.h>
-#ifndef ETIMEDOUT
-#define ETIMEDOUT WSAETIMEDOUT
-#endif
 #endif
 
 #include "fdobex.h"
-- 
1.7.5.4

The cmake build files used some self-named variables or fixed value. Replace
them by the new GNUInstallDirs.cmake that introduces variables as defined for
GNU autotools.
---
 CMakeLists.txt                |   21 +++++----------------
 apps/CMakeLists.txt           |    2 +-
 apps/ircp/CMakeLists.txt      |    2 +-
 apps/obex_test/CMakeLists.txt |    2 +-
 doc/CMakeLists.txt            |    6 +++---
 lib/CMakeLists.txt            |    8 ++++----
 udev/CMakeLists.txt           |    8 ++++----
 7 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a2bde4..fe1d8d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required ( VERSION 2.6.3 FATAL_ERROR )
+cmake_minimum_required ( VERSION 2.8.5 FATAL_ERROR )
 
 project ( openobex C )
 
@@ -31,6 +31,7 @@ if ( NOT CMAKE_BUILD_TYPE )
 endif ( NOT CMAKE_BUILD_TYPE )
 
 include ( MaintainerMode )
+include ( GNUInstallDirs )
 
 #
 # define how to build libraries
@@ -112,8 +113,8 @@ endif ( OPENOBEX_BLUETOOTH )
 #
 set ( prefix      "${CMAKE_INSTALL_PREFIX}" )
 set ( exec_prefix "\${prefix}" )
-set ( libdir      "\${prefix}/lib${LIB_SUFFIX}" )
-set ( includedir  "\${prefix}/include" )
+set ( libdir      "\${prefix}/${CMAKE_INSTALL_LIBDIR}" )
+set ( includedir  "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" )
 set ( top_srcdir   "${CMAKE_SOURCE_DIR}" )
 set ( top_builddir "${CMAKE_BINARY_DIR}" )
 if ( OPENOBEX_BLUETOOTH AND UNIT AND NOT WIN32 )
@@ -141,7 +142,7 @@ configure_file (
 )
 
 if ( NOT PKGCONFIG_INSTALL_DIR )
-  set ( PKGCONFIG_INSTALL_DIR lib${LIB_SUFFIX}/pkgconfig
+  set ( PKGCONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig
         CACHE PATH "Where to install .pc files to" FORCE )
 endif ( NOT PKGCONFIG_INSTALL_DIR )
 mark_as_advanced ( PKGCONFIG_INSTALL_DIR )
@@ -179,18 +180,6 @@ add_subdirectory ( apps )
 #
 option ( BUILD_DOCUMENTATION "Build library and application documentation" ON)
 if ( BUILD_DOCUMENTATION )
-  if ( NOT DOCUMENTATION_INSTALL_DIR )
-    set ( DOCUMENTATION_INSTALL_DIR share/doc/openobex
-      CACHE PATH "Where to install generic documentation files to" FORCE )
-  endif ( NOT DOCUMENTATION_INSTALL_DIR )
-  mark_as_advanced ( DOCUMENTATION_INSTALL_DIR )
-
-  if ( NOT MANPAGE_INSTALL_DIR )
-    set ( MANPAGE_INSTALL_DIR share/man
-      CACHE PATH "Where to install manpage files to" FORCE )
-  endif ( NOT MANPAGE_INSTALL_DIR )
-  mark_as_advanced ( MANPAGE_INSTALL_DIR )
-
   add_subdirectory ( doc )
 endif ( BUILD_DOCUMENTATION )
 
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 0e27baf..55268ca 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -37,7 +37,7 @@ foreach ( prog ${OPENOBEX_APPS} )
   target_link_libraries ( ${prog} ${${prog}_LIBS} )
   get_target_property ( ${prog}_EXECUTABLE ${prog} LOCATION )
   install ( PROGRAMS ${${prog}_EXECUTABLE}
-    DESTINATION bin
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
     COMPONENT applications
     OPTIONAL
   )
diff --git a/apps/ircp/CMakeLists.txt b/apps/ircp/CMakeLists.txt
index 51b230b..ceef156 100644
--- a/apps/ircp/CMakeLists.txt
+++ b/apps/ircp/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable ( ircp EXCLUDE_FROM_ALL ${ircp_SOURCES} )
 target_link_libraries ( ircp openobex )
 get_target_property ( ircp_EXECUTABLE ircp LOCATION )
 install ( PROGRAMS ${ircp_EXECUTABLE}
-  DESTINATION bin
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
   COMPONENT applications
   OPTIONAL
 )
diff --git a/apps/obex_test/CMakeLists.txt b/apps/obex_test/CMakeLists.txt
index 4c12457..a920149 100644
--- a/apps/obex_test/CMakeLists.txt
+++ b/apps/obex_test/CMakeLists.txt
@@ -18,7 +18,7 @@ endif ( WIN32 )
 
 get_target_property ( obex_test_EXECUTABLE obex_test LOCATION )
 install ( PROGRAMS ${obex_test_EXECUTABLE}
-  DESTINATION bin
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
   COMPONENT applications
   OPTIONAL
 )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index bc0afae..2257410 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -48,7 +48,7 @@ if ( DOXYGEN_FOUND )
   add_dependencies ( doc apidoc_html )
 
   install ( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
-    DESTINATION ${DOCUMENTATION_INSTALL_DIR}
+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
     COMPONENT documentation
   )
 endif ( DOXYGEN_FOUND )
@@ -72,7 +72,7 @@ if ( Docbook_FOUND )
       string ( REGEX REPLACE "^[.]" "" fileExt ${fileExt} )
       install (
 	FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
-	DESTINATION ${MANPAGE_INSTALL_DIR}/man${fileExt}
+	DESTINATION ${CMAKE_INSTALL_MANDIR}/man${fileExt}
 	PERMISSIONS OWNER_READ OWNER_WRITE
                     GROUP_READ
                     WORLD_READ
@@ -89,7 +89,7 @@ if ( Docbook_FOUND )
       list ( APPEND OPENOBEX_HELP_FILES ${file} )
       install (
 	FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
-	DESTINATION ${DOCUMENTATION_INSTALL_DIR}
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}
 	PERMISSIONS OWNER_READ OWNER_WRITE
                     GROUP_READ
                     WORLD_READ
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index eacc1dd..186cdfa 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -194,10 +194,10 @@ set_property ( TARGET openobex PROPERTY
 )
 
 install ( TARGETS openobex
-  RUNTIME       DESTINATION bin
-  LIBRARY       DESTINATION lib${LIB_SUFFIX}
-  ARCHIVE       DESTINATION lib${LIB_SUFFIX}
-  PUBLIC_HEADER DESTINATION include/openobex
+  RUNTIME       DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openobex
   COMPONENT library
 )
 
diff --git a/udev/CMakeLists.txt b/udev/CMakeLists.txt
index 5185b44..69e2d80 100644
--- a/udev/CMakeLists.txt
+++ b/udev/CMakeLists.txt
@@ -2,18 +2,18 @@ if ( CMAKE_SYSTEM_NAME STREQUAL "Linux" AND OPENOBEX_USB )
   add_executable ( obex-check-device obex-check-device.c )
   target_link_libraries ( obex-check-device openobex )
   install ( TARGETS obex-check-device
-    DESTINATION sbin
+    DESTINATION ${CMAKE_INSTALL_SBINDIR}
     COMPONENT system
   )
 
   # The udev rules file needs to be configured to have the right
   # path to obex-check-device.
   configure_file ( openobex.rules.in openobex.rules @ONLY )
-  set ( UDEV_RULES_INSTALL_DIR /lib/udev/rules.d
+  set ( CMAKE_INSTALL_UDEVRULESDIR /lib/udev/rules.d
         CACHE PATH "Where to install udev rules" )
-  mark_as_advanced ( UDEV_RULES_INSTALL_DIR )
+  mark_as_advanced ( CMAKE_INSTALL_UDEVRULESDIR )
   install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/openobex.rules
-    DESTINATION ${UDEV_RULES_INSTALL_DIR}
+    DESTINATION ${CMAKE_INSTALL_UDEVRULESDIR}
     COMPONENT system
     RENAME 60-openobex.rules
   )
-- 
1.7.5.4

The substates create situations where this function name doesn't fit anymore.
To avoid confusion, it is renamed to OBEX_Work(). The timeout argument is
now in milliseconds, the previous argument was in seconds which may be not
fine enough.
---
 doc/openobex.coverpage        |    2 +-
 include/openobex/obex.h       |    3 ++-
 include/openobex/obex_const.h |    2 +-
 lib/fdobex.c                  |   10 ++++++++--
 lib/obex.c                    |    6 +++---
 lib/obex.sym                  |    2 +-
 lib/obex_main.c               |    2 +-
 lib/obex_main.h               |    2 +-
 lib/obex_transport.c          |   12 +++++++++---
 lib/obex_transport.h          |    4 ++--
 lib/usb1obex.c                |    6 +++---
 lib/usbobex.c                 |    6 +++---
 12 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/doc/openobex.coverpage b/doc/openobex.coverpage
index 1f7715b..d90075f 100644
--- a/doc/openobex.coverpage
+++ b/doc/openobex.coverpage
@@ -35,7 +35,7 @@ First of all you must create an OBEX instance by calling #OBEX_New.
 In this call you specify what transport you want to use, an event callback, and optional flags.
 #OBEX_New will return a handle which shall be passed to almost all other functions.
 
-To let the parser do some work you must call #OBEX_HandleInput.
+To let the parser do some work you must call #OBEX_Work.
 It will block for at-most the specified timeout for read and write actions.
 You can call #OBEX_GetFD if you want to do select() yourself (this may not work with all transports).
 
diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index ae91f6e..096d5a2 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -84,6 +84,7 @@ OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self,
 					       void * data);
 OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server,
 					    obex_event_t eventcb, void * data);
+#define OBEX_HandleInput(self, timeout) OBEX_Work((self), ((timeout)*1000L))
 
 /*
  *  OBEX API
@@ -116,7 +117,7 @@ OPENOBEX_SYMBOL(void *) OBEX_GetCustomData(obex_t *self);
 OPENOBEX_SYMBOL(int) OBEX_TransportConnect(obex_t *self, struct sockaddr *saddr, int addlen);
 OPENOBEX_SYMBOL(int) OBEX_TransportDisconnect(obex_t *self);
 OPENOBEX_SYMBOL(int) OBEX_CustomDataFeed(obex_t *self, uint8_t *inputbuf, int actual);
-OPENOBEX_SYMBOL(int) OBEX_HandleInput(obex_t *self, int timeout);
+OPENOBEX_SYMBOL(int) OBEX_Work(obex_t *self, long timeout);
 
 OPENOBEX_SYMBOL(int)      OBEX_ServerRegister(obex_t *self, struct sockaddr *saddr, int addrlen);
 OPENOBEX_SYMBOL(obex_t *) OBEX_Accept(obex_t *server);
diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index cdcd823..f0cbbf0 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -66,7 +66,7 @@ typedef struct {
 	int (*read)(obex_t *handle, void *customdata, uint8_t *buf, int size);
 	/** remote connection output */
 	int (*write)(obex_t *handle, void *customdata, uint8_t *buf, int len);
-	/** directly called by #OBEX_HandleInput */
+	/** eventually called by OBEX_Work() */
 	int (*handleinput)(obex_t *handle, void *customdata, int timeout);
 	void *customdata;
 } obex_ctrans_t;
diff --git a/lib/fdobex.c b/lib/fdobex.c
index 70ae791..e057562 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -70,7 +70,10 @@ static int fdobex_write(obex_t *self, buf_t *msg)
 	size_t size = msg->data_size;
 	int status;
 	fd_set fdset;
-	struct timeval time = {trans->timeout, 0};
+	struct timeval time = {
+		trans->timeout / 1000,
+		(trans->timeout % 1000) * 1000
+	};
 
 	if (size == 0)
 		return 0;
@@ -108,7 +111,10 @@ static int fdobex_read(obex_t *self, void *buf, int buflen)
 	int status;
 	int fd = trans->fd;
 	fd_set fdset;
-	struct timeval time = {trans->timeout, 0};
+	struct timeval time = {
+		trans->timeout / 1000,
+		(trans->timeout % 1000) * 1000
+	};
 
 	FD_ZERO(&fdset);
 	FD_SET(fd, &fdset);
diff --git a/lib/obex.c b/lib/obex.c
index 460b0be..04016e1 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -390,7 +390,7 @@ obex_t *CALLAPI OBEX_Accept(obex_t *server)
 /**
 	Let the OBEX parser do some work.
 	\param self OBEX handle
-	\param timeout Maximum time to wait in seconds (-1 for infinite)
+	\param timeout Maximum time to wait in milliseconds (-1 for infinite)
 	\return -1 on error, 0 on timeout, positive on success
 
 	Let the OBEX parser read and process incoming data. If no data
@@ -404,7 +404,7 @@ obex_t *CALLAPI OBEX_Accept(obex_t *server)
 	positive on success.
  */
 LIB_SYMBOL
-int CALLAPI OBEX_HandleInput(obex_t *self, int timeout)
+int CALLAPI OBEX_Work(obex_t *self, long timeout)
 {
 	DEBUG(4, "\n");
 	obex_return_val_if_fail(self != NULL, -1);
@@ -482,7 +482,7 @@ int CALLAPI OBEX_TransportDisconnect(obex_t *self)
 	USB and custom transports do not.
 
 	The returned filehandle can be used to do select() on, before
-	calling OBEX_HandleInput()
+	calling OBEX_Work()
 
 	There is one subtelty about this function. When the OBEX connection is
 	established, it returns the connection filedescriptor, while for
diff --git a/lib/obex.sym b/lib/obex.sym
index 6483738..3de52c7 100644
--- a/lib/obex.sym
+++ b/lib/obex.sym
@@ -13,7 +13,7 @@ OBEX_GetCustomData
 OBEX_TransportConnect
 OBEX_TransportDisconnect
 OBEX_CustomDataFeed
-OBEX_HandleInput
+OBEX_Work
 OBEX_ServerRegister
 OBEX_ServerAccept
 OBEX_Accept
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 1233120..714571a 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -386,7 +386,7 @@ static int obex_mode(obex_t *self)
  *    Do some work on the current transferred object.
  *
  */
-int obex_work(obex_t *self, int timeout)
+int obex_work(obex_t *self, long timeout)
 {
 	int ret;
 
diff --git a/lib/obex_main.h b/lib/obex_main.h
index d880bb8..be154d1 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -71,7 +71,7 @@ socket_t obex_create_packet_socket(obex_t *self, int domain);
 int obex_delete_socket(struct obex *self, socket_t fd);
 
 void obex_deliver_event(struct obex *self, int event, int cmd, int rsp, int del);
-int obex_work(struct obex *self, int timeout);
+int obex_work(struct obex *self, long timeout);
 int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
 buf_t* obex_data_receive(obex_t *self);
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index a41f6e6..1c03baa 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -207,7 +207,10 @@ int obex_transport_standard_handle_input(obex_t *self)
 
 	/* Wait for input */
 	if (trans->timeout >= 0) {
-		struct timeval time = { trans->timeout, 0 };
+		struct timeval time = {
+			trans->timeout / 1000,
+			(trans->timeout % 1000) * 1000
+		};
 		ret = select((int) highestfd + 1, &fdset, NULL, NULL, &time);
 	} else {
 		ret = select((int) highestfd + 1, &fdset, NULL, NULL, NULL);
@@ -245,7 +248,7 @@ int obex_transport_standard_handle_input(obex_t *self)
  *    Used when working in synchronous mode.
  *
  */
-int obex_transport_handle_input(obex_t *self, int timeout)
+int obex_transport_handle_input(obex_t *self, long timeout)
 {
 	DEBUG(4, "\n");
 	self->trans.timeout = timeout;
@@ -369,7 +372,10 @@ int obex_transport_do_send (obex_t *self, buf_t *msg)
 	int status;
 	fd_set fdset;
 	struct timeval *time_ptr = NULL;
-	struct timeval timeout = {trans->timeout, 0};
+	struct timeval timeout = {
+		trans->timeout / 1000,
+		(trans->timeout % 1000) * 1000
+	};
 
 	if (size == 0)
 		return 0;
diff --git a/lib/obex_transport.h b/lib/obex_transport.h
index b7a4423..8c3d7cb 100644
--- a/lib/obex_transport.h
+++ b/lib/obex_transport.h
@@ -110,7 +110,7 @@ typedef struct obex_transport {
 	socket_t fd;		/* Socket descriptor */
 	socket_t serverfd;
 
-	int timeout;		/* set timeout */
+	long timeout;		/* timeout in milliseconds */
 
 	int connected;		/* Link connection state */
 	unsigned int mtu;	/* Tx MTU of the link */
@@ -122,7 +122,7 @@ void obex_transport_cleanup(obex_t *self);
 void obex_transport_clone(obex_t *self, obex_t *old);
 void obex_transport_split(obex_t *self, obex_t *server);
 
-int obex_transport_handle_input(struct obex *self, int timeout);
+int obex_transport_handle_input(struct obex *self, long timeout);
 int obex_transport_connect_request(struct obex *self);
 void obex_transport_disconnect_request(struct obex *self);
 int obex_transport_listen(struct obex *self);
diff --git a/lib/usb1obex.c b/lib/usb1obex.c
index c00b55a..26f0c41 100644
--- a/lib/usb1obex.c
+++ b/lib/usb1obex.c
@@ -479,17 +479,17 @@ static int usbobex_disconnect_request(obex_t *self)
 	return 1;
 }
 
-static unsigned int usbobex_get_timeout(int timeout)
+static unsigned int usbobex_get_timeout(long timeout)
 {
 	/* uses closest to zero, 0 itself means infinite */
 	if (timeout == 0) {
 		return 1;
 
 	} else if (timeout > 0) {
-		if ((unsigned int)timeout > UINT_MAX/1000)
+		if ((unsigned int)timeout > UINT_MAX)
 			return UINT_MAX;
 		else
-			return timeout * 1000;
+			return timeout;
 
 	}
 	return 0;
diff --git a/lib/usbobex.c b/lib/usbobex.c
index 2ed26e1..a5f63f0 100644
--- a/lib/usbobex.c
+++ b/lib/usbobex.c
@@ -448,15 +448,15 @@ static int usbobex_disconnect_request(obex_t *self)
 	return ret;
 }
 
-static int usbobex_get_timeout(int timeout)
+static int usbobex_get_timeout(long timeout)
 {
-	if (timeout < 0 || timeout > INT_MAX/1000) {
+	if (timeout < 0 || timeout > INT_MAX) {
 		/* libusb-0.x doesn't know about waiting infinitely
 		 * so we try with the largest value possible
 		 */
 		return INT_MAX;
 	}
-	return timeout*1000;
+	return timeout;
 }
 
 static int usbobex_write(obex_t *self, buf_t *msg)
-- 
1.7.5.4

The old way of aborting objects does not work anymore, neither with SRM nor
with the new possibilities of incomplete writes, as that may break the
synchronisation between server and client.
This patch integrates the abort action right within the affected states.
---
 lib/defines.h     |    1 +
 lib/obex_client.c |  126 ++++++++++++++++++++++++++++++++++++++++-------------
 lib/obex_main.c   |   35 ++-------------
 lib/obex_server.c |   91 +++++++++++++++++++++++++++++++++-----
 4 files changed, 179 insertions(+), 74 deletions(-)

diff --git a/lib/defines.h b/lib/defines.h
index eb2257b..5935930 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -27,6 +27,7 @@ enum obex_state {
 	STATE_IDLE,
 	STATE_SEND,
 	STATE_REC,
+	STATE_ABORT,
 };
 
 enum obex_substate {
diff --git a/lib/obex_client.c b/lib/obex_client.c
index c8dc843..efaf9f3 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -49,6 +49,61 @@ static __inline uint16_t msg_get_len(const buf_t *msg)
 		return 0;
 }
 
+static int obex_client_abort_transmit(obex_t *self)
+{
+	int ret = 0;
+	int rsp = OBEX_RSP_CONTINUE;
+
+	DEBUG(4, "STATE: ABORT/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, NULL);
+	if (ret == -1) {
+		obex_deliver_event(self, OBEX_EV_LINKERR,
+				   self->object->opcode, rsp, TRUE);
+		self->state = STATE_IDLE;
+
+	} else if (ret == 1) {
+		self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return ret;
+}
+
+static int obex_client_abort_prepare(obex_t *self)
+{
+	buf_t *msg = buf_reuse(self->tx_msg);
+
+	DEBUG(4, "STATE: ABORT/PREPARE_TX\n");
+
+	obex_data_request_prepare(self, msg, OBEX_CMD_ABORT);
+	self->substate = SUBSTATE_TRANSMIT_TX;
+	return obex_client_abort_transmit(self);
+}
+
+static int obex_client_abort(obex_t *self)
+{
+	int ret = 0;
+	buf_t *msg = obex_data_receive(self);
+	int rsp;
+	int event = OBEX_EV_LINKERR;
+
+	DEBUG(4, "STATE: ABORT/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	rsp = msg_get_rsp(msg);
+
+	if (rsp == OBEX_RSP_SUCCESS)
+		event = OBEX_EV_ABORT;
+	obex_deliver_event(self, event, self->object->opcode, rsp, TRUE);
+	if (event == OBEX_EV_LINKERR)
+		ret = -1;
+
+	self->mode = MODE_SRV;
+	self->state = STATE_IDLE;
+	return ret;
+}
+
 static int obex_client_recv_transmit_tx(obex_t *self)
 {
 	int ret = 0;
@@ -75,12 +130,19 @@ static int obex_client_recv_prepare_tx(obex_t *self)
 {
 	DEBUG(4, "STATE: RECV/PREPARE_TX\n");
 
+	/* Sending ABORT is allowed even during SRM */
+	if (self->object->abort == 1) {
+		self->state = STATE_ABORT;
+		return obex_client_abort_prepare(self);
+	}
+
 	if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
 	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
 	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
 	{
-		int ret = obex_object_prepare_send(self, self->object, TRUE,
-						   FALSE);
+		int ret;
+
+		ret = obex_object_prepare_send(self, self->object, TRUE, FALSE);
 		if (ret == 1) {
 			self->substate = SUBSTATE_TRANSMIT_TX;
 			return obex_client_recv_transmit_tx(self);
@@ -130,50 +192,33 @@ static int obex_client_recv(obex_t *self)
 		break;
 	}
 
-	/* Receive any headers */
-	ret = obex_object_receive(self, msg);
-	if (ret < 0) {
-		obex_deliver_event(self, OBEX_EV_PARSEERR,
+	if (self->object->abort == 0) {
+		/* Receive any headers */
+		ret = obex_object_receive(self, msg);
+		if (ret < 0) {
+			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
-		self->mode = MODE_SRV;
-		self->state = STATE_IDLE;
-		return -1;
+			self->mode = MODE_SRV;
+			self->state = STATE_IDLE;
+			return -1;
+		}
 	}
 	obex_data_receive_finished(self);
 
 	/* Are we done yet? */
 	if (rsp == OBEX_RSP_CONTINUE) {
 		DEBUG(3, "Continue...\n");
-		if (self->object->abort) {
-			DEBUG(3, "Ignoring CONTINUE because request was aborted\n");
-			return 0;
-		}
 		self->substate = SUBSTATE_PREPARE_TX;
 		return obex_client_recv_prepare_tx(self);
 
 	} else {
 		/* Notify app that client-operation is done! */
-		ret = 0;
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
-		if (self->object->abort) {
-			if (rsp == OBEX_RSP_SUCCESS)
-				obex_deliver_event(self, OBEX_EV_ABORT,
-							self->object->opcode,
-							rsp, TRUE);
-			else {
-				obex_deliver_event(self, OBEX_EV_LINKERR,
-							self->object->opcode,
-							rsp, TRUE);
-				ret = -1;
-			}
-
-		} else
-			obex_deliver_event(self, OBEX_EV_REQDONE,
-							self->object->opcode,
-							rsp, TRUE);
+		obex_deliver_event(self, OBEX_EV_REQDONE, self->object->opcode,
+								     rsp, TRUE);
 		self->mode = MODE_SRV;
 		self->state = STATE_IDLE;
-		return ret;
+		return 0;
 	}
 
 }
@@ -225,6 +270,12 @@ static int obex_client_send_prepare_tx(obex_t *self)
 
 	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
 
+	if (self->object->abort == 1) {
+		self->state = STATE_ABORT;
+		return obex_client_abort_prepare(self);
+	}
+
+
 	ret = obex_object_prepare_send(self, self->object, TRUE, FALSE);
 	if (ret == 1) {
 		self->substate = SUBSTATE_TRANSMIT_TX;
@@ -347,6 +398,19 @@ int obex_client(obex_t *self)
 		}
 		break;
 
+	case STATE_ABORT:
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_client_abort(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_client_abort_prepare(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_client_abort_transmit(self);
+		}
+		break;
+
 	default:
 		DEBUG(0, "Unknown state\n");
 		break;
diff --git a/lib/obex_main.c b/lib/obex_main.c
index bc55661..b3a8a45 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -436,39 +436,12 @@ int obex_cancelrequest(obex_t *self, int nice)
 		 * signal link error to app */
 		obex_deliver_event(self, OBEX_EV_LINKERR, 0, 0, FALSE);
 		return 1;
-	} else {
-		obex_object_t *object;
-
-		object = obex_object_new();
-		if (object == NULL)
-			return -1;
-
-		if (self->mode == MODE_SRV) {
-			/* Do not send continue */
-			if (self->object->opcode != OBEX_RSP_CONTINUE)
-				obex_object_setrsp(object, self->object->opcode,
-							self->object->lastopcode);
-			else
-				obex_object_setrsp(object,
-						OBEX_RSP_INTERNAL_SERVER_ERROR,
-						OBEX_RSP_INTERNAL_SERVER_ERROR);
-		} else
-			obex_object_setcmd(object, OBEX_CMD_ABORT);
-
-		if (obex_object_send(self, object, TRUE, TRUE) < 0) {
-			obex_object_delete(object);
-			return -1;
-		}
-
-		obex_object_delete(object);
 
+	} else {
+		/* The client or server code will take action at the
+		 * right time. */
 		self->object->abort = TRUE;
-		self->state = self->mode == MODE_SRV ? STATE_IDLE : STATE_REC;
 
-		if (self->state == STATE_IDLE)
-			/* Deliver event will delete the object */
-			obex_deliver_event(self, OBEX_EV_ABORT, 0, 0, TRUE);
-
-		return 0;
+		return 1;
 	}
 }
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 351d710..3a8d179 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -58,6 +58,42 @@ static __inline int msg_get_final(const buf_t *msg)
 		return 0;
 }
 
+static int obex_server_abort_transmit(obex_t *self)
+{
+	int ret = 0;
+	int rsp = OBEX_RSP_CONTINUE;
+
+	DEBUG(4, "STATE: ABORT/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, NULL);
+	if (ret == -1) {
+		obex_deliver_event(self, OBEX_EV_LINKERR,
+				   self->object->opcode, rsp, TRUE);
+
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_ABORT,
+				   self->object->opcode, rsp, FALSE);
+	}
+
+	self->state = STATE_IDLE;
+	return ret;
+}
+
+static int obex_server_abort_prepare(obex_t *self)
+{
+	buf_t *msg = buf_reuse(self->tx_msg);
+	int opcode = OBEX_RSP_INTERNAL_SERVER_ERROR;
+
+	DEBUG(4, "STATE: ABORT/PREPARE_TX\n");
+
+	/* Do not send continue */
+	if (self->object->opcode != OBEX_RSP_CONTINUE)
+		opcode = self->object->lastopcode;
+	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
+	self->substate = SUBSTATE_TRANSMIT_TX;
+	return obex_server_abort_transmit(self);
+}
+
 static int obex_server_send_transmit_tx(obex_t *self)
 {
 	int ret;
@@ -102,6 +138,11 @@ static int obex_server_send_prepare_tx(obex_t *self)
 
 	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
 
+	if (self->object->abort == 1) {
+		self->state = STATE_ABORT;
+		return obex_server_abort_prepare(self);
+	}
+
 	/* As a server, the final bit is always SET, and the "real final" packet
 	 * is distinguished by being SUCCESS instead of CONTINUE.
 	 * So, force the final bit here. */
@@ -139,7 +180,7 @@ static int obex_server_send(obex_t *self)
 		DEBUG(1, "Got OBEX_ABORT request!\n");
 		obex_response_request(self, OBEX_RSP_SUCCESS);
 		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode, cmd, TRUE);
+		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode, 0, TRUE);
 		/* This is not an Obex error, it is just that the peer
 		 * aborted the request, so return 0 - Jean II */
 		return 0;
@@ -220,8 +261,14 @@ static int obex_server_recv_prepare_tx(obex_t *self)
 	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
 	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
 	{
-		int ret = obex_object_prepare_send(self, self->object,
-						   FALSE, TRUE);
+		int ret;
+
+		if (self->object->abort == 1) {
+			self->state = STATE_ABORT;
+			return obex_server_abort_prepare(self);
+		}
+
+		ret = obex_object_prepare_send(self, self->object, FALSE, TRUE);
 		if (ret == 1) {
 			self->substate = SUBSTATE_TRANSMIT_TX;
 			return obex_server_recv_transmit_tx(self);
@@ -256,7 +303,7 @@ static int obex_server_recv(obex_t *self, int first)
 		obex_response_request(self, OBEX_RSP_SUCCESS);
 		self->state = STATE_IDLE;
 		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode,
-								cmd, TRUE);
+								0, TRUE);
 		/* This is not an Obex error, it is just that the peer
 		 * aborted the request, so return 0 - Jean II */
 		return 0;
@@ -364,6 +411,17 @@ static int obex_server_idle(obex_t *self)
 		return -1;
 	}
 
+	/* If ABORT command is done while we are not handling another command,
+	 * we don't need to send a request hint to the application */
+	if (cmd == OBEX_CMD_ABORT) {
+		DEBUG(1, "Got OBEX_ABORT request!\n");
+		obex_response_request(self, OBEX_RSP_SUCCESS);
+		self->state = STATE_IDLE;
+		obex_deliver_event(self, OBEX_EV_ABORT, cmd, 0, TRUE);
+		obex_data_receive_finished(self);
+		return 0;
+	}
+
 	self->object = obex_object_new();
 	if (self->object == NULL) {
 		DEBUG(1, "Allocation of object failed!\n");
@@ -374,14 +432,10 @@ static int obex_server_idle(obex_t *self)
 	self->object->cmd = cmd;
 	self->object->rsp_mode = self->rsp_mode;
 
-	/* If ABORT command is done while we are not handling another command,
-	 * we don't need to send a request hint to the application */
-	if (cmd != OBEX_CMD_ABORT) {
-		/* Hint app that something is about to come so that
-		 * the app can deny a PUT-like request early, or
-		 * set the header-offset */
-		obex_deliver_event(self, OBEX_EV_REQHINT, cmd, 0, FALSE);
-	}
+	/* Hint app that something is about to come so that
+	 * the app can deny a PUT-like request early, or
+	 * set the header-offset */
+	obex_deliver_event(self, OBEX_EV_REQHINT, cmd, 0, FALSE);
 
 	/* Some commands needs special treatment (data outside headers) */
 	switch (cmd) {
@@ -458,6 +512,19 @@ int obex_server(obex_t *self)
 		}
 		break;
 
+	case STATE_ABORT:
+		switch (self->substate) {
+		case SUBSTATE_PREPARE_TX:
+			return obex_server_abort_prepare(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_server_abort_transmit(self);
+
+		default:
+			break;
+		}
+		break;
+
 	default:
 		DEBUG(0, "Unknown state\n");
 		break;
-- 
1.7.5.4

---
 apps/obex_test/obex_test.c        |   85 ++++++++++++++++++++++++-------------
 apps/obex_test/obex_test_client.c |    6 ---
 2 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 8142d4b..96e16fa 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -166,6 +166,8 @@ int main (int argc, char *argv[])
 	int tcpobex = FALSE;
 	obex_t *handle = NULL;
 	struct context global_context = {0};
+	unsigned int flags = 0;
+	int i = 1;
 
 #ifdef HAVE_BLUETOOTH
 	int btobex = 0;
@@ -187,6 +189,7 @@ int main (int argc, char *argv[])
 			"Usage: obex_test [options]\n"
 			"\n"
 			"Options:\n"
+			"    -f [flags]        Set some flags: n=non-blocking\n"
 #ifdef HAVE_CABLE_OBEX
 			"    -s [tty]          Use cable transport (Sony-Ericsson phones/DCU-11 cable)\n"
 			"    -r [tty]          Use cable transport for R320\n"
@@ -206,31 +209,51 @@ int main (int argc, char *argv[])
 		return 0;
 	}
 
+	/* Read flags for OBEX_New() */
+	if (argc >= i+1 && strcmp(argv[i], "-f") == 0) {
+		++i;
+		if (argc >= i+1 && argv[i][0] != '-') {
+			char *flag = argv[i++];
+
+			for (; *flag != 0; ++flag)
+				switch(*flag) {
+				case 'n':
+					fprintf(stderr, "Using non-blocking mode\n");
+					flags |= OBEX_FL_NONBLOCK;
+					break;
+
+				default:
+					fprintf(stderr, "Unknown flag %c\n", *flag);
+					break;
+				};
+		}
+	}
+
 #ifdef HAVE_CABLE_OBEX
-	if ((argc == 2 || argc ==3) && strcmp(argv[1], "-s") == 0)
+	if ((argc == i+1 || argc == i+2) && strcmp(argv[i], "-s") == 0)
 		cobex = TRUE;
-	if ((argc == 2 || argc ==3) && strcmp(argv[1], "-r") == 0) {
+	if ((argc == i+1 || argc == i+2) && strcmp(argv[i], "-r") == 0) {
 		cobex = TRUE;
 		r320 = TRUE;
 	}
 #endif
 #ifdef HAVE_BLUETOOTH
-	if (argc >= 2 && strcmp(argv[1], "-b") == 0)
+	if (argc >= i+1 && strcmp(argv[i], "-b") == 0)
 		btobex = 1;
-	if (argc >= 2 && strcmp(argv[1], "-B") == 0)
+	if (argc >= i+1 && strcmp(argv[i], "-B") == 0)
 		btobex = 2;
 #endif
 #ifdef HAVE_USB
-	if (argc >= 2 && strcmp(argv[1], "-u") == 0)
+	if (argc >= i+1 && strcmp(argv[i], "-u") == 0)
 		usbobex = TRUE;
 #endif
-	if (argc == 2 && strcmp(argv[1], "-i") == 0)
+	if (argc == i+1 && strcmp(argv[i], "-i") == 0)
 		tcpobex = TRUE;
 
 #ifdef HAVE_CABLE_OBEX
 	if (cobex) {
-		if (argc == 3)
-			port = argv[2];
+		if (argc == i+2)
+			port = argv[i+1];
 		else
 			port = "/dev/ttyS0";
 
@@ -246,7 +269,7 @@ int main (int argc, char *argv[])
 			return -1;
 		}
 
-		handle = OBEX_New(OBEX_TRANS_CUSTOM, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_CUSTOM, obex_event, flags);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			return -1;
@@ -266,17 +289,17 @@ int main (int argc, char *argv[])
 #ifdef HAVE_BLUETOOTH
 	if (btobex) {
 		const char *channel_arg = NULL;
-		switch (argc) {
-		case 4:
-			str2ba(argv[2], &bdaddr);
-			channel_arg = argv[3];
-			break;
+		switch (argc-i) {
 		case 3:
-			str2ba(argv[2], &bdaddr);
-			if (bacmp(&bdaddr, BDADDR_ANY) == 0)
-				channel_arg = argv[2];
+			str2ba(argv[i+1], &bdaddr);
+			channel_arg = argv[i+2];
 			break;
 		case 2:
+			str2ba(argv[i+1], &bdaddr);
+			if (bacmp(&bdaddr, BDADDR_ANY) == 0)
+				channel_arg = argv[i+1];
+			break;
+		case 1:
 			bacpy(&bdaddr, BDADDR_ANY);
 			break;
 		default:
@@ -287,7 +310,8 @@ int main (int argc, char *argv[])
 		switch (btobex) {
 		case 1:
 			printf("Using Bluetooth RFCOMM transport\n");
-			handle = OBEX_New(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_BLUETOOTH, obex_event,
+					  flags);
 			if (channel_arg)
 				channel = (atoi(channel_arg) & 0xFF);
 			else
@@ -296,7 +320,8 @@ int main (int argc, char *argv[])
 
 		case 2:
 			printf("Using Bluetooth L2CAP transport\n");
-			handle = OBEX_New(OBEX_TRANS_BT_L2CAP, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_BT_L2CAP, obex_event,
+					  flags);
 			if (channel_arg)
 				channel = atoi(channel_arg);
 			channel = (channel | 0x1001) & 0xFFFF;
@@ -311,22 +336,22 @@ int main (int argc, char *argv[])
 #endif
 #ifdef HAVE_USB
 	if (usbobex) {
-		int i, interfaces_number, intf_num;
-		switch (argc) {
-		case 2:
+		int k, interfaces_number, intf_num;
+		switch (argc-i) {
+		case 1:
 			printf("Using USB transport, "
 			       "querying available interfaces\n");
-			handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_USB, obex_event, flags);
 			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
 			}
 			interfaces_number = OBEX_EnumerateInterfaces(handle);
-			for (i = 0; i < interfaces_number; i++) {
+			for (k = 0; k < interfaces_number; k++) {
 				obex_intf = OBEX_GetInterfaceByIndex(handle, i);
 				printf("Interface %d: idVendor: %#x, "
 				       "idProduct: %#x, bus %d, dev %d, "
-				       "intf %d, %s %s %s\n", i,
+				       "intf %d, %s %s %s\n", k,
 					obex_intf->usb.idVendor,
 					obex_intf->usb.idProduct,
 					obex_intf->usb.bus_number,
@@ -341,10 +366,10 @@ int main (int argc, char *argv[])
 			OBEX_Cleanup(handle);
 			exit(0);
 			break;
-		case 3:
-			intf_num = atoi(argv[2]);
+		case 2:
+			intf_num = atoi(argv[i+1]);
 			printf("Using USB transport \n");
-			handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_USB, obex_event, flags);
 			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
@@ -367,7 +392,7 @@ int main (int argc, char *argv[])
 
 	if (tcpobex) {
 		printf("Using TCP transport\n");
-		handle = OBEX_New(OBEX_TRANS_INET, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_INET, obex_event, flags);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
@@ -375,7 +400,7 @@ int main (int argc, char *argv[])
 
 	} else {
 		printf("Using IrDA transport\n");
-		handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, flags);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
diff --git a/apps/obex_test/obex_test_client.c b/apps/obex_test/obex_test_client.c
index cf2dab4..f8bc537 100644
--- a/apps/obex_test/obex_test_client.c
+++ b/apps/obex_test/obex_test_client.c
@@ -77,12 +77,6 @@ static void syncwait(obex_t *handle)
 			printf("Error while doing OBEX_HandleInput()\n");
 			break;
 		}
-		if(ret == 0) {
-			/* If running cable. We get no link-errors, so cancel on timeout */
-			printf("Timeout waiting for data. Aborting\n");
-			OBEX_CancelRequest(handle, FALSE);
-			break;
-		}
 	}
 
 	gt->clientdone = FALSE;
-- 
1.7.5.4

---
 lib/obex_client.c |   27 ++++++++++++++-------------
 lib/obex_object.c |    8 --------
 lib/obex_server.c |   21 ++++++++++++---------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/lib/obex_client.c b/lib/obex_client.c
index 0282886..9d07c29 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -338,21 +338,22 @@ static int obex_client_send(obex_t *self)
 		 * PUT).
 		 * No headeroffset needed because 'connect' is single
 		 * packet (or we deny it). */
-		ret = -1;
-		if (self->object->opcode == OBEX_CMD_CONNECT)
-			ret = obex_object_receive(self, msg);
-		if (ret < 0) {
-			obex_deliver_event(self, OBEX_EV_PARSEERR,
+		if (!self->object->abort) {
+			ret = -1;
+			if (self->object->opcode != OBEX_CMD_CONNECT)
+				ret = obex_object_receive(self, msg);
+			if (ret < 0) {
+				obex_deliver_event(self, OBEX_EV_PARSEERR,
 						 self->object->opcode, 0, TRUE);
-			self->mode = OBEX_MODE_SERVER;
-			self->state = STATE_IDLE;
-			return -1;
+				self->mode = OBEX_MODE_SERVER;
+				self->state = STATE_IDLE;
+				return -1;
+			}
+			/* Note : we may want to get rid of received header,
+			 * however they are mixed with legitimate headers,
+			 * and the user may expect to consult them later.
+			 * So, leave them here (== overhead). */
 		}
-
-		/* Note : we may want to get rid of received header,
-		 * however they are mixed with legitimate headers,
-		 * and the user may expect to consult them later.
-		 * So, leave them here (== overhead). */
 	}
 
 	obex_data_receive_finished(self);
diff --git a/lib/obex_object.c b/lib/obex_object.c
index 9f84862..00c75ee 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -609,9 +609,6 @@ int obex_object_finished(obex_t *self, obex_object_t *object, int allowfinalcmd)
 {
 	int finished = 0;
 
-	if (object->abort)
-		return 1;
-
 	if (object->suspend)
 		return 0;
 
@@ -762,11 +759,6 @@ static void obex_object_receive_stream(obex_t *self, uint8_t hi,
 
 	DEBUG(4, "\n");
 
-	if (object->abort) {
-		DEBUG(3, "Ignoring incoming data because request was aborted\n");
-		return;
-	}
-
 	/* Spare the app this empty nonlast body-hdr */
 	if (hi == OBEX_HDR_BODY && len == 0)
 		return;
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 4b701ba..0995452 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -241,15 +241,18 @@ static int obex_server_send(obex_t *self)
 		 * condition itself.
 		 * No headeroffset needed because 'connect' is single packet (or
 		 * we deny it). */
-		ret = -1;
-		if (cmd != OBEX_CMD_CONNECT)
-			ret = obex_object_receive(self, msg);
-		if (ret < 0)
-			return obex_server_bad_request(self);
-
-		/* Note: we may want to get rid of received header, however they
-		 * are mixed with legitimate headers, and the user may expect to
-		 * consult them later. So, leave them here (== overhead). */
+		if (!self->object->abort) {
+			ret = -1;
+			if (cmd != OBEX_CMD_CONNECT)
+				ret = obex_object_receive(self, msg);
+			if (ret < 0)
+				return obex_server_bad_request(self);
+
+			/* Note: we may want to get rid of received header,
+			 * however they are mixed with legitimate headers, and
+			 * the user may expect to consult them later. So, leave
+			 * them here (== overhead). */
+		}
 	}
 
 	obex_data_receive_finished(self);
-- 
1.7.5.4

The member can be replaced by a rather static usage of a new parameter to
obex_server_recv().
---
 lib/obex_object.h |    1 -
 lib/obex_server.c |   10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/obex_object.h b/lib/obex_object.h
index eef3458..5bcbe0b 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -71,7 +71,6 @@ struct obex_object {
 	int totallen;			/* Size of all headers */
 	int abort;			/* Request shall be aborted */
 
-	int checked;			/* OBEX_EV_REQCHECK has been signaled */
 	enum obex_rsp_mode rsp_mode;	/* OBEX_RSP_MODE_* */
 
 	int suspend;			/* Temporarily stop transfering object */
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 1902e4f..401a98d 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -137,7 +137,7 @@ int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len)
 	return 0;
 }
 
-static int obex_server_recv(obex_t *self, buf_t *msg, int final,
+static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
 							int cmd, uint16_t len)
 {
 	int deny = 0;
@@ -191,10 +191,8 @@ static int obex_server_recv(obex_t *self, buf_t *msg, int final,
 	/* Let the user decide whether to accept or deny a
 	 * multi-packet request by examining all headers in
 	 * the first packet */
-	if (!self->object->checked) {
+	if (first)
 		obex_deliver_event(self, OBEX_EV_REQCHECK, cmd, 0, FALSE);
-		self->object->checked = 1;
-	}
 
 	/* Everything except 0x1X and 0x2X means that the user
 	 * callback denied the request. In the denied cases
@@ -310,7 +308,7 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
 	case OBEX_RSP_CONTINUE:
 	case OBEX_RSP_SUCCESS:
 		self->state = STATE_REC;
-		return obex_server_recv(self, msg, final, cmd, len);
+		return obex_server_recv(self, msg, 1, final, cmd, len);
 
 	default:
 		self->state = STATE_SEND;
@@ -341,7 +339,7 @@ int obex_server(obex_t *self)
 		break;
 
 	case STATE_REC:
-		ret = obex_server_recv(self, msg, final, cmd, len);
+		ret = obex_server_recv(self, msg, 0, final, cmd, len);
 		break;
 
 	case STATE_SEND:
-- 
1.7.5.4

---
 apps/ircp/ircp_client.c           |   10 ++++++----
 apps/ircp/ircp_server.c           |   11 ++++++-----
 apps/irobex_palm3.c               |    4 ++--
 apps/irxfer.c                     |    4 ++--
 apps/lib/obex_put_common.c        |    5 +++--
 apps/lib/obex_put_common.h        |    4 ++--
 apps/obex_find.c                  |    7 ++++---
 apps/obex_tcp.c                   |    4 ++--
 apps/obex_test/obex_test.c        |   19 ++++++++++---------
 apps/obex_test/obex_test_client.c |    2 +-
 apps/obex_test/obex_test_server.c |    2 +-
 udev/obex-check-device.c          |    7 ++++---
 12 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/apps/ircp/ircp_client.c b/apps/ircp/ircp_client.c
index 9035c2c..ed49096 100644
--- a/apps/ircp/ircp_client.c
+++ b/apps/ircp/ircp_client.c
@@ -87,7 +87,9 @@ static int cli_fillstream(ircp_client_t *cli, obex_object_t *object)
 //
 // Incoming event from OpenOBEX.
 //
-static void cli_obex_event(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp)
+static void cli_obex_event(obex_t *handle, obex_object_t *object,
+			   enum obex_mode mode, enum obex_event event,
+			   uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	ircp_client_t *cli;
 
@@ -132,7 +134,7 @@ static int cli_sync_request(ircp_client_t *cli, obex_object_t *object)
 	OBEX_Request(cli->obexhandle, object);
 
 	while(cli->finished == FALSE) {
-		ret = OBEX_HandleInput(cli->obexhandle, 20);
+		ret = OBEX_Work(cli->obexhandle, 20*1000);
 		DEBUG(4, "ret = %d\n", ret);
 
 		if (ret <= 0)
@@ -164,9 +166,9 @@ ircp_client_t *ircp_cli_open(ircp_info_cb_t infocb)
 	cli->fd = -1;
 
 #ifdef DEBUG_TCP
-	cli->obexhandle = OBEX_Init(OBEX_TRANS_INET, cli_obex_event, 0);
+	cli->obexhandle = OBEX_New(OBEX_TRANS_INET, cli_obex_event, 0);
 #else
-	cli->obexhandle = OBEX_Init(OBEX_TRANS_IRDA, cli_obex_event, 0);
+	cli->obexhandle = OBEX_New(OBEX_TRANS_IRDA, cli_obex_event, 0);
 #endif
 
 	if(cli->obexhandle == NULL) {
diff --git a/apps/ircp/ircp_server.c b/apps/ircp/ircp_server.c
index 749a84e..41bbe83 100644
--- a/apps/ircp/ircp_server.c
+++ b/apps/ircp/ircp_server.c
@@ -27,8 +27,9 @@
 //
 // Incoming event from OpenOBEX
 //
-static void srv_obex_event(obex_t *handle, obex_object_t *object, int mode,
-					int event, int obex_cmd, int obex_rsp)
+static void srv_obex_event(obex_t *handle, obex_object_t *object,
+			   enum obex_mode mode, enum obex_event event,
+			   uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	ircp_server_t *srv;
 	int ret;
@@ -125,7 +126,7 @@ static int ircp_srv_sync_wait(ircp_server_t *srv)
 {
 	int ret;
 	while(srv->finished == FALSE) {
-		ret = OBEX_HandleInput(srv->obexhandle, 1);
+		ret = OBEX_Work(srv->obexhandle, 1000);
 		if (ret < 0)
 			return -1;
 	}
@@ -314,9 +315,9 @@ ircp_server_t *ircp_srv_open(ircp_info_cb_t infocb)
 	srv->infocb = infocb;
 
 #ifdef DEBUG_TCP
-	srv->obexhandle = OBEX_Init(OBEX_TRANS_INET, srv_obex_event, 0);
+	srv->obexhandle = OBEX_New(OBEX_TRANS_INET, srv_obex_event, 0);
 #else
-	srv->obexhandle = OBEX_Init(OBEX_TRANS_IRDA, srv_obex_event, 0);
+	srv->obexhandle = OBEX_New(OBEX_TRANS_IRDA, srv_obex_event, 0);
 #endif
 
 	if(srv->obexhandle == NULL) {
diff --git a/apps/irobex_palm3.c b/apps/irobex_palm3.c
index a819363..e06fe6c 100644
--- a/apps/irobex_palm3.c
+++ b/apps/irobex_palm3.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 	if ((argc < 1) || (argc > 4))	{
 		return usage(argv);
 	}
-	handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+	handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
 
 	if (argc == 1)	{
 		/* We are server*/
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 		IrOBEX_ServerRegister(handle, "OBEX");
 
 		while (!finished)
-			OBEX_HandleInput(handle, 1);
+			OBEX_Work(handle, 1000);
 	}
 	else {
 		/* We are a client */
diff --git a/apps/irxfer.c b/apps/irxfer.c
index c42bca1..99d54cb 100644
--- a/apps/irxfer.c
+++ b/apps/irxfer.c
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+	handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
 	obex_protocol_type = OBEX_PROTOCOL_WIN95_IRXFER;
 
 	if (argc == 1) {
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 		IrOBEX_ServerRegister(handle, "OBEX:IrXfer");
 
 		while (!finished) {
-			OBEX_HandleInput(handle, 1);
+			OBEX_Work(handle, 1000);
 		}
 	} else {
 		/* We are a client */
diff --git a/apps/lib/obex_put_common.c b/apps/lib/obex_put_common.c
index cb48910..e18bf1e 100644
--- a/apps/lib/obex_put_common.c
+++ b/apps/lib/obex_put_common.c
@@ -158,7 +158,8 @@ static void client_done(obex_object_t *object, int obex_cmd, int obex_rsp)
  *    Called by the obex-layer when some event occurs.
  *
  */
-void obex_event(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp)
+void obex_event(obex_t *handle, obex_object_t *object, enum obex_mode mode,
+		enum obex_event event, uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	switch (event)	{
 	case OBEX_EV_PROGRESS:
@@ -212,7 +213,7 @@ static int wait_for_rsp()
 
 	while(!finished) {
 		//printf("wait_for_rsp()\n");
-		ret = OBEX_HandleInput(handle, 10);
+		ret = OBEX_Work(handle, 10*1000);
 		if (ret < 0)
 			return ret;
 	}
diff --git a/apps/lib/obex_put_common.h b/apps/lib/obex_put_common.h
index 92e45cb..8383502 100644
--- a/apps/lib/obex_put_common.h
+++ b/apps/lib/obex_put_common.h
@@ -23,6 +23,6 @@
 #define OBEX_PUT_COMMON_H
 
 int do_sync_request(obex_t *handle, obex_object_t *object, int async);
-void obex_event(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp);
-
+void obex_event(obex_t *handle, obex_object_t *object, enum obex_mode mode,
+		enum obex_event event, uint8_t obex_cmd, uint8_t obex_rsp);
 #endif
diff --git a/apps/obex_find.c b/apps/obex_find.c
index 598ce7d..9198bb1 100644
--- a/apps/obex_find.c
+++ b/apps/obex_find.c
@@ -34,8 +34,9 @@
 
 static int verbose = 0;
 
-static void obex_event_cb(obex_t *handle, obex_object_t *obj, int mode,
-			  int event, int obex_cmd, int obex_rsp)
+static void obex_event_cb(obex_t *handle, obex_object_t *obj,
+			  enum obex_mode mode, enum obex_event event,
+			  uint8_t obex_cmd, uint8_t obex_rsp)
 {
 }
 
@@ -103,7 +104,7 @@ static void find_devices(int trans, int flags)
 		return;
 	}
   
-	handle = OBEX_Init(trans, obex_event_cb, flags);
+	handle = OBEX_New(trans, obex_event_cb, flags);
 	found = OBEX_EnumerateInterfaces(handle);
 	printf("Found %d %s devices.\n", found, descr);
 	for (; i < found; ++i) {
diff --git a/apps/obex_tcp.c b/apps/obex_tcp.c
index a9036ff..058eb2b 100644
--- a/apps/obex_tcp.c
+++ b/apps/obex_tcp.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+	handle = OBEX_New(OBEX_TRANS_INET, obex_event, 0);
 
 	if (argc == 1)	{
 		printf("Waiting for files\n");
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 		}
 
 		while (!finished) {
-			ret = OBEX_HandleInput(handle, 10);
+			ret = OBEX_Work(handle, 10*1000);
 			if (ret == 0) {
 				printf("Timeout waiting for connection\n");
 				break;
diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 4b9b0b2..8142d4b 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -70,8 +70,9 @@ int str2ba(const char *str, bdaddr_t *ba) {
 //
 // Called by the obex-layer when some event occurs.
 //
-static void obex_event(obex_t *handle, obex_object_t *object, int mode,
-					int event, int obex_cmd, int obex_rsp)
+static void obex_event(obex_t *handle, obex_object_t *object,
+		       enum obex_mode mode, enum obex_event event,
+		       uint8_t obex_cmd, uint8_t obex_rsp)
 {
 	switch (event)	{
 	case OBEX_EV_PROGRESS:
@@ -245,7 +246,7 @@ int main (int argc, char *argv[])
 			return -1;
 		}
 
-		handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_CUSTOM, obex_event, 0);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			return -1;
@@ -286,7 +287,7 @@ int main (int argc, char *argv[])
 		switch (btobex) {
 		case 1:
 			printf("Using Bluetooth RFCOMM transport\n");
-			handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_BLUETOOTH, obex_event, 0);
 			if (channel_arg)
 				channel = (atoi(channel_arg) & 0xFF);
 			else
@@ -295,7 +296,7 @@ int main (int argc, char *argv[])
 
 		case 2:
 			printf("Using Bluetooth L2CAP transport\n");
-			handle = OBEX_Init(OBEX_TRANS_BT_L2CAP, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_BT_L2CAP, obex_event, 0);
 			if (channel_arg)
 				channel = atoi(channel_arg);
 			channel = (channel | 0x1001) & 0xFFFF;
@@ -315,7 +316,7 @@ int main (int argc, char *argv[])
 		case 2:
 			printf("Using USB transport, "
 			       "querying available interfaces\n");
-			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
 			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
@@ -343,7 +344,7 @@ int main (int argc, char *argv[])
 		case 3:
 			intf_num = atoi(argv[2]);
 			printf("Using USB transport \n");
-			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
 			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
@@ -366,7 +367,7 @@ int main (int argc, char *argv[])
 
 	if (tcpobex) {
 		printf("Using TCP transport\n");
-		handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_INET, obex_event, 0);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
@@ -374,7 +375,7 @@ int main (int argc, char *argv[])
 
 	} else {
 		printf("Using IrDA transport\n");
-		handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+		handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
 		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
diff --git a/apps/obex_test/obex_test_client.c b/apps/obex_test/obex_test_client.c
index d9714b4..cf2dab4 100644
--- a/apps/obex_test/obex_test_client.c
+++ b/apps/obex_test/obex_test_client.c
@@ -72,7 +72,7 @@ static void syncwait(obex_t *handle)
 
 	while(!gt->clientdone) {
 		//printf("syncwait()\n");
-		ret = OBEX_HandleInput(handle, 10);
+		ret = OBEX_Work(handle, 10*1000);
 		if(ret < 0) {
 			printf("Error while doing OBEX_HandleInput()\n");
 			break;
diff --git a/apps/obex_test/obex_test_server.c b/apps/obex_test/obex_test_server.c
index 38014da..b2fb41f 100644
--- a/apps/obex_test/obex_test_server.c
+++ b/apps/obex_test/obex_test_server.c
@@ -238,7 +238,7 @@ void server_do(obex_t *handle)
 
 	gt->serverdone = FALSE;
 	while(!gt->serverdone) {
-	        ret = OBEX_HandleInput(handle, 60);
+	        ret = OBEX_Work(handle, 60*1000);
 		if(ret < 0) {
 			printf("Error while doing OBEX_HandleInput()\n");
 			break;
diff --git a/udev/obex-check-device.c b/udev/obex-check-device.c
index 9eb4769..2ab6ad8 100644
--- a/udev/obex-check-device.c
+++ b/udev/obex-check-device.c
@@ -24,8 +24,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-static void obex_event_cb(obex_t *handle, obex_object_t *obj, int mode,
-			  int event, int obex_cmd, int obex_rsp)
+static void obex_event_cb(obex_t *handle, obex_object_t *obj,
+			  enum obex_mode mode, enum obex_event event,
+			  uint8_t cmd, uint8_t rsp)
 {
 }
 
@@ -42,7 +43,7 @@ static int find_usb_device(uint16_t vendor, uint16_t product)
 	int matched = 0;
 	int i = 0;
 
-	handle = OBEX_Init(OBEX_TRANS_USB, obex_event_cb, 0);
+	handle = OBEX_New(OBEX_TRANS_USB, obex_event_cb, 0);
 	if (!handle)
 		return 0;
 
-- 
1.7.5.4

Note that the transport only works on Linux. Although it also compiles on
Windows, the operating system itself does not support it. FreeBSD and NetBSD do
not seem to support ERTM, yet. The code for the last two is not compile-tested.
---
 include/openobex/obex.h       |    4 +-
 include/openobex/obex_const.h |    3 +-
 lib/CMakeLists.txt            |    1 +
 lib/Makefile.am               |    3 +-
 lib/bluez_compat.h            |   18 +++-
 lib/btobex.c                  |   24 +++-
 lib/btobex.h                  |   11 ++-
 lib/btobex_l2cap.c            |  315 +++++++++++++++++++++++++++++++++++++++++
 lib/obex.c                    |   16 ++-
 lib/obex_main.c               |   20 +++
 lib/obex_main.h               |    1 +
 lib/obex_transport.c          |    4 +
 12 files changed, 403 insertions(+), 17 deletions(-)
 create mode 100644 lib/btobex_l2cap.c

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 6dda861..6bf91d4 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -147,8 +147,8 @@ OPENOBEX_SYMBOL(int) IrOBEX_TransportConnect(obex_t *self, const char *service);
 #endif
 
 #if defined(bt_addr_t)
-OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel);
-OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint8_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint16_t channel);
+OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src, const bt_addr_t *dst, uint16_t channel);
 #endif
 
 /*
diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index cb7afeb..b4bad7f 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -179,9 +179,10 @@ typedef union {
 #define OBEX_TRANS_IRDA		1
 #define OBEX_TRANS_INET		2
 #define OBEX_TRANS_CUSTOM	3
-#define OBEX_TRANS_BLUETOOTH	4
+#define OBEX_TRANS_BLUETOOTH	4 /* Bluetooth RFCOMM */
 #define OBEX_TRANS_FD		5
 #define OBEX_TRANS_USB		6
+#define OBEX_TRANS_BT_L2CAP	7 /* Bluetooth L2CAP */
 
 /* Standard headers */
 #define OBEX_HDR_TYPE_UNICODE	(0 << 6)  /* zero terminated unicode string (network byte order) */
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 6efa6d0..f404529 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -95,6 +95,7 @@ endif ( OPENOBEX_IRDA )
 if ( OPENOBEX_BLUETOOTH )
   list ( APPEND SOURCES
     btobex.c
+    btobex_l2cap.c
   )
   list ( APPEND HEADERS
     btobex.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 897450d..ae92239 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,14 +12,13 @@ libopenobex_la_SOURCES = \
 	obex_client.c obex_client.h \
 	irobex.c irobex.h \
 	inobex.c inobex.h \
-	btobex.c btobex.h \
+	btobex.c btobex.h btobex_l2cap.c bluez_compat.h \
 	fdobex.c fdobex.h \
 	customtrans.c customtrans.h \
 	databuffer.c databuffer.h \
 	irda_wrap.h \
 	usbutils.c usbutils.h \
 	usbobex.c usb1obex.c usbobex.h \
-	bluez_compat.h \
 	visibility.h defines.h debug.h cloexec.h
 
 libopenobex_la_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/lib/bluez_compat.h b/lib/bluez_compat.h
index c8b046c..b4dae25 100644
--- a/lib/bluez_compat.h
+++ b/lib/bluez_compat.h
@@ -32,13 +32,17 @@
 #include <ws2bth.h>
 #define bdaddr_t    BTH_ADDR
 #define sockaddr_rc _SOCKADDR_BTH
+#define sockaddr_l2 _SOCKADDR_BTH
 #define rc_family   addressFamily
 #define rc_bdaddr   btAddr
 #define rc_channel  port
+#define l2_family   addressFamily
+#define l2_bdaddr   btAddr
+#define l2_psm      port
 #define PF_BLUETOOTH   PF_BTH
 #define AF_BLUETOOTH   AF_BTH
 #define BTPROTO_RFCOMM BTHPROTO_RFCOMM
-/* TODO: should be const */
+#define BTPROTO_L2CAP  BTHPROTO_L2CAP
 extern bdaddr_t bluez_compat_bdaddr_any;
 #define BDADDR_ANY     &bluez_compat_bdaddr_any
 #define bacpy(dst,src) memcpy((dst),(src),sizeof(bdaddr_t))
@@ -47,23 +51,35 @@ extern bdaddr_t bluez_compat_bdaddr_any;
 #elif defined(HAVE_BLUETOOTH_LINUX)
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/rfcomm.h>
+#include <bluetooth/l2cap.h>
 
 #elif defined(HAVE_BLUETOOTH_FREEBSD)
 #include <bluetooth.h>
 #define sockaddr_rc sockaddr_rfcomm
+#define sockaddr_l2 sockaddr_l2cap
 #define rc_family   rfcomm_family
 #define rc_bdaddr   rfcomm_bdaddr
 #define rc_channel  rfcomm_channel
+#define l2_family   l2cap_family
+#define l2_bdaddr   l2cap_bdaddr
+#define l2_psm      l2cap_psm
 #define BDADDR_ANY  NG_HCI_BDADDR_ANY
 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
+#define BTPROTO_L2CAP  BLUETOOTH_PROTO_L2CAP
 
 #elif defined(HAVE_BLUETOOTH_NETBSD)
 #include <bluetooth.h>
 #include <netbt/rfcomm.h>
+#include <netbt/l2cap.h>
 #define sockaddr_rc sockaddr_bt
+#define sockaddr_l2 sockaddr_bt
 #define rc_family   bt_family
 #define rc_bdaddr   bt_bdaddr
 #define rc_channel  bt_channel
+#define l2_family   bt_family
+#define l2_bdaddr   bt_bdaddr
+#define l2_psm      bt_psm
+#define SOL_L2CAP   BTPROTO_L2CAP
 #define bacpy(dst,src) memcpy((dst),(src),sizeof(bdaddr_t))
 #define bacmp(a,b)     memcmp((a),(b),sizeof(bdaddr_t))
 #define str2ba(str, ba)	(bt_aton((str), (ba)) == 1 ? 0 : -1)
diff --git a/lib/btobex.c b/lib/btobex.c
index 810ce91..8df237a 100644
--- a/lib/btobex.c
+++ b/lib/btobex.c
@@ -108,7 +108,7 @@ static int btobex_set_remote_addr(obex_t *self, struct sockaddr *addr, size_t le
  *
  */
 void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
-					const bdaddr_t *dst, uint8_t channel)
+					const bdaddr_t *dst, uint16_t channel)
 {
 	struct obex_transport *trans = &self->trans;
 
@@ -123,6 +123,16 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
 		addr.rc_channel = (uint8_t)(channel & 0xFF);
 		obex_transport_set_remote_addr(self, (struct sockaddr *) &addr,
 					       sizeof(addr));
+
+	} else if (trans->type == OBEX_TRANS_BT_L2CAP) {
+		struct sockaddr_l2 addr;
+
+		memset(&addr, 0, sizeof(addr));
+		addr.l2_family = AF_BLUETOOTH;
+		bacpy(&addr.l2_bdaddr, dst);
+		addr.l2_psm = channel;
+		obex_transport_set_remote_addr(self, (struct sockaddr *) &addr,
+					       sizeof(addr));
 	}
 }
 
@@ -132,7 +142,7 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
  *    Prepare for Bluetooth RFCOMM listen
  *
  */
-void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
+void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint16_t channel)
 {
 	struct obex_transport *trans = &self->trans;
 
@@ -145,6 +155,16 @@ void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
 		addr.rc_channel = (uint8_t)(channel & 0xFF);
 		obex_transport_set_local_addr(self, (struct sockaddr *) &addr,
 					      sizeof(addr));
+
+	} else if (trans->type == OBEX_TRANS_BT_L2CAP) {
+		struct sockaddr_l2 addr;
+
+		memset(&addr, 0, sizeof(addr));
+		addr.l2_family = AF_BLUETOOTH;
+		bacpy(&addr.l2_bdaddr, src);
+		addr.l2_psm = channel;
+		obex_transport_set_local_addr(self, (struct sockaddr *) &addr,
+					      sizeof(addr));
 	}
 }
 
diff --git a/lib/btobex.h b/lib/btobex.h
index 4375881..9c4d0c8 100644
--- a/lib/btobex.h
+++ b/lib/btobex.h
@@ -26,16 +26,23 @@
 #include "obex_transport.h"
 
 void btobex_get_ops(struct obex_transport_ops* ops);
+void btobex_l2cap_get_ops(struct obex_transport_ops *ops);
 void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
-			    const bdaddr_t *dst, uint8_t channel);
-void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel);
+			    const bdaddr_t *dst, uint16_t channel);
+void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint16_t channel);
 
 struct btobex_rfcomm_data {
 	struct sockaddr_rc self;
 	struct sockaddr_rc peer;
 };
 
+struct btobex_l2cap_data {
+	struct sockaddr_l2 self;
+	struct sockaddr_l2 peer;
+};
+
 union btobex_data {
 	struct btobex_rfcomm_data rfcomm;
+	struct btobex_l2cap_data l2cap;
 };
 #endif
diff --git a/lib/btobex_l2cap.c b/lib/btobex_l2cap.c
new file mode 100644
index 0000000..a170a42
--- /dev/null
+++ b/lib/btobex_l2cap.c
@@ -0,0 +1,315 @@
+/**
+	\file btobex_l2cap.c
+	Bluetooth L2CAP OBEX, Bluetooth L2CAP transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 2011 Hendrik Sattler, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_BLUETOOTH
+
+#ifdef _WIN32
+/* Windows does not support L2CAP transports, although it compiles, it will
+ * return an error code on runtime.
+ */
+#include <winsock2.h>
+
+#else /* _WIN32 */
+/* Linux/FreeBSD/NetBSD case */
+
+#include <string.h>
+#include <errno.h>
+#include <sys/socket.h>
+#endif /* _WIN32 */
+
+#include "obex_main.h"
+#include "btobex.h"
+
+#ifdef _WIN32
+#define WSA_VER_MAJOR 2
+#define WSA_VER_MINOR 2
+#endif
+
+#include "cloexec.h"
+
+static int btobex_l2cap_init(obex_t *self)
+{
+#ifdef _WIN32
+	WORD ver = MAKEWORD(WSA_VER_MAJOR,WSA_VER_MINOR);
+	WSADATA WSAData;
+	if (WSAStartup(ver, &WSAData) != 0) {
+		DEBUG(4, "WSAStartup failed (%d)\n",WSAGetLastError());
+		return -1;
+	}
+	if (LOBYTE(WSAData.wVersion) != WSA_VER_MAJOR ||
+				HIBYTE(WSAData.wVersion) != WSA_VER_MINOR) {
+		DEBUG(4, "WSA version mismatch\n");
+		WSACleanup();
+		return -1;
+	}
+#endif
+
+	return 0;
+}
+
+static void btobex_l2cap_cleanup(obex_t *self)
+{
+	DEBUG(3, "\n");
+
+#ifdef _WIN32
+	WSACleanup();
+#endif
+}
+
+static int btobex_l2cap_set_opts(obex_t *self, socket_t fd)
+{
+	int ret = 0;
+
+#ifdef HAVE_BLUETOOTH_LINUX
+	struct l2cap_options opts;
+	socklen_t optlen = sizeof(opts);
+
+	DEBUG(3, "\n");
+
+	memset(&opts, 0, sizeof(opts));
+	ret = getsockopt(fd, SOL_L2CAP, L2CAP_OPTIONS, &opts, &optlen);
+	if (ret < 0)
+		return -errno;
+
+	opts.imtu = self->mtu_rx;
+	opts.mode = L2CAP_MODE_ERTM;
+
+	ret = setsockopt(fd, SOL_L2CAP, L2CAP_OPTIONS, &opts, optlen);
+	if (ret < 0)
+		return -errno;
+
+#elif HAVE_BLUETOOTH_FREEBSD || HAVE_BLUETOOTH_NETBSD
+	uint16_t imtu_opt = self->mtu_rx;
+	socklen_t imtu_optlen = sizeof(imtu_opt);
+
+	DEBUG(3, "\n");
+	ret = setsockopt(fd, SOL_L2CAP, SO_L2CAP_IMTU, &imtu_opt, imtu_optlen);
+	if (ret < 0)
+		return -errno;
+
+	/* ERTM not available? */
+
+#endif /* HAVE_BLUETOOTH_* */
+
+	return 0;
+}
+
+static int btobex_l2cap_set_local_addr(obex_t *self, struct sockaddr *addr,
+				       size_t len)
+{
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	const struct sockaddr_l2 *local = (struct sockaddr_l2 *) addr;
+
+	DEBUG(3, "\n");
+
+	if (len == sizeof(*local) && local->l2_family == AF_BLUETOOTH) {
+		data->self = *local;
+		return 0;
+	}
+
+	return -1;
+}
+
+static int btobex_l2cap_set_remote_addr(obex_t *self, struct sockaddr *addr,
+					size_t len)
+{
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	const struct sockaddr_l2 *remote = (struct sockaddr_l2 *) addr;
+
+	DEBUG(3, "\n");
+
+	if (len == sizeof(*remote) && remote->l2_family == AF_BLUETOOTH) {
+		data->peer = *remote;
+		return 0;
+	}
+
+	return -1;
+}
+
+static int btobex_l2cap_listen(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	int ret = 0;
+
+	DEBUG(3, "\n");
+
+	trans->serverfd = obex_create_packet_socket(self, AF_BLUETOOTH);
+	if (trans->serverfd == INVALID_SOCKET) {
+		DEBUG(0, "Error creating socket\n");
+		return -1;
+	}
+
+	ret = bind(trans->serverfd, (struct sockaddr*) &data->self,
+		   sizeof(data->self));
+	if (ret < 0) {
+		DEBUG(0, "Error doing bind\n");
+		goto out_freesock;
+	}
+
+	ret = btobex_l2cap_set_opts(self, trans->serverfd);
+	if (ret) {
+		DEBUG(4, "Setting L2CAP socket options failed: %s\n",
+		      strerror(-ret));
+		goto out_freesock;
+	}
+
+	ret = listen(trans->serverfd, 1);
+	if (ret < 0) {
+		DEBUG(0, "Error doing listen\n");
+		goto out_freesock;
+	}
+
+	DEBUG(4, "We are now listening for connections\n");
+	return 1;
+
+out_freesock:
+	obex_delete_socket(self, trans->serverfd);
+	trans->serverfd = INVALID_SOCKET;
+	return -1;
+}
+
+static int btobex_l2cap_accept(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	struct sockaddr *addr = (struct sockaddr *) &data->peer;
+	socklen_t addrlen = sizeof(data->peer);
+
+	DEBUG(3, "\n");
+
+	// First accept the connection and get the new client socket.
+	if (self->init_flags & OBEX_FL_CLOEXEC)
+		trans->fd = accept_cloexec(trans->serverfd, addr, &addrlen);
+	else
+		trans->fd = accept(trans->serverfd, addr, &addrlen);
+
+	if (trans->fd == INVALID_SOCKET)
+		return -1;
+
+	trans->mtu = OBEX_DEFAULT_MTU;
+
+	return 0;
+}
+
+static int btobex_l2cap_connect_request(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	struct btobex_l2cap_data *data = &self->trans.data.bt.l2cap;
+	int ret = 0;
+
+	DEBUG(3, "\n");
+
+	if (trans->fd == INVALID_SOCKET) {
+		trans->fd = obex_create_packet_socket(self, AF_BLUETOOTH);
+		if (trans->fd == INVALID_SOCKET)
+			return -1;
+	}
+
+	ret = bind(trans->fd, (struct sockaddr*) &data->self,
+		   sizeof(data->self));
+	if (ret < 0) {
+		DEBUG(4, "bind(): error %d\n", errno);
+		goto out_freesock;
+	}
+
+	ret = btobex_l2cap_set_opts(self, trans->fd);
+	if (ret) {
+		DEBUG(4, "Setting L2CAP socket options failed: %s\n",
+		      strerror(-ret));
+		goto out_freesock;
+	}
+
+	ret = connect(trans->fd, (struct sockaddr*) &data->peer,
+		      sizeof(data->peer));
+	if (ret < 0) {
+		DEBUG(4, "connect(): error %d\n", errno);
+		goto out_freesock;
+	}
+
+	trans->mtu = OBEX_DEFAULT_MTU;
+
+	DEBUG(2, "transport mtu=%d\n", trans->mtu);
+
+	return 1;
+
+out_freesock:
+	obex_delete_socket(self, trans->fd);
+	trans->fd = INVALID_SOCKET;
+	return ret;
+}
+
+static int btobex_l2cap_disconnect_request(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	int ret;
+
+	DEBUG(4, "\n");
+
+	ret = obex_delete_socket(self, trans->fd);
+	if (ret < 0)
+		return ret;
+
+	trans->fd = INVALID_SOCKET;
+
+	return ret;
+}
+
+static int btobex_l2cap_disconnect_server(obex_t *self)
+{
+	struct obex_transport *trans = &self->trans;
+	int ret;
+
+	DEBUG(4, "\n");
+
+	ret = obex_delete_socket(self, trans->serverfd);
+	trans->serverfd = INVALID_SOCKET;
+
+	return ret;
+}
+
+static int btobex_l2cap_read(obex_t *self, void *buf, int buflen)
+{
+	struct obex_transport *trans = &self->trans;
+
+	return recv(trans->fd, buf, self->mtu_rx, 0);
+}
+
+void btobex_l2cap_get_ops(struct obex_transport_ops *ops)
+{
+	ops->init = &btobex_l2cap_init;
+	ops->cleanup = &btobex_l2cap_cleanup;
+	ops->write = &obex_transport_do_send;
+	ops->read = &btobex_l2cap_read;
+	ops->set_local_addr = &btobex_l2cap_set_local_addr;
+	ops->set_remote_addr = &btobex_l2cap_set_remote_addr;
+	ops->server.listen = &btobex_l2cap_listen;
+	ops->server.accept = &btobex_l2cap_accept;
+	ops->server.disconnect = &btobex_l2cap_disconnect_server;
+	ops->client.connect = &btobex_l2cap_connect_request;
+	ops->client.disconnect = &btobex_l2cap_disconnect_request;
+}
+
+#endif /* HAVE_BLUETOOTH */
diff --git a/lib/obex.c b/lib/obex.c
index 874cfcd..a2409a2 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -73,6 +73,7 @@
 			- #OBEX_TRANS_CUSTOM : Use user provided transport, you must
 			register your own transport with #OBEX_RegisterCTransport()
 			- #OBEX_TRANS_BLUETOOTH: Use regular Bluetooth RFCOMM socket
+			- #OBEX_TRANS_BT_L2CAP: Use regular Bluetooth L2CAP socket
 			- #OBEX_TRANS_USB: Use USB transport (libusb needed)
 	\param eventcb Function pointer to your event callback.
 			See obex.h for prototype of this callback.
@@ -1051,14 +1052,15 @@ int CALLAPI IrOBEX_TransportConnect(obex_t *self, const char *service)
 /**
 	Start listening for incoming connections.
 	\param self OBEX handle
-	\param src source address to listen on
-	\param channel source channel to listen on
+	\param src bluetooth address to listen on
+	\param channel RFComm channel or L2CAP PSM to listen on
 	\return -1 or negative error code on error
 
 	An easier server function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
-int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t channel)
+int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src,
+				  uint16_t channel)
 {
 	DEBUG(3, "\n");
 
@@ -1077,16 +1079,16 @@ int CALLAPI BtOBEX_ServerRegister(obex_t *self, const bt_addr_t *src, uint8_t ch
 /**
 	Connect Bluetooth transport.
 	\param self OBEX handle
-	\param src source address to connect from
-	\param dst destination address to connect to
-	\param channel destination channel to connect to
+	\param src bluetooth address of local adapter to use
+	\param dst bluetooth address to connect to
+	\param channel RFComm channel or L2CAP PSM to connect to
 	\return -1 or negative error code on error
 
 	An easier connect function to use for Bluetooth (Bluetooth OBEX) only.
  */
 LIB_SYMBOL
 int CALLAPI BtOBEX_TransportConnect(obex_t *self, const bt_addr_t *src,
-					const bt_addr_t *dst, uint8_t channel)
+					const bt_addr_t *dst, uint16_t channel)
 {
 	DEBUG(4, "\n");
 
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 14a5263..1d39cd8 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -83,6 +83,26 @@ socket_t obex_create_socket(obex_t *self, int domain)
 	return fd;
 }
 
+socket_t obex_create_packet_socket(obex_t *self, int domain)
+{
+	socket_t fd;
+	int type = SOCK_SEQPACKET, proto = 0;
+
+	DEBUG(4, "\n");
+
+#ifdef HAVE_BLUETOOTH
+	if (domain == AF_BLUETOOTH)
+		proto = BTPROTO_L2CAP;
+#endif /*HAVE_BLUETOOTH*/
+
+	if (self->init_flags & OBEX_FL_CLOEXEC)
+		fd = socket_cloexec(domain, type, proto);
+	else
+		fd = socket(domain, type, proto);
+
+	return fd;
+}
+
 /*
  * Function obex_delete_socket()
  *
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 86474e5..3c3098c 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -62,6 +62,7 @@ struct obex {
 };
 
 socket_t obex_create_socket(struct obex *self, int domain);
+socket_t obex_create_packet_socket(obex_t *self, int domain);
 int obex_delete_socket(struct obex *self, socket_t fd);
 
 void obex_deliver_event(struct obex *self, int event, int cmd, int rsp, int del);
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index 695a712..aa113ed 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -87,6 +87,10 @@ int obex_transport_init(obex_t *self, int transport)
 	case OBEX_TRANS_BLUETOOTH:
 		btobex_get_ops(&trans->ops);
 		break;
+
+	case OBEX_TRANS_BT_L2CAP:
+		btobex_l2cap_get_ops(&trans->ops);
+		break;
 #endif /*HAVE_BLUETOOTH*/
 
 	case OBEX_TRANS_FD:
-- 
1.7.5.4

To be backward compatible, the old obex_event_t callback type is still
supported but the documentation only refers to the new type and its functions.
---
 doc/openobex.coverpage  |   20 +----
 include/openobex/obex.h |   44 ++++++++++--
 lib/obex.c              |  185 ++++++++++++++++++++++-------------------------
 lib/obex.sym            |    3 +
 lib/obex_main.c         |  111 +++++++++++++++++++++++++++-
 lib/obex_main.h         |    6 ++-
 6 files changed, 246 insertions(+), 123 deletions(-)

diff --git a/doc/openobex.coverpage b/doc/openobex.coverpage
index 1f75eb4..1f7715b 100644
--- a/doc/openobex.coverpage
+++ b/doc/openobex.coverpage
@@ -31,9 +31,9 @@ You might also find the OpenOBEX test applications useful.
 
 To be able to use the OpenOBEX API you must include the files openobex/obex_const.h and openobex/obex.h.
 
-First of all you must create an OBEX instance by calling #OBEX_Init.
+First of all you must create an OBEX instance by calling #OBEX_New.
 In this call you specify what transport you want to use, an event callback, and optional flags.
-#OBEX_Init will return a handle which shall be passed to almost all other functions.
+#OBEX_New will return a handle which shall be passed to almost all other functions.
 
 To let the parser do some work you must call #OBEX_HandleInput.
 It will block for at-most the specified timeout for read and write actions.
@@ -41,19 +41,7 @@ You can call #OBEX_GetFD if you want to do select() yourself (this may not work
 
 	\subsection callback_sec The event callback
 
-The event callback shall be a function with the #obex_event_t prototype:
-	\code
-void *obex_event_t(obex_t *handle, obex_object_t *obj, int mode, int event, int obex_cmd, int obex_rsp)
-	\endcode
-
-Arguments:
-  - handle : OBEX handle
-  - obj : OBEX object
-  - mode : OBEX_MODE_CLIENT for client event or OBEX_MODE_SERVER, for server event
-  - event : The event. See obex_const.h for possible events (OBEX_EV_*)
-  - obex_cmd : Command if any (depending on event type). See obex_const.h for commands (OBEX_CMD_*)
-  - obex_rsp : Response if any (depending on event type). See obex_const.h for responses (OBEX_RSP_*)
-
+The event callback shall be a function with the #obex_event_cb_t prototype.
 To this function events from the library will be passed to you, for example when an operation finishes.
 #OBEX_SetUserData and #OBEX_GetUserData are useful if you need to access your own private data from inside the event callback.
 
@@ -125,7 +113,7 @@ generic function #OBEX_ServerRegister or one of the specialized:
   - #BtOBEX_ServerRegister.
 
 When an incoming connection is coming you'll get an #OBEX_EV_ACCEPTHINT event.
-If you ignore this event no more incoming connections will be accepted but if you call #OBEX_ServerAccept,
+If you ignore this event no more incoming connections will be accepted but if you call #OBEX_Accept,
 you'll get back a new OBEX handle and the old handle will still be listening to connections.
 
 When an incoming request comes, you will first get an #OBEX_EV_REQHINT event. The supplied
diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 6bf91d4..ae91f6e 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -60,18 +60,52 @@ struct obex_object;
 typedef struct obex obex_t;
 typedef struct obex_object obex_object_t;
 
-typedef void (*obex_event_t)(obex_t *handle, obex_object_t *obj, int mode, int event, int obex_cmd, int obex_rsp);
-
 #include <openobex/obex_const.h>
 
 /*
+ *  OBEX API (deprecated)
+ */
+/** The user event callback.
+ *  \deprecated Use #obex_event_cb_t and its functions instead.
+ *  \param handle the obex handle
+ *  \param obj the object that this callback is about
+ *  \param mode one of the OBEX_MODE_*
+ *  \param event one of the OBEX_EV_*
+ *  \param obex_cmd the current OBEX command code
+ *  \param obex_rsp the current OBEX response code (client only)
+ */
+typedef void (*obex_event_t)(obex_t *handle, obex_object_t *obj, int mode,
+			     int event, int obex_cmd, int obex_rsp);
+
+OPENOBEX_SYMBOL(obex_t *) OBEX_Init(int transport, obex_event_t eventcb,
+				    unsigned int flags);
+OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self,
+					       obex_event_t eventcb,
+					       void * data);
+OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server,
+					    obex_event_t eventcb, void * data);
+
+/*
  *  OBEX API
  */
-OPENOBEX_SYMBOL(obex_t *) OBEX_Init(int transport, obex_event_t eventcb, unsigned int flags);
+/** The user event callback.
+ *  \param handle the obex handle
+ *  \param obj the object that this callback is about
+ *  \param mode the current #obex_mode
+ *  \param event the current #obex_event
+ *  \param obex_cmd the current OBEX command code
+ *  \param obex_rsp the current OBEX response code (client only)
+ */
+typedef void (*obex_event_cb_t)(obex_t *handle, obex_object_t *obj,
+				enum obex_mode mode, enum obex_event event,
+				uint8_t cmd, uint8_t rsp);
+
+OPENOBEX_SYMBOL(obex_t *) OBEX_New(enum obex_transport_type transport,
+				   obex_event_cb_t eventcb, unsigned int flags);
 OPENOBEX_SYMBOL(void)     OBEX_Cleanup(obex_t *self);
 OPENOBEX_SYMBOL(void)     OBEX_SetUserData(obex_t *self, void * data);
 OPENOBEX_SYMBOL(void *)   OBEX_GetUserData(obex_t *self);
-OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self, obex_event_t eventcb, void * data);
+OPENOBEX_SYMBOL(void)     OBEX_SetEventCb(obex_t *self, obex_event_cb_t eventcb, void * data);
 OPENOBEX_SYMBOL(int)      OBEX_SetTransportMTU(obex_t *self, uint16_t mtu_rx, uint16_t mtu_tx_max);
 OPENOBEX_SYMBOL(int)      OBEX_GetFD(obex_t *self);
 
@@ -85,7 +119,7 @@ OPENOBEX_SYMBOL(int) OBEX_CustomDataFeed(obex_t *self, uint8_t *inputbuf, int ac
 OPENOBEX_SYMBOL(int) OBEX_HandleInput(obex_t *self, int timeout);
 
 OPENOBEX_SYMBOL(int)      OBEX_ServerRegister(obex_t *self, struct sockaddr *saddr, int addrlen);
-OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server, obex_event_t eventcb, void * data);
+OPENOBEX_SYMBOL(obex_t *) OBEX_Accept(obex_t *server);
 
 OPENOBEX_SYMBOL(int) OBEX_Request(obex_t *self, obex_object_t *object);
 OPENOBEX_SYMBOL(int) OBEX_CancelRequest(obex_t *self, int nice);
diff --git a/lib/obex.c b/lib/obex.c
index 7bb5bfb..460b0be 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -44,7 +44,6 @@
 #include "obex_main.h"
 #include "obex_object.h"
 #include "obex_connect.h"
-#include "databuffer.h"
 
 #include "fdobex.h"
 #include "customtrans.h"
@@ -66,6 +65,7 @@
 
 /**
 	Initialize OBEX.
+	\deprecated Use OBEX_New() instead of this function.
 	\param transport Which transport to use. The following transports are available :
 			- #OBEX_TRANS_IRDA : Use regular IrDA socket (need an IrDA stack)
 			- #OBEX_TRANS_INET : Use regular TCP/IP socket
@@ -89,65 +89,41 @@ obex_t * CALLAPI OBEX_Init(int transport, obex_event_t eventcb,
 							unsigned int flags)
 {
 	obex_t *self;
-	char *env;
 
-#if OBEX_DEBUG
-	obex_debug = OBEX_DEBUG;
-#else
-	obex_debug = -1;
-#endif
-#if OBEX_DUMP
-	obex_dump = OBEX_DUMP;
-#else
-	obex_dump = 0;
-#endif
-
-	env = getenv("OBEX_DEBUG");
-	if (env)
-		obex_debug = atoi(env);
+	obex_return_val_if_fail(eventcb != NULL, NULL);
 
-	env = getenv("OBEX_DUMP");
-	if (env)
-		obex_dump = atoi(env);
+	self = obex_new((enum obex_transport_type)transport, flags);
+	if (self)
+		self->old_eventcb = eventcb;
 
-	obex_return_val_if_fail(eventcb != NULL, NULL);
+	return self;
+}
 
-	self = calloc(1, sizeof(*self));
-	if (self == NULL)
-		return NULL;
+/**
+	Create a new OBEX instance
+	\param transport Which transport to use.
+	\param eventcb Function pointer to your event callback.
+	\param flags Bitmask of flags. The following flags can be used here:
+			- #OBEX_FL_KEEPSERVER : Keep the server alive after incomming request
+			- #OBEX_FL_FILTERHINT : Filter target devices based on Obex hint bit
+			- #OBEX_FL_FILTERIAS  : Filter target devices based on IAS entry
+			- #OBEX_FL_CLOEXEC   : Open all sockets with SO_CLOEXEC set
+			- #OBEX_FL_NONBLOCK   : Open all sockets non-blocking
+	\return an OBEX handle or NULL on error.
+ */
+LIB_SYMBOL
+obex_t * CALLAPI OBEX_New(enum obex_transport_type transport,
+			  obex_event_cb_t eventcb, unsigned int flags)
+{
+	obex_t *self;
 
-	self->eventcb = eventcb;
-	self->init_flags = flags;
-	self->mode = OBEX_MODE_SERVER;
-	self->state = STATE_IDLE;
-	self->rsp_mode = OBEX_RSP_MODE_NORMAL;
-
-	/* Safe values.
-	 * Both self->mtu_rx and self->mtu_tx_max can be increased by app
-	 * self->mtu_tx will be whatever the other end sends us - Jean II */
-	self->mtu_rx = OBEX_DEFAULT_MTU;
-	self->mtu_tx = OBEX_MINIMUM_MTU;
-	self->mtu_tx_max = OBEX_DEFAULT_MTU;
-
-	if (obex_transport_init(self, transport) < 0)
-		goto out_err;
-
-	/* Allocate message buffers */
-	/* It's safe to allocate them smaller than OBEX_MAXIMUM_MTU
-	 * because buf_t will realloc data as needed. - Jean II */
-	self->rx_msg = buf_new(self->mtu_rx);
-	if (self->rx_msg == NULL)
-		goto out_err;
+	obex_return_val_if_fail(eventcb != NULL, NULL);
 
-	self->tx_msg = buf_new(self->mtu_tx_max);
-	if (self->tx_msg == NULL)
-		goto out_err;
+	self = obex_new(transport, flags);
+	if (self)
+		self->eventcb = eventcb;
 
 	return self;
-
-out_err:
-	OBEX_Cleanup(self);
-	return NULL;
 }
 
 /**
@@ -222,6 +198,7 @@ void * CALLAPI OBEX_GetUserData(obex_t *self)
 
 /**
 	Change user callback on an OBEX handle.
+	\deprecated Use OBEX_SetEventCb() instead.
 	\param self OBEX handle
 	\param eventcb Function pointer to your new event callback.
 	\param data Pointer to the new user data to pass to the new
@@ -234,6 +211,27 @@ void CALLAPI OBEX_SetUserCallBack(obex_t *self, obex_event_t eventcb,
 	obex_return_if_fail(self != NULL);
 	/* The callback can't be NULL */
 	if (eventcb != NULL) {
+		self->old_eventcb = eventcb;
+		/* Optionaly change the user data */
+		if (data != NULL)
+			self->userdata = data;
+	}
+}
+
+/**
+	Change event callback on an OBEX handle.
+	\param self OBEX handle
+	\param eventcb Function pointer to your new event callback.
+	\param data Pointer to the new user data to pass to the new
+	callback (optional)
+ */
+LIB_SYMBOL
+void CALLAPI OBEX_SetEventCb(obex_t *self, obex_event_cb_t eventcb,
+								void *data)
+{
+	obex_return_if_fail(self != NULL);
+	/* The callback can't be NULL */
+	if (eventcb != NULL) {
 		self->eventcb = eventcb;
 		/* Optionaly change the user data */
 		if (data != NULL)
@@ -312,6 +310,8 @@ int CALLAPI OBEX_ServerRegister(obex_t *self, struct sockaddr *saddr, int addrle
 
 /**
 	Accept an incoming connection.
+	\deprecated Use OBEX_Accept() in combination with OBEX_SetEventCb()
+			instead.
 	\param server OBEX handle
 	\param eventcb Event callback for client (use NULL for same as server)
 	\param data Userdata for client (use NULL for same as server)
@@ -332,6 +332,38 @@ LIB_SYMBOL
 obex_t *CALLAPI OBEX_ServerAccept(obex_t *server, obex_event_t eventcb,
 								void *data)
 {
+	obex_t * client = OBEX_Accept(server);
+
+	if (client) {
+		if (eventcb == NULL)
+			eventcb = client->old_eventcb;
+		if (data == NULL)
+			data = client->userdata;
+		OBEX_SetUserCallBack(client, eventcb, data);
+	}
+
+	return client;
+}
+
+/**
+	Accept an incoming connection.
+	\param server OBEX handle
+	\return the client instance or NULL on error
+
+	Create a new OBEX instance to handle the incomming connection.
+	The old OBEX instance will continue to listen for new connections.
+	The two OBEX instances become totally independant from each other.
+
+	This function should be called after the library generates
+	an #OBEX_EV_ACCEPTHINT event to the user, but before the user
+	start to pull data out of the incomming connection.
+
+	Using this function also requires that the OBEX handle was created
+	with the #OBEX_FL_KEEPSERVER flag set while calling #OBEX_New().
+ */
+LIB_SYMBOL
+obex_t *CALLAPI OBEX_Accept(obex_t *server)
+{
 	obex_t *self;
 
 	DEBUG(3, "\n");
@@ -348,54 +380,11 @@ obex_t *CALLAPI OBEX_ServerAccept(obex_t *server, obex_event_t eventcb,
 	if (server->object != NULL)
 		return NULL;
 
-	/* Allocate new instance */
-	self = calloc(1, sizeof(*self));
-	if (self == NULL)
-		return NULL;
-
-	/* Set callback and callback data as needed */
-	if (eventcb != NULL)
-		self->eventcb = eventcb;
-	else
-		self->eventcb = server->eventcb;
-
-	if (data != NULL)
-		self->userdata = data;
-	else
-		self->userdata = server->userdata;
-
-	self->init_flags = server->init_flags;
-
-	obex_transport_clone(self, server);
-
-	self->mtu_rx = server->mtu_rx;
-	self->mtu_tx = server->mtu_tx;
-	self->mtu_tx_max = server->mtu_tx_max;
-
-	/* Allocate message buffers */
-	self->rx_msg = buf_new(self->mtu_rx);
-	if (self->rx_msg == NULL)
-		goto out_err;
-
-	/* Note : mtu_tx not yet negociated, so let's be safe here - Jean II */
-	self->tx_msg = buf_new(self->mtu_tx_max);
-	if (self->tx_msg == NULL)
-		goto out_err;
-
-	obex_transport_split(self, server);
-	self->mode = OBEX_MODE_SERVER;
-        self->state = STATE_IDLE;
-	self->rsp_mode = server->rsp_mode;
+	self = obex_clone(server);
+	if (self)
+		obex_transport_split(self, server);
 
 	return self;
-
-out_err:
-	if (self->tx_msg != NULL)
-		buf_free(self->tx_msg);
-	if (self->rx_msg != NULL)
-		buf_free(self->rx_msg);
-	free(self);
-	return NULL;
 }
 
 /**
diff --git a/lib/obex.sym b/lib/obex.sym
index 0c33b63..6483738 100644
--- a/lib/obex.sym
+++ b/lib/obex.sym
@@ -1,8 +1,10 @@
 OBEX_Init
+OBEX_New
 OBEX_Cleanup
 OBEX_SetUserData
 OBEX_GetUserData
 OBEX_SetUserCallBack
+OBEX_SetEventCb
 OBEX_SetTransportMTU
 OBEX_GetFD
 OBEX_RegisterCTransport
@@ -14,6 +16,7 @@ OBEX_CustomDataFeed
 OBEX_HandleInput
 OBEX_ServerRegister
 OBEX_ServerAccept
+OBEX_Accept
 OBEX_Request
 OBEX_CancelRequest
 OBEX_SuspendRequest
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 690dd97..1233120 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 
 #endif /* _WIN32 */
+#include <stdlib.h>
 
 #ifdef HAVE_BLUETOOTH
 #include "bluez_compat.h"
@@ -52,12 +53,110 @@
 
 #include <openobex/obex_const.h>
 
-int obex_debug;
-int obex_dump;
+#ifndef OBEX_DEBUG
+#define OBEX_DEBUG -1
+#endif
+#ifndef OBEX_DUMP
+#define OBEX_DUMP 0
+#endif
+
+int obex_debug = OBEX_DEBUG;
+int obex_dump = OBEX_DUMP;
 
 #include "cloexec.h"
 #include "nonblock.h"
 
+obex_t * obex_new(enum obex_transport_type transport, unsigned int flags)
+{
+	obex_t *self;
+	char *env;
+
+	env = getenv("OBEX_DEBUG");
+	if (env)
+		obex_debug = atoi(env);
+
+	env = getenv("OBEX_DUMP");
+	if (env)
+		obex_dump = atoi(env);
+
+	self = calloc(1, sizeof(*self));
+	if (self == NULL)
+		return NULL;
+
+	self->init_flags = flags;
+	self->mode = OBEX_MODE_SERVER;
+	self->state = STATE_IDLE;
+	self->rsp_mode = OBEX_RSP_MODE_NORMAL;
+
+	/* Safe values.
+	 * Both self->mtu_rx and self->mtu_tx_max can be increased by app
+	 * self->mtu_tx will be whatever the other end sends us - Jean II */
+	self->mtu_rx = OBEX_DEFAULT_MTU;
+	self->mtu_tx = OBEX_MINIMUM_MTU;
+	self->mtu_tx_max = OBEX_DEFAULT_MTU;
+
+	if (obex_transport_init(self, transport) < 0)
+		goto out_err;
+
+	/* Allocate message buffers */
+	/* It's safe to allocate them smaller than OBEX_MAXIMUM_MTU
+	 * because buf_t will realloc data as needed. - Jean II */
+	self->rx_msg = buf_new(self->mtu_rx);
+	if (self->rx_msg == NULL)
+		goto out_err;
+
+	self->tx_msg = buf_new(self->mtu_tx_max);
+	if (self->tx_msg == NULL)
+		goto out_err;
+
+	return self;
+
+out_err:
+	OBEX_Cleanup(self);
+	return NULL;
+}
+
+obex_t *obex_clone(obex_t *from)
+{
+	/* Allocate new instance */
+	obex_t *self = calloc(1, sizeof(*self));
+	if (self == NULL)
+		return NULL;
+
+	/* Set callback and callback data as needed */
+	self->eventcb = from->eventcb;
+	self->userdata = from->userdata;
+
+	self->init_flags = from->init_flags;
+
+	obex_transport_clone(self, from);
+
+	self->mtu_rx = from->mtu_rx;
+	self->mtu_tx = from->mtu_tx;
+	self->mtu_tx_max = from->mtu_tx_max;
+
+	/* Allocate message buffers */
+	self->rx_msg = buf_new(self->mtu_rx);
+	if (self->rx_msg == NULL)
+		goto out_err;
+
+	/* Note : mtu_tx not negotiated, yet, so let's be safe here */
+	self->tx_msg = buf_new(self->mtu_tx_max);
+	if (self->tx_msg == NULL)
+		goto out_err;
+
+	self->mode = OBEX_MODE_SERVER;
+        self->state = STATE_IDLE;
+	self->rsp_mode = from->rsp_mode;
+
+	return self;
+
+out_err:
+	OBEX_Cleanup(self);
+	return NULL;
+
+}
+
 /*
  * Function obex_create_socket()
  *
@@ -192,7 +291,13 @@ void obex_deliver_event(obex_t *self, int event, int cmd, int rsp, int del)
 	if (del == TRUE)
 		self->object = NULL;
 
-	self->eventcb(self, object, self->mode, event, cmd, rsp);
+	if (self->eventcb)
+		self->eventcb(self, object, self->mode, event, cmd, rsp);
+
+	else if (self->old_eventcb)
+		self->old_eventcb(self, object, (int)self->mode, (int)event,
+				  (int)cmd, (int)rsp);
+
 
 	if (del == TRUE)
 		obex_object_delete(object);
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 24d37c5..d880bb8 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -52,7 +52,9 @@ struct obex {
 	struct databuffer *rx_msg;	/* Reusable receive message */
 
 	struct obex_object *object;	/* Current object being transfered */
-	obex_event_t eventcb;		/* Event-callback */
+
+	obex_event_t old_eventcb;	/* Old, deprecated event-callback */
+	obex_event_cb_t eventcb;	/* Event-callback */
 
 	obex_transport_t trans;		/* Transport being used */
 
@@ -62,6 +64,8 @@ struct obex {
 	void * userdata;		/* For user */
 };
 
+obex_t * obex_new(enum obex_transport_type transport, unsigned int flags);
+obex_t * obex_clone(obex_t *from);
 socket_t obex_create_socket(struct obex *self, int domain);
 socket_t obex_create_packet_socket(obex_t *self, int domain);
 int obex_delete_socket(struct obex *self, socket_t fd);
-- 
1.7.5.4

---
 apps/obex_test/obex_test.c        |   12 ++++---
 apps/obex_test/obex_test_client.c |   61 ++++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 4200f9b..350d808 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -153,8 +153,8 @@ static int inet_connect(obex_t *handle)
 //
 int main (int argc, char *argv[])
 {
-	char cmd[10];
-	int num, end = 0;
+	char cmd[3];
+	int end = 0;
 	int cobex = FALSE, tcpobex = FALSE, btobex = FALSE, r320 = FALSE, usbobex = FALSE;
 	obex_t *handle;
 #ifdef HAVE_BLUETOOTH
@@ -350,10 +350,12 @@ int main (int argc, char *argv[])
 
 	while (!end) {
 		printf("> ");
-		num = scanf("%s", cmd);
-		if (num == EOF)
+		fflush(stdout);
+		(void)fgets(cmd, sizeof(cmd), stdin);
+		if (cmd[0] == 0) /* EOF */
 			break;
-		switch (cmd[0] | 0x20)	{
+		cmd[strlen(cmd)-1] = 0; /* remove trailing newline */
+		switch(cmd[0]) {
 			case 'h':
 				printf("Commands:\n"
 				       " c - connect\n"
diff --git a/apps/obex_test/obex_test_client.c b/apps/obex_test/obex_test_client.c
index 8f0efc7..d9714b4 100644
--- a/apps/obex_test/obex_test_client.c
+++ b/apps/obex_test/obex_test_client.c
@@ -227,17 +227,19 @@ void push_client(obex_t *handle)
 	unsigned int uname_size;
 	char *bfname;
 	uint8_t *uname;
-	int num;
 
 	obex_headerdata_t hd;
 	
 	uint8_t *buf;
 	int file_size;
 
-	printf("PUSH filename> ");
-	memset(fname, 0, sizeof(fname));
-	num = scanf("%199c", fname);
-	if (num != 1) {
+	fprintf(stdout, "PUSH file> ");
+	fflush(stdout);
+	(void)fgets(fname, sizeof(fname), stdin);
+	if (fname[0] == 0) /* EOF */
+		return;
+	fname[strlen(fname)-1] = 0; /* remove trailing newline */
+	if (strlen(fname) == 0) {
 		perror("scanf");
 		return;
 	}
@@ -294,15 +296,17 @@ void put_client(obex_t *handle)
 	char rname[200];
 	unsigned int rname_size;
 	obex_headerdata_t hd;
-	int num;
 	
 	uint8_t *buf;
 	int file_size;
 
-	printf("PUT file (local)> ");
-	memset(lname, 0, sizeof(lname));
-	num = scanf("%199c", lname);
-	if (num != 1) {
+	fprintf(stdout, "PUT file (local)> ");
+	fflush(stdout);
+	(void)fgets(lname, sizeof(lname), stdin);
+	if (lname[0] == 0) /* EOF */
+		return;
+	lname[strlen(lname)-1] = 0; /* remove trailing newline */
+	if (strlen(lname) == 0) {
 		perror("scanf:");
 		return;
 	}
@@ -314,10 +318,13 @@ void put_client(obex_t *handle)
 		return;
 	}
 
-	printf("PUT remote filename (default: %s)> ", lname);
-	memset(rname, 0, sizeof(rname));
-	num = scanf("%199c", rname);
-	if (num == 0)
+	fprintf(stdout, "PUT remote filename (default: %s)> ", lname);
+	fflush(stdout);
+	(void)fgets(rname, sizeof(rname), stdin);
+	if (rname[0] == 0) /* EOF */
+		return;
+	rname[strlen(rname)-1] = 0; /* remove trailing newline */
+	if (strlen(rname) == 0)
 		strcpy(rname, lname);
 	printf("Going to send %d bytes\n", file_size);
 
@@ -362,13 +369,16 @@ void get_client(obex_t *handle, struct context *gt)
 	obex_object_t *object;
 	uint8_t rname[200];
 	char req_name[200];
-	int num, rname_size;
+	int rname_size;
 	obex_headerdata_t hd;
 
-	printf("GET File> ");
-	memset(req_name, 0, sizeof(req_name));
-	num = scanf("%199c", req_name);
-	if (num != 1) {
+	fprintf(stdout, "GET file> ");
+	fflush(stdout);
+	(void)fgets(req_name, sizeof(req_name), stdin);
+	if (req_name[0] == 0) /* EOF */
+		return;
+	req_name[strlen(req_name)-1] = 0; /* remove trailing newline */
+	if (strlen(req_name) == 0) {
 		perror("scanf:");
 		return;
 	}
@@ -438,13 +448,16 @@ void setpath_client(obex_t *handle)
 	uint8_t setpath_data[2] = { 0, 0 };
 	obex_object_t *object;
 	char path[200];
-	int num, path_size;
+	int path_size;
 	obex_headerdata_t hd;
 
-	printf("SETPATH> ");
-	memset(path, 0, sizeof(path));
-	num = scanf("%199c", path);
-	if (num != 1) {
+	fprintf(stdout, "SETPATH> ");
+	fflush(stdout);
+	(void)fgets(path, sizeof(path), stdin);
+	if (path[0] == 0) /* EOF */
+		return;
+	path[strlen(path)-1] = 0; /* remove trailing newline */
+	if (strlen(path) == 0) {
 		perror("scanf:");
 		return;
 	}
-- 
1.7.5.4

---
 lib/bluez_compat.h   |    2 +-
 lib/btobex.c         |   45 +++++++++++++++++++++++++++------------------
 lib/btobex.h         |    6 +++++-
 lib/obex_transport.h |    2 +-
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/lib/bluez_compat.h b/lib/bluez_compat.h
index 3f36cd7..c8b046c 100644
--- a/lib/bluez_compat.h
+++ b/lib/bluez_compat.h
@@ -36,7 +36,7 @@
 #define rc_bdaddr   btAddr
 #define rc_channel  port
 #define PF_BLUETOOTH   PF_BTH
-#define AF_BLUETOOTH   PF_BLUETOOTH
+#define AF_BLUETOOTH   AF_BTH
 #define BTPROTO_RFCOMM BTHPROTO_RFCOMM
 /* TODO: should be const */
 extern bdaddr_t bluez_compat_bdaddr_any;
diff --git a/lib/btobex.c b/lib/btobex.c
index 749fefb..810ce91 100644
--- a/lib/btobex.c
+++ b/lib/btobex.c
@@ -32,10 +32,7 @@
 /* Linux/FreeBSD/NetBSD case */
 
 #include <string.h>
-#include <unistd.h>
-#include <stdio.h>		/* perror */
 #include <errno.h>		/* errno and EADDRNOTAVAIL */
-#include <netinet/in.h>
 #include <sys/socket.h>
 #endif /* _WIN32 */
 
@@ -80,7 +77,7 @@ static void btobex_cleanup (obex_t *self)
 static int btobex_set_local_addr(obex_t *self, struct sockaddr *addr,
 								size_t len)
 {
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	const struct sockaddr_rc *local = (struct sockaddr_rc *) addr;
 
 	if (len == sizeof(*local) && local->rc_family == AF_BLUETOOTH) {
@@ -93,7 +90,7 @@ static int btobex_set_local_addr(obex_t *self, struct sockaddr *addr,
 
 static int btobex_set_remote_addr(obex_t *self, struct sockaddr *addr, size_t len)
 {
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	const struct sockaddr_rc *remote = (struct sockaddr_rc *)addr;
 
 	if (len == sizeof(*remote) && remote->rc_family == AF_BLUETOOTH) {
@@ -113,14 +110,20 @@ static int btobex_set_remote_addr(obex_t *self, struct sockaddr *addr, size_t le
 void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
 					const bdaddr_t *dst, uint8_t channel)
 {
-	struct sockaddr_rc addr;
+	struct obex_transport *trans = &self->trans;
 
 	btobex_prepare_listen(self, src, 0);
 
-	addr.rc_family = AF_BLUETOOTH;
-	bacpy(&addr.rc_bdaddr, dst);
-	addr.rc_channel = channel;
-	btobex_set_remote_addr(self, (struct sockaddr *) &addr, sizeof(addr));
+	if (trans->type == OBEX_TRANS_BLUETOOTH) {
+		struct sockaddr_rc addr;
+
+		memset(&addr, 0, sizeof(addr));
+		addr.rc_family = AF_BLUETOOTH;
+		bacpy(&addr.rc_bdaddr, dst);
+		addr.rc_channel = (uint8_t)(channel & 0xFF);
+		obex_transport_set_remote_addr(self, (struct sockaddr *) &addr,
+					       sizeof(addr));
+	}
 }
 
 /*
@@ -131,12 +134,18 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
  */
 void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
 {
-	struct sockaddr_rc addr;
+	struct obex_transport *trans = &self->trans;
+
+	if (trans->type == OBEX_TRANS_BLUETOOTH) {
+		struct sockaddr_rc addr;
 
-	addr.rc_family = AF_BLUETOOTH;
-	bacpy(&addr.rc_bdaddr, src);
-	addr.rc_channel = channel;
-	btobex_set_local_addr(self, (struct sockaddr *) &addr, sizeof(addr));
+		memset(&addr, 0, sizeof(addr));
+		addr.rc_family = AF_BLUETOOTH;
+		bacpy(&addr.rc_bdaddr, src);
+		addr.rc_channel = (uint8_t)(channel & 0xFF);
+		obex_transport_set_local_addr(self, (struct sockaddr *) &addr,
+					      sizeof(addr));
+	}
 }
 
 /*
@@ -148,7 +157,7 @@ void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel)
 static int btobex_listen(obex_t *self)
 {
 	struct obex_transport *trans = &self->trans;
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 
 	DEBUG(3, "\n");
 
@@ -190,7 +199,7 @@ out_freesock:
 static int btobex_accept(obex_t *self)
 {
 	struct obex_transport *trans = &self->trans;
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	struct sockaddr *addr = (struct sockaddr *) &data->peer;
 	socklen_t addrlen = sizeof(data->peer);
 
@@ -217,7 +226,7 @@ static int btobex_accept(obex_t *self)
 static int btobex_connect_request(obex_t *self)
 {
 	struct obex_transport *trans = &self->trans;
-	struct btobex_data *data = &self->trans.data.rfcomm;
+	struct btobex_rfcomm_data *data = &self->trans.data.bt.rfcomm;
 	int ret;
 	int mtu = 0;
 
diff --git a/lib/btobex.h b/lib/btobex.h
index d863ecb..4375881 100644
--- a/lib/btobex.h
+++ b/lib/btobex.h
@@ -30,8 +30,12 @@ void btobex_prepare_connect(obex_t *self, const bdaddr_t *src,
 			    const bdaddr_t *dst, uint8_t channel);
 void btobex_prepare_listen(obex_t *self, const bdaddr_t *src, uint8_t channel);
 
-struct btobex_data {
+struct btobex_rfcomm_data {
 	struct sockaddr_rc self;
 	struct sockaddr_rc peer;
 };
+
+union btobex_data {
+	struct btobex_rfcomm_data rfcomm;
+};
 #endif
diff --git a/lib/obex_transport.h b/lib/obex_transport.h
index a39f563..b7a4423 100644
--- a/lib/obex_transport.h
+++ b/lib/obex_transport.h
@@ -93,7 +93,7 @@ union obex_transport_data {
 #endif /*HAVE_IRDA*/
 	struct inobex_data inet;
 #ifdef HAVE_BLUETOOTH
-	struct btobex_data rfcomm;
+	union btobex_data bt;
 #endif /*HAVE_BLUETOOTH*/
 	obex_ctrans_t custom;
 #ifdef HAVE_USB
-- 
1.7.5.4

---
 CMakeLists.txt |    4 ++--
 ChangeLog      |   17 +++++++++++++++++
 UPGRADING.txt  |   28 ++++++++++++++++++++++++++++
 configure.ac   |    2 +-
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 UPGRADING.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe1d8d5..6a98870 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ project ( openobex C )
 #
 # The project version
 #
-set ( VERSION_MAJOR 1 )
-set ( VERSION_MINOR 6 )
+set ( VERSION_MAJOR 2 )
+set ( VERSION_MINOR 0 )
 set ( VERSION_PATCH 0 )
 set ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" )
 if ( VERSION_PATCH GREATER 0 )
diff --git a/ChangeLog b/ChangeLog
index fccdd41..517d347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+ver 2.0:
+	Add support for Obex-over-L2CAP (experimental)
+	Add support for Single Response Mode (experimental)
+	Add manpages for the example applications
+	Add udev helper (Linux only)
+	Extend USB support with support for libusb-1.x and updated CDC spec
+	Add new custom transport read() callback
+	Add flag OBEX_FL_CLOEXEC to better support multi-threading
+	Add flag OBEX_FL_NONBLOCK to create non-blocking sockets
+	Add new definitions from OBEX 1.3 errata: ACTION command and headers
+	Updated discovery API
+	Add support for discovery of IrDA devices
+	Add a new stricter event callback
+	Remove deprecated functions and definitions
+	Add support for compiling with gcc-4.6 and Microsoft Visual C++ 10
+	Lots of internal fixes, cleanups and improvements
+
 ver 1.5:
 	Revert USB changes that broke the ABI.
 	Add more documentation and update manual pages.
diff --git a/UPGRADING.txt b/UPGRADING.txt
new file mode 100644
index 0000000..bf3cbc2
--- /dev/null
+++ b/UPGRADING.txt
@@ -0,0 +1,28 @@
+Upgrade guide from previous version of openobex
+===============================================
+
+
+version 1.5 -> 2.0
+------------------
+
+This version introduces a stricter event callback:
+	obex_event_t -> obex_event_cb_t
+The old version is still supported but you must add -DOPENOBEX_DEPRECATED to
+your compile setting. Using the new version requires to also use different
+functions that had obex_event_t as argument:
+	OBEX_Init() -> OBEX_New()
+	OBEX_SetUserCallback() -> OBEX_SetEventCb()
+	OBEX_ServerAccept() -> OBEX_Accept() + OBEX_SetEventCb()
+
+OBEX_HandleInput() is now a wrapper around its new name: OBEX_Work(). Note that
+when switch to OBEX_Work() directly, that the timeout value changed from seconds
+to milliseconds. To get more non-blocking behaviour, check out the new
+OBEX_FL_NONBLOCK flag for OBEX_New().
+
+Some liked more control over when to OBEX_HandleInput() by using select in
+combination with OBEX_GetFD() themselves and waiting for incoming data.
+This still works but you have to use OBEX_GetDataDirection() to find out
+about the current data direction and thus when to ideally call OBEX_Work().
+
+The function OBEX_UnicodeToAscii() and its counterpart OBEX_AsciiToUnicode() are
+gone. Please use the more complete functionality from your toolkit.
diff --git a/configure.ac b/configure.ac
index 91909f3..b14b10c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(openobex, 1.5)
+AM_INIT_AUTOMAKE(openobex, 2.0)
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-- 
1.7.5.4

We never actually shipped the result from glib/ to be easily compilable, it has
no known dependencies.
---
 .gitignore                  |    6 -
 CMakeLists.txt              |   22 +-
 CMakeModules/FindGlib.cmake |   94 ----
 Makefile.am                 |    8 +-
 acinclude.m4                |   14 -
 configure.ac                |    3 +-
 glib/CMakeLists.txt         |  139 ------
 glib/Makefile.am            |   42 --
 glib/obex-client.c          |  589 -------------------------
 glib/obex-client.h          |  163 -------
 glib/obex-debug.h           |   28 --
 glib/obex-error.c           |  226 ----------
 glib/obex-error.h           |   31 --
 glib/obex-lowlevel.c        | 1014 -------------------------------------------
 glib/obex-lowlevel.h        |   50 ---
 glib/obex-marshal.list      |    1 -
 glib/test-client.c          |  237 ----------
 glib/test-lowlevel.c        |  104 -----
 openobex-glib.pc.in         |   12 -
 19 files changed, 8 insertions(+), 2775 deletions(-)
 delete mode 100644 CMakeModules/FindGlib.cmake
 delete mode 100644 glib/CMakeLists.txt
 delete mode 100644 glib/Makefile.am
 delete mode 100644 glib/obex-client.c
 delete mode 100644 glib/obex-client.h
 delete mode 100644 glib/obex-debug.h
 delete mode 100644 glib/obex-error.c
 delete mode 100644 glib/obex-error.h
 delete mode 100644 glib/obex-lowlevel.c
 delete mode 100644 glib/obex-lowlevel.h
 delete mode 100644 glib/obex-marshal.list
 delete mode 100644 glib/test-client.c
 delete mode 100644 glib/test-lowlevel.c
 delete mode 100644 openobex-glib.pc.in

diff --git a/.gitignore b/.gitignore
index 643a070..2e6307f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,12 +24,6 @@ stamp-h1
 autom4te.cache
 
 openobex.pc
-openobex-glib.pc
-
-glib/obex-marshal.h
-glib/obex-marshal.c
-glib/test-lowlevel
-glib/test-client
 
 ircp/ircp
 apps/irxfer
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf312a6..5a2bde4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,13 +134,11 @@ if ( OPENOBEX_USB AND UNIX AND NOT WIN32 )
     endforeach ( lib )
   endif ( PKGCONFIG_LIBUSB_FOUND )
 endif ( OPENOBEX_USB AND UNIX AND NOT WIN32 )
-foreach ( file openobex openobex-glib )
-  configure_file (
-    ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${file}.pc
-    @ONLY
-  )
-endforeach ( file )
+configure_file (
+  ${CMAKE_CURRENT_SOURCE_DIR}/openobex.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/openobex.pc
+  @ONLY
+)
 
 if ( NOT PKGCONFIG_INSTALL_DIR )
   set ( PKGCONFIG_INSTALL_DIR lib${LIB_SUFFIX}/pkgconfig
@@ -198,16 +196,6 @@ endif ( BUILD_DOCUMENTATION )
 
 
 #
-# build the glib binding library
-# not enabled by default because it requires an additional dependency
-#
-#option ( BUILD_GLIB_BINDING "Build the glib binding library")
-#if ( BUILD_GLIB_BINDING )
-#  add_subdirectory ( glib )
-#endif ( BUILD_GLIB_BINDING )
-
-
-#
 # The following adds CPack support
 #
 set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenObex" )
diff --git a/CMakeModules/FindGlib.cmake b/CMakeModules/FindGlib.cmake
deleted file mode 100644
index 89a3eab..0000000
--- a/CMakeModules/FindGlib.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-
-set ( GLIB_COMPONENTS glib-2.0 )
-foreach ( c ${Glib_FIND_COMPONENTS} )
-  list ( APPEND GLIB_COMPONENTS "g${c}-2.0" )
-endforeach ( c ) 
-
-find_package ( PkgConfig )
-
-if ( PKG_CONFIG_FOUND )
-  pkg_check_modules ( PKGCONFIG_GLIB REQUIRED ${GLIB_COMPONENTS} )
-endif ( PKG_CONFIG_FOUND )
-
-if ( PKG_CONFIG_GLIB_FOUND )
-  set ( Glib_FOUND ${PKG_CONFIG_GLIB_FOUND} )
-  set ( Glib_INCLUDE_DIRS ${PKG_CONFIG_GLIB_INCLUDE_DIRS} )
-  foreach ( i ${PKGCONFIG_GLIB_LIBRARIES} )
-    find_library ( ${i}_LIBRARY
-      NAMES ${i}
-      PATHS ${PKGCONFIG_GLIB_LIBRARY_DIRS}
-    )
-    if ( ${i}_LIBRARY )
-      list ( APPEND Glib_LIBRARIES ${${i}_LIBRARY} )
-    endif ( ${i}_LIBRARY )
-    mark_as_advanced ( ${i}_LIBRARY )
-  endforeach ( i )
-  mark_as_advanced ( Glib_LIBRARIES )
-
-else ( PKG_CONFIG_GLIB_FOUND )
-  find_path ( GLIB_INCLUDE_PATH
-    NAMES
-      glib.h
-    PATHS
-      $ENV{GLIB_ROOT_DIR}/include
-    PATH_SUFFIXES
-      glib-2.0
-  )
-  mark_as_advanced ( GLIB_INCLUDE_PATH )
-
-  foreach ( i ${GLIB_COMPONENTS} )
-    find_library ( ${i}_LIBRARY
-      NAMES
-        ${i}
-      PATHS
-        $ENV{GLIB_ROOT_DIR}/lib
-    )
-    if ( ${i}_LIBRARY )
-      list ( APPEND Glib_LIBRARIES ${${i}_LIBRARY} )
-    endif ( ${i}_LIBRARY )
-    mark_as_advanced ( ${i}_LIBRARY )
-  endforeach ( i )
-  mark_as_advanced ( Glib_LIBRARIES )
-
-  if ( glib-2.0_LIBRARY )
-    get_filename_component ( glib-2.0_LIBRARY_PATH "${glib-2.0_LIBRARY}" PATH )
-    find_path ( GLIBCONFIG_INCLUDE_PATH
-      NAMES
-        glibconfig.h
-      PATHS
-        ${glib-2.0_LIBRARY_PATH}/glib-2.0/include   
-      NO_DEFAULT_PATH
-    )
-    mark_as_advanced ( GLIBCONFIG_INCLUDE_PATH )
-  endif ( glib-2.0_LIBRARY )
-
-  set ( Glib_INCLUDE_DIRS 
-    ${GLIB_INCLUDE_PATH}
-    ${GLIBCONFIG_INCLUDE_PATH}
-  )
-
-  if ( Glib_INCLUDE_DIRS AND Glib_LIBRARIES )
-    set ( Glib_FOUND true )
-  endif ( Glib_INCLUDE_DIRS AND Glib_LIBRARIES )
-endif ( PKG_CONFIG_GLIB_FOUND )
-
-if ( Glib_FOUND )
-  set ( CMAKE_REQUIRED_INCLUDES "${Glib_INCLUDE_DIRS}" )
-  check_include_file ( glib.h Glib_FOUND )
-endif ( Glib_FOUND )
-
-if ( NOT Glib_FOUND )
-  if ( NOT Glib_FIND_QUIETLY )
-    message ( STATUS "Glib not found, try setting GLIB_ROOT_DIR environment variable." )
-  endif ( NOT Glib_FIND_QUIETLY )
-  if ( Glib_FIND_REQUIRED )
-    message ( FATAL_ERROR "" )
-  endif ( Glib_FIND_REQUIRED )
-endif ( NOT Glib_FOUND )
-
-find_program ( GLIB_GENMARSHAL_EXECUTABLE
-  NAMES glib-genmarshal
-  PATHS ${GLIB2_PREFIX}
-  PATH_SUFFIXES bin
-)
-mark_as_advanced ( GLIB_GENMARSHAL_EXECUTABLE )
diff --git a/Makefile.am b/Makefile.am
index 76dc85e..f62077f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,16 @@
 
-SUBDIRS = include lib glib apps udev doc
+SUBDIRS = include lib apps udev doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-if GLIB
-pkgconfig_DATA = openobex.pc openobex-glib.pc
-else
 pkgconfig_DATA = openobex.pc
-endif
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-apps
 
 EXTRA_DIST = openobex.m4 \
 		INSTALL.txt INSTALL_Win32.txt \
 		CMakeLists.txt \
-		CMakeModules/FindBluetooth.cmake CMakeModules/FindGlib.cmake \
+		CMakeModules/FindBluetooth.cmake \
 		CMakeModules/FindIrda.cmake CMakeModules/FindLibUSB.cmake \
 		CMakeModules/FindXslt.cmake CMakeModules/UseXslt.cmake \
 		CMakeModules/FindDocbook.cmake CMakeModules/UseDocbook.cmake \
diff --git a/acinclude.m4 b/acinclude.m4
index 3da248a..e2009f9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -210,14 +210,6 @@ AC_DEFUN([AC_PATH_USB1], [
 	fi
 ])
 
-dnl AC_DEFUN([AC_PATH_GLIB], [
-dnl 	PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0 gthread-2.0, glib_found=yes, glib_found=no)
-dnl 	AC_SUBST(GLIB_CFLAGS)
-dnl 	AC_SUBST(GLIB_LIBS)
-dnl 	GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-dnl 	AC_SUBST(GLIB_GENMARSHAL)
-dnl ])
-
 AC_DEFUN([AC_VISIBILITY], [
 	case $host in
 	*-*-mingw32*)
@@ -238,7 +230,6 @@ AC_DEFUN([AC_ARG_OPENOBEX], [
 	irda_enable=yes
 	bluetooth_enable=yes
 	usb_enable=yes
-	glib_enable=no
 	apps_enable=no
 	apps_doc_enable=no
 	debug_enable=no
@@ -261,10 +252,6 @@ AC_DEFUN([AC_ARG_OPENOBEX], [
 		usb_enable=${enableval}
 	])
 
-	dnl AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], [enable GLib bindings]), [
-	dnl 	glib_enable=${enableval}
-	dnl ])
-
 	AC_ARG_ENABLE(apps, AC_HELP_STRING([--enable-apps], [enable test applications]), [
 		apps_enable=${enableval}
 		apps_doc_enable=${enableval}
@@ -334,7 +321,6 @@ AC_DEFUN([AC_ARG_OPENOBEX], [
 		apps_doc_enable=no
 	fi
 
-	AM_CONDITIONAL(GLIB, test "${glib_enable}" = "yes" && test "${glib_found}" = "yes")
 	AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
 	AM_CONDITIONAL(APPS_DOC, test "${apps_doc_enable}" = "yes")
 	case $host in
diff --git a/configure.ac b/configure.ac
index 34cf7cd..91909f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,9 +39,8 @@ AC_ARG_OPENOBEX
 AC_OUTPUT(Makefile
           include/Makefile include/openobex/Makefile
           lib/Makefile
-          glib/Makefile
           apps/Makefile apps/lib/Makefile apps/obex_test/Makefile
 	  apps/ircp/Makefile
 	  doc/Makefile doc/Doxyfile
 	  udev/Makefile udev/openobex.rules
-	  openobex.pc openobex-glib.pc)
+	  openobex.pc)
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
deleted file mode 100644
index ec5223e..0000000
--- a/glib/CMakeLists.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-
-set ( openobex-glib_VERSION 1.0.0 )
-set ( openobex-glib_SOVERSION 0 )
-
-find_package ( Glib REQUIRED object thread)
-
-set ( GENERATED_SOURCES
-  obex-marshal.c
-  obex-marshal.h
-)
-set_property ( SOURCE ${GENERATED_SOURCES} PROPERTY
-  GENERATED true
-)
-
-if ( GLIB_GENMARSHAL_EXECUTABLE )
-  add_custom_command (
-    OUTPUT            ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.c
-    COMMAND           ${GLIB_GENMARSHAL_EXECUTABLE}
-    ARGS              --prefix=obex_marshal obex-marshal.list --body
-                      > ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.c
-    MAIN_DEPENDENCY   ${CMAKE_CURRENT_SOURCE_DIR}/obex-marshal.list
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    VERBATIM
-  )
-  add_custom_command (
-    OUTPUT            ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.h
-    COMMAND           ${GLIB_GENMARSHAL_EXECUTABLE}
-    ARGS              --prefix=obex_marshal obex-marshal.list --header
-                      > ${CMAKE_CURRENT_BINARY_DIR}/obex-marshal.h
-    MAIN_DEPENDENCY   ${CMAKE_CURRENT_SOURCE_DIR}/obex-marshal.list
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    VERBATIM
-  )
-
-else ( GLIB_GENMARSHAL_EXECUTABLE )
-  message ( FATAL_ERROR "glib-genmarshal not found but needed." )
-endif ( GLIB_GENMARSHAL_EXECUTABLE )
-
-set ( SOURCES
-  obex-client.c
-  obex-error.c
-  obex-lowlevel.c
-  ${GENERATED_SOURCES}
-)
-
-set ( HEADERS
-  obex-client.h
-  obex-debug.h
-  obex-error.h
-  obex-lowlevel.h
-)
-
-set ( openobex-glib_PUBLIC_HEADER
-  obex-client.h
-)
-
-include_directories (
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${Glib_INCLUDE_DIRS}
-)
-
-if ( COMPILER_SUPPORT_NOUNDEFINED )
-  set ( openobex-glib_LINK_FLAGS
-    "${openobex-glib_LINK_FLAGS} ${LINKER_FLAG_NOUNDEFINED}"
-  )
-endif ( COMPILER_SUPPORT_NOUNDEFINED )
-
-add_library ( openobex-glib
-  ${SOURCES}
-)
-
-target_link_libraries ( openobex-glib
-  ${Glib_LIBRARIES}
-  openobex
-)
-
-foreach ( i VERSION SOVERSION PUBLIC_HEADER LINK_FLAGS )
-  if ( DEFINED openobex-glib_${i} )
-    set_property ( TARGET openobex-glib PROPERTY ${i} ${openobex-glib_${i}} )
-  endif ( DEFINED openobex-glib_${i} )
-endforeach ( i )
-
-set_property ( TARGET openobex-glib PROPERTY
-  DEFINE_SYMBOL OPENOBEX_GLIB_EXPORTS
-)
-
-if ( WIN32 )
-  target_link_libraries ( openobex-glib 
-    ws2_32
-  )
-endif ( WIN32 )
-
-install ( TARGETS openobex-glib
-  RUNTIME       DESTINATION bin
-  LIBRARY       DESTINATION lib
-  ARCHIVE       DESTINATION lib
-  PUBLIC_HEADER DESTINATION include/openobex
-  COMPONENT bindings
-)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/obex-client.h
-  DESTINATION include/openobex
-  COMPONENT bindings
-) 
-
-#
-# Copy the .pc file to install it only if the lib gets installed
-#
-add_custom_command ( TARGET openobex-glib
-  COMMAND ${CMAKE_COMMAND}
-  ARGS    -E copy_if_different ${CMAKE_BINARY_DIR}/openobex-glib.pc
-          ${CMAKE_CURRENT_BINARY_DIR}/openobex-glib.pc
-  VERBATIM
-)
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/openobex-glib.pc
-  DESTINATION ${PKGCONFIG_INSTALL_DIR}
-  OPTIONAL
-)
-
-
-
-#
-# These are some test apps for the library above.
-#
-set ( openobex-glib_TESTS
-  test-client
-  test-lowlevel
-)
-foreach ( prog ${openobex-glib_TESTS} )
-  add_executable ( openobex-glib-${prog} EXCLUDE_FROM_ALL
-    ${prog}.c
-  )
-  target_link_libraries ( openobex-glib-${prog}
-    openobex-glib
-    ${Glib_LIBRARIES}
-  )
-endforeach ( prog )
-add_custom_target ( openobex-glib-tests
-  DEPENDS ${openobex-glib_TESTS}
-)
diff --git a/glib/Makefile.am b/glib/Makefile.am
deleted file mode 100644
index ed46dc8..0000000
--- a/glib/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-
-includedir = @includedir@...
-
-if GLIB
-include_HEADERS = obex-client.h
-
-lib_LTLIBRARIES = libopenobex-glib.la
-
-libopenobex_glib_la_SOURCES = obex-lowlevel.h obex-lowlevel.c obex-client.c obex-debug.h obex-error.c obex-error.h
-
-libopenobex_glib_la_LDFLAGS = -no-undefined -version-info 1:0:0
-
-libopenobex_glib_la_LIBADD = @GLIB_LIBS@ $(top_builddir)/lib/libopenobex.la @EXTRA_LIBS@
-
-BUILT_SOURCES = obex-marshal.h obex-marshal.c
-
-nodist_libopenobex_glib_la_SOURCES = $(BUILT_SOURCES)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_PROGRAMS = test-lowlevel test-client
-
-test_lowlevel_LDADD = libopenobex-glib.la
-
-test_client_LDADD = @GLIB_LIBS@ libopenobex-glib.la
-endif
-
-AM_CFLAGS = @GLIB_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/include
-
-EXTRA_DIST = obex-marshal.list CMakeLists.txt
-
-MAINTAINERCLEANFILES = Makefile.in
-
-if GLIB
-obex-marshal.h: obex-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=obex_marshal $< --header > $@
-
-obex-marshal.c: obex-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=obex_marshal $< --body > $@
-endif
diff --git a/glib/obex-client.c b/glib/obex-client.c
deleted file mode 100644
index 6ab7cfe..0000000
--- a/glib/obex-client.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/**
-	\file glib/obex-client.c
-	OpenOBEX glib bindings client code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-
-#include "obex-debug.h"
-#include "obex-lowlevel.h"
-#include "obex-error.h"
-#include "obex-marshal.h"
-#include "obex-client.h"
-
-#define OBEX_CLIENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
-					OBEX_TYPE_CLIENT, ObexClientPrivate))
-
-typedef struct _ObexClientPrivate ObexClientPrivate;
-
-struct _ObexClientPrivate {
-	gboolean auto_connect;
-
-#ifdef G_THREADS_ENABLED
-	GMutex *mutex;
-#endif
-
-	GMainContext *context;
-	GIOChannel *channel;
-	obex_t *handle;
-
-	gpointer watch_data;
-	ObexClientFunc watch_func;
-	GDestroyNotify watch_destroy;
-
-	GSource *idle_source;
-
-	gboolean connected;
-};
-
-G_DEFINE_TYPE(ObexClient, obex_client, G_TYPE_OBJECT)
-
-static void obex_client_init(ObexClient *self)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-#ifdef G_THREADS_ENABLED
-	priv->mutex = g_mutex_new();
-#endif
-
-	priv->auto_connect = TRUE;
-
-	priv->context = g_main_context_default();
-	g_main_context_ref(priv->context);
-
-	priv->connected = FALSE;
-}
-
-static void obex_client_finalize(GObject *object)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(object);
-
-	if (priv->connected == TRUE && priv->auto_connect == TRUE)
-		obex_disconnect(priv->handle);
-
-	if (priv->idle_source) {
-		g_source_destroy(priv->idle_source);
-		priv->idle_source = NULL;
-	}
-
-	obex_close(priv->handle);
-	priv->handle = NULL;
-
-	g_main_context_unref(priv->context);
-	priv->context = NULL;
-
-#ifdef G_THREADS_ENABLED
-	g_mutex_free(priv->mutex);
-#endif
-}
-
-enum {
-	PROP_0,
-	PROP_AUTO_CONNECT
-};
-
-static void obex_client_set_property(GObject *object, guint prop_id,
-					const GValue *value, GParamSpec *pspec)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(object);
-
-	switch (prop_id) {
-	case PROP_AUTO_CONNECT:
-		priv->auto_connect = g_value_get_boolean(value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-		break;
-	}
-}
-
-static void obex_client_get_property(GObject *object, guint prop_id,
-					GValue *value, GParamSpec *pspec)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(object);
-
-	switch (prop_id) {
-	case PROP_AUTO_CONNECT:
-		g_value_set_boolean(value, priv->auto_connect);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-		break;
-	}
-}
-
-enum {
-	CONNECTED_SIGNAL,
-	DISCONNECT_SIGNAL,
-	CANCELED_SIGNAL,
-	PROGRESS_SIGNAL,
-	IDLE_SIGNAL,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static void obex_client_class_init(ObexClientClass *klass)
-{
-#ifdef G_THREADS_ENABLED
-	if (!g_thread_supported())
-		g_thread_init(NULL);
-#endif
-
-	g_type_class_add_private(klass, sizeof(ObexClientPrivate));
-
-	G_OBJECT_CLASS(klass)->finalize = obex_client_finalize;
-
-	G_OBJECT_CLASS(klass)->set_property = obex_client_set_property;
-	G_OBJECT_CLASS(klass)->get_property = obex_client_get_property;
-
-	g_object_class_install_property(G_OBJECT_CLASS(klass),
-			PROP_AUTO_CONNECT, g_param_spec_boolean("auto-connect",
-					NULL, NULL, TRUE, G_PARAM_READWRITE));
-
-	signals[CONNECTED_SIGNAL] = g_signal_new("connected",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, connected),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[DISCONNECT_SIGNAL] = g_signal_new("disconnect",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, disconnect),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[CANCELED_SIGNAL] = g_signal_new("canceled",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, canceled),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[PROGRESS_SIGNAL] = g_signal_new("progress",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, progress),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-
-	signals[IDLE_SIGNAL] = g_signal_new("idle",
-			G_TYPE_FROM_CLASS(klass),
-			G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			G_STRUCT_OFFSET(ObexClientClass, idle),
-			NULL, NULL,
-			obex_marshal_VOID__VOID,
-			G_TYPE_NONE, 0);
-}
-
-static gboolean obex_client_callback(GIOChannel *source,
-					GIOCondition cond, gpointer data)
-{
-	ObexClient *self = data;
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
-		debug("link error");
-		return FALSE;
-	}
-
-	if (OBEX_HandleInput(priv->handle, 1) < 0)
-		debug("input error");
-	else
-		obex_do_callback(priv->handle);
-
-	return TRUE;
-}
-
-static gboolean obex_client_put_idle(ObexClient *self)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	debug("obex_client_put_idle");
-
-	g_source_destroy(priv->idle_source);
-	priv->idle_source = NULL;
-
-	if (priv->watch_func)
-		priv->watch_func(self, OBEX_CLIENT_COND_OUT, priv->watch_data);
-
-	return FALSE;
-}
-
-ObexClient *obex_client_new(void)
-{
-	return OBEX_CLIENT(g_object_new(OBEX_TYPE_CLIENT, NULL));
-}
-
-void obex_client_destroy(ObexClient *self)
-{
-	g_object_unref(self);
-}
-
-void obex_client_set_auto_connect(ObexClient *self, gboolean auto_connect)
-{
-	g_object_set(self, "auto-connect", auto_connect, NULL);
-}
-
-gboolean obex_client_get_auto_connect(ObexClient *self)
-{
-	gboolean auto_connect;
-
-	g_object_get(self, "auto-connect", &auto_connect, NULL);
-
-	return auto_connect;
-}
-
-void obex_client_add_watch_full(ObexClient *self,
-			ObexClientCondition condition, ObexClientFunc func,
-					gpointer data, GDestroyNotify notify)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	priv->watch_data = data;
-	priv->watch_func = func;
-	priv->watch_destroy = notify;
-}
-
-void obex_client_add_watch(ObexClient *self, ObexClientCondition condition,
-				ObexClientFunc func, gpointer data)
-{
-	obex_client_add_watch_full(self, condition, func, data, NULL);
-}
-
-static void obex_connect_cfm(obex_t *handle, void *user_data)
-{
-	ObexClient *self = user_data;
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	debug("connected");
-
-	priv->connected = TRUE;
-
-	g_signal_emit(self, signals[CONNECTED_SIGNAL], 0, NULL);
-}
-
-static void obex_disconn_ind(obex_t *handle, void *user_data)
-{
-	ObexClient *self = user_data;
-
-	debug("disconnect");
-
-	g_signal_emit(self, signals[DISCONNECT_SIGNAL], 0, NULL);
-}
-
-static void obex_progress_ind(obex_t *handle, void *user_data)
-{
-	ObexClient *self = user_data;
-
-	debug("progress");
-
-	g_signal_emit(self, signals[PROGRESS_SIGNAL], 0, NULL);
-}
-
-static void obex_command_ind(obex_t *handle, int event, void *user_data)
-{
-	ObexClient *self = user_data;
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-
-	if (!priv->watch_func)
-		return;
-
-	switch (event) {
-	case OBEX_EV_LINKERR:
-	case OBEX_EV_PARSEERR:
-		priv->watch_func(self, OBEX_CLIENT_COND_ERR, priv->watch_data);
-		break;
-
-	case OBEX_EV_STREAMAVAIL:
-		priv->watch_func(self, OBEX_CLIENT_COND_IN, priv->watch_data);
-		break;
-
-	case OBEX_EV_STREAMEMPTY:
-		priv->watch_func(self, OBEX_CLIENT_COND_OUT, priv->watch_data);
-		break;
-
-	case OBEX_EV_ABORT:
-	case OBEX_EV_REQDONE:
-		priv->watch_func(self, OBEX_CLIENT_COND_DONE, priv->watch_data);
-		break;
-		
-	default:
-		debug("unhandled event %d", event);
-		break;
-	}
-}
-
-static obex_callback_t callback = {
-	&obex_connect_cfm,
-	&obex_disconn_ind,
-	&obex_progress_ind,
-	&obex_command_ind,
-};
-
-gboolean obex_client_attach_fd(ObexClient *self, int fd, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	GSource *source;
-
-	priv->handle = obex_open(fd, &callback, self);
-	if (priv->handle == NULL) {
-		err2gerror(errno, error);
-		return FALSE;
-	}
-
-	priv->channel = g_io_channel_unix_new(fd);
-
-	source = g_io_create_watch(priv->channel,
-				G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL);
-
-	g_source_set_callback(source, (GSourceFunc) obex_client_callback,
-								self, NULL);
-
-	g_source_attach(source, priv->context);
-
-	g_source_unref(source);
-
-	return TRUE;
-}
-
-gboolean obex_client_connect(ObexClient *self, const guchar *target,
-						gsize size, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_connect(priv->handle, target, size);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_disconnect(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_disconnect(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_put_object(ObexClient *self, const gchar *type,
-					const gchar *name, gint size,
-					time_t mtime, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	gboolean add_idle = FALSE;
-	int err;
-
-	if (priv->connected == FALSE && priv->auto_connect == TRUE)
-		obex_connect(priv->handle, NULL, 0);
-	else
-		add_idle = TRUE;
-
-	err = obex_put(priv->handle, type, name, size, mtime);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	/* So the application gets OBEX_CLIENT_COND_OUT immediately when
-	 * returning to the mainloop */
-	if (add_idle) {
-		priv->idle_source = g_idle_source_new();
-		g_source_set_callback(priv->idle_source, (GSourceFunc) obex_client_put_idle,
-					self, NULL);
-		g_source_attach(priv->idle_source, priv->context);
-		g_source_unref(priv->idle_source);
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_get_object(ObexClient *self, const gchar *type,
-					const gchar *name, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	if (priv->connected == FALSE && priv->auto_connect == TRUE)
-		obex_connect(priv->handle, NULL, 0);
-
-	err = obex_get(priv->handle, type, name);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_read(ObexClient *self, gchar *buf, gsize count,
-					gsize *bytes_read, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_read(priv->handle, buf, count, bytes_read);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_write(ObexClient *self, const gchar *buf, gsize count,
-					gsize *bytes_written, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_write(priv->handle, buf, count, bytes_written);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_flush(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_flush(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_abort(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	err = obex_abort(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_close(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_close_transfer(priv->handle);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_get_error(ObexClient *self, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int rsp;
-
-	rsp = obex_get_response(priv->handle);
-	if (rsp == OBEX_RSP_SUCCESS)
-		return TRUE;
-
-	rsp2gerror(rsp, error);
-
-	return FALSE;
-}
-
-gboolean obex_client_mkdir(ObexClient *self, const gchar *path, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_setpath(priv->handle, path, 1);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_chdir(ObexClient *self, const gchar *path, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_setpath(priv->handle, path, 0);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean obex_client_delete(ObexClient *self, const gchar *name, GError **error)
-{
-	ObexClientPrivate *priv = OBEX_CLIENT_GET_PRIVATE(self);
-	int err;
-
-	debug("");
-
-	err = obex_delete(priv->handle, name);
-	if (err < 0) {
-		err2gerror(-err, error);
-		return FALSE;
-	}
-
-	return TRUE;
-}
diff --git a/glib/obex-client.h b/glib/obex-client.h
deleted file mode 100644
index 28ebd1d..0000000
--- a/glib/obex-client.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
-	\file glib/obex-client.h
-	OpenOBEX glib bindings client code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifndef __OBEX_CLIENT_H
-#define __OBEX_CLIENT_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-GQuark obex_error_quark(void);
-
-#define OBEX_ERROR obex_error_quark()
-
-enum {
-	OBEX_ERROR_NO_MEMORY,
-	OBEX_ERROR_BUSY,
-	OBEX_ERROR_INVALID_PARAMS,
-	OBEX_ERROR_ALREADY_CONNECTED,
-	OBEX_ERROR_NOT_CONNECTED,
-	OBEX_ERROR_LINK_FAILURE,
-	OBEX_ERROR_ABORTED,
-
-	/* Errors derived from OBEX response codes */
-	OBEX_ERROR_BAD_REQUEST,
-	OBEX_ERROR_UNAUTHORIZED,
-	OBEX_ERROR_PAYMENT_REQUIRED,
-	OBEX_ERROR_FORBIDDEN,
-	OBEX_ERROR_NOT_FOUND,
-	OBEX_ERROR_NOT_ALLOWED,
-	OBEX_ERROR_NOT_ACCEPTABLE,
-	OBEX_ERROR_PROXY_AUTH_REQUIRED,
-	OBEX_ERROR_REQUEST_TIME_OUT,
-	OBEX_ERROR_CONFLICT,
-	OBEX_ERROR_GONE,
-	OBEX_ERROR_LENGTH_REQUIRED,
-	OBEX_ERROR_PRECONDITION_FAILED,
-	OBEX_ERROR_ENTITY_TOO_LARGE,
-	OBEX_ERROR_URL_TOO_LARGE,
-	OBEX_ERROR_UNSUPPORTED_MEDIA_TYPE,
-	OBEX_ERROR_INTERNAL_SERVER_ERROR,
-	OBEX_ERROR_NOT_IMPLEMENTED,
-	OBEX_ERROR_BAD_GATEWAY,
-	OBEX_ERROR_SERVICE_UNAVAILABLE,
-	OBEX_ERROR_GATEWAY_TIMEOUT,
-	OBEX_ERROR_VERSION_NOT_SUPPORTED,
-	OBEX_ERROR_DATABASE_FULL,
-	OBEX_ERROR_DATABASE_LOCKED,
-
-	OBEX_ERROR_FAILED
-};
-
-#define OBEX_TYPE_CLIENT (obex_client_get_type())
-#define OBEX_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-					OBEX_TYPE_CLIENT, ObexClient))
-#define OBEX_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-					OBEX_TYPE_CLIENT, ObexClientClass))
-#define OBEX_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-							OBEX_TYPE_CLIENT))
-#define OBEX_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \
-							OBEX_TYPE_CLIENT))
-#define OBEX_GET_CLIENT_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \
-					OBEX_TYPE_CLIENT, ObexClientClass))
-
-typedef struct _ObexClient ObexClient;
-typedef struct _ObexClientClass ObexClientClass;
-
-struct _ObexClient {
-	GObject parent;
-};
-
-struct _ObexClientClass {
-	GObjectClass parent_class;
-
-	void (*connected)(ObexClient *self);
-	void (*disconnect)(ObexClient *self);
-	void (*canceled)(ObexClient *self);
-	void (*progress)(ObexClient *self);
-	void (*idle)(ObexClient *self);
-};
-
-GType obex_client_get_type(void);
-
-ObexClient *obex_client_new(void);
-
-void obex_client_destroy(ObexClient *self);
-
-void obex_client_set_auto_connect(ObexClient *self, gboolean auto_connect);
-
-gboolean obex_client_get_auto_connect(ObexClient *self);
-
-typedef enum {
-	OBEX_CLIENT_COND_IN	= 1 << 0,
-	OBEX_CLIENT_COND_OUT 	= 1 << 1,
-	OBEX_CLIENT_COND_DONE 	= 1 << 2,
-	OBEX_CLIENT_COND_ERR 	= 1 << 3,
-} ObexClientCondition;
-
-typedef void (*ObexClientFunc)(ObexClient *client,
-				ObexClientCondition condition, gpointer data);
-
-void obex_client_add_watch(ObexClient *self, ObexClientCondition condition,
-				ObexClientFunc func, gpointer data);
-
-void obex_client_add_watch_full(ObexClient *self,
-			ObexClientCondition condition, ObexClientFunc func,
-					gpointer data, GDestroyNotify notify);
-
-gboolean obex_client_attach_fd(ObexClient *self, int fd, GError **error);
-
-gboolean obex_client_connect(ObexClient *self, const guchar *target,
-						gsize size, GError **error);
-
-gboolean obex_client_disconnect(ObexClient *self, GError **error);
-
-gboolean obex_client_put_object(ObexClient *self, const gchar *type,
-					const gchar *name, gint size,
-					time_t mtime, GError **error);
-
-gboolean obex_client_get_object(ObexClient *self, const gchar *type,
-					const gchar *name, GError **error);
-
-gboolean obex_client_read(ObexClient *self, gchar *buf, gsize count,
-					gsize *bytes_read, GError **error);
-
-gboolean obex_client_write(ObexClient *self, const gchar *buf, gsize count,
-					gsize *bytes_written, GError **error);
-
-gboolean obex_client_flush(ObexClient *self, GError **error);
-
-gboolean obex_client_abort(ObexClient *self, GError **error);
-
-gboolean obex_client_close(ObexClient *self, GError **error);
-
-gboolean obex_client_get_error(ObexClient *self, GError **error);
-
-gboolean obex_client_mkdir(ObexClient *self, const gchar *path, GError **error);
-
-gboolean obex_client_chdir(ObexClient *self, const gchar *path, GError **error);
-
-gboolean obex_client_delete(ObexClient *self, const gchar *name, GError **error);
-
-G_END_DECLS
-
-#endif /* __OBEX_CLIENT_H */
diff --git a/glib/obex-debug.h b/glib/obex-debug.h
deleted file mode 100644
index 7c1f3d9..0000000
--- a/glib/obex-debug.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
-	\file glib/obex-debug.h
-	OpenOBEX glib bindings debug code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#include <stdio.h>
-
-#if defined(_MSC_VER) && _MSC_VER < 1400
-static void debug (char *fmt, ...) {}
-#else
-#define debug(fmt, ...) fprintf(stderr, "== %s: " fmt "\n" , __FUNCTION__ , ## __VA_ARGS__)
-#endif
diff --git a/glib/obex-error.c b/glib/obex-error.c
deleted file mode 100644
index cba70b4..0000000
--- a/glib/obex-error.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
-	\file glib/obex-error.c
-	OpenOBEX glib bindings error handling code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef _WIN32
-#include <winsock2.h>
-#define EISCONN WSAEISCONN
-#define ENOTCONN WSAENOTCONN
-#endif
-
-#include <errno.h>
-
-#include "obex-debug.h"
-#include "obex-client.h"
-#include "obex-error.h"
-
-GQuark obex_error_quark(void)
-{
-	static GQuark q = 0;
-
-	if (q == 0)
-		q = g_quark_from_static_string("obex-error-quark");
-
-	return q;
-}
-
-void err2gerror(int err, GError **gerr)
-{
-	debug("%s", g_strerror(err));
-
-	if (!gerr)
-		return;
-
-	switch (err) {
-	case ENOMEM:
-            g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NO_MEMORY,
-			    "Out of memory");
-	    break;
-
-	case EBUSY:
-            g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_BUSY,
-			    "Busy performing another operation");
-	    break;
-
-	case EINVAL:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_INVALID_PARAMS,
-			    "Invalid parameters were given");
-	    break;
-
-	case EISCONN:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_ALREADY_CONNECTED,
-			    "Already connected");
-	    break;
-
-	case ENOTCONN:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_CONNECTED,
-			    "Not connected");
-	    break;
-
-	case EINTR:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_ABORTED,
-			    "The operation was aborted");
-	    break;
-
-	default:
-	    g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_FAILED,
-			    "Failed");
-	    break;
-	}
-}
-
-void rsp2gerror(int rsp, GError **gerr)
-{
-	if (!gerr)
-		return;
-
-	switch (rsp) {
-	case 0x40:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_BAD_REQUEST,
-				"Bad Request - server couldn't understand request");
-		break;
-
-	case 0x41:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_UNAUTHORIZED,
-				"Unauthorized");
-		break;
-
-	case 0x42:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_PAYMENT_REQUIRED,
-				"Payment required");
-		break;
-
-	case 0x43:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_FORBIDDEN,
-				"Forbidden - operation is understood but refused");
-		break;
-
-	case 0x44:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_FOUND,
-				"Not Found");
-		break;
-
-	case 0x45:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_ALLOWED,
-				"Method not allowed");
-		break;
-
-	case 0x46:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_ACCEPTABLE,
-				"Not Acceptable");
-		break;
-
-	case 0x47:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_PROXY_AUTH_REQUIRED,
-				"Proxy Authentication required");
-		break;
-		
-	case 0x48:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_REQUEST_TIME_OUT,
-				"Request Time Out");
-		break;
-		
-	case 0x49:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_CONFLICT,
-				"Conflict");
-		break;
-
-	case 0x4A:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_GONE,
-				"Gone");
-		break;
-
-	case 0x4B:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_LENGTH_REQUIRED,
-				"Length Required");
-		break;
-
-	case 0x4C:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_PRECONDITION_FAILED,
-				"Precondition failed");
-		break;
-
-	case 0x4D:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_ENTITY_TOO_LARGE,
-				"Requested entity too large");
-		break;
-
-	case 0x4E:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_URL_TOO_LARGE,
-				"Request URL too large");
-		break;
-
-	case 0x4F:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_UNSUPPORTED_MEDIA_TYPE,
-				"Unsupported media type");
-		break;
-
-	case 0x50:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_INTERNAL_SERVER_ERROR,
-				"Internal Server Error");
-		break;
-
-	case 0x51:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_NOT_IMPLEMENTED,
-				"Not Implemented");
-		break;
-
-	case 0x52:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_BAD_GATEWAY,
-				"Bad Gateway");
-		break;
-
-	case 0x53:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_SERVICE_UNAVAILABLE,
-				"Service Unavailable");
-		break;
-
-	case 0x54:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_GATEWAY_TIMEOUT,
-				"Gateway Timeout");
-		break;
-
-	case 0x55:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_VERSION_NOT_SUPPORTED,
-				"HTTP version not supported");
-		break;
-
-	case 0x60:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_DATABASE_FULL,
-				"Database Full");
-		break;
-
-	case 0x61:
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_DATABASE_LOCKED,
-				"Database Locked");
-		break;
-
-	default:
-		debug("Unmapped OBEX response: %d", rsp);
-		g_set_error(gerr, OBEX_ERROR, OBEX_ERROR_FAILED,
-				"Failed");
-		break;
-	}
-}
-
diff --git a/glib/obex-error.h b/glib/obex-error.h
deleted file mode 100644
index b6ec5ca..0000000
--- a/glib/obex-error.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
-	\file glib/obex-error.h
-	OpenOBEX glib bindings error handling code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
- 	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifndef __OBEX_ERROR_H
-#define __OBEX_ERROR_H
-
-#include <glib.h>
-
-void err2gerror(int err, GError **gerr);
-
-void rsp2gerror(int rsp, GError **gerr);
-
-#endif /* __OBEX_ERROR_H */
diff --git a/glib/obex-lowlevel.c b/glib/obex-lowlevel.c
deleted file mode 100644
index 65172fc..0000000
--- a/glib/obex-lowlevel.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/**
-	\file glib/obex-lowlevel.c
-	OpenOBEX glib bindings low level code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
-#include <time.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
-static struct tm * gmtime_r ( time_t *t, struct tm *result)
-{
-	if (result) {
-		const time_t t2 = *t;
-		struct tm *tmp = gmtime(&t2);
-		if (!tmp)
-			return NULL;
-		memcpy(result, &tmp, sizeof(result));
-	}
-	return result;
-}
-#define snprintf _snprintf
-#define EISCONN WSAEISCONN
-#define ENOTCONN WSAENOTCONN
-#else
-#include <arpa/inet.h>
-#endif
-
-#include <glib.h>
-
-#include "obex-debug.h"
-#include "obex-lowlevel.h"
-
-#define BUF_SIZE 32767
-
-#define CID_INVALID 0xFFFFFFFF
-
-#define OBEX_TIMEOUT 1
-
-enum {
-	OBEX_CONNECTED = 1,	/* Equal to TCP_ESTABLISHED */
-	OBEX_OPEN,
-	OBEX_BOUND,
-	OBEX_LISTEN,
-	OBEX_CONNECT,
-	OBEX_CONNECT2,
-	OBEX_CONFIG,
-	OBEX_DISCONN,
-	OBEX_CLOSED
-};
-
-#pragma pack(1)
-typedef struct obex_setpath_hdr {
-    uint8_t  flags;
-    uint8_t constants;
-} obex_setpath_hdr_t;
-#pragma pack()
-
-#pragma pack(1)
-typedef struct obex_connect_hdr {
-    uint8_t  version;
-    uint8_t  flags;
-    uint16_t mtu;
-} obex_connect_hdr_t;
-#pragma pack()
-
-typedef struct {
-	int event;
-} obex_ev_t;
-
-typedef struct {
-	unsigned long state;
-	uint32_t cid;
-
-	void *user_data;
-	obex_callback_t *callback;
-
-	obex_object_t *pending;
-
-	int obex_rsp;		/* Response to last OBEX command */
-
-	/* Transfer related variables */
-	char buf[BUF_SIZE];	/* Data buffer for put and get requests */
-	int data_start;		/* Offset of data in buffer */
-	int data_length;	/* Length of actual data in buffer */
-	int counter;		/* Total bytes transfered so far */
-	int target_size;	/* Final length of object under transfer */
-	time_t modtime;		/* Modification time of object under transfer */
-	int tx_max;		/* Maximum size for sent chunks of data */
-	int close;		/* If the user has called obex_close */
-	GSList *events;		/* Events to signal when HandleInput returns */
-} obex_context_t;
-
-static void queue_event(obex_context_t *context, int e)
-{
-	obex_ev_t *event;
-
-	event = malloc(sizeof(obex_ev_t));
-	if (!event)
-		return;
-
-	memset(event, 0, sizeof(obex_ev_t));
-
-	event->event = e;
-
-	context->events = g_slist_append(context->events, event);
-}
-
-static int make_iso8601(time_t time, char *str, int len) {
-    struct tm tm;
-#if defined(HAVE_TIMEZONE) && defined(USE_LOCALTIME)
-    time_t tz_offset = 0;
-
-    tzset();
-
-    tz_offset = -timezone;
-    if (daylight > 0)
-        tz_offset += 3600;
-    time += tz_offset;
-#endif
-
-    if (gmtime_r(&time, &tm) == NULL)
-        return -1;
-
-    tm.tm_year += 1900;
-    tm.tm_mon++;
-
-    return snprintf(str, len,
-#ifdef USE_LOCALTIME
-                    "%04u%02u%02uT%02u%02u%02u",
-#else
-                    "%04u%02u%02uT%02u%02u%02uZ",
-#endif
-                    tm.tm_year, tm.tm_mon, tm.tm_mday,
-                    tm.tm_hour, tm.tm_min, tm.tm_sec);
-}
-
-time_t parse_iso8601(const char *str, int len)
-{
-	char *tstr, tz;
-	struct tm tm;
-	int nr;
-	time_t time, tz_offset = 0;
-
-	memset(&tm, 0, sizeof(struct tm));
-
-	/* According to spec the time doesn't have to be null terminated */
-	tstr = malloc(len + 1);
-	if (!tstr)
-		return -1;
-
-	strncpy(tstr, str, len);
-	tstr[len] = '\0';
-
-	nr = sscanf(tstr, "%04u%02u%02uT%02u%02u%02u%c",
-			&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
-			&tm.tm_hour, &tm.tm_min, &tm.tm_sec,
-			&tz);
-
-	free(tstr);
-
-	/* Fixup the tm values */
-	tm.tm_year -= 1900;       /* Year since 1900 */
-	tm.tm_mon--;              /* Months since January, values 0-11 */
-	tm.tm_isdst = -1;         /* Daylight savings information not avail */
-
-	if (nr < 6) {
-		/* Invalid time format */
-		return -1;
-	} 
-
-	time = mktime(&tm);
-
-#if defined(HAVE_TM_GMTOFF)
-	tz_offset = tm.tm_gmtoff;
-#elif defined(HAVE_TIMEZONE)
-	tz_offset = -timezone;
-	if (tm.tm_isdst > 0)
-		tz_offset += 3600;
-#endif
-
-	if (nr == 7) { /* Date/Time was in localtime (to remote device)
-			* already. Since we don't know anything about the
-			* timezone on that one we won't try to apply UTC offset
-			*/
-		time += tz_offset;
-	}
-
-	return time;
-}
-
-static void get_target_size_and_time(obex_t *handle, obex_object_t *object,
-					obex_context_t *context) {
-    obex_headerdata_t hv;
-    uint8_t hi;
-    unsigned int hlen;
-
-    context->target_size = -1;
-    context->modtime = -1;
-
-    while (OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) {
-        switch (hi) {
-            case OBEX_HDR_LENGTH:
-                context->target_size = hv.bq4;
-                break;
-            case OBEX_HDR_TIME:
-                context->modtime = parse_iso8601((char *) hv.bs, hlen);
-                break;
-            default:
-                break;
-        }
-    }
-
-    OBEX_ObjectReParseHeaders(handle, object);
-}
-
-static void obex_progress(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (context->callback && context->callback->progress_ind)
-		context->callback->progress_ind(handle, context->user_data);
-}
-
-static void obex_connect_done(obex_t *handle,
-					obex_object_t *object, int response)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-        obex_headerdata_t hd;
-        uint32_t hl;
-        uint8_t hi, *ptr;
-
-	if (response != OBEX_RSP_SUCCESS)
-		return;
-
-	context->state = OBEX_CONNECTED;
-
-	if (OBEX_ObjectGetNonHdrData(object, &ptr) == sizeof(obex_connect_hdr_t)) {
-		obex_connect_hdr_t *chdr = (obex_connect_hdr_t *) ptr;
-		uint16_t mtu = ntohs(chdr->mtu);
-		int new_size;
-		
-		debug("Connect success. Version: 0x%02x. Flags: 0x%02x OBEX packet length: %d",
-				chdr->version, chdr->flags, mtu);
-
-		/* Leave space for headers */
-		new_size = mtu - 200;
-		if (new_size < context->tx_max) {
-			debug("Resizing stream chunks to %d", new_size);
-			context->tx_max = new_size;
-		}
-	}
-
-	while (OBEX_ObjectGetNextHeader(handle, object, &hi, &hd, &hl)) {
-		switch (hi) {
-		case OBEX_HDR_CONNECTION:
-			context->cid = hd.bq4;
-			break;
-		case OBEX_HDR_WHO:
-			break;
-		}
-	}
-
-	if (context->callback && context->callback->connect_cfm)
-		context->callback->connect_cfm(handle, context->user_data);
-}
-
-static void obex_disconnect_done(obex_t *handle,
-					obex_object_t *object, int response)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	context->state = OBEX_CLOSED;
-}
-
-void obex_do_callback(obex_t *handle)
-{
-	GSList *l;
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (!context->events || ! context->callback || ! context->callback->command_ind)
-		return;
-
-	for (l = context->events; l != NULL; l = l->next) {
-		obex_ev_t *event = l->data;
-		context->callback->command_ind(handle, event->event, context->user_data);
-		free(event);
-	}
-
-	g_slist_free(context->events);
-	context->events = NULL;
-}
-
-static void obex_readstream(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	const uint8_t *buf;
-	int actual, free_space;
-
-	if (context->counter == 0)
-		get_target_size_and_time(handle, object, context);
-
-	actual = OBEX_ObjectReadStream(handle, object, &buf);
-	if (actual <= 0) {
-		debug("Error or no data on OBEX stream");
-		return;
-	}
-
-	context->counter += actual;
-
-	debug("obex_readstream: got %d bytes (%d in total)", actual, context->counter);
-
-	free_space = sizeof(context->buf) - (context->data_start + context->data_length);
-	if (actual > free_space) {
-		/* This should never happen */
-		debug("Out of buffer space: actual=%d, free=%d", actual, free_space);
-		return;
-	}
-
-	memcpy(&context->buf[context->data_start], buf, actual);
-	context->data_length += actual;
-
-	debug("OBEX_SuspendRequest");
-	OBEX_SuspendRequest(handle, object);
-
-	queue_event(context, OBEX_EV_STREAMAVAIL);
-}
-
-static void obex_writestream(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_headerdata_t hv;
-
-	if (context->data_length > 0) {
-		int send_size = context->data_length > context->tx_max ?
-						context->tx_max : context->data_length;
-
-		hv.bs = (uint8_t *) &context->buf[context->data_start];
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_BODY,
-				hv, send_size, OBEX_FL_STREAM_DATA);
-
-		context->counter += send_size;
-		context->data_length -= send_size;
-
-		if (context->data_length == 0)
-			context->data_start = 0;
-		else
-			context->data_start += send_size;
-
-		if (!context->close && context->data_length == 0) {
-			debug("OBEX_SuspendRequest");
-			OBEX_SuspendRequest(handle, object);
-			queue_event(context, OBEX_EV_STREAMEMPTY);
-		}
-	}
-	else {
-		if (context->counter < context->target_size)
-			debug("Sending stream end but only %d/%d bytes sent",
-					context->counter, context->target_size);
-		hv.bs = NULL;
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_BODY, hv, 0,
-					OBEX_FL_STREAM_DATAEND);
-	}
-}
-
-static void obex_event(obex_t *handle, obex_object_t *object,
-			int mode, int event, int command, int response)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	switch (event) {
-	case OBEX_EV_PROGRESS:
-		obex_progress(handle, object);
-		break;
-
-	case OBEX_EV_REQHINT:
-		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, response);
-		break;
-
-	case OBEX_EV_REQ:
-		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, response);
-		break;
-
-	case OBEX_EV_REQDONE:
-		debug("OBEX_EV_REQDONE");
-
-		context->obex_rsp = response;
-		queue_event(context, OBEX_EV_REQDONE);
-
-		if (context->pending && OBEX_Request(handle, context->pending) == 0) {
-			if (OBEX_ObjectGetCommand(handle, context->pending) == OBEX_CMD_PUT)
-				queue_event(context, OBEX_EV_STREAMEMPTY);
-			context->pending = NULL;
-		}
-
-	        switch (command) {
-	        case OBEX_CMD_CONNECT:
-			obex_connect_done(handle, object, response);
-			break;
-		case OBEX_CMD_DISCONNECT:
-			obex_disconnect_done(handle, object, response);
-			break;
-		case OBEX_CMD_PUT:
-		case OBEX_CMD_GET:
-			break;
-		case OBEX_CMD_SETPATH:
-			break;
-		case OBEX_CMD_SESSION:
-			break;
-		case OBEX_CMD_ABORT:
-			break;
-		}
-		break;
-
-	case OBEX_EV_LINKERR:
-		OBEX_TransportDisconnect(handle);
-		break;
-
-	case OBEX_EV_PARSEERR:
-		OBEX_TransportDisconnect(handle);
-		break;
-
-	case OBEX_EV_ACCEPTHINT:
-		break;
-
-	case OBEX_EV_ABORT:
-		queue_event(context, OBEX_EV_ABORT);
-		break;
-
-	case OBEX_EV_STREAMEMPTY:
-		debug("OBEX_EV_STREAMEMPTY");
-		obex_writestream(handle, object);
-		break;
-
-	case OBEX_EV_STREAMAVAIL:
-		debug("OBEX_EV_STREAMAVAIL");
-		obex_readstream(handle, object);
-		break;
-
-	case OBEX_EV_UNEXPECTED:
-		break;
-
-	case OBEX_EV_REQCHECK:
-		break;
-	}
-}
-
-obex_t *obex_open(int fd, obex_callback_t *callback, void *data)
-{
-	obex_t *handle;
-	obex_context_t *context;
-
-	context = malloc(sizeof(*context));
-	if (!context)
-		return NULL;
-
-	memset(context, 0, sizeof(*context));
-
-	context->state = OBEX_OPEN;
-	context->cid = CID_INVALID;
-
-	handle = OBEX_Init(OBEX_TRANS_FD, obex_event, 0);
-	if (!handle) {
-		free(context);
-		return NULL;
-	}
-
-	context->user_data = data;
-	context->callback = callback;
-	context->tx_max = sizeof(context->buf);
-
-	OBEX_SetUserData(handle, context);
-
-	OBEX_SetTransportMTU(handle, sizeof(context->buf), sizeof(context->buf));
-
-	if (FdOBEX_TransportSetup(handle, fd, fd, 0) < 0) {
-		OBEX_Cleanup(handle);
-		return NULL;
-	}
-
-        return handle;
-}
-
-void obex_close(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	g_return_if_fail(context != NULL);
-
-	OBEX_SetUserData(handle, NULL);
-
-	if (context->pending)
-		OBEX_ObjectDelete(handle, context->pending);
-
-	free(context);
-
-	OBEX_Cleanup(handle);
-}
-
-void obex_poll(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	unsigned long state = context->state;
-
-	while (1) {
-		OBEX_HandleInput(handle, OBEX_TIMEOUT);
-		if (context->state != state)
-			break;
-        }
-
-	obex_do_callback(handle);
-}
-
-static int obex_send_or_queue(obex_t *handle, obex_object_t *object)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int err;
-
-	err = OBEX_Request(handle, object);
-
-	if (err == -EBUSY && !context->pending) {
-		context->pending = object;
-		return 0;
-	}
-
-	return err;
-}
-
-int obex_connect(obex_t *handle, const unsigned char *target, size_t size)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err, ret;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CLOSED)
-		return -EISCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_CONNECT);
-	if (!object)
-		return -ENOMEM;
-
-	if (target) {
-                hd.bs = target;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_TARGET, hd, size, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			return err;
-                }
-	}
-
-	context->state = OBEX_CONNECT;
-
-	ret = obex_send_or_queue(handle, object);	
-	if (ret < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return ret;
-}
-
-int obex_disconnect(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	int ret;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_DISCONNECT);
-	if (!object)
-		return -ENOMEM;
-
-	context->state = OBEX_DISCONN;
-
-	if (context->callback && context->callback->disconn_ind)
-		context->callback->disconn_ind(handle, context->user_data);
-
-	ret = obex_send_or_queue(handle, object);
-	if (ret < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return ret;
-}
-
-int obex_delete(obex_t *handle, const char *name)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CONNECT
-					&& context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_PUT);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_CONNECTION, hd, 4, OBEX_FL_FIT_ONE_PACKET);
-	}
-
-	if (name) {
-		int len, ulen = (strlen(name) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) name, ulen);
-		hd.bs = unicode;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_NAME, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return err;
-                }
-
-                free(unicode);
-        }
-
-	err = obex_send_or_queue(handle, object);
-	if (err < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return err;
-}
-
-int obex_put(obex_t *handle, const char *type, const char *name, int size, time_t mtime)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err, cmd;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CONNECT
-					&& context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd == OBEX_CMD_GET || cmd == OBEX_CMD_PUT)
-		return -EBUSY;
-
-	/* Initialize transfer variables */
-	context->data_start = 0;
-	context->data_length = 0;
-	context->counter = 0;
-	context->target_size = size;
-	context->modtime = mtime;
-	context->close = 0;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_PUT);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_CONNECTION, hd, 4, OBEX_FL_FIT_ONE_PACKET);
-	}
-
-	if (type) {
-		int len = strlen(type) + 1;
-
-		hd.bs = (uint8_t *) type;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_TYPE, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			return err;
-                }
-        }
-
-	if (name) {
-		int len, ulen = (strlen(name) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) name, ulen);
-		hd.bs = unicode;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_NAME, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return err;
-                }
-
-                free(unicode);
-        }
-
-	/* Add a time header if possible */
-	if (context->modtime >= 0) {
-		char tstr[17];
-		int len;
-
-		len = make_iso8601(context->modtime, tstr, sizeof(tstr));
-
-		if (len >= 0) {
-			debug("Adding time header: %s", tstr);
-			hd.bs = (uint8_t *) tstr;
-			OBEX_ObjectAddHeader(handle, object, OBEX_HDR_TIME, hd, len, 0);
-		}
-	}
-
-	/* Add a length header if possible */
-	if (context->target_size > 0) {
-		debug("Adding length header: %d", context->target_size);
-		hd.bq4 = (uint32_t) context->target_size;
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_LENGTH, hd, 4, 0);
-	}
-
-	hd.bs = NULL;
-	OBEX_ObjectAddHeader(handle, object, OBEX_HDR_BODY, hd, 0, OBEX_FL_STREAM_START);
-
-	/* We need to suspend until the user has provided some data
-	 * by calling obex_client_write */
-	debug("OBEX_SuspendRequest");
-	OBEX_SuspendRequest(handle, object);
-
-	err = obex_send_or_queue(handle, object);
-	if (err < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return err;
-}
-
-int obex_get(obex_t *handle, const char *type, const char *name)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	int err, cmd;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_OPEN && context->state != OBEX_CONNECT
-					&& context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd == OBEX_CMD_GET || cmd == OBEX_CMD_PUT)
-		return -EBUSY;
-
-	/* Initialize transfer variables */
-	context->data_start = 0;
-	context->data_length = 0;
-	context->counter = 0;
-	context->target_size = -1;
-	context->modtime = -1;
-	context->close = 0;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_GET);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_CONNECTION, hd, 4, OBEX_FL_FIT_ONE_PACKET);
-	}
-
-	if (type) {
-		int len = strlen(type) + 1;
-
-		hd.bs = (uint8_t *) type;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_TYPE, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			return err;
-                }
-        }
-
-	if (name) {
-		int len, ulen = (strlen(name) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) name, ulen);
-		hd.bs = unicode;
-
-		err = OBEX_ObjectAddHeader(handle, object,
-			OBEX_HDR_NAME, hd, len, OBEX_FL_FIT_ONE_PACKET);
-		if (err < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return err;
-                }
-
-                free(unicode);
-        }
-
-	OBEX_ObjectReadStream(handle, object, NULL);
-
-	err = obex_send_or_queue(handle, object);
-	if (err < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return err;
-}
-
-int obex_read(obex_t *handle, char *buf, size_t count, size_t *bytes_read)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (OBEX_ObjectGetCommand(handle, NULL) != OBEX_CMD_GET)
-		return -EINVAL;
-
-	if (context->data_length == 0)
-		return -EAGAIN;
-
-	*bytes_read = count < context->data_length ? count : context->data_length;
-
-	memcpy(buf, &context->buf[context->data_start], *bytes_read);
-
-	context->data_length -= *bytes_read;
-
-	if (context->data_length)
-		context->data_start += *bytes_read;
-	else {
-		context->data_start = 0;
-		debug("OBEX_ResumeRequest");
-		OBEX_ResumeRequest(handle);
-	}
-
-	return 0;
-}
-
-int obex_write(obex_t *handle, const char *buf, size_t count, size_t *bytes_written)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int free_space;
-
-	if (OBEX_ObjectGetCommand(handle, NULL) != OBEX_CMD_PUT)
-		return -EINVAL;
-
-	free_space = sizeof(context->buf) - (context->data_start + context->data_length);
-
-	*bytes_written = count > free_space ? free_space : count;
-
-	memcpy(&context->buf[context->data_start + context->data_length], buf, *bytes_written);
-
-	context->data_length += *bytes_written;
-
-	if (context->data_length >= context->tx_max || *bytes_written == free_space) {
-		debug("OBEX_ResumeRequest");
-		OBEX_ResumeRequest(handle);
-	}
-
-	return 0;
-}
-
-int obex_flush(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-
-	if (OBEX_ObjectGetCommand(handle, NULL) != OBEX_CMD_PUT)
-		return -EINVAL;
-
-	if (context->data_length) {
-		debug("OBEX_ResumeRequest");
-		OBEX_ResumeRequest(handle);
-	}
-
-	return 0;
-}
-
-int obex_abort(obex_t *handle)
-{
-	int cmd;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd != OBEX_CMD_PUT || cmd != OBEX_CMD_GET)
-		return -EINVAL;
-
-	return OBEX_CancelRequest(handle, 1);
-}
-
-int obex_close_transfer(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int cmd;
-
-	cmd = OBEX_ObjectGetCommand(handle, NULL);
-	if (cmd != OBEX_CMD_PUT && cmd != OBEX_CMD_GET)
-		return -EINVAL;
-
-	context->close = 1;
-
-	debug("OBEX_ResumeRequest");
-	OBEX_ResumeRequest(handle);
-
-	return 0;
-}
-
-int obex_get_response(obex_t *handle)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	int rsp;
-
-	rsp = context->obex_rsp;
-	context->obex_rsp = OBEX_RSP_SUCCESS;
-
-	return rsp;
-}
-
-int obex_setpath(obex_t *handle, const char *path, int create)
-{
-	obex_context_t *context = OBEX_GetUserData(handle);
-	obex_object_t *object;
-	obex_headerdata_t hd;
-	obex_setpath_hdr_t sphdr;
-	int ret;
-	g_return_val_if_fail(context != NULL, -1);
-
-	if (context->state != OBEX_CONNECTED)
-		return -ENOTCONN;
-
-	object = OBEX_ObjectNew(handle, OBEX_CMD_SETPATH);
-	if (!object)
-		return -ENOMEM;
-
-	if (context->cid != CID_INVALID) {
-		hd.bq4 = context->cid;
-		OBEX_ObjectAddHeader(handle, object, OBEX_HDR_CONNECTION, hd, 4, 0);
-	}
-
-	memset(&sphdr, 0, sizeof(obex_setpath_hdr_t));
-
-	if (strcmp(path, "..") == 0) {
-		/* Can't create parent dir */
-		if (create)
-			return -EINVAL;
-		sphdr.flags = 0x03;
-	} else {
-		int len, ulen = (strlen(path) + 1) * 2;
-		uint8_t *unicode = malloc(ulen);
-
-		if (!create)
-			sphdr.flags = 0x02;
-
-		if (!unicode) {
-			OBEX_ObjectDelete(handle, object);
-			return -ENOMEM;
-		}
-
-		len = OBEX_CharToUnicode(unicode, (uint8_t *) path, ulen);
-		hd.bs = unicode;
-
-		ret = OBEX_ObjectAddHeader(handle, object, OBEX_HDR_NAME, hd, len, 0);
-		if (ret < 0) {
-			OBEX_ObjectDelete(handle, object);
-			free(unicode);
-			return ret;
-		}
-
-		free(unicode);
-	}
-
-	OBEX_ObjectSetNonHdrData(object, (uint8_t *) &sphdr, 2);
-
-	ret = obex_send_or_queue(handle, object);
-	if (ret < 0)
-		OBEX_ObjectDelete(handle, object);
-
-	return ret;
-}
diff --git a/glib/obex-lowlevel.h b/glib/obex-lowlevel.h
deleted file mode 100644
index 594b6fa..0000000
--- a/glib/obex-lowlevel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-	\file glib/obex-lowlevel.h
-	OpenOBEX glib bindings low level code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#include <openobex/obex.h>
-
-#ifdef OBEX_CLIENT
-#undef OBEX_CLIENT
-#endif
-
-typedef struct {
-	void (*connect_cfm)(obex_t *handle, void *data);
-	void (*disconn_ind)(obex_t *handle, void *data);
-	void (*progress_ind)(obex_t *handle, void *data);
-	void (*command_ind)(obex_t *handle, int event, void *data);
-} obex_callback_t;
-
-obex_t *obex_open(int fd, obex_callback_t *callback, void *data);
-void obex_close(obex_t *handle);
-void obex_poll(obex_t *handle);
-int obex_connect(obex_t *handle, const unsigned char *target, size_t size);
-int obex_disconnect(obex_t *handle);
-int obex_put(obex_t *handle, const char *type, const char *name, int size, time_t mtime);
-int obex_get(obex_t *handle, const char *type, const char *name);
-int obex_write(obex_t *handle, const char *buf, size_t count, size_t *bytes_written);
-int obex_read(obex_t *handle, char *buf, size_t count, size_t *bytes_read);
-int obex_abort(obex_t *handle);
-int obex_flush(obex_t *handle);
-int obex_close_transfer(obex_t *handle);
-int obex_get_response(obex_t *handle);
-void obex_do_callback(obex_t *handle);
-int obex_setpath(obex_t *handle, const char *path, int create);
-int obex_delete(obex_t *handle, const char *name);
diff --git a/glib/obex-marshal.list b/glib/obex-marshal.list
deleted file mode 100644
index 5b76282..0000000
--- a/glib/obex-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:VOID
diff --git a/glib/test-client.c b/glib/test-client.c
deleted file mode 100644
index ca93948..0000000
--- a/glib/test-client.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- 	\file glib/test-client.c
-	OpenOBEX glib bindings client test code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#include <io.h>
-#else
-#include <termios.h>
-#endif
-
-#include "obex-client.h"
-
-#define FTP_UUID (guchar *) \
-	"\xF9\xEC\x7B\xC4\x95\x3C\x11\xD2\x98\x4E\x52\x54\x00\xDC\x9E\x09"
-
-static GMainLoop *mainloop;
-
-static void sig_term(int sig)
-{
-	g_main_loop_quit(mainloop);
-}
-
-static int open_device(const char *device)
-{
-	int fd;
-#ifdef _WIN32
-	HANDLE h;
-	DCB ti;
-
-	h = CreateFile(device,
-			GENERIC_READ|GENERIC_WRITE,
-			0,NULL,OPEN_EXISTING,0,NULL);
-	if (h == INVALID_HANDLE_VALUE)
-		return -1;
-
-	//TODO: tcflush-equivalent function?
-	ti.StopBits = ONESTOPBIT;
-	ti.Parity = NOPARITY;
-	ti.ByteSize = 8;
-	ti.fNull = FALSE;
-	SetCommState(h,&ti);
-	fd = _open_osfhandle((intptr_t)h,0);
-#else
-	struct termios ti;
-
-	fd = open(device, O_RDWR | O_NOCTTY);
-	if (fd < 0)
-		return fd;
-
-	tcflush(fd, TCIOFLUSH);
-
-	cfmakeraw(&ti);
-	tcsetattr(fd, TCSANOW, &ti);
-#endif
-	return fd;
-}
-
-static void transfer(ObexClient *client, ObexClientCondition cond, gpointer data)
-{
-	GError *gerr = NULL;
-	int err, *io = data;
-
-	if (cond & OBEX_CLIENT_COND_IN) {
-		gchar buf[1024];
-		gsize len;
-
-		printf("OBEX_CLIENT_COND_IN\n");
-
-		do {
-			obex_client_read(client, buf, sizeof(buf), &len, &gerr);
-
-			if (gerr != NULL) {
-				printf("obex_client_read failed: %s\n", gerr->message);
-				g_error_free(gerr);
-				gerr = NULL;
-				break;
-			}
-
-			printf("Data buffer with size %zd available\n", len);
-
-			if (len > 0 && *io >= 0)
-				err = write(*io, buf, len);	
-
-		} while (len == sizeof(buf));
-	}
-
-	if (cond & OBEX_CLIENT_COND_OUT) {
-		char buf[10000];
-		ssize_t actual;
-
-		printf("OBEX_CLIENT_COND_OUT\n");
-
-		if (*io < 0) {
-			printf("No data to send!\n");
-			return;
-		}
-
-		actual = read(*io, buf, sizeof(buf));
-		if (actual == 0) {
-			obex_client_close(client, &gerr);
-			if (gerr != NULL) {
-				printf("obex_client_close failed: %s\n",
-						gerr->message);
-				g_error_free(gerr);
-				gerr = NULL;
-			}
-			close(*io);
-			*io = -1;
-		} else if (actual > 0) {
-			gsize written;
-
-			obex_client_write(client, buf, actual, &written, &gerr);
-
-			if (gerr != NULL) {
-				printf("writing data failed: %s\n", gerr->message);
-				g_error_free(gerr);
-				gerr = NULL;
-			} else if (written < actual)
-				printf("Only %zd/%zd bytes were accepted by obex_client_write!\n",
-						written, actual);
-			else
-				obex_client_flush(client, NULL);
-
-		}
-		else
-			fprintf(stderr, "read: %s\n", strerror(errno));
-	}
-	
-	if (cond & OBEX_CLIENT_COND_DONE) {
-		obex_client_get_error(client, &gerr);
-		if (gerr != NULL) {
-			printf("Operation failed: %s\n", gerr->message);
-			g_error_free(gerr);
-			gerr = NULL;
-		}
-		else
-			printf("Operation completed with success\n");
-	}
-		
-	if (cond & OBEX_CLIENT_COND_ERR)
-		printf("Error in transfer\n");
-}
-
-int main(int argc, char *argv[])
-{
-	ObexClient *client;
-	int fd, io = -1;
-#ifndef _WIN32
-	struct sigaction sa;
-#endif
-
-	g_type_init();
-
-	fd = open_device("/dev/rfcomm42");
-	if (fd < 0) {
-		perror("Can't open device");
-		exit(EXIT_FAILURE);
-	}
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-
-	client = obex_client_new();
-
-	obex_client_add_watch(client, 0, transfer, &io);
-
-	obex_client_attach_fd(client, fd, NULL);
-
-	if (argc > 1) {
-		struct stat s;
-
-		if (stat(argv[1], &s) < 0) {
-			fprintf(stderr, "stat(%s): %s\n", argv[1], strerror(errno));
-			return 1;
-		}
-
-		io = open(argv[1], O_RDONLY);
-		if (io < 0) {
-			fprintf(stderr, "open(%s): %s\n", argv[1], strerror(errno));
-			return 1;
-		}
-
-		obex_client_put_object(client, NULL, argv[1], s.st_size, s.st_mtime, NULL);
-	}
-	else
-		obex_client_get_object(client, NULL, "telecom/devinfo.txt", NULL);
-
-
-#ifndef _WIN32
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = sig_term;
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGINT,  &sa, NULL);
-#endif
-
-	g_main_loop_run(mainloop);
-
-	obex_client_destroy(client);
-
-	if (io >= 0)
-		close(io);
-
-	close(fd);
-
-	return 0;
-}
diff --git a/glib/test-lowlevel.c b/glib/test-lowlevel.c
deleted file mode 100644
index d0bf80b..0000000
--- a/glib/test-lowlevel.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
-	\file glib/test-lowlevel.c
-	OpenOBEX glib bindings low level test code.
-	OpenOBEX library - Free implementation of the Object Exchange protocol.
-
-	Copyright (C) 2005-2006  Marcel Holtmann <marcel@...>
-
-	OpenOBEX 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 OpenOBEX. If not, see <http://www.gnu.org/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#ifdef _WIN32
-#include <io.h>
-#define SOME_TTY "COM4"
-#else
-#include <termios.h>
-#define SOME_TTY "/dev/rfcomm42"
-#endif
-
-#include "obex-lowlevel.h"
-
-static int open_device(const char *device)
-{
-	int fd;
-#ifdef _WIN32
-	HANDLE h;
-	DCB ti;
-
-	h = CreateFile(device,
-			GENERIC_READ|GENERIC_WRITE,
-			0,NULL,OPEN_EXISTING,0,NULL);
-	if (h == INVALID_HANDLE_VALUE)
-		return -1;
-
-	//TODO: tcflush-equivalent function?
-	ti.StopBits = ONESTOPBIT;
-	ti.Parity = NOPARITY;
-	ti.ByteSize = 8;
-	ti.fNull = FALSE;
-	SetCommState(h,&ti);
-	fd = _open_osfhandle((intptr_t)h,0);
-#else
-	struct termios ti;
-
-	fd = open(device, O_RDWR | O_NOCTTY);
-	if (fd < 0)
-		return fd;
-
-	tcflush(fd, TCIOFLUSH);
-
-	cfmakeraw(&ti);
-	tcsetattr(fd, TCSANOW, &ti);
-#endif
-	return fd;
-}
-
-int main(int argc, char *argv[])
-{
-	obex_t *handle;
-	int fd;
-
-	fd = open_device(SOME_TTY);
-	if (fd < 0) {
-		perror("Can't open device");
-		exit(EXIT_FAILURE);
-	}
-
-	handle = obex_open(fd, NULL, NULL);
-
-	obex_connect(handle, NULL, 0);
-	obex_poll(handle);
-
-	obex_get(handle, NULL, "telecom/devinfo.txt");
-	obex_poll(handle);
-
-	obex_disconnect(handle);
-	obex_poll(handle);
-
-	obex_close(handle);
-
-	close(fd);
-
-	return 0;
-}
diff --git a/openobex-glib.pc.in b/openobex-glib.pc.in
deleted file mode 100644
index 9ee3e87..0000000
--- a/openobex-glib.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
- 
-Name: OpenOBEX
-Description: GLib integration of the Object Exchange protocol
-Version: @VERSION@
-Requires: glib-2.0
-Requires.private: openobex
-Libs: -L${libdir} -lopenobex-glib
-Cflags: -I${includedir}
-- 
1.7.5.4

---
 INSTALL.txt       |   10 +++-----
 INSTALL_Win32.txt |   54 ++++++++++++++++++++++++++--------------------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index 25b4fcd..88f7b38 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,16 +1,15 @@
 How to compile OpenObex
 =======================
 
-
 The compilation of OpenObex is done using CMake.
 The following OBEX transports are available:
  * Bluetooth (not all systems, see below)
  * Irda (not all systems, see below)
  * TCP
+ * USB
  * Custom transport
  * File descriptor
 
-
 The following operating systems are supported:
  * Linux [Bluetooth, Irda]
  * FreeBSD [Bluetooth]
@@ -32,7 +31,6 @@ system, please see INSTALL_Win32.txt.
 [2]: at http://www.cmake.org
 
 
-
 2 Compilation
 =============
 
@@ -53,9 +51,9 @@ gives you lots of other options.
 ========================
 
 It is recommended to not build in the source directory. To build in any other
-directory, just run cmake with the path to the source directory as last argument.
-A mix of this is a 'build' subdirectory in the source tree. The example below uses
-this method.
+directory, just run cmake with the path to the source directory as last
+argument. A mix of this is a 'build' subdirectory in the source tree. The
+example below uses this method.
 
 At the command line, run:
   $ mkdir build
diff --git a/INSTALL_Win32.txt b/INSTALL_Win32.txt
index 1800854..69bea2f 100644
--- a/INSTALL_Win32.txt
+++ b/INSTALL_Win32.txt
@@ -13,12 +13,15 @@ The requirements to compile OpenObex on Windows are fairly low:
 4. CMake(>= 2.6)[2] or autoconf+automake
 
 The supported compilers are:
- * Microsoft Visual Studio 9 .NET 2008
- * Microsoft Visual Studio 8 .NET 2005
- * Microsoft Visual Studio 7.1 .NET 2003
+ * Microsoft Visual Studio 2010 (10)
+ * Microsoft Visual Studio 2008 (9)
+ * Microsoft Visual Studio 2005 (8)
+ * Microsoft Visual Studio .NET 2003 (7.1)
  * MinGW gcc
  * Cygwin gcc
 
+Visual Studio 2008 and 2010 already include the SDK.
+
 [1]: at http://libusb-win32.sf.net (if not compiling for cygwin)
 [2]: at http://www.cmake.org
 
@@ -45,19 +48,18 @@ You need to install the following extra packages from http://www.mingw.org:
   * msysDTK (1.0.1 works)
 
 Libtool from msysDTK in incomplete, it needs an additional 'file' utility. You
-can get this from http://gnuwin32.sf.net. Do NOT install it in the MSYS directory
-but somewhere else that is already mounted and in $PATH (e.g. into the mingw
-directory).
+can get this from http://gnuwin32.sf.net. Do NOT install it in the MSYS
+directory but somewhere else that is already mounted and in $PATH (e.g. into
+the mingw directory).
 
-Additionally, download the following packages from http://www.gtk.org/download-windows.html:
-  * glib
-  * glib-dev
+Additionally, download the following packages from e.g.
+http://www.gtk.org/download-windows.html:
   * pkg-config
 Unpack them all into the same directory!
 
 You need to prepare the build environment by editing /etc/fstab and mount the
-GLIB installation dir to /glib and the libusb-win32 installation dir to /libusb.
-MinGW should already be present unter /mingw.
+libusb-win32 installation dir to /libusb. MinGW should already be present under
+/mingw.
 Additionally, you create /pdsk/include and copy the following header files from
 the Platform SDK to there:
   ws2bth.h
@@ -66,20 +68,18 @@ the Platform SDK to there:
   af_irda.h
 
 If you check out from VCS and configure does not exist, you can create it with:
-  $ export ACLOCAL="aclocal -I /glib/share/aclocal"
   $ autoreconf -v -f -i
 
 Now you need some environment variables for configure:
-  $ export CFLAGS="-I/libusb/include -I/glib/include -I/psdk/include"
-  $ export LDFLAGS="-L/libusb/lib/gcc -L/glib/lib"
-  $ export PATH="$PATH:/glib/bin"
-  $ export PKG_CONFIG_PATH="/glib/lib/pkgconfig"
+  $ export CFLAGS="-I/libusb/include -I/psdk/include"
+  $ export LDFLAGS="-L/libusb/lib/gcc"
 
 Now you can finally run configure:
   $ ./configure --prefix=/mingw --disable-shared
 
 This will build a static library. Due to a bug in libtool, you cannot build the
-static and the shared version at the same time. To build the shared version, run:
+static and the shared version at the same time.
+To build the shared version, run:
   $ ./configure --prefix=/mingw --disable-static
 
 
@@ -89,11 +89,11 @@ static and the shared version at the same time. To build the shared version, run
 Visual Studio
 -------------
 
-Using Visual Studion >= 8 (EXpress versions are sufficient) is the recommended
-way of compiling under Windows.
-You must open the console link that runs the proper vcvars.bat (see Start menu).
-Then, you _MUST_ add the directories of the platform SDK include files, libraries
-and executables to the environment variables INCLUDE, LIB and PATH.
+Using Visual Studio >= 2008 (Express versions are sufficient) is the
+recommended way of compiling under Windows. You must open the console link that
+runs the proper vcvars.bat (see Start menu).
+Then, you _MUST_ add the directories of the platform SDK include files,
+libraries and executables to the environment variables INCLUDE, LIB and PATH.
 Now, your build environment is set up. You can now call cmake with the proper
 generator (see "cmake --help"). Using the "NMake Makefiles" generator, OpenObex
 can be compiled directly in the command prompt window:
@@ -148,12 +148,12 @@ shell command window:
 3 Installation
 ==============
 
-You can run the installation directly by calling the "install" make target. With
-the DESTDIR variable, you can add an additional prefix:
+You can run the installation directly by calling the "install" make target.
+With the DESTDIR variable, you can add an additional prefix:
   $ make install DESTDIR=/some/directory
 
-Additionally, when you used CMake, you can create installation packages but a few
-steps are needed:
+Additionally, when you used CMake, you can create installation packages but a
+few steps are needed:
   * install NSIS
   * install a ZIP program (e.g. info-zip)
-Now you are ready to run the "pacakge" make target.
+Now you are ready to run the "package" make target.
-- 
1.7.5.4

There are now three steps for sending an object: a prepare step where a new
TX message is written to the TX buffer, a transmit step where the object
is transmitted and the decision step on wether the whole object is finished.
The goal is to allow sending incomplete message buffers on non-blocking sockets.
---
 lib/obex_main.c   |   30 +++++++---
 lib/obex_main.h   |    4 +-
 lib/obex_object.c |  154 +++++++++++++++++++++++++++++++++++++----------------
 lib/obex_object.h |    5 ++
 4 files changed, 136 insertions(+), 57 deletions(-)

diff --git a/lib/obex_main.c b/lib/obex_main.c
index 1d39cd8..884c9e3 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -210,23 +210,20 @@ void obex_response_request(obex_t *self, uint8_t opcode)
 	obex_return_if_fail(self != NULL);
 
 	msg = buf_reuse(self->tx_msg);
-
-	obex_data_request(self, msg, opcode | OBEX_FINAL);
+	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
+	obex_data_request(self, msg);
 }
 
 /*
- * Function obex_data_request (self, opcode, cmd)
+ * Function obex_data_request_prepare (self, opcode, cmd)
  *
- *    Send response or command code along with optional headers/data.
+ *    Prepare response or command code along with optional headers/data
+ *    to send.
  *
  */
-int obex_data_request(obex_t *self, buf_t *msg, int opcode)
+void obex_data_request_prepare(obex_t *self, buf_t *msg, int opcode)
 {
 	obex_common_hdr_t *hdr;
-	int status;
-
-	obex_return_val_if_fail(self != NULL, -1);
-	obex_return_val_if_fail(msg != NULL, -1);
 
 	/* Insert common header */
 	hdr = buf_reserve_begin(msg, sizeof(*hdr));
@@ -235,6 +232,21 @@ int obex_data_request(obex_t *self, buf_t *msg, int opcode)
 	hdr->len = htons((uint16_t) msg->data_size);
 
 	DUMPBUFFER(1, "Tx", msg);
+}
+
+/*
+ * Function obex_data_request (self, opcode)
+ *
+ *    Send message.
+ *
+ */
+int obex_data_request(obex_t *self, buf_t *msg)
+{
+	int status;
+
+	obex_return_val_if_fail(self != NULL, -1);
+	obex_return_val_if_fail(msg != NULL, -1);
+
 	DEBUG(1, "len = %lu bytes\n", (unsigned long) msg->data_size);
 
 	do {
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 3c3098c..53d2768 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -71,7 +71,9 @@ int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
 
 void obex_response_request(struct obex *self, uint8_t opcode);
-int obex_data_request(struct obex *self, struct databuffer *msg, int opcode);
+void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
+			       int opcode);
+int obex_data_request(struct obex *self, struct databuffer *msg);
 int obex_cancelrequest(struct obex *self, int nice);
 
 char *obex_response_to_string(int rsp);
diff --git a/lib/obex_object.c b/lib/obex_object.c
index 3fcd10a..f888a2d 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -446,30 +446,54 @@ static unsigned int obex_object_send_srm_flags (uint8_t flag)
 	}
 }
 
+static int obex_object_get_real_opcode(obex_object_t *object,
+				       int allowfinalcmd, int forcefinalbit)
+{
+	int real_opcode = object->opcode;
+
+	/* Decide which command to use, and if to use final-bit */
+	DEBUG(4, "allowfinalcmd: %d forcefinalbit:%d\n", allowfinalcmd,
+	      forcefinalbit);
+
+	/* Have more headers (or body) to send? */
+	if (!slist_is_empty(object->tx_headerq)) {
+		/* In server, final bit is always set.
+		 * In client, final bit is set only when we finish sending. */
+		if (forcefinalbit)
+			real_opcode |= OBEX_FINAL;
+
+	} else {
+		/* Have no more headers to send */
+		if (allowfinalcmd != FALSE) {
+			/* Allowed to send final command (== end data we are
+			 * sending) */
+			real_opcode = object->lastopcode;
+		}
+
+		real_opcode |= OBEX_FINAL;
+	}
+
+	return real_opcode;
+}
+
 /*
- * Function obex_object_send()
+ * Function obex_object_prepare_send()
  *
- *    Send away all headers attached to an object. Returns:
- *       1 on sucessfully done
- *       0 on progress made
- *     < 0 on error
+ *    Prepare to send away all headers attached to an object.
+ *    Returns:
+ *       1 when a message was created
+ *       0 when no message was created
+ *      -1 on error
  */
-int obex_object_send(obex_t *self, obex_object_t *object,
-					int allowfinalcmd, int forcefinalbit)
+int obex_object_prepare_send(obex_t *self, obex_object_t *object,
+			     int allowfinalcmd, int forcefinalbit)
 {
 	buf_t *txmsg;
-	int actual, real_opcode, finished = 0, addmore = TRUE;
+	int actual, real_opcode, addmore = TRUE;
 	uint16_t tx_left;
 	unsigned int srm_flags = 0;
 
-	DEBUG(4, "allowfinalcmd: %d forcefinalbit:%d\n", allowfinalcmd,
-			forcefinalbit);
-
-	/* Return finished if aborted */
-	if (object->abort)
-		return 1;
-
-	/* Don't do anything of object is suspended */
+	/* Don't do anything if object is suspended */
 	if (object->suspend)
 		return 0;
 
@@ -539,8 +563,8 @@ int obex_object_send(obex_t *self, obex_object_t *object,
 					object->suspend = 1;
 
 				if (h->hi == OBEX_HDR_SRM_FLAGS)
-					srm_flags =
-						obex_object_send_srm_flags(h->buf->data[0]);
+					srm_flags = obex_object_send_srm_flags(
+							       h->buf->data[0]);
 
 				/* Remove from tx-queue */
 				object->tx_headerq =
@@ -570,46 +594,82 @@ int obex_object_send(obex_t *self, obex_object_t *object,
 			addmore = FALSE;
 	}
 
-	/* Decide which command to use, and if to use final-bit */
-	if (object->tx_headerq) {
-		/* Have more headers (or body) to send */
-		real_opcode = object->opcode;
+	real_opcode = obex_object_get_real_opcode(self->object, allowfinalcmd,
+						  forcefinalbit);
+	DEBUG(4, "Generating packet with opcode %d\n", real_opcode);
+	obex_data_request_prepare(self, self->tx_msg, real_opcode);
 
-		/* In server, final bit is always set.
-		 * In client, final bit is set only when we finish sending. */
-		if (forcefinalbit)
-			real_opcode |= OBEX_FINAL;
+	self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_REMOTE;
+	self->srm_flags |= srm_flags;
 
-		finished = 0;
-	} else {
-		/* Have no more headers to send */
-		if (allowfinalcmd == FALSE) {
-			/* Not allowed to send final command (== server,
-			 * receiving incomming request) */
-			real_opcode = object->opcode;
+	return 1;
+}
 
-		} else {
-			/* Allowed to send final command (== end data we are
-			 * sending) */
-			real_opcode = object->lastopcode;
-		}
+int obex_object_finished(obex_t *self, obex_object_t *object, int allowfinalcmd)
+{
+	int finished = 0;
 
-		real_opcode |= OBEX_FINAL;
+	if (object->abort)
+		return 1;
+
+	if (object->suspend)
+		return 0;
+
+	if (slist_is_empty(object->tx_headerq))
 		finished = !!allowfinalcmd;
+
+	return finished;
+}
+
+int obex_object_send_transmit(obex_t *self, obex_object_t *object)
+{
+	int ret;
+
+	if (!buf_empty(self->tx_msg)) {
+		ret = obex_data_request(self, self->tx_msg);
+		if (ret < 0) {
+			DEBUG(4, "Send error\n");
+			return -1;
+		}
 	}
 
-	DEBUG(4, "Sending package with opcode %d\n", real_opcode);
-	actual = obex_data_request(self, txmsg, real_opcode);
+	return buf_empty(self->tx_msg);
+}
 
-	if (actual < 0) {
-		DEBUG(4, "Send error\n");
-		return -1;
+/*
+ * Function obex_object_send()
+ *
+ *    Send away an object packet.
+ *    Returns:
+ *       1 complete
+ *       0 incomplete but no error
+ *      -1 error
+ */
+int obex_object_send(obex_t *self, obex_object_t *object, int allowfinalcmd,
+		     int forcefinalbit)
+{
+	int ret;
+
+	/* Return finished if aborted */
+	if (object->abort) {
+		(void)buf_reuse(self->tx_msg);
+		return 1;
 	}
 
-	self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_REMOTE;
-	self->srm_flags |= srm_flags;
+	if (buf_empty(self->tx_msg)) {
+		ret = obex_object_prepare_send(self, object, allowfinalcmd,
+					       forcefinalbit);
+		if (ret == -1) {
+			DEBUG(4, "Packet prepare error\n");
+			return -1;
+		} else if (ret == 0)
+			return 0;
+	}
 
-	return finished;
+	ret = obex_object_send_transmit(self, object);
+	if (ret == 1)
+		ret = obex_object_finished(self, object, allowfinalcmd);
+	return ret;
 }
 
 /*
diff --git a/lib/obex_object.h b/lib/obex_object.h
index fd2904a..eef3458 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -96,6 +96,11 @@ int obex_object_getnextheader(struct obex *self, struct obex_object *object, uin
 int obex_object_reparseheaders(struct obex *self, struct obex_object *object);
 void obex_object_setcmd(struct obex_object *object, uint8_t cmd);
 int obex_object_setrsp(struct obex_object *object, uint8_t rsp, uint8_t lastrsp);
+int obex_object_prepare_send(obex_t *self, obex_object_t *object,
+			     int allowfinalcmd, int forcefinalbit);
+int obex_object_finished(obex_t *self, obex_object_t *object,
+			 int allowfinalcmd);
+int obex_object_send_transmit(obex_t *self, obex_object_t *object);
 int obex_object_send(struct obex *self, struct obex_object *object,
 		     int allowfinalcmd, int forcefinalbit);
 
-- 
1.7.5.4

---
 lib/obex.c        |    8 +-
 lib/obex_client.c |  207 ++++++++++++++++++++++++++++++++--------------------
 lib/obex_client.h |    2 -
 lib/obex_main.c   |   36 +++++-----
 4 files changed, 148 insertions(+), 105 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index e56ef74..991f06f 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -44,7 +44,6 @@
 #include "obex_main.h"
 #include "obex_object.h"
 #include "obex_connect.h"
-#include "obex_client.h"
 #include "databuffer.h"
 
 #include "fdobex.h"
@@ -511,10 +510,10 @@ int CALLAPI OBEX_GetFD(obex_t *self)
 }
 
 /**
-	Start a request (as client).
+	Schedule a request (as client).
 	\param self OBEX handle
 	\param object Object containing request
-	\return -1 or negative error code on error
+	\return -1 on error, 0 on success.
  */
 LIB_SYMBOL
 int CALLAPI OBEX_Request(obex_t *self, obex_object_t *object)
@@ -534,8 +533,9 @@ int CALLAPI OBEX_Request(obex_t *self, obex_object_t *object)
 	self->object = object;
 	self->mode = MODE_CLI;
         self->state = STATE_SEND;
+	self->substate = SUBSTATE_PREPARE_TX;
 
-	return obex_client_send(self, NULL, 0);
+	return 0;
 }
 
 /**
diff --git a/lib/obex_client.c b/lib/obex_client.c
index fd9962b..c8dc843 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -178,91 +178,135 @@ static int obex_client_recv(obex_t *self)
 
 }
 
-int obex_client_send(obex_t *self, buf_t *msg, int rsp)
+static int obex_client_send_transmit_tx(obex_t *self)
 {
 	int ret;
 
-	/* In progress of sending request */
-	DEBUG(4, "STATE_SEND\n");
+	DEBUG(4, "STATE: SEND/TRANSMIT_TX\n");
 
-	if (self->object->first_packet_sent == 1) {
-		/* Any errors from peer? Win2k will send RSP_SUCCESS after
-		 * every fragment sent so we have to accept that too.*/
-		switch (rsp) {
-		case OBEX_RSP_SUCCESS:
-		case OBEX_RSP_CONTINUE:
-			break;
-
-		default:
-			DEBUG(0, "STATE_SEND. request not accepted.\n");
-			obex_deliver_event(self, OBEX_EV_REQDONE,
-						self->object->opcode, rsp, TRUE);
-			/* This is not an Obex error, it is just that the peer
-			 * doesn't accept the request, so return 0 - Jean II */
-			return 0;
-		}
-
-		if (msg_get_len(msg) > 3) {
-			/* For Single Response Mode, this is actually not
-			 * unexpected. */
-			if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL) {
-				DEBUG(1, "STATE_SEND. Didn't excpect data from "
-						"peer (%u)\n", msg_get_len(msg));
-				DUMPBUFFER(4, "unexpected data", msg);
-				obex_deliver_event(self, OBEX_EV_UNEXPECTED,
-						self->object->opcode, 0, FALSE);
-			}
-
-			/* At this point, we are in the middle of sending our
-			 * request to the server, and it is already sending us
-			 * some data! This breaks the whole Request/Response
-			 * model! Most often, the server is sending some out of
-			 * band progress information for a PUT.
-			 * This is the way we will handle that:
-			 * Save this header in our Rx header list. We can have
-			 * duplicated headers, so no problem. User can check the
-			 * header in the next EV_PROGRESS, doing so will hide
-			 * the header (until reparse). If not, header will be
-			 * parsed at 'final', or just ignored (common case for
-			 * PUT).
-			 * No headeroffset needed because 'connect' is single
-			 * packet (or we deny it). */
-			ret = -1;
-			if (self->object->opcode == OBEX_CMD_CONNECT)
-				ret = obex_object_receive(self, msg);
-			if (ret < 0) {
-				obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-				self->mode = MODE_SRV;
-				self->state = STATE_IDLE;
-				return -1;
-			}
-
-			/* Note : we may want to get rid of received header,
-			 * however they are mixed with legitimate headers,
-			 * and the user may expect to consult them later.
-			 * So, leave them here (== overhead). */
-		}
-	}
-
-	ret = obex_object_send(self, self->object, TRUE, FALSE);
+	ret = obex_object_send_transmit(self, self->object);
 	if (ret < 0) {
 		/* Error while sending */
 		obex_deliver_event(self, OBEX_EV_LINKERR,
 					self->object->opcode, 0, TRUE);
 		self->mode = MODE_SRV;
 		self->state = STATE_IDLE;
-		return -1;
 
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_PROGRESS, self->object->opcode,
+								      0, FALSE);
+		if (obex_object_finished(self, self->object, TRUE)) {
+			self->state = STATE_REC;
+			self->substate = SUBSTATE_RECEIVE_RX;
+
+		} else {
+			int check = 0;
+			if (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+			    !(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
+				/* Still, we need to do a zero-wait check for an
+				 * negative response or for connection errors. */
+				check = obex_transport_handle_input(self, 0);
+				if (check <= 0) /* no input */
+					self->substate = SUBSTATE_RECEIVE_RX;
+				else
+					self->substate = SUBSTATE_PREPARE_TX;
+
+			} else
+				self->substate = SUBSTATE_RECEIVE_RX;
+		}
 	}
 
-	self->object->first_packet_sent = 1;
-	obex_deliver_event(self, OBEX_EV_PROGRESS, self->object->opcode,
-								0, FALSE);
-	if (ret > 0)
-		self->state = STATE_REC;
+	return ret;
+}
 
-	return 0;
+static int obex_client_send_prepare_tx(obex_t *self)
+{
+	int ret;
+
+	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
+
+	ret = obex_object_prepare_send(self, self->object, TRUE, FALSE);
+	if (ret == 1) {
+		self->substate = SUBSTATE_TRANSMIT_TX;
+		return obex_client_send_transmit_tx(self);
+
+	} else
+		return ret;
+}
+
+static int obex_client_send(obex_t *self)
+{
+	int ret;
+	buf_t *msg = obex_data_receive(self);
+	int rsp;
+
+	DEBUG(4, "STATE: SEND/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	rsp = msg_get_rsp(msg);
+
+	/* Any errors from peer? Win2k will send RSP_SUCCESS after
+	 * every fragment sent so we have to accept that too.*/
+	switch (rsp) {
+	case OBEX_RSP_SUCCESS:
+	case OBEX_RSP_CONTINUE:
+		break;
+
+	default:
+		DEBUG(0, "STATE_SEND. request not accepted.\n");
+		obex_deliver_event(self, OBEX_EV_REQDONE, self->object->opcode,
+								     rsp, TRUE);
+		/* This is not an Obex error, it is just that the peer
+		 * doesn't accept the request, so return 0 - Jean II */
+		return 0;
+	}
+
+	if (msg_get_len(msg) > 3) {
+		/* For Single Response Mode, this is actually not
+		 * unexpected. */
+		if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL) {
+			DEBUG(1, "STATE_SEND. Didn't excpect data from "
+			      "peer (%u)\n", msg_get_len(msg));
+			DUMPBUFFER(4, "unexpected data", msg);
+			obex_deliver_event(self, OBEX_EV_UNEXPECTED,
+						self->object->opcode, 0, FALSE);
+		}
+
+		/* At this point, we are in the middle of sending our
+		 * request to the server, and it is already sending us
+		 * some data! This breaks the whole Request/Response
+		 * model! Most often, the server is sending some out of
+		 * band progress information for a PUT.
+		 * This is the way we will handle that:
+		 * Save this header in our Rx header list. We can have
+		 * duplicated headers, so no problem. User can check the
+		 * header in the next EV_PROGRESS, doing so will hide
+		 * the header (until reparse). If not, header will be
+		 * parsed at 'final', or just ignored (common case for
+		 * PUT).
+		 * No headeroffset needed because 'connect' is single
+		 * packet (or we deny it). */
+		ret = -1;
+		if (self->object->opcode == OBEX_CMD_CONNECT)
+			ret = obex_object_receive(self, msg);
+		if (ret < 0) {
+			obex_deliver_event(self, OBEX_EV_PARSEERR,
+						 self->object->opcode, 0, TRUE);
+			self->mode = MODE_SRV;
+			self->state = STATE_IDLE;
+			return -1;
+		}
+
+		/* Note : we may want to get rid of received header,
+		 * however they are mixed with legitimate headers,
+		 * and the user may expect to consult them later.
+		 * So, leave them here (== overhead). */
+	}
+
+	obex_data_receive_finished(self);
+	self->substate = SUBSTATE_PREPARE_TX;
+	return obex_client_send_prepare_tx(self);
 }
 
 
@@ -274,15 +318,20 @@ int obex_client_send(obex_t *self, buf_t *msg, int rsp)
  */
 int obex_client(obex_t *self)
 {
-	int ret = -1;
-	buf_t *msg = obex_data_receive(self);
-	int rsp = msg_get_rsp(msg);
-
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_SEND:
-		ret = obex_client_send(self, msg, rsp);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_client_send(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_client_send_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_client_send_transmit_tx(self);
+		}
 		break;
 
 	case STATE_REC:
@@ -300,10 +349,8 @@ int obex_client(obex_t *self)
 
 	default:
 		DEBUG(0, "Unknown state\n");
-		obex_deliver_event(self, OBEX_EV_PARSEERR, rsp, 0, TRUE);
-		return -1;
+		break;
 	}
 
-	obex_data_receive_finished(self);
-	return ret;
+	return -1;
 }
diff --git a/lib/obex_client.h b/lib/obex_client.h
index d1ae8fd..6f0d0fa 100644
--- a/lib/obex_client.h
+++ b/lib/obex_client.h
@@ -23,9 +23,7 @@
 #define OBEX_CLIENT_H
 
 struct obex;
-struct databuffer;
 
 int obex_client(struct obex *self);
-int obex_client_send(obex_t *self, buf_t *msg, int rsp);
 
 #endif
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 5337208..d3f0612 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -285,37 +285,35 @@ int obex_work(obex_t *self, int timeout)
 	 * as the client is not supposed to send any when we (as server) are
 	 * sending the response.
 	 * For request reception, this is handled above */
-	if (self->object &&
+	if (self->mode == MODE_SRV &&
+			self->object &&
 			self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
 			self->state == STATE_SEND &&
 			!(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
 		/* Still, we need to do a zero-wait check for an ABORT
 		 * and for connection errors. */
 		ret = obex_transport_handle_input(self, 0);
-		if (ret == 0) { /* timeout: no error, no input */
-			switch (self->mode) {
-			case MODE_SRV:
-				ret = obex_server_send(self, NULL, self->object->cmd, 0);
-				break;
-
-			case MODE_CLI:
-				ret = obex_client_send(self, NULL, OBEX_RSP_CONTINUE);
-				break;
-
-			default:
-				return -1;
-			}
-		}
+		if (ret == 0) /* timeout: no error, no input */
+			ret = obex_server_send(self, NULL, self->object->cmd, 0);
 		if (ret < 0)
 			return -1;
 		else
 			return sizeof(obex_common_hdr_t);
+
+		ret = obex_transport_handle_input(self, timeout);
+		if (ret <= 0)
+			return ret;
+
+	} else if (self->mode == MODE_CLI) {
+		if (self->substate == SUBSTATE_RECEIVE_RX) {
+			ret = obex_transport_handle_input(self, timeout);
+			if (ret <= 0)
+				return ret;
+		}
+
 	}
 
-	ret = obex_transport_handle_input(self, timeout);
-	if (ret == 1)
-		ret = obex_mode(self);
-	return ret;
+	return obex_mode(self);
 }
 
 /*
-- 
1.7.5.4

We don't need install instruction in the (usually installed by distributions)
README file, that's what the INSTALL* files are for. The copyright information
in this file is non-sense, it belongs to the source files.
---
 README |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/README b/README
index ddbe0ab..e46e521 100644
--- a/README
+++ b/README
@@ -1,27 +1,6 @@
 OpenOBEX - Free implementation of the Object Exchange protocol
 **************************************************************
 
-Copyright (C) 1998-2000  Dag Brattli <dagb@...>
-Copyright (C) 1999-2000  Pontus Fuchs <pontus.fuchs@...>
-Copyright (C) 2001-2002  Jean Tourrilhes <jt@...>
-Copyright (C) 2002-2008  Marcel Holtmann <marcel@...>
-
-
-Compilation and installation
-============================
-
-In order to compile OpenOBEX you need following software packages:
-	- GCC compiler
-
-To configure run:
-	./configure --prefix=/usr
- 
-Configure automatically searches for all required components and packages. 
-
-To compile and install run:
-	make && make install
-
-
 Information
 ===========
 
-- 
1.7.5.4

---
 include/openobex/obex.h |    2 ++
 lib/obex_incl.h         |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index 096d5a2..e773c12 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -65,6 +65,7 @@ typedef struct obex_object obex_object_t;
 /*
  *  OBEX API (deprecated)
  */
+#if defined(OPENOBEX_DEPRECATED)
 /** The user event callback.
  *  \deprecated Use #obex_event_cb_t and its functions instead.
  *  \param handle the obex handle
@@ -85,6 +86,7 @@ OPENOBEX_SYMBOL(void)     OBEX_SetUserCallBack(obex_t *self,
 OPENOBEX_SYMBOL(obex_t *) OBEX_ServerAccept(obex_t *server,
 					    obex_event_t eventcb, void * data);
 #define OBEX_HandleInput(self, timeout) OBEX_Work((self), ((timeout)*1000L))
+#endif
 
 /*
  *  OBEX API
diff --git a/lib/obex_incl.h b/lib/obex_incl.h
index ae95e59..dbca28e 100644
--- a/lib/obex_incl.h
+++ b/lib/obex_incl.h
@@ -6,6 +6,10 @@
 
 /* This overides the define in openobex/obex.h */
 #define OPENOBEX_SYMBOL(retval) LIB_SYMBOL retval CALLAPI
+
+/* This add the deprecated API items */
+#define OPENOBEX_DEPRECATED 1
+
 #include <openobex/obex.h>
 
 #endif
-- 
1.7.5.4

---
 lib/obex_object.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/lib/obex_object.h b/lib/obex_object.h
index 31a7d80..914b405 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -74,8 +74,6 @@ struct obex_object {
 	enum obex_rsp_mode rsp_mode;	/* OBEX_RSP_MODE_* */
 
 	int suspend;			/* Temporarily stop transfering object */
-	int continue_received;		/* CONTINUE received after sending last command */
-	int first_packet_sent;		/* Whether we've sent the first packet */
 
 	const uint8_t *s_buf;		/* Pointer to streaming data */
 	unsigned int s_len;		/* Length of stream-data */
-- 
1.7.5.4

Additionally, it adds a small wrapper function for BAD_REQUEST which can be
used quite often. Still, this is the only case where an incomplete write/send
is not possible but adding more states for this seems overkill. After all its
only 3 bytes to send.
The abort cases are now using the STATE_ABORT with a small wrapper.
---
 lib/obex_main.c   |   21 ----------
 lib/obex_main.h   |    1 -
 lib/obex_server.c |  114 +++++++++++++++++++++++++---------------------------
 3 files changed, 55 insertions(+), 81 deletions(-)

diff --git a/lib/obex_main.c b/lib/obex_main.c
index 5a7864c..c62386c 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -304,27 +304,6 @@ void obex_deliver_event(obex_t *self, int event, int cmd, int rsp, int del)
 }
 
 /*
- * Function obex_response_request (self, opcode)
- *
- *    Send a response to peer device
- *
- */
-void obex_response_request(obex_t *self, uint8_t opcode)
-{
-	buf_t *msg;
-
-	obex_return_if_fail(self != NULL);
-
-	msg = buf_reuse(self->tx_msg);
-	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
-	do {
-		int status = obex_data_request(self, msg);
-		if (status < 0)
-			break;
-	} while (!buf_empty(msg));
-}
-
-/*
  * Function obex_data_request_prepare (self, opcode, cmd)
  *
  *    Prepare response or command code along with optional headers/data
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 4f1465c..5aae7e9 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -78,7 +78,6 @@ buf_t* obex_data_receive(obex_t *self);
 void obex_data_receive_finished(obex_t *self);
 enum obex_data_direction obex_get_data_direction (obex_t *self);
 
-void obex_response_request(struct obex *self, uint8_t opcode);
 void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
 			       int opcode);
 int obex_data_request(struct obex *self, struct databuffer *msg);
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 3a8d179..4b701ba 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -58,27 +58,61 @@ static __inline int msg_get_final(const buf_t *msg)
 		return 0;
 }
 
+static void obex_response_request(obex_t *self, uint8_t opcode)
+{
+	buf_t *msg;
+
+	obex_return_if_fail(self != NULL);
+
+	msg = buf_reuse(self->tx_msg);
+	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
+	do {
+		int status = obex_data_request(self, msg);
+		if (status < 0)
+			break;
+	} while (!buf_empty(msg));
+}
+
+static int obex_server_bad_request(obex_t *self)
+{
+	int opcode = self->object->opcode;
+
+	obex_response_request(self, OBEX_RSP_BAD_REQUEST);
+	self->state = STATE_IDLE;
+	obex_deliver_event(self, OBEX_EV_PARSEERR, opcode, 0, TRUE);
+	return -1;
+}
+
 static int obex_server_abort_transmit(obex_t *self)
 {
 	int ret = 0;
 	int rsp = OBEX_RSP_CONTINUE;
+	int opcode = OBEX_CMD_ABORT;
 
 	DEBUG(4, "STATE: ABORT/TRANSMIT_TX\n");
 
 	ret = obex_object_send_transmit(self, NULL);
-	if (ret == -1) {
-		obex_deliver_event(self, OBEX_EV_LINKERR,
-				   self->object->opcode, rsp, TRUE);
-
-	} else if (ret == 1) {
-		obex_deliver_event(self, OBEX_EV_ABORT,
-				   self->object->opcode, rsp, FALSE);
-	}
+	if (self->object)
+		opcode = self->object->opcode;
+	if (ret == -1)
+		obex_deliver_event(self, OBEX_EV_LINKERR, opcode, rsp, TRUE);
+	else if (ret == 1)
+		obex_deliver_event(self, OBEX_EV_ABORT, opcode, rsp, FALSE);
 
 	self->state = STATE_IDLE;
 	return ret;
 }
 
+static int obex_server_abort_response(obex_t *self)
+{
+	buf_t *msg = buf_reuse(self->tx_msg);
+
+	obex_data_request_prepare(self, msg, OBEX_RSP_SUCCESS | OBEX_FINAL);
+	self->state = STATE_ABORT;
+	self->substate = SUBSTATE_TRANSMIT_TX;
+	return obex_server_abort_transmit(self);
+}
+
 static int obex_server_abort_prepare(obex_t *self)
 {
 	buf_t *msg = buf_reuse(self->tx_msg);
@@ -178,12 +212,7 @@ static int obex_server_send(obex_t *self)
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
 		DEBUG(1, "Got OBEX_ABORT request!\n");
-		obex_response_request(self, OBEX_RSP_SUCCESS);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode, 0, TRUE);
-		/* This is not an Obex error, it is just that the peer
-		 * aborted the request, so return 0 - Jean II */
-		return 0;
+		return obex_server_abort_response(self);
 	}
 
 	if (len > 3) {
@@ -215,13 +244,8 @@ static int obex_server_send(obex_t *self)
 		ret = -1;
 		if (cmd != OBEX_CMD_CONNECT)
 			ret = obex_object_receive(self, msg);
-		if (ret < 0) {
-			obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-			self->state = STATE_IDLE;
-			obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-			return -1;
-		}
+		if (ret < 0)
+			return obex_server_bad_request(self);
 
 		/* Note: we may want to get rid of received header, however they
 		 * are mixed with legitimate headers, and the user may expect to
@@ -300,25 +324,14 @@ static int obex_server_recv(obex_t *self, int first)
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
 		DEBUG(1, "Got OBEX_ABORT request!\n");
-		obex_response_request(self, OBEX_RSP_SUCCESS);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, self->object->opcode,
-								0, TRUE);
-		/* This is not an Obex error, it is just that the peer
-		 * aborted the request, so return 0 - Jean II */
-		return 0;
+		return obex_server_abort_response(self);
 	}
 
 	/* Sanity check */
-	if (cmd != self->object->cmd) {
+	if (cmd != self->object->cmd)
 		/* The cmd-field of this packet is not the
 		 * same as int the first fragment. Bail out! */
-		obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_PARSEERR,
-					self->object->opcode, cmd, TRUE);
-		return -1;
-	}
+		return obex_server_bad_request(self);
 
 	/* Get the non-header data and look at all non-body headers.
 	 * Leaving the body headers out here has advantages:
@@ -331,13 +344,8 @@ static int obex_server_recv(obex_t *self, int first)
 	 */
 	filter = (1 << OBEX_HDR_ID_BODY | 1 << OBEX_HDR_ID_BODY_END);
 	if (obex_object_receive_nonhdr_data(self, msg) < 0 ||
-			obex_object_receive_headers(self, msg, filter) < 0) {
-		obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-		return -1;
-	}
+			obex_object_receive_headers(self, msg, filter) < 0)
+		return obex_server_bad_request(self);
 
 	/* Let the user decide whether to accept or deny a
 	 * multi-packet request by examining all headers in
@@ -353,13 +361,8 @@ static int obex_server_recv(obex_t *self, int first)
 	switch ((self->object->opcode & ~OBEX_FINAL) & 0xF0) {
 	case OBEX_RSP_CONTINUE:
 	case OBEX_RSP_SUCCESS:
-		if (obex_object_receive_headers(self, msg, ~filter) < 0) {
-			obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-			self->state = STATE_IDLE;
-			obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-			return -1;
-		}
+		if (obex_object_receive_headers(self, msg, ~filter) < 0)
+			return obex_server_bad_request(self);
 		break;
 
 	default:
@@ -415,11 +418,8 @@ static int obex_server_idle(obex_t *self)
 	 * we don't need to send a request hint to the application */
 	if (cmd == OBEX_CMD_ABORT) {
 		DEBUG(1, "Got OBEX_ABORT request!\n");
-		obex_response_request(self, OBEX_RSP_SUCCESS);
-		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_ABORT, cmd, 0, TRUE);
 		obex_data_receive_finished(self);
-		return 0;
+		return obex_server_abort_response(self);
 	}
 
 	self->object = obex_object_new();
@@ -442,12 +442,8 @@ static int obex_server_idle(obex_t *self)
 	case OBEX_CMD_CONNECT:
 		DEBUG(4, "Got CMD_CONNECT\n");
 		/* Connect needs some extra special treatment */
-		if (obex_parse_connect_header(self, msg) < 0) {
-			obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-			obex_deliver_event(self, OBEX_EV_PARSEERR,
-						self->object->opcode, 0, TRUE);
-			return -1;
-		}
+		if (obex_parse_connect_header(self, msg) < 0)
+			return obex_server_bad_request(self);
 		self->object->headeroffset = 4;
 		break;
 
-- 
1.7.5.4

This additional level of the state machine is used by the states SEND and REC
and will help to remove some work-arounds that are currently only there because
this additional level is missing.
---
 lib/defines.h   |    6 ++++++
 lib/obex_main.h |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lib/defines.h b/lib/defines.h
index 4169911..eb2257b 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -29,6 +29,12 @@ enum obex_state {
 	STATE_REC,
 };
 
+enum obex_substate {
+	SUBSTATE_RECEIVE_RX,
+	SUBSTATE_PREPARE_TX,
+	SUBSTATE_TRANSMIT_TX,
+};
+
 #define OBEX_SRM_FLAG_WAIT_LOCAL  (1 << 0)
 #define OBEX_SRM_FLAG_WAIT_REMOTE (1 << 1)
 
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 8a3e975..24d37c5 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -41,6 +41,7 @@ struct obex {
 	uint16_t mtu_tx_max;		/* Maximum TX we can accept */
 
 	enum obex_state state;
+	enum obex_substate substate;
 	enum obex_mode mode;
 	enum obex_rsp_mode rsp_mode;	/* OBEX_RSP_MODE_* */
 
-- 
1.7.5.4

---
 include/openobex/obex_const.h |    1 +
 lib/CMakeLists.txt            |    1 +
 lib/Makefile.am               |    2 +-
 lib/btobex.c                  |   12 ++++++++-
 lib/fdobex.c                  |   58 +++++++++++++++++++++++++++++-----------
 lib/inobex.c                  |   12 ++++++++
 lib/irobex.c                  |   21 ++++++++++-----
 lib/nonblock.h                |   43 ++++++++++++++++++++++++++++++
 lib/obex.c                    |    1 +
 lib/obex_main.c               |   19 +++++++++----
 lib/obex_transport.c          |   51 ++++++++++++++++++++++++++----------
 11 files changed, 176 insertions(+), 45 deletions(-)
 create mode 100644 lib/nonblock.h

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index b4bad7f..8276aae 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -167,6 +167,7 @@ typedef union {
 #define OBEX_FL_FILTERHINT	(1 <<  2) /* Filter devices based on hint bit */
 #define OBEX_FL_FILTERIAS	(1 <<  3) /* Filter devices based on IAS entry */
 #define OBEX_FL_CLOEXEC		(1 <<  4) /* Set CLOEXEC flag on file descriptors */
+#define OBEX_FL_NONBLOCK	(1 <<  5) /* Set the NONBLOCK flag on file descriptors */ 
 
 /* For OBEX_ObjectAddHeader */
 #define OBEX_FL_FIT_ONE_PACKET	0x01	/* This header must fit in one packet */
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f404529..eacc1dd 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -53,6 +53,7 @@ set ( HEADERS
   fdobex.h
   customtrans.h
   cloexec.h
+  nonblock.h
 )
 
 set ( openobex_PUBLIC_HEADER
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ae92239..8da0860 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,7 @@ libopenobex_la_SOURCES = \
 	irda_wrap.h \
 	usbutils.c usbutils.h \
 	usbobex.c usb1obex.c usbobex.h \
-	visibility.h defines.h debug.h cloexec.h
+	visibility.h defines.h debug.h cloexec.h nonblock.h
 
 libopenobex_la_CPPFLAGS = -I$(top_srcdir)/include
 libopenobex_la_CFLAGS = -D_GNU_SOURCE @CFLAG_VISIBILITY@ @USB1_CFLAGS@
diff --git a/lib/btobex.c b/lib/btobex.c
index 8df237a..652e3db 100644
--- a/lib/btobex.c
+++ b/lib/btobex.c
@@ -46,6 +46,7 @@ bdaddr_t bluez_compat_bdaddr_any = { BTH_ADDR_NULL };
 #endif
 
 #include "cloexec.h"
+#include "nonblock.h"
 
 static int btobex_init(obex_t *self)
 {
@@ -233,6 +234,8 @@ static int btobex_accept(obex_t *self)
 		return -1;
 
 	trans->mtu = OBEX_DEFAULT_MTU;
+	if (self->init_flags & OBEX_FL_NONBLOCK)
+		socket_set_nonblocking(trans->fd);	
 
 	return 0;
 }
@@ -268,7 +271,14 @@ static int btobex_connect_request(obex_t *self)
 
 	ret = connect(trans->fd, (struct sockaddr*) &data->peer,
 							sizeof(data->peer));
-	if (ret < 0) {
+#if defined(_WIN32)
+	if (ret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)
+		ret = 0;
+#else
+	if (ret == -1 && errno == EINPROGRESS)
+		ret = 0;
+#endif
+	if (ret == -1) {
 		DEBUG(4, "connect(): error %d\n", errno);
 		goto out_freesock;
 	}
diff --git a/lib/fdobex.c b/lib/fdobex.c
index fa2d64a..70ae791 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -68,6 +68,9 @@ static int fdobex_write(obex_t *self, buf_t *msg)
 	struct obex_transport *trans = &self->trans;
 	int fd = trans->data.fd.writefd;
 	size_t size = msg->data_size;
+	int status;
+	fd_set fdset;
+	struct timeval time = {trans->timeout, 0};
 
 	if (size == 0)
 		return 0;
@@ -76,35 +79,58 @@ static int fdobex_write(obex_t *self, buf_t *msg)
 		size = trans->mtu;
 	DEBUG(1, "sending %zu bytes\n", size);
 
-	if (trans->timeout >= 0) {
-		/* setup everything to check for blocking writes */
-		fd_set fdset;
-		struct timeval time = {trans->timeout, 0};
-		int status;
-
-		FD_ZERO(&fdset);
-		FD_SET(fd, &fdset);
+	FD_ZERO(&fdset);
+	FD_SET(fd, &fdset);
+	if (trans->timeout >= 0)
 		status = select((int)fd+1, NULL, &fdset, NULL, &time);
-		if (status == 0)
-			return 0;
-	}
+	else
+		status = select((int)fd+1, NULL, &fdset, NULL, NULL);
 
-#ifdef _WIN32
-	return _write(fd, msg->data, size);
+	if (status == 0)
+		return 0;
+
+#if defined(_WIN32)
+	status = _write(fd, msg->data, size);
 #else
-	return write(fd, msg->data, size);
+	status = write(fd, msg->data, size);
+	/* The following are not really transport errors. */
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
 #endif
+
+	return status;
 }
 
 static int fdobex_read(obex_t *self, void *buf, int buflen)
 {
 	struct obex_transport *trans = &self->trans;
+	int status;
+	int fd = trans->fd;
+	fd_set fdset;
+	struct timeval time = {trans->timeout, 0};
+
+	FD_ZERO(&fdset);
+	FD_SET(fd, &fdset);
+	if (trans->timeout >= 0)
+		status = select((int)fd+1, NULL, &fdset, NULL, &time);
+	else
+		status = select((int)fd+1, NULL, &fdset, NULL, NULL);
+
+	if (status == 0)
+		return 0;
 
 #ifdef _WIN32
-	return  _read(trans->fd, buf, buflen);
+	status = _read(fd, buf, buflen);
 #else
-	return read(trans->fd, buf, buflen);
+	status = read(fd, buf, buflen);
+	/* The following are not really transport errors */
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
 #endif
+
+	return status;
 }
 
 void fdobex_get_ops(struct obex_transport_ops* ops)
diff --git a/lib/inobex.c b/lib/inobex.c
index 4ae2b61..51302fd 100644
--- a/lib/inobex.c
+++ b/lib/inobex.c
@@ -40,9 +40,11 @@
 #include "obex_main.h"
 #include "inobex.h"
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include "cloexec.h"
+#include "nonblock.h"
 
 #define OBEX_PORT 650
 
@@ -292,6 +294,9 @@ static int inobex_accept(obex_t *self)
 
 	/* Just use the default MTU for now */
 	trans->mtu = OBEX_DEFAULT_MTU;
+	if (self->init_flags & OBEX_FL_NONBLOCK)
+		socket_set_nonblocking(trans->fd);	
+
 	return 1;
 }
 
@@ -346,6 +351,13 @@ static int inobex_connect_request(obex_t *self)
 
 	ret = connect(trans->fd, (struct sockaddr *) &data->peer,
 							sizeof(data->peer));
+#if defined(_WIN32)
+	if (ret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)
+		ret = 0;
+#else
+	if (ret == -1 && errno == EINPROGRESS)
+		ret = 0;
+#endif
 	if (ret == -1) {
 		DEBUG(4, "Connect failed\n");
 		obex_delete_socket(self, trans->fd);
diff --git a/lib/irobex.c b/lib/irobex.c
index b0aeaa2..d2512d1 100644
--- a/lib/irobex.c
+++ b/lib/irobex.c
@@ -59,6 +59,7 @@
 #include "obex_main.h"
 #include "irobex.h"
 #include "cloexec.h"
+#include "nonblock.h"
 
 static int irobex_init (obex_t *self)
 {
@@ -363,6 +364,8 @@ static int irobex_accept(obex_t *self)
 
 	trans->mtu = irobex_get_mtu(self);
 	DEBUG(3, "transport mtu=%d\n", trans->mtu);
+	if (self->init_flags & OBEX_FL_NONBLOCK)
+		socket_set_nonblocking(trans->fd);	
 
 	return 1;
 }
@@ -519,20 +522,24 @@ static int irobex_connect_request(obex_t *self)
 
 	ret = connect(trans->fd, (struct sockaddr*) &data->peer,
 							sizeof(data->peer));
-	if (ret < 0) {
+#if defined(_WIN32)
+	if (ret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)
+		ret = 0;
+#else
+	if (ret == -1 && errno == EINPROGRESS)
+		ret = 0;
+#endif
+	if (ret == -1) {
 		DEBUG(4, "ret=%d\n", ret);
-		goto out_freesock;
+		obex_delete_socket(self, trans->fd);
+		trans->fd = INVALID_SOCKET;
+		return ret;
 	}
 
 	trans->mtu = irobex_get_mtu(self);
 	DEBUG(3, "transport mtu=%d\n", trans->mtu);
 
 	return 1;
-
-out_freesock:
-	obex_delete_socket(self, trans->fd);
-	trans->fd = INVALID_SOCKET;
-	return ret;
 }
 
 /*
diff --git a/lib/nonblock.h b/lib/nonblock.h
new file mode 100644
index 0000000..fad6058
--- /dev/null
+++ b/lib/nonblock.h
@@ -0,0 +1,43 @@
+/**
+	\file nonblock.h
+	wrapper functions to enable/disable non-blocking
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 2010 Hendrik Sattler, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
+
+#if defined(_WIN32)
+#include <winsock2.h>
+#else
+#include <fcntl.h>
+#endif
+
+static __inline void socket_set_nonblocking(socket_t fd)
+{
+#if defined(_WIN32)
+	unsigned long val = 1;
+
+	(void)ioctlsocket(fd, FIONBIO, &val);
+
+#else
+	long status = fcntl(fd, F_GETFL);
+
+	if (status == -1)
+		status = 0;
+
+	(void)fcntl(fd, F_SETFL, status | O_NONBLOCK);
+#endif
+}
diff --git a/lib/obex.c b/lib/obex.c
index 277dbf2..eaa50b0 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -81,6 +81,7 @@
 			- #OBEX_FL_FILTERHINT : Filter target devices based on Obex hint bit
 			- #OBEX_FL_FILTERIAS  : Filter target devices based on IAS entry
 			- #OBEX_FL_CLOEXEC   : Open all sockets with SO_CLOEXEC set
+			- #OBEX_FL_NONBLOCK   : Open all sockets non-blocking
 	\return an OBEX handle or NULL on error.
  */
 LIB_SYMBOL
diff --git a/lib/obex_main.c b/lib/obex_main.c
index b3a8a45..03819a2 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -56,6 +56,7 @@ int obex_debug;
 int obex_dump;
 
 #include "cloexec.h"
+#include "nonblock.h"
 
 /*
  * Function obex_create_socket()
@@ -80,6 +81,9 @@ socket_t obex_create_socket(obex_t *self, int domain)
 	else
 		fd = socket(domain, type, proto);
 
+	if (self->init_flags & OBEX_FL_NONBLOCK)
+		socket_set_nonblocking(fd);
+
 	return fd;
 }
 
@@ -211,7 +215,11 @@ void obex_response_request(obex_t *self, uint8_t opcode)
 
 	msg = buf_reuse(self->tx_msg);
 	obex_data_request_prepare(self, msg, opcode | OBEX_FINAL);
-	obex_data_request(self, msg);
+	do {
+		int status = obex_data_request(self, msg);
+		if (status < 0)
+			break;
+	} while (!buf_empty(msg));
 }
 
 /*
@@ -249,11 +257,10 @@ int obex_data_request(obex_t *self, buf_t *msg)
 
 	DEBUG(1, "len = %lu bytes\n", (unsigned long) msg->data_size);
 
-	do {
-		status = obex_transport_write(self, msg);
-		if (status > 0)
-			buf_remove_begin(msg, status);
-	} while (status >= 0 && !buf_empty(msg));
+	status = obex_transport_write(self, msg);
+	if (status > 0)
+		buf_remove_begin(msg, status);
+
 	return status;
 }
 
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index 6207279..a41f6e6 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -366,6 +366,10 @@ int obex_transport_do_send (obex_t *self, buf_t *msg)
 	struct obex_transport *trans = &self->trans;
 	int fd = trans->fd;
 	size_t size = msg->data_size;
+	int status;
+	fd_set fdset;
+	struct timeval *time_ptr = NULL;
+	struct timeval timeout = {trans->timeout, 0};
 
 	if (size == 0)
 		return 0;
@@ -374,21 +378,28 @@ int obex_transport_do_send (obex_t *self, buf_t *msg)
 		size = trans->mtu;
 	DEBUG(1, "sending %zu bytes\n", size);
 
-	if (trans->timeout >= 0) {
-		/* setup everything to check for blocking writes */
-		fd_set fdset;
-		struct timeval time = {trans->timeout, 0};
-		int status;
-
-		FD_ZERO(&fdset);
-		FD_SET(fd, &fdset);
-		status = select((int)fd+1, NULL, &fdset, NULL, &time);
-		if (status == 0)
-			return 0;
-	}
+	FD_ZERO(&fdset);
+	FD_SET(fd, &fdset);
+	if (trans->timeout >= 0)
+		time_ptr = &timeout;
+	status = select((int)fd+1, NULL, &fdset, NULL, time_ptr);
+	if (status == 0)
+		return 0;
 
 	/* call send() if no error */
-	return send(fd, msg->data, size, 0);
+	status = send(fd, msg->data, size, 0);
+
+	/* The following are not really transport errors. */
+#if defined(_WIN32)
+	if (status == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)
+		status = 0;
+#else
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
+#endif
+
+	return status;
 }
 
 /*
@@ -408,7 +419,19 @@ int obex_transport_write(obex_t *self, buf_t *msg)
 int obex_transport_do_recv (obex_t *self, void *buf, int buflen)
 {
 	struct obex_transport *trans = &self->trans;
-	return recv(trans->fd, buf, buflen, 0);
+	int status = recv(trans->fd, buf, buflen, 0);
+
+	/* The following are not really transport errors. */
+#if defined(_WIN32)
+	if (status == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)
+		status = 0;
+#else
+	if (status == -1 &&
+	    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+		status = 0;
+#endif
+
+	return status;
 }
 
 /*
-- 
1.7.5.4

---
 lib/obex_object.c |   36 ------------------------------------
 lib/obex_object.h |    2 --
 2 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/lib/obex_object.c b/lib/obex_object.c
index 00c75ee..78a15c5 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -634,42 +634,6 @@ int obex_object_send_transmit(obex_t *self, obex_object_t *object)
 }
 
 /*
- * Function obex_object_send()
- *
- *    Send away an object packet.
- *    Returns:
- *       1 complete
- *       0 incomplete but no error
- *      -1 error
- */
-int obex_object_send(obex_t *self, obex_object_t *object, int allowfinalcmd,
-		     int forcefinalbit)
-{
-	int ret;
-
-	/* Return finished if aborted */
-	if (object->abort) {
-		(void)buf_reuse(self->tx_msg);
-		return 1;
-	}
-
-	if (buf_empty(self->tx_msg)) {
-		ret = obex_object_prepare_send(self, object, allowfinalcmd,
-					       forcefinalbit);
-		if (ret == -1) {
-			DEBUG(4, "Packet prepare error\n");
-			return -1;
-		} else if (ret == 0)
-			return 0;
-	}
-
-	ret = obex_object_send_transmit(self, object);
-	if (ret == 1)
-		ret = obex_object_finished(self, object, allowfinalcmd);
-	return ret;
-}
-
-/*
  * Function obex_object_getnextheader()
  *
  * Return the next header in the rx-queue
diff --git a/lib/obex_object.h b/lib/obex_object.h
index 914b405..60c990a 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -98,8 +98,6 @@ int obex_object_prepare_send(obex_t *self, obex_object_t *object,
 int obex_object_finished(obex_t *self, obex_object_t *object,
 			 int allowfinalcmd);
 int obex_object_send_transmit(obex_t *self, obex_object_t *object);
-int obex_object_send(struct obex *self, struct obex_object *object,
-		     int allowfinalcmd, int forcefinalbit);
 
 int obex_object_receive_nonhdr_data(obex_t *self, buf_t *msg);
 int obex_object_receive_headers(obex_t *self, buf_t *msg, uint64_t filter);
-- 
1.7.5.4

---
 lib/bluez_compat.h |    2 +-
 lib/cloexec.h      |   20 ++++++++++++++++++++
 lib/customtrans.c  |   22 ++++++++++++++++++++++
 lib/customtrans.h  |   21 +++++++++++++++++++++
 lib/fdobex.c       |   22 ++++++++++++++++++++++
 lib/fdobex.h       |   21 +++++++++++++++++++++
 6 files changed, 107 insertions(+), 1 deletions(-)

diff --git a/lib/bluez_compat.h b/lib/bluez_compat.h
index b4dae25..092d370 100644
--- a/lib/bluez_compat.h
+++ b/lib/bluez_compat.h
@@ -3,7 +3,7 @@
 	Provides the Bluez API on other platforms.
 	OpenOBEX library - Free implementation of the Object Exchange protocol.
 
-	Copyright (c) 2007 Hendrik Sattler, All Rights Reserved.
+	Copyright (c) 2007-2011 Hendrik Sattler, All Rights Reserved.
 
 	OpenOBEX is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as
diff --git a/lib/cloexec.h b/lib/cloexec.h
index 1c5c396..f2a77c0 100644
--- a/lib/cloexec.h
+++ b/lib/cloexec.h
@@ -1,3 +1,23 @@
+/**
+	\file cloexec.h
+	close-on-exec wrapper functions.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 2010 Hendrik Sattler, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
 
 #ifndef _WIN32
 #include <fcntl.h>
diff --git a/lib/customtrans.c b/lib/customtrans.c
index 20e264c..98a1423 100644
--- a/lib/customtrans.c
+++ b/lib/customtrans.c
@@ -1,3 +1,25 @@
+/**
+	\file customtrans.c
+	Custom OBEX, custom transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
+
 #include "obex_main.h"
 #include "customtrans.h"
 
diff --git a/lib/customtrans.h b/lib/customtrans.h
index fed7880..98290c7 100644
--- a/lib/customtrans.h
+++ b/lib/customtrans.h
@@ -1,3 +1,24 @@
+/**
+	\file customtrans.h
+	Custom OBEX, custom transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
 
 #ifndef CUSTOMTRANS_H
 #define CUSTOMTRANS_H
diff --git a/lib/fdobex.c b/lib/fdobex.c
index 45c56ff..fa2d64a 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -1,3 +1,25 @@
+/**
+	\file fdobex.c
+	FD OBEX, file descriptor transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
+
 #include <errno.h>
 
 #include "obex_main.h"
diff --git a/lib/fdobex.h b/lib/fdobex.h
index 07e33ab..7008fa5 100644
--- a/lib/fdobex.h
+++ b/lib/fdobex.h
@@ -1,3 +1,24 @@
+/**
+	\file fdobex.h
+	FD OBEX, file descriptor transport for OBEX.
+	OpenOBEX library - Free implementation of the Object Exchange protocol.
+
+	Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
+	Copyright (c) 1999, 2000 Dag Brattli, All Rights Reserved.
+
+	OpenOBEX 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 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with OpenOBEX. If not, see <http://www.gnu.org/>.
+ */
 
 #ifndef FDOBEX_H
 #define FDOBEX_H
-- 
1.7.5.4

---
 lib/obex_main.c   |   44 +---------
 lib/obex_server.c |  259 +++++++++++++++++++++++++++++++++++++---------------
 lib/obex_server.h |    2 -
 3 files changed, 187 insertions(+), 118 deletions(-)

diff --git a/lib/obex_main.c b/lib/obex_main.c
index d3f0612..bc55661 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -281,36 +281,12 @@ int obex_work(obex_t *self, int timeout)
 {
 	int ret;
 
-	/* Waiting for an incoming packet will not work for single response mode
-	 * as the client is not supposed to send any when we (as server) are
-	 * sending the response.
-	 * For request reception, this is handled above */
-	if (self->mode == MODE_SRV &&
-			self->object &&
-			self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
-			self->state == STATE_SEND &&
-			!(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
-		/* Still, we need to do a zero-wait check for an ABORT
-		 * and for connection errors. */
-		ret = obex_transport_handle_input(self, 0);
-		if (ret == 0) /* timeout: no error, no input */
-			ret = obex_server_send(self, NULL, self->object->cmd, 0);
-		if (ret < 0)
-			return -1;
-		else
-			return sizeof(obex_common_hdr_t);
-
+	if (self->state == STATE_IDLE ||
+	    self->substate == SUBSTATE_RECEIVE_RX)
+	{
 		ret = obex_transport_handle_input(self, timeout);
 		if (ret <= 0)
 			return ret;
-
-	} else if (self->mode == MODE_CLI) {
-		if (self->substate == SUBSTATE_RECEIVE_RX) {
-			ret = obex_transport_handle_input(self, timeout);
-			if (ret <= 0)
-				return ret;
-		}
-
 	}
 
 	return obex_mode(self);
@@ -417,20 +393,6 @@ int obex_data_indication(obex_t *self)
 buf_t* obex_data_receive(obex_t *self)
 {
 	buf_t *msg = self->rx_msg;
-	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
-	uint8_t opcode = hdr->opcode & ~OBEX_FINAL;
-
-	if (self->mode == MODE_SRV) {
-		/* Single response mode makes it possible for the client to send
-		 * the next request (e.g. PUT) while still receiving the last
-		 * multi-packet response. So we must not consume any request
-		 * except ABORT. */
-		if (self->object &&
-				self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
-				self->state == STATE_SEND &&
-				!(opcode == OBEX_CMD_ABORT || opcode == self->object->cmd))
-			return NULL;
-	}
 
 	if (!obex_get_buffer_status(msg))
 		return NULL;
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 401a98d..351d710 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -36,20 +36,103 @@
 
 static __inline int msg_get_cmd(const buf_t *msg)
 {
-	return ((obex_common_hdr_t *) msg->data)->opcode & ~OBEX_FINAL;
+	if (msg)
+		return ((obex_common_hdr_t *) msg->data)->opcode & ~OBEX_FINAL;
+	else
+		return 0;
 }
 
 static __inline uint16_t msg_get_len(const buf_t *msg)
 {
-	return ntohs(((obex_common_hdr_t *) msg->data)->len);
+	if (msg)
+		return ntohs(((obex_common_hdr_t *) msg->data)->len);
+	else
+		return 0;
+}
+
+static __inline int msg_get_final(const buf_t *msg)
+{
+	if (msg)
+		return ((obex_common_hdr_t *) msg->data)->opcode & OBEX_FINAL;
+	else
+		return 0;
+}
+
+static int obex_server_send_transmit_tx(obex_t *self)
+{
+	int ret;
+	int cmd = self->object->cmd;
+
+	DEBUG(4, "STATE: SEND/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, self->object);
+	if (ret == -1) {
+		/* Error sending response */
+		obex_deliver_event(self, OBEX_EV_LINKERR, cmd, 0, TRUE);
+		self->state = STATE_IDLE;
+
+	} else if (ret == 1) {
+		/* Made some progress */
+		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
+		if (obex_object_finished(self, self->object, TRUE)) {
+			self->state = STATE_IDLE;
+			/* Response sent and object finished! */
+			if (cmd == OBEX_CMD_DISCONNECT) {
+				DEBUG(2, "CMD_DISCONNECT done. Resetting MTU!\n");
+				self->mtu_tx = OBEX_MINIMUM_MTU;
+				self->rsp_mode = OBEX_RSP_MODE_NORMAL;
+				self->srm_flags = 0;
+			}
+			obex_deliver_event(self, OBEX_EV_REQDONE, cmd, 0, TRUE);
+
+		} else if (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+			   !(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
+			self->substate = SUBSTATE_PREPARE_TX;
+
+		} else
+			self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return ret;
 }
 
-int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len)
+static int obex_server_send_prepare_tx(obex_t *self)
 {
 	int ret;
 
-	/* Send back response */
-	DEBUG(4, "STATE_SEND\n");
+	DEBUG(4, "STATE: SEND/PREPARE_TX\n");
+
+	/* As a server, the final bit is always SET, and the "real final" packet
+	 * is distinguished by being SUCCESS instead of CONTINUE.
+	 * So, force the final bit here. */
+	ret = obex_object_prepare_send(self, self->object, TRUE, TRUE);
+	if (ret == 1) {
+		self->substate = SUBSTATE_TRANSMIT_TX;
+		return obex_server_send_transmit_tx(self);
+
+	} else
+		return ret;
+}
+
+static int obex_server_send(obex_t *self)
+{
+	int ret;
+	buf_t *msg = obex_data_receive(self);
+	int cmd = msg_get_cmd(msg);
+	uint16_t len = msg_get_len(msg);
+
+	DEBUG(4, "STATE: SEND/RECEIVE_RX\n");
+
+	/* Single response mode makes it possible for the client to send
+	 * the next request (e.g. PUT) while still receiving the last
+	 * multi-packet response. So we must not consume any request
+	 * except ABORT. */
+	if (self->object &&
+	    self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+	    !(cmd == OBEX_CMD_ABORT || cmd == self->object->cmd)) {
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_send_prepare_tx(self);
+	}
 
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
@@ -104,47 +187,68 @@ int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len)
 		 * consult them later. So, leave them here (== overhead). */
 	}
 
-	/* As a server, the final bit is always SET, and the "real final" packet
-	 * is distinguish by beeing SUCCESS instead of CONTINUE.
-	 * So, force the final bit here. */
-	self->object->continue_received = 1;
+	obex_data_receive_finished(self);
+	self->substate = SUBSTATE_PREPARE_TX;
+	return obex_server_send_prepare_tx(self);
+}
 
-	if (self->object->suspend)
-		return 0;
+static int obex_server_recv_transmit_tx(obex_t *self)
+{
+	int ret = 0;
+	int cmd = self->object->cmd;
 
-	ret = obex_object_send(self, self->object, TRUE, TRUE);
-	if (ret == 0) {
-		/* Made some progress */
-		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
-		self->object->first_packet_sent = 1;
-		self->object->continue_received = 0;
-	} else if (ret < 0) {
-		/* Error sending response */
+	DEBUG(4, "STATE: RECV/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, self->object);
+	if (ret == -1) {
 		obex_deliver_event(self, OBEX_EV_LINKERR, cmd, 0, TRUE);
-		return -1;
-	} else {
-		/* Response sent! */
-		if (cmd == OBEX_CMD_DISCONNECT) {
-			DEBUG(2, "CMD_DISCONNECT done. Resetting MTU!\n");
-			self->mtu_tx = OBEX_MINIMUM_MTU;
-			self->rsp_mode = OBEX_RSP_MODE_NORMAL;
-			self->srm_flags = 0;
-		}
 		self->state = STATE_IDLE;
-		obex_deliver_event(self, OBEX_EV_REQDONE, cmd, 0, TRUE);
+
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
+		self->substate = SUBSTATE_RECEIVE_RX;
 	}
 
-	return 0;
+	return ret;
+}
+
+static int obex_server_recv_prepare_tx(obex_t *self)
+{
+	DEBUG(4, "STATE: RECV/PREPARE_TX\n");
+
+	if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
+	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
+	{
+		int ret = obex_object_prepare_send(self, self->object,
+						   FALSE, TRUE);
+		if (ret == 1) {
+			self->substate = SUBSTATE_TRANSMIT_TX;
+			return obex_server_recv_transmit_tx(self);
+
+		} else
+			return ret;
+
+	} else {
+		self->substate = SUBSTATE_RECEIVE_RX;
+		return 0;
+	}
 }
 
-static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
-							int cmd, uint16_t len)
+static int obex_server_recv(obex_t *self, int first)
 {
 	int deny = 0;
 	uint64_t filter;
+	buf_t *msg = obex_data_receive(self);
+	int cmd;
+	int final;
 
-	DEBUG(4, "STATE_REC\n");
-	/* In progress of receiving a request */
+	DEBUG(4, "STATE: RECV/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	cmd = msg_get_cmd(msg);
+	final = msg_get_final(msg);
 
 	/* Abort? */
 	if (cmd == OBEX_CMD_ABORT) {
@@ -217,23 +321,12 @@ static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
 		break;
 	}
 
+	obex_data_receive_finished(self);
 	if (!final) {
-		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
-		if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
-				(self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE)) {
-			int ret = obex_object_send(self, self->object, FALSE,
-									TRUE);
-			if (ret < 0) {
-				obex_deliver_event(self, OBEX_EV_LINKERR,
-								cmd, 0, TRUE);
-				return -1;
-			}
-		}
-
-		return 0;
-	}
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_recv_prepare_tx(self);
 
-	if (!self->object->first_packet_sent) {
+	} else {
 		/* Tell the app that a whole request has
 		 * arrived. While this event is delivered the
 		 * app should append the headers that should be
@@ -245,19 +338,24 @@ static int obex_server_recv(obex_t *self, buf_t *msg, int first, int final,
 		/* More connect-magic woodoo stuff */
 		if (cmd == OBEX_CMD_CONNECT)
 			obex_insert_connectframe(self, self->object);
-		/* Otherwise sanitycheck later will fail */
-		len = 3;
-	}
 
-	self->state = STATE_SEND;
-	return obex_server_send(self, msg, cmd, len);
+		self->state = STATE_SEND;
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_send_prepare_tx(self);
+	}
 }
 
-static int obex_server_idle(obex_t *self, buf_t *msg, int final,
-							int cmd, uint16_t len)
+static int obex_server_idle(obex_t *self)
 {
+	buf_t *msg = obex_data_receive(self);
+	int cmd;
+
 	/* Nothing has been recieved yet, so this is probably a new request */
-	DEBUG(4, "STATE_IDLE\n");
+	DEBUG(4, "STATE: IDLE\n");
+
+	if (msg == NULL)
+		return 0;
+	cmd = msg_get_cmd(msg);
 
 	if (self->object) {
 		/* What shall we do here? I don't know!*/
@@ -304,15 +402,19 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
 		break;
 	}
 
+	/* Check the response from the REQHINT event */
 	switch ((self->object->opcode & ~OBEX_FINAL) & 0xF0) {
 	case OBEX_RSP_CONTINUE:
 	case OBEX_RSP_SUCCESS:
 		self->state = STATE_REC;
-		return obex_server_recv(self, msg, 1, final, cmd, len);
+		self->substate = SUBSTATE_RECEIVE_RX;
+		return obex_server_recv(self, 1);
 
 	default:
+		obex_data_receive_finished(self);
 		self->state = STATE_SEND;
-		return obex_server_send(self, msg, cmd, 3);
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_server_send_prepare_tx(self);
 	}
 }
 
@@ -324,35 +426,42 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
  */
 int obex_server(obex_t *self)
 {
-	int ret = -1;
-	buf_t *msg = obex_data_receive(self);
-	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
-	int cmd = msg_get_cmd(msg);
-	uint16_t len = msg_get_len(msg);
-	int final = hdr->opcode & OBEX_FINAL; /* Extract final bit */
-
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_IDLE:
-		ret = obex_server_idle(self, msg, final, cmd, len);
-		break;
+		return obex_server_idle(self);
 
 	case STATE_REC:
-		ret = obex_server_recv(self, msg, 0, final, cmd, len);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_server_recv(self, 0);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_server_recv_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_server_recv_transmit_tx(self);
+		}
 		break;
 
 	case STATE_SEND:
-		ret = obex_server_send(self, msg, cmd, len);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_server_send(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_server_send_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_server_send_transmit_tx(self);
+		}
 		break;
 
 	default:
 		DEBUG(0, "Unknown state\n");
-		obex_response_request(self, OBEX_RSP_BAD_REQUEST);
-		obex_deliver_event(self, OBEX_EV_PARSEERR, cmd, 0, TRUE);
-		return -1;
+		break;
 	}
 
-	obex_data_receive_finished(self);
-	return ret;
+	return -1;
 }
diff --git a/lib/obex_server.h b/lib/obex_server.h
index 2d4bc18..fc9f115 100644
--- a/lib/obex_server.h
+++ b/lib/obex_server.h
@@ -23,9 +23,7 @@
 #define OBEX_SERVER_H
 
 struct obex;
-struct databuffer;
 
 int obex_server(struct obex *self);
-int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len);
 
 #endif
-- 
1.7.5.4

The ./bootstrap (or autoreconf -i) will automatically copy the file to its
place but there is no need to keep that in the repository (it is not the one
that's shipped in releases anyway).
---
 .gitignore |    1 +
 INSTALL    |  236 ------------------------------------------------------------
 2 files changed, 1 insertions(+), 236 deletions(-)
 delete mode 100644 INSTALL

diff --git a/.gitignore b/.gitignore
index 2e6307f..5bd619f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.so
 .deps
 .libs
+INSTALL
 Makefile
 Makefile.in
 aclocal.m4
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 56b077d..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
-- 
1.7.5.4

---
 doc/openobex.coverpage |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/openobex.coverpage b/doc/openobex.coverpage
index d90075f..941fb2a 100644
--- a/doc/openobex.coverpage
+++ b/doc/openobex.coverpage
@@ -29,7 +29,7 @@ You might also find the OpenOBEX test applications useful.
 
 	\subsection preparations_sec Preparations
 
-To be able to use the OpenOBEX API you must include the files openobex/obex_const.h and openobex/obex.h.
+To be able to use the OpenOBEX API you must include the files openobex/obex_const.h or openobex/obex.h.
 
 First of all you must create an OBEX instance by calling #OBEX_New.
 In this call you specify what transport you want to use, an event callback, and optional flags.
-- 
1.7.5.4

---
 lib/CMakeLists.txt |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 186cdfa..aaec1ec 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -66,22 +66,22 @@ if ( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
   add_definitions ( -D_GNU_SOURCE )
 endif ( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
 
-option ( ENABLE_DEBUG_MESSAGES "Enables debug messages printed during runtime" )
-if ( ENABLE_DEBUG_MESSAGES )
-  set ( DEBUG_LEVEL 1 CACHE STRING "Amount of debug message (1-4)" )
-  list ( APPEND openobex_COMPILE_DEFINITIONS OBEX_DEBUG=${DEBUG_LEVEL} )
-  if ( NOT CMAKE_SYSTEM_NAME STREQUAL "Windows" )
-     option ( DEBUG_USE_SYSLOG "Use SysLog facility instead of stderr for debug messages" )
-  endif ( NOT CMAKE_SYSTEM_NAME STREQUAL "Windows" )
-  if ( DEBUG_USE_SYSLOG )
-    list ( APPEND openobex_COMPILE_DEFINITIONS OBEX_SYSLOG )
-  endif ( DEBUG_USE_SYSLOG )
-endif ( ENABLE_DEBUG_MESSAGES )
-
-option ( ENABLE_DUMP_MESSAGES "Enables dumping of data" )
-if ( ENABLE_DUMP_MESSAGES )
-  list ( APPEND openobex_COMPILE_DEFINITIONS OBEX_DUMP=3 )
-endif ( ENABLE_DUMP_MESSAGES )
+if ( NOT OBEX_DEBUG )
+  set ( OBEX_DEBUG 0 CACHE STRING "Amount of debug message (1-4)" )
+endif ( NOT OBEX_DEBUG )
+list ( APPEND openobex_COMPILE_DEFINITIONS OBEX_DEBUG=${OBEX_DEBUG} )
+
+if ( NOT CMAKE_SYSTEM_NAME STREQUAL "Windows" )
+  option ( OBEX_DEBUG_SYSLOG "Use SysLog facility instead of stderr for debug messages" )
+  if ( OBEX_DEBUG_SYSLOG )
+    list ( APPEND openobex_COMPILE_DEFINITIONS OBEX_DEBUG_SYSLOG )
+  endif ( OBEX_DEBUG_SYSLOG )
+endif ( NOT CMAKE_SYSTEM_NAME STREQUAL "Windows" )
+
+if ( NOT OBEX_DUMP )
+  set ( OBEX_DUMP 0 CACHE STRING "Tx/Rx message dump" )
+endif ( NOT OBEX_DUMP )
+list ( APPEND openobex_COMPILE_DEFINITIONS OBEX_DUMP=${OBEX_DUMP} )
 
 if ( OPENOBEX_IRDA )
   list ( APPEND SOURCES
-- 
1.7.5.4

---
 include/openobex/obex_const.h |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index 18d698a..cdcd823 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -193,14 +193,16 @@ enum obex_event {
 #define OBEX_FL_STREAM_DATAEND	0x08	/* Body stream last data */
 #define OBEX_FL_SUSPEND		0x10	/* Suspend after sending this header */
 
-/* Transports */
-#define OBEX_TRANS_IRDA		1
-#define OBEX_TRANS_INET		2
-#define OBEX_TRANS_CUSTOM	3
-#define OBEX_TRANS_BLUETOOTH	4 /* Bluetooth RFCOMM */
-#define OBEX_TRANS_FD		5
-#define OBEX_TRANS_USB		6
-#define OBEX_TRANS_BT_L2CAP	7 /* Bluetooth L2CAP */
+/** Possible transports */
+enum obex_transport_type {
+	OBEX_TRANS_IRDA = 1,      /**< Infrared */
+	OBEX_TRANS_INET = 2,      /**< TCP over IPv4/v6 */
+	OBEX_TRANS_CUSTOM = 3,    /**< Custom transport with callbacks */
+	OBEX_TRANS_BLUETOOTH = 4, /**< Bluetooth RFCOMM */
+	OBEX_TRANS_FD = 5,        /**< file descriptors */
+	OBEX_TRANS_USB = 6,       /**< USB CDC OBEX */
+	OBEX_TRANS_BT_L2CAP = 7,  /**< Bluetooth L2CAP */
+};
 
 /* Standard headers */
 #define OBEX_HDR_TYPE_UNICODE	(0 << 6)  /* zero terminated unicode string (network byte order) */
-- 
1.7.5.4

Change obex_test so that only the compiled-in parts are visible. Prepare the
bluetooth part for addition of L2CAP usage.
---
 apps/obex_test/obex_test.c |  247 ++++++++++++++++++++++++--------------------
 1 files changed, 136 insertions(+), 111 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 350d808..7527a51 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -27,6 +27,11 @@
 #include "../lib/bluez_compat.h"
 #ifdef _WIN32
 bdaddr_t bluez_compat_bdaddr_any = { BTH_ADDR_NULL };
+int str2ba(const char *str, bdaddr_t *ba) {
+	//TODO
+	*ba = *BDADDR_ANY;
+	return 0;
+}
 #endif
 #endif
 
@@ -36,9 +41,11 @@ bdaddr_t bluez_compat_bdaddr_any = { BTH_ADDR_NULL };
 #include "obex_test_client.h"
 #include "obex_test_server.h"
 
-#ifndef _WIN32
+#if defined(_WIN32)
+#undef HAVE_CABLE_OBEX
+#else
 #include "obex_test_cable.h"
-
+#define HAVE_CABLE_OBEX 1
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -76,7 +83,7 @@ static void obex_event(obex_t *handle, obex_object_t *object, int mode,
 		break;
 
 	case OBEX_EV_REQDONE:
-		if(mode == OBEX_MODE_CLIENT) {
+		if (mode == OBEX_MODE_CLIENT) {
 			client_done(handle, object, obex_cmd, obex_rsp);
 		}
 		else	{
@@ -155,76 +162,88 @@ int main (int argc, char *argv[])
 {
 	char cmd[3];
 	int end = 0;
-	int cobex = FALSE, tcpobex = FALSE, btobex = FALSE, r320 = FALSE, usbobex = FALSE;
-	obex_t *handle;
+	int tcpobex = FALSE;
+	obex_t *handle = NULL;
+	struct context global_context = {0};
+
 #ifdef HAVE_BLUETOOTH
+	int btobex = FALSE;
 	bdaddr_t bdaddr;
 	uint8_t channel = 0;
 #endif
-
 #ifdef HAVE_USB
+	int usbobex = FALSE;
 	obex_interface_t *obex_intf = NULL;
 #endif
-
-	struct context global_context = {0,};
-
-#ifndef _WIN32
-
+#ifdef HAVE_CABLE_OBEX
+	int cobex = FALSE, r320 = FALSE;
 	char *port;
 	obex_ctrans_t custfunc;
+#endif
 
-	if( (argc == 2) && (strcmp(argv[1], "-h") == 0 ) ) {
+	if (argc == 2 && strcmp(argv[1], "-h") == 0) {
 		printf(
 			"Usage: obex_test [options]\n"
 			"\n"
 			"Options:\n"
-			"    -s [tty]           Use cable transport (Sony-Ericsson phones/DCU-11 cable)\n"
-			"    -r [tty]           Use cable transport for R320\n"
-			"    -i                 Use IP/TCP transport\n"
-			"    -b [addr] [chan]   Use bluetooth  transport\n"
-			"    -u [interface]     Use USB transport\n"
-			"    -h                 Print this help message\n"
+#ifdef HAVE_CABLE_OBEX
+			"    -s [tty]          Use cable transport (Sony-Ericsson phones/DCU-11 cable)\n"
+			"    -r [tty]          Use cable transport for R320\n"
+#endif
+#ifdef HAVE_BLUETOOTH
+			"    -b [addr] [chan]  Use bluetooth RFCOMM transport\n"
+#endif
+#ifdef HAVE_USB
+			"    -u [interface]    Use USB transport\n"
+#endif
+			"    -i                Use IP/TCP transport\n"
+			"    -h                Print this help message\n"
 			"\n"
 			"If no transport is selected, IrDA is used.\n"
 		);
 		return 0;
 	}
 
-	if( (argc == 2 || argc ==3) && (strcmp(argv[1], "-s") == 0 ) )
+#ifdef HAVE_CABLE_OBEX
+	if ((argc == 2 || argc ==3) && strcmp(argv[1], "-s") == 0)
 		cobex = TRUE;
-	if( (argc == 2 || argc ==3) && (strcmp(argv[1], "-r") == 0 ) ) {
+	if ((argc == 2 || argc ==3) && strcmp(argv[1], "-r") == 0) {
 		cobex = TRUE;
 		r320 = TRUE;
 	}
 #endif
-
-	if( (argc == 2) && (strcmp(argv[1], "-i") == 0 ) )
-		tcpobex = TRUE;
-	if( (argc >= 2) && (strcmp(argv[1], "-b") == 0 ) )
+#ifdef HAVE_BLUETOOTH
+	if (argc >= 2 && strcmp(argv[1], "-b") == 0)
 		btobex = TRUE;
-	if( (argc >= 2) && (strcmp(argv[1], "-u") == 0 ) )
+#endif
+#ifdef HAVE_USB
+	if (argc >= 2 && strcmp(argv[1], "-u") == 0)
 		usbobex = TRUE;
+#endif
+	if (argc == 2 && strcmp(argv[1], "-i") == 0)
+		tcpobex = TRUE;
 
-	if(cobex)	{
-#ifndef _WIN32
-		if(argc == 3)
+#ifdef HAVE_CABLE_OBEX
+	if (cobex) {
+		if (argc == 3)
 			port = argv[2];
 		else
 			port = "/dev/ttyS0";
 
-		if(r320)
+		if (r320)
 			printf("OBEX to R320 on %s!\n", port);
 		else
 			printf("OBEX on %s!\n", port);
 
 		custfunc.customdata = cobex_open(port, r320);
 
-		if(custfunc.customdata == NULL) {
+		if (custfunc.customdata == NULL) {
 			printf("cobex_open() failed\n");
 			return -1;
 		}
 
-		if(! (handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0)))	{
+		handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0);
+		if (!handle) {
 			perror( "OBEX_Init failed");
 			return -1;
 		}
@@ -235,69 +254,67 @@ int main (int argc, char *argv[])
 		custfunc.handleinput = cobex_handle_input;
 		custfunc.listen = cobex_connect;	// Listen and connect is 100% same on cable
 
-		if(OBEX_RegisterCTransport(handle, &custfunc) < 0)	{
+		if (OBEX_RegisterCTransport(handle, &custfunc) < 0)
 			printf("Custom transport callback-registration failed\n");
-		}
-#else
-		printf("Not implemented in Win32 yet.\n");
-#endif	// _WIN32
-	}
 
-	else if(tcpobex) {
-		printf("Using TCP transport\n");
-		if(! (handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0)))	{
-			perror( "OBEX_Init failed");
-			exit(0);
-		}
-	}
-	else if(btobex) {
-#ifndef _WIN32
-		switch (argc) {
+	} else
+#endif
 #ifdef HAVE_BLUETOOTH
+	if (btobex) {
+		const char *channel_arg = NULL;
+		switch (argc) {
 		case 4:
 			str2ba(argv[2], &bdaddr);
-			channel = atoi(argv[3]);
+			channel_arg = argv[3];
 			break;
 		case 3:
 			str2ba(argv[2], &bdaddr);
 			if (bacmp(&bdaddr, BDADDR_ANY) == 0)
-				channel = atoi(argv[2]);
-			else
-				channel = BT_CHANNEL;
+				channel_arg = argv[2];
 			break;
 		case 2:
 			bacpy(&bdaddr, BDADDR_ANY);
-			channel = BT_CHANNEL;
 			break;
-#endif
 		default:
 			printf("Wrong number of arguments\n");
 			exit(0);
 		}
 
-		printf("Using Bluetooth RFCOMM transport\n");
-		if(! (handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0)))      {
+		switch (btobex) {
+		case TRUE:
+			printf("Using Bluetooth RFCOMM transport\n");
+			handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+			if (channel_arg)
+				channel = (atoi(channel_arg) & 0xFF);
+			else
+				channel = BT_CHANNEL;
+			break;
+		}
+
+		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
 		}
-#else
-		printf("Not implemented in Win32 yet.\n");
-#endif	// _WIN32
-	}
-	else if(usbobex) {
+	} else
+#endif
 #ifdef HAVE_USB
+	if (usbobex) {
 		int i, interfaces_number, intf_num;
 		switch (argc) {
 		case 2:
-			printf("Using USB transport, querying available interfaces\n");
-			if(! (handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0)))      {
+			printf("Using USB transport, "
+			       "querying available interfaces\n");
+			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
 			}
 			interfaces_number = OBEX_EnumerateInterfaces(handle);
-			for (i=0; i < interfaces_number; i++) {
+			for (i = 0; i < interfaces_number; i++) {
 				obex_intf = OBEX_GetInterfaceByIndex(handle, i);
-				printf("Interface %d: idVendor: %#x, idProduct: %#x, bus %d, dev %d, intf %d, %s %s %s\n", i,
+				printf("Interface %d: idVendor: %#x, "
+				       "idProduct: %#x, bus %d, dev %d, "
+				       "intf %d, %s %s %s\n", i,
 					obex_intf->usb.idVendor,
 					obex_intf->usb.idProduct,
 					obex_intf->usb.bus_number,
@@ -307,14 +324,16 @@ int main (int argc, char *argv[])
 					obex_intf->usb.product,
 					obex_intf->usb.control_interface);
 			}
-			printf("Use '%s -u interface_number' to run interactive OBEX test client\n", argv[0]);
+			printf("Use '%s -u interface_number' to run "
+			       "interactive OBEX test client\n", argv[0]);
 			OBEX_Cleanup(handle);
 			exit(0);
 			break;
 		case 3:
 			intf_num = atoi(argv[2]);
 			printf("Using USB transport \n");
-			if(! (handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0)))      {
+			handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+			if (!handle) {
 				perror( "OBEX_Init failed");
 				exit(0);
 			}
@@ -331,14 +350,21 @@ int main (int argc, char *argv[])
 			printf("Wrong number of arguments\n");
 			exit(0);
 		}
-#else
-		printf("Not compiled with USB support\n");
-		exit(0);
+	} else
 #endif
-	}
-	else	{
+
+	if (tcpobex) {
+		printf("Using TCP transport\n");
+		handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+		if (!handle) {
+			perror( "OBEX_Init failed");
+			exit(0);
+		}
+
+	} else {
 		printf("Using IrDA transport\n");
-		if(! (handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0)))	{
+		handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+		if (!handle) {
 			perror( "OBEX_Init failed");
 			exit(0);
 		}
@@ -386,44 +412,41 @@ int main (int argc, char *argv[])
 			break;
 			case 'c':
 				/* First connect transport */
-				if(tcpobex) {
-					if(TcpOBEX_TransportConnect(handle, NULL, 0) < 0) {
-						printf("Transport connect error! (TCP)\n");
-						break;
-					}
-				}
-				if(cobex) {
-					if(OBEX_TransportConnect(handle, (void*) 1, 0) < 0) {
+#ifdef HAVE_CABLE_OBEX
+				if (cobex) {
+					if (OBEX_TransportConnect(handle, (void*) 1, 0) < 0) {
 						printf("Transport connect error! (Serial)\n");
 						break;
 					}
-				}
-				if(btobex) {
+				} else
+#endif
 #ifdef HAVE_BLUETOOTH
+				if (btobex) {
 					if (bacmp(&bdaddr, BDADDR_ANY) == 0) {
 						printf("Device address error! (Bluetooth)\n");
 						break;
 					}
-					if(BtOBEX_TransportConnect(handle, BDADDR_ANY, &bdaddr, channel) <0) {
+					if (BtOBEX_TransportConnect(handle, BDADDR_ANY, &bdaddr, channel) <0) {
 						printf("Transport connect error! (Bluetooth)\n");
 						break;
 					}
-#else
-					printf("Transport not found! (Bluetooth)\n");
+				} else
 #endif
-				}
-				if (usbobex) {
 #ifdef HAVE_USB
+				if (usbobex) {
 					if (OBEX_InterfaceConnect(handle, obex_intf) < 0) {
 						printf("Transport connect error! (USB)\n");
 						break;
 					}
-#else
-					printf("Transport not found! (USB)\n");
+				} else
 #endif
-				}	
-				if (!tcpobex && !cobex && !btobex && !usbobex) {
-					if(IrOBEX_TransportConnect(handle, IR_SERVICE) < 0) {
+				if (tcpobex) {
+					if (TcpOBEX_TransportConnect(handle, NULL, 0) < 0) {
+						printf("Transport connect error! (TCP)\n");
+						break;
+					}
+				} else {
+					if (IrOBEX_TransportConnect(handle, IR_SERVICE) < 0) {
 						printf("Transport connect error! (IrDA)\n");
 						break;
 					}
@@ -436,33 +459,35 @@ int main (int argc, char *argv[])
 			break;
 			case 's':
 				/* First register server */
-				if(tcpobex) {
-					if(TcpOBEX_ServerRegister(handle, NULL, 0) < 0) {
-						printf("Server register error! (TCP)\n");
-						break;
-					}
-				}
-				if(cobex) {
-					if(OBEX_ServerRegister(handle, (void*) 1, 0) < 0) {
+#ifdef HAVE_CABLE_OBEX
+				if (cobex) {
+					if (OBEX_ServerRegister(handle, (void*) 1, 0) < 0) {
 						printf("Server register error! (Serial)\n");
 						break;
 					}
-				}
-				if(btobex) {
+				} else
+#endif
 #ifdef HAVE_BLUETOOTH
-					if(BtOBEX_ServerRegister(handle, BDADDR_ANY, channel) < 0) {
+				if (btobex) {
+					if (BtOBEX_ServerRegister(handle, BDADDR_ANY, channel) < 0) {
 						printf("Server register error! (Bluetooth)\n");
 						break;
 					}
-#else
-					printf("Transport not found! (Bluetooth)\n");
+				} else
 #endif
-				}
+#ifdef HAVE_USB
 				if (usbobex) {
 					printf("Transport not found! (USB)\n");
-				}
-				if (!tcpobex && !cobex && !btobex && !usbobex) {
-					if(IrOBEX_ServerRegister(handle, IR_SERVICE) < 0)	{
+				} else
+#endif
+				if (tcpobex) {
+					if (TcpOBEX_ServerRegister(handle, NULL, 0) < 0) {
+						printf("Server register error! (TCP)\n");
+						break;
+					}
+
+				} else {
+					if (IrOBEX_ServerRegister(handle, IR_SERVICE) < 0) {
 						printf("Server register error! (IrDA)\n");
 						break;
 					}
@@ -475,8 +500,8 @@ int main (int argc, char *argv[])
 				printf("Unknown command %s\n", cmd);
 		}
 	}
-#ifndef _WIN32
-	if(cobex)
+#ifdef HAVE_CABLE_OBEX
+	if (cobex)
 		cobex_close(custfunc.customdata);
 #endif
 
-- 
1.7.5.4

This also makes the public type an enum (like it was for the internal type) but
the names for the values stay the same.
---
 include/openobex/obex_const.h |    7 +++++--
 lib/defines.h                 |    5 -----
 lib/obex.c                    |    6 +++---
 lib/obex_client.c             |   12 ++++++------
 lib/obex_main.c               |    9 +++------
 lib/obex_object.c             |    2 +-
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index 8276aae..ff147df 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -145,8 +145,11 @@ typedef union {
 	//obex_bluetooth_intf_t bt; // to be added
 } obex_interface_t;
 
-#define OBEX_MODE_CLIENT	0
-#define OBEX_MODE_SERVER	1
+/** Possible modes */
+enum obex_mode {
+	OBEX_MODE_CLIENT = 0, /**< client mode */
+	OBEX_MODE_SERVER = 1, /**< server mode */
+};
 
 /* Possible events */
 #define OBEX_EV_PROGRESS	0	/* Progress has been made */
diff --git a/lib/defines.h b/lib/defines.h
index 5935930..051509a 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -18,11 +18,6 @@
 
 #define OBEX_VERSION	0x10      /* OBEX Protocol Version 1.1 */
 
-enum obex_mode {
-	MODE_SRV,
-	MODE_CLI,
-};
-
 enum obex_state {
 	STATE_IDLE,
 	STATE_SEND,
diff --git a/lib/obex.c b/lib/obex.c
index eaa50b0..7bb5bfb 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -118,7 +118,7 @@ obex_t * CALLAPI OBEX_Init(int transport, obex_event_t eventcb,
 
 	self->eventcb = eventcb;
 	self->init_flags = flags;
-	self->mode = MODE_SRV;
+	self->mode = OBEX_MODE_SERVER;
 	self->state = STATE_IDLE;
 	self->rsp_mode = OBEX_RSP_MODE_NORMAL;
 
@@ -383,7 +383,7 @@ obex_t *CALLAPI OBEX_ServerAccept(obex_t *server, obex_event_t eventcb,
 		goto out_err;
 
 	obex_transport_split(self, server);
-	self->mode = MODE_SRV;
+	self->mode = OBEX_MODE_SERVER;
         self->state = STATE_IDLE;
 	self->rsp_mode = server->rsp_mode;
 
@@ -532,7 +532,7 @@ int CALLAPI OBEX_Request(obex_t *self, obex_object_t *object)
 
 	object->rsp_mode = self->rsp_mode;
 	self->object = object;
-	self->mode = MODE_CLI;
+	self->mode = OBEX_MODE_CLIENT;
         self->state = STATE_SEND;
 	self->substate = SUBSTATE_PREPARE_TX;
 
diff --git a/lib/obex_client.c b/lib/obex_client.c
index efaf9f3..0282886 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -99,7 +99,7 @@ static int obex_client_abort(obex_t *self)
 	if (event == OBEX_EV_LINKERR)
 		ret = -1;
 
-	self->mode = MODE_SRV;
+	self->mode = OBEX_MODE_SERVER;
 	self->state = STATE_IDLE;
 	return ret;
 }
@@ -176,7 +176,7 @@ static int obex_client_recv(obex_t *self)
 		if (obex_parse_connect_header(self, msg) < 0) {
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
-			self->mode = MODE_SRV;
+			self->mode = OBEX_MODE_SERVER;
 			self->state = STATE_IDLE;
 			return -1;
 		}
@@ -198,7 +198,7 @@ static int obex_client_recv(obex_t *self)
 		if (ret < 0) {
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
-			self->mode = MODE_SRV;
+			self->mode = OBEX_MODE_SERVER;
 			self->state = STATE_IDLE;
 			return -1;
 		}
@@ -216,7 +216,7 @@ static int obex_client_recv(obex_t *self)
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
 		obex_deliver_event(self, OBEX_EV_REQDONE, self->object->opcode,
 								     rsp, TRUE);
-		self->mode = MODE_SRV;
+		self->mode = OBEX_MODE_SERVER;
 		self->state = STATE_IDLE;
 		return 0;
 	}
@@ -234,7 +234,7 @@ static int obex_client_send_transmit_tx(obex_t *self)
 		/* Error while sending */
 		obex_deliver_event(self, OBEX_EV_LINKERR,
 					self->object->opcode, 0, TRUE);
-		self->mode = MODE_SRV;
+		self->mode = OBEX_MODE_SERVER;
 		self->state = STATE_IDLE;
 
 	} else if (ret == 1) {
@@ -344,7 +344,7 @@ static int obex_client_send(obex_t *self)
 		if (ret < 0) {
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						 self->object->opcode, 0, TRUE);
-			self->mode = MODE_SRV;
+			self->mode = OBEX_MODE_SERVER;
 			self->state = STATE_IDLE;
 			return -1;
 		}
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 03819a2..690dd97 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -192,10 +192,7 @@ void obex_deliver_event(obex_t *self, int event, int cmd, int rsp, int del)
 	if (del == TRUE)
 		self->object = NULL;
 
-	if (self->mode == MODE_SRV)
-		self->eventcb(self, object, OBEX_MODE_SERVER, event, cmd, rsp);
-	else
-		self->eventcb(self, object, OBEX_MODE_CLIENT, event, cmd, rsp);
+	self->eventcb(self, object, self->mode, event, cmd, rsp);
 
 	if (del == TRUE)
 		obex_object_delete(object);
@@ -267,10 +264,10 @@ int obex_data_request(obex_t *self, buf_t *msg)
 static int obex_mode(obex_t *self)
 {
 	switch (self->mode) {
-	case MODE_SRV:
+	case OBEX_MODE_SERVER:
 		return obex_server(self);
 
-	case MODE_CLI:
+	case OBEX_MODE_CLIENT:
 		return obex_client(self);
 
 	default:
diff --git a/lib/obex_object.c b/lib/obex_object.c
index f0b4b7f..9f84862 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -278,7 +278,7 @@ int obex_object_addheader(obex_t *self, obex_object_t *object, uint8_t hi,
 static uint8_t obex_object_getcmd(const obex_t *self,
 						const obex_object_t *object)
 {
-	if (self->mode == MODE_SRV)
+	if (self->mode == OBEX_MODE_SERVER)
 		return object->cmd;
 	else
 		return (object->opcode & ~OBEX_FINAL);
-- 
1.7.5.4

---
 apps/obex_test/obex_test.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 96e16fa..184a70b 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -118,28 +118,25 @@ static void obex_event(obex_t *handle, obex_object_t *object,
 #if 0
 /*
  * Function get_peer_addr (name, peer)
- *
- *    
- *
  */
-static int get_peer_addr(char *name, struct sockaddr_in *peer) 
+static int get_peer_addr(char *name, struct sockaddr_in *peer)
 {
 	struct hostent *host;
 	in_addr_t inaddr;
-        
+
 	/* Is the address in dotted decimal? */
 	if ((inaddr = inet_addr(name)) != INADDR_NONE) {
 		memcpy((char *) &peer->sin_addr, (char *) &inaddr,
-		      sizeof(inaddr));  
+		      sizeof(inaddr));
 	}
 	else {
 		if ((host = gethostbyname(name)) == NULL) {
 			printf( "Bad host name: ");
 			exit(-1);
-                }
+		}
 		memcpy((char *) &peer->sin_addr, host->h_addr,
 				host->h_length);
-        }
+	}
 	return 0;
 }
 
@@ -155,7 +152,7 @@ static int inet_connect(obex_t *handle)
 				  sizeof(struct sockaddr_in));
 }
 #endif
-	
+
 //
 //
 //
@@ -408,7 +405,7 @@ int main (int argc, char *argv[])
 	}
 
 	OBEX_SetUserData(handle, &global_context);
-	
+
 	printf( "OBEX Interactive test client/server.\n");
 
 	while (!end) {
-- 
1.7.5.4

This is needed for obex_test to actually work.
---
 lib/obex_client.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/obex_client.c b/lib/obex_client.c
index 5107d62..0199fbf 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -61,10 +61,10 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 		/* Response of a CMD_CONNECT needs some special treatment.*/
 		DEBUG(2, "We expect a connect-rsp\n");
 		if (obex_parse_connect_header(self, msg) < 0) {
-			self->mode = MODE_SRV;
-			self->state = STATE_IDLE;
 			obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
+			self->mode = MODE_SRV;
+			self->state = STATE_IDLE;
 			return -1;
 		}
 		self->object->headeroffset=4;
@@ -82,10 +82,10 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 	/* Receive any headers */
 	ret = obex_object_receive(self, msg);
 	if (ret < 0) {
-		self->mode = MODE_SRV;
-		self->state = STATE_IDLE;
 		obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
+		self->mode = MODE_SRV;
+		self->state = STATE_IDLE;
 		return -1;
 	}
 
@@ -123,8 +123,6 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 	} else {
 		/* Notify app that client-operation is done! */
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
-		self->mode = MODE_SRV;
-		self->state = STATE_IDLE;
 		if (self->object->abort) {
 			if (rsp == OBEX_RSP_SUCCESS)
 				obex_deliver_event(self, OBEX_EV_ABORT,
@@ -139,6 +137,8 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 			obex_deliver_event(self, OBEX_EV_REQDONE,
 							self->object->opcode,
 							rsp, TRUE);
+		self->mode = MODE_SRV;
+		self->state = STATE_IDLE;
 	}
 
 	return 0;
@@ -197,10 +197,10 @@ int obex_client_send(obex_t *self, buf_t *msg, int rsp)
 			if (self->object->opcode == OBEX_CMD_CONNECT)
 				ret = obex_object_receive(self, msg);
 			if (ret < 0) {
-				self->mode = MODE_SRV;
-				self->state = STATE_IDLE;
 				obex_deliver_event(self, OBEX_EV_PARSEERR,
 						self->object->opcode, 0, TRUE);
+				self->mode = MODE_SRV;
+				self->state = STATE_IDLE;
 				return -1;
 			}
 
-- 
1.7.5.4

---
 lib/obex_incl.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/lib/obex_incl.h b/lib/obex_incl.h
index dbca28e..d1b5446 100644
--- a/lib/obex_incl.h
+++ b/lib/obex_incl.h
@@ -10,6 +10,11 @@
 /* This add the deprecated API items */
 #define OPENOBEX_DEPRECATED 1
 
+/* Visual Studio C++ Compiler 7.1 does not know about Bluetooth */
+#if defined(_MSC_VER) && _MSC_VER < 1400
+#define bt_addr_t void
+#endif
+
 #include <openobex/obex.h>
 
 #endif
-- 
1.7.5.4

---
 lib/obex_client.c |  101 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/lib/obex_client.c b/lib/obex_client.c
index e17528a..fd9962b 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -49,12 +49,63 @@ static __inline uint16_t msg_get_len(const buf_t *msg)
 		return 0;
 }
 
-static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
+static int obex_client_recv_transmit_tx(obex_t *self)
+{
+	int ret = 0;
+	int rsp = OBEX_RSP_CONTINUE;
+
+	DEBUG(4, "STATE: RECV/TRANSMIT_TX\n");
+
+	ret = obex_object_send_transmit(self, self->object);
+	if (ret == -1) {
+		obex_deliver_event(self, OBEX_EV_LINKERR,
+				   self->object->opcode, rsp, TRUE);
+		self->state = STATE_IDLE;
+
+	} else if (ret == 1) {
+		obex_deliver_event(self, OBEX_EV_PROGRESS,
+				   self->object->opcode, rsp, FALSE);
+		self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return ret;
+}
+
+static int obex_client_recv_prepare_tx(obex_t *self)
+{
+	DEBUG(4, "STATE: RECV/PREPARE_TX\n");
+
+	if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
+	    (self->object->rsp_mode == OBEX_RSP_MODE_SINGLE &&
+	     self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE))
+	{
+		int ret = obex_object_prepare_send(self, self->object, TRUE,
+						   FALSE);
+		if (ret == 1) {
+			self->substate = SUBSTATE_TRANSMIT_TX;
+			return obex_client_recv_transmit_tx(self);
+
+		} else
+			return ret;
+
+	} else {
+		self->substate = SUBSTATE_RECEIVE_RX;
+	}
+
+	return 0;
+}
+
+static int obex_client_recv(obex_t *self)
 {
 	int ret;
+	buf_t *msg = obex_data_receive(self);
+	int rsp;
 
-	/* Receiving answer of request */
-	DEBUG(4, "STATE_REC\n");
+	DEBUG(4, "STATE: RECV/RECEIVE_RX\n");
+
+	if (msg == NULL)
+		return 0;
+	rsp = msg_get_rsp(msg);
 
 	switch (self->object->opcode) {
 	case OBEX_CMD_CONNECT:
@@ -88,50 +139,33 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 		self->state = STATE_IDLE;
 		return -1;
 	}
+	obex_data_receive_finished(self);
 
 	/* Are we done yet? */
 	if (rsp == OBEX_RSP_CONTINUE) {
 		DEBUG(3, "Continue...\n");
-
-		self->object->continue_received = 1;
-
 		if (self->object->abort) {
 			DEBUG(3, "Ignoring CONTINUE because request was aborted\n");
 			return 0;
 		}
-
-		if (self->object->suspend) {
-			DEBUG(3, "Not sending new request because transfer is suspended\n");
-			return 0;
-		}
-
-		if (self->object->rsp_mode == OBEX_RSP_MODE_NORMAL ||
-				(self->srm_flags & OBEX_SRM_FLAG_WAIT_REMOTE)) {
-			ret = obex_object_send(self, self->object, TRUE, FALSE);
-			if (ret < 0)
-				obex_deliver_event(self, OBEX_EV_LINKERR,
-						self->object->opcode, rsp,
-						TRUE);
-		}
-		if (ret >= 0)
-			obex_deliver_event(self, OBEX_EV_PROGRESS,
-						self->object->opcode, rsp, FALSE);
-
-		if (self->object)
-			self->object->continue_received = 0;
+		self->substate = SUBSTATE_PREPARE_TX;
+		return obex_client_recv_prepare_tx(self);
 
 	} else {
 		/* Notify app that client-operation is done! */
+		ret = 0;
 		DEBUG(3, "Done! Rsp=%02x!\n", rsp);
 		if (self->object->abort) {
 			if (rsp == OBEX_RSP_SUCCESS)
 				obex_deliver_event(self, OBEX_EV_ABORT,
 							self->object->opcode,
 							rsp, TRUE);
-			else
+			else {
 				obex_deliver_event(self, OBEX_EV_LINKERR,
 							self->object->opcode,
 							rsp, TRUE);
+				ret = -1;
+			}
 
 		} else
 			obex_deliver_event(self, OBEX_EV_REQDONE,
@@ -139,9 +173,9 @@ static int obex_client_recv(obex_t *self, buf_t *msg, int rsp)
 							rsp, TRUE);
 		self->mode = MODE_SRV;
 		self->state = STATE_IDLE;
+		return ret;
 	}
 
-	return 0;
 }
 
 int obex_client_send(obex_t *self, buf_t *msg, int rsp)
@@ -252,7 +286,16 @@ int obex_client(obex_t *self)
 		break;
 
 	case STATE_REC:
-		ret = obex_client_recv(self, msg, rsp);
+		switch (self->substate) {
+		case SUBSTATE_RECEIVE_RX:
+			return obex_client_recv(self);
+
+		case SUBSTATE_PREPARE_TX:
+			return obex_client_recv_prepare_tx(self);
+
+		case SUBSTATE_TRANSMIT_TX:
+			return obex_client_recv_transmit_tx(self);
+		}
 		break;
 
 	default:
-- 
1.7.5.4

Now that the multi-level state machine is used, the resume function can be
simplified a lot. To actually continue now, you have to call the
OBEX_HandleInput() function.
---
 lib/obex.c        |    2 +-
 lib/obex_object.c |   43 ++++++-------------------------------------
 lib/obex_object.h |    2 +-
 3 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index 991f06f..277dbf2 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -574,7 +574,7 @@ LIB_SYMBOL
 int CALLAPI OBEX_ResumeRequest(obex_t *self)
 {
 	obex_return_val_if_fail(self->object != NULL, -1);
-	return obex_object_resume(self, self->object);
+	return obex_object_resume(self->object);
 }
 
 /**
diff --git a/lib/obex_object.c b/lib/obex_object.c
index f888a2d..f0b4b7f 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -1146,49 +1146,18 @@ int obex_object_readstream(obex_t *self, obex_object_t *object,
 
 int obex_object_suspend(obex_object_t *object)
 {
+	if (object->suspend == 1)
+		return -1;
+
 	object->suspend = 1;
 	return 0;
 }
 
-int obex_object_resume(obex_t *self, obex_object_t *object)
+int obex_object_resume(obex_object_t *object)
 {
-	int ret;
-	uint8_t cmd = obex_object_getcmd(self, object);
-	int allowfinalcmd = TRUE, forcefinalbit = FALSE;
-
-	if (!object->suspend)
-		return 0;
-
-	object->suspend = 0;
-
-	if (object->first_packet_sent && !object->continue_received)
-		return 0;
-
-	if (self->mode == MODE_SRV) {
-		forcefinalbit = TRUE;
-		if (self->state == STATE_REC)
-			allowfinalcmd = FALSE;
-	}
-
-	ret = obex_object_send(self, object, allowfinalcmd, forcefinalbit);
-
-	if (ret < 0) {
-		obex_deliver_event(self, OBEX_EV_LINKERR, cmd, 0, TRUE);
+	if (object->suspend == 0)
 		return -1;
-	} else if (ret == 0) {
-		obex_deliver_event(self, OBEX_EV_PROGRESS, cmd, 0, FALSE);
-		object->first_packet_sent = 1;
-		object->continue_received = 0;
-	} else {
-		if (self->mode == MODE_SRV) {
-			obex_deliver_event(self, OBEX_EV_REQDONE,
-							cmd, 0, TRUE);
-			self->state = STATE_IDLE;
-			return 0;
-		}
-	}
-
-	self->state = STATE_REC;
 
+	object->suspend = 0;
 	return 0;
 }
diff --git a/lib/obex_object.h b/lib/obex_object.h
index 5bcbe0b..31a7d80 100644
--- a/lib/obex_object.h
+++ b/lib/obex_object.h
@@ -109,6 +109,6 @@ int obex_object_receive(struct obex *self, struct databuffer *msg);
 
 int obex_object_readstream(struct obex *self, struct obex_object *object, const uint8_t **buf);
 int obex_object_suspend(struct obex_object *object);
-int obex_object_resume(struct obex *self, struct obex_object *object);
+int obex_object_resume(struct obex_object *object);
 
 #endif
-- 
1.7.5.4

---
 lib/obex_object.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/obex_object.c b/lib/obex_object.c
index 78a15c5..f3f5672 100644
--- a/lib/obex_object.c
+++ b/lib/obex_object.c
@@ -744,9 +744,9 @@ static void obex_object_receive_stream(obex_t *self, uint8_t hi,
 }
 
 /*
- * Function obex_object_receive_body()
+ * Function obex_object_receive_buffered()
  *
- *    Handle receiving of body
+ *    Handle receiving of buffered body
  *
  */
 static int obex_object_receive_buffered(obex_t *self, uint8_t hi,
-- 
1.7.5.4

One step is triggered the transport handle_input function: this one fills the
rx_msg buffer. It also used to read from that rx_msg buffer right again and
trigger the state machine. This patch decouples the second part and is needed
for further splitting into substates.
---
 lib/obex.c           |    2 +-
 lib/obex_client.c    |   13 +++++++--
 lib/obex_client.h    |    2 +-
 lib/obex_main.c      |   73 ++++++++++++++++++++++++++++++++-----------------
 lib/obex_main.h      |    2 +
 lib/obex_server.c    |   18 +++++++++---
 lib/obex_server.h    |    2 +-
 lib/obex_transport.c |    2 +-
 8 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index bf2b71b..e56ef74 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -535,7 +535,7 @@ int CALLAPI OBEX_Request(obex_t *self, obex_object_t *object)
 	self->mode = MODE_CLI;
         self->state = STATE_SEND;
 
-	return obex_client(self, NULL, 0);
+	return obex_client_send(self, NULL, 0);
 }
 
 /**
diff --git a/lib/obex_client.c b/lib/obex_client.c
index 0199fbf..e17528a 100644
--- a/lib/obex_client.c
+++ b/lib/obex_client.c
@@ -238,22 +238,29 @@ int obex_client_send(obex_t *self, buf_t *msg, int rsp)
  *    Handle client operations
  *
  */
-int obex_client(obex_t *self, buf_t *msg, int final)
+int obex_client(obex_t *self)
 {
+	int ret = -1;
+	buf_t *msg = obex_data_receive(self);
 	int rsp = msg_get_rsp(msg);
 
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_SEND:
-		return obex_client_send(self, msg, rsp);
+		ret = obex_client_send(self, msg, rsp);
+		break;
 
 	case STATE_REC:
-		return obex_client_recv(self, msg, rsp);
+		ret = obex_client_recv(self, msg, rsp);
+		break;
 
 	default:
 		DEBUG(0, "Unknown state\n");
 		obex_deliver_event(self, OBEX_EV_PARSEERR, rsp, 0, TRUE);
 		return -1;
 	}
+
+	obex_data_receive_finished(self);
+	return ret;
 }
diff --git a/lib/obex_client.h b/lib/obex_client.h
index bed3593..d1ae8fd 100644
--- a/lib/obex_client.h
+++ b/lib/obex_client.h
@@ -25,7 +25,7 @@
 struct obex;
 struct databuffer;
 
-int obex_client(struct obex *self, struct databuffer *msg, int final);
+int obex_client(struct obex *self);
 int obex_client_send(obex_t *self, buf_t *msg, int rsp);
 
 #endif
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 884c9e3..5337208 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -257,6 +257,20 @@ int obex_data_request(obex_t *self, buf_t *msg)
 	return status;
 }
 
+static int obex_mode(obex_t *self)
+{
+	switch (self->mode) {
+	case MODE_SRV:
+		return obex_server(self);
+
+	case MODE_CLI:
+		return obex_client(self);
+
+	default:
+		return -1;
+	}
+}
+
 /*
  * Function obex_work (self, timeout)
  *
@@ -265,6 +279,8 @@ int obex_data_request(obex_t *self, buf_t *msg)
  */
 int obex_work(obex_t *self, int timeout)
 {
+	int ret;
+
 	/* Waiting for an incoming packet will not work for single response mode
 	 * as the client is not supposed to send any when we (as server) are
 	 * sending the response.
@@ -273,8 +289,6 @@ int obex_work(obex_t *self, int timeout)
 			self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
 			self->state == STATE_SEND &&
 			!(self->srm_flags & OBEX_SRM_FLAG_WAIT_LOCAL)) {
-		int ret;
-
 		/* Still, we need to do a zero-wait check for an ABORT
 		 * and for connection errors. */
 		ret = obex_transport_handle_input(self, 0);
@@ -298,7 +312,10 @@ int obex_work(obex_t *self, int timeout)
 			return sizeof(obex_common_hdr_t);
 	}
 
-	return obex_transport_handle_input(self, timeout);
+	ret = obex_transport_handle_input(self, timeout);
+	if (ret == 1)
+		ret = obex_mode(self);
+	return ret;
 }
 
 /*
@@ -314,15 +331,14 @@ int obex_get_buffer_status(buf_t *msg) {
 /*
  * Function obex_data_indication (self)
  *
- *    Read/Feed some input from device and find out which packet it is
+ *    Read some input from device and find out which packet it is
  *
  */
 int obex_data_indication(obex_t *self)
 {
 	obex_common_hdr_t *hdr;
 	buf_t *msg;
-	uint8_t opcode;
-	int final, ret, actual = 0;
+	int actual;
 	unsigned int size;
 
 	DEBUG(4, "\n");
@@ -342,7 +358,7 @@ int obex_data_indication(obex_t *self)
 		 * partial buffer (custom transport) */
 		if (actual < 0) {
 			obex_deliver_event(self, OBEX_EV_LINKERR, 0, 0, TRUE);
-			return actual;
+			return -1;
 		}
 	}
 
@@ -366,14 +382,14 @@ int obex_data_indication(obex_t *self)
 			if (actual < 0) {
 				obex_deliver_event(self, OBEX_EV_LINKERR,
 								0, 0, TRUE);
-				return actual;
+				return -1;
 			}
 		}
 	} else {
 		/* Wait until we have at least 3 bytes data */
 		DEBUG(3, "Need at least 3 bytes got only %lu!\n",
 					(unsigned long) msg->data_size);
-		return actual;
+		return 0;
         }
 
 	/* New data has been inserted at the end of message */
@@ -392,16 +408,20 @@ int obex_data_indication(obex_t *self)
 				size, (unsigned long)msg->data_size);
 
 		/* I'll be back! */
-		return msg->data_size;
+		return 0;
 	}
 
 	DUMPBUFFER(2, "Rx", msg);
 
-	actual = msg->data_size;
-	opcode = hdr->opcode & ~OBEX_FINAL;
-	final = hdr->opcode & OBEX_FINAL; /* Extract final bit */
+	return 1;
+}
+
+buf_t* obex_data_receive(obex_t *self)
+{
+	buf_t *msg = self->rx_msg;
+	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
+	uint8_t opcode = hdr->opcode & ~OBEX_FINAL;
 
-	/* Dispatch to the mode we are in */
 	if (self->mode == MODE_SRV) {
 		/* Single response mode makes it possible for the client to send
 		 * the next request (e.g. PUT) while still receiving the last
@@ -411,23 +431,26 @@ int obex_data_indication(obex_t *self)
 				self->object->rsp_mode != OBEX_RSP_MODE_NORMAL &&
 				self->state == STATE_SEND &&
 				!(opcode == OBEX_CMD_ABORT || opcode == self->object->cmd))
-			return 0;
+			return NULL;
+	}
 
-		self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_LOCAL;
-		ret = obex_server(self, msg, final);
-	} else
-		ret = obex_client(self, msg, final);
+	if (!obex_get_buffer_status(msg))
+		return NULL;
+
+	self->srm_flags &= ~OBEX_SRM_FLAG_WAIT_LOCAL;
+	return msg;
+}
+
+void obex_data_receive_finished(obex_t *self)
+{
+	buf_t *msg = self->rx_msg;
+	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
+	unsigned int size = ntohs(hdr->len);
 
 	DEBUG(4, "Pulling %u bytes\n", size);
 	buf_remove_begin(msg, size);
 	if (msg->data_size == 0)
 		buf_reuse(msg);
-
-	/* Check parse errors */
-	if (ret < 0)
-		actual = ret;
-
-	return actual;
 }
 
 /*
diff --git a/lib/obex_main.h b/lib/obex_main.h
index 53d2768..8a3e975 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -69,6 +69,8 @@ void obex_deliver_event(struct obex *self, int event, int cmd, int rsp, int del)
 int obex_work(struct obex *self, int timeout);
 int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
+buf_t* obex_data_receive(obex_t *self);
+void obex_data_receive_finished(obex_t *self);
 
 void obex_response_request(struct obex *self, uint8_t opcode);
 void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
diff --git a/lib/obex_server.c b/lib/obex_server.c
index 52f490e..1902e4f 100644
--- a/lib/obex_server.c
+++ b/lib/obex_server.c
@@ -324,22 +324,29 @@ static int obex_server_idle(obex_t *self, buf_t *msg, int final,
  *    Handle server-operations
  *
  */
-int obex_server(obex_t *self, buf_t *msg, int final)
+int obex_server(obex_t *self)
 {
+	int ret = -1;
+	buf_t *msg = obex_data_receive(self);
+	obex_common_hdr_t *hdr = (obex_common_hdr_t *)msg->data;
 	int cmd = msg_get_cmd(msg);
 	uint16_t len = msg_get_len(msg);
+	int final = hdr->opcode & OBEX_FINAL; /* Extract final bit */
 
 	DEBUG(4, "\n");
 
 	switch (self->state) {
 	case STATE_IDLE:
-		return obex_server_idle(self, msg, final, cmd, len);
+		ret = obex_server_idle(self, msg, final, cmd, len);
+		break;
 
 	case STATE_REC:
-		return obex_server_recv(self, msg, final, cmd, len);
+		ret = obex_server_recv(self, msg, final, cmd, len);
+		break;
 
 	case STATE_SEND:
-		return obex_server_send(self, msg, cmd, len);
+		ret = obex_server_send(self, msg, cmd, len);
+		break;
 
 	default:
 		DEBUG(0, "Unknown state\n");
@@ -347,4 +354,7 @@ int obex_server(obex_t *self, buf_t *msg, int final)
 		obex_deliver_event(self, OBEX_EV_PARSEERR, cmd, 0, TRUE);
 		return -1;
 	}
+
+	obex_data_receive_finished(self);
+	return ret;
 }
diff --git a/lib/obex_server.h b/lib/obex_server.h
index 3906e6f..2d4bc18 100644
--- a/lib/obex_server.h
+++ b/lib/obex_server.h
@@ -25,7 +25,7 @@
 struct obex;
 struct databuffer;
 
-int obex_server(struct obex *self, struct databuffer *msg, int final);
+int obex_server(struct obex *self);
 int obex_server_send(obex_t *self, buf_t *msg, int cmd, uint16_t len);
 
 #endif
diff --git a/lib/obex_transport.c b/lib/obex_transport.c
index aa113ed..6207279 100644
--- a/lib/obex_transport.c
+++ b/lib/obex_transport.c
@@ -251,7 +251,7 @@ int obex_transport_handle_input(obex_t *self, int timeout)
 	self->trans.timeout = timeout;
 	if (obex_get_buffer_status(self->rx_msg)) {
 		DEBUG(4, "full message already in buffer\n");
-		return obex_data_indication(self);
+		return 1;
 	}
 
 	if (self->trans.ops.handle_input)
-- 
1.7.5.4

---
 apps/obex_test/obex_test.c |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 7527a51..4b9b0b2 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -167,9 +167,9 @@ int main (int argc, char *argv[])
 	struct context global_context = {0};
 
 #ifdef HAVE_BLUETOOTH
-	int btobex = FALSE;
+	int btobex = 0;
 	bdaddr_t bdaddr;
-	uint8_t channel = 0;
+	uint16_t channel = 0;
 #endif
 #ifdef HAVE_USB
 	int usbobex = FALSE;
@@ -192,6 +192,7 @@ int main (int argc, char *argv[])
 #endif
 #ifdef HAVE_BLUETOOTH
 			"    -b [addr] [chan]  Use bluetooth RFCOMM transport\n"
+			"    -B [addr] [psm]   Use bluetooth L2CAP transport\n"
 #endif
 #ifdef HAVE_USB
 			"    -u [interface]    Use USB transport\n"
@@ -214,7 +215,9 @@ int main (int argc, char *argv[])
 #endif
 #ifdef HAVE_BLUETOOTH
 	if (argc >= 2 && strcmp(argv[1], "-b") == 0)
-		btobex = TRUE;
+		btobex = 1;
+	if (argc >= 2 && strcmp(argv[1], "-B") == 0)
+		btobex = 2;
 #endif
 #ifdef HAVE_USB
 	if (argc >= 2 && strcmp(argv[1], "-u") == 0)
@@ -281,7 +284,7 @@ int main (int argc, char *argv[])
 		}
 
 		switch (btobex) {
-		case TRUE:
+		case 1:
 			printf("Using Bluetooth RFCOMM transport\n");
 			handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
 			if (channel_arg)
@@ -289,6 +292,14 @@ int main (int argc, char *argv[])
 			else
 				channel = BT_CHANNEL;
 			break;
+
+		case 2:
+			printf("Using Bluetooth L2CAP transport\n");
+			handle = OBEX_Init(OBEX_TRANS_BT_L2CAP, obex_event, 0);
+			if (channel_arg)
+				channel = atoi(channel_arg);
+			channel = (channel | 0x1001) & 0xFFFF;
+			break;
 		}
 
 		if (!handle) {
-- 
1.7.5.4

---
 include/openobex/obex.h       |    1 +
 include/openobex/obex_const.h |    7 +++++++
 lib/obex.c                    |   16 ++++++++++++++++
 lib/obex.sym                  |    1 +
 lib/obex_main.c               |   16 +++++++++++++---
 lib/obex_main.h               |    1 +
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index e773c12..4d15671 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -111,6 +111,7 @@ OPENOBEX_SYMBOL(void *)   OBEX_GetUserData(obex_t *self);
 OPENOBEX_SYMBOL(void)     OBEX_SetEventCb(obex_t *self, obex_event_cb_t eventcb, void * data);
 OPENOBEX_SYMBOL(int)      OBEX_SetTransportMTU(obex_t *self, uint16_t mtu_rx, uint16_t mtu_tx_max);
 OPENOBEX_SYMBOL(int)      OBEX_GetFD(obex_t *self);
+OPENOBEX_SYMBOL(enum obex_data_direction) OBEX_GetDataDirection(obex_t *self);
 
 OPENOBEX_SYMBOL(int)    OBEX_RegisterCTransport(obex_t *self, obex_ctrans_t *ctrans);
 OPENOBEX_SYMBOL(int)    OBEX_SetCustomData(obex_t *self, void * data);
diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index f0cbbf0..eaf9a64 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -204,6 +204,13 @@ enum obex_transport_type {
 	OBEX_TRANS_BT_L2CAP = 7,  /**< Bluetooth L2CAP */
 };
 
+/** Possible directions for data */
+enum obex_data_direction {
+	OBEX_DATA_DIR_NONE = 0, /**< No data */
+	OBEX_DATA_DIR_RX = 1, /**< Incoming data */
+	OBEX_DATA_DIR_TX = 2, /**< Outgoing data */
+};
+
 /* Standard headers */
 #define OBEX_HDR_TYPE_UNICODE	(0 << 6)  /* zero terminated unicode string (network byte order) */
 #define OBEX_HDR_TYPE_BYTES	(1 << 6)  /* byte array */
diff --git a/lib/obex.c b/lib/obex.c
index 04016e1..ab22037 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -412,6 +412,22 @@ int CALLAPI OBEX_Work(obex_t *self, long timeout)
 }
 
 /**
+   	Find out the current data transfer direction
+	\param self OBEX handle
+	\return see #obex_data_direction
+
+	If you want to check externally if a socket is readable/writable, this
+	function together with OBEX_GetFD() gives you full control when to
+	call OBEX_Work().
+ */
+LIB_SYMBOL
+enum obex_data_direction CALLAPI OBEX_GetDataDirection(obex_t *self)
+{
+	DEBUG(4, "\n");
+	return obex_get_data_direction(self);
+}
+
+/**
 	Feed OBEX with data when using a custom transport.
 	\param self OBEX handle
 	\param inputbuf Pointer to custom data
diff --git a/lib/obex.sym b/lib/obex.sym
index 3de52c7..4c07c29 100644
--- a/lib/obex.sym
+++ b/lib/obex.sym
@@ -7,6 +7,7 @@ OBEX_SetUserCallBack
 OBEX_SetEventCb
 OBEX_SetTransportMTU
 OBEX_GetFD
+OBEX_GetDataDirection
 OBEX_RegisterCTransport
 OBEX_SetCustomData
 OBEX_GetCustomData
diff --git a/lib/obex_main.c b/lib/obex_main.c
index 714571a..5a7864c 100644
--- a/lib/obex_main.c
+++ b/lib/obex_main.c
@@ -380,6 +380,18 @@ static int obex_mode(obex_t *self)
 	}
 }
 
+enum obex_data_direction obex_get_data_direction (obex_t *self)
+{
+	if (self == NULL)
+		return OBEX_DATA_DIR_NONE;
+
+	if (self->state == STATE_IDLE ||
+	    self->substate == SUBSTATE_RECEIVE_RX)
+		return OBEX_DATA_DIR_RX;
+	else
+		return OBEX_DATA_DIR_TX;
+}
+
 /*
  * Function obex_work (self, timeout)
  *
@@ -390,9 +402,7 @@ int obex_work(obex_t *self, long timeout)
 {
 	int ret;
 
-	if (self->state == STATE_IDLE ||
-	    self->substate == SUBSTATE_RECEIVE_RX)
-	{
+	if (obex_get_data_direction(self) == OBEX_DATA_DIR_RX) {
 		ret = obex_transport_handle_input(self, timeout);
 		if (ret <= 0)
 			return ret;
diff --git a/lib/obex_main.h b/lib/obex_main.h
index be154d1..4f1465c 100644
--- a/lib/obex_main.h
+++ b/lib/obex_main.h
@@ -76,6 +76,7 @@ int obex_get_buffer_status(buf_t *msg);
 int obex_data_indication(struct obex *self);
 buf_t* obex_data_receive(obex_t *self);
 void obex_data_receive_finished(obex_t *self);
+enum obex_data_direction obex_get_data_direction (obex_t *self);
 
 void obex_response_request(struct obex *self, uint8_t opcode);
 void obex_data_request_prepare(struct obex *self, struct databuffer *msg,
-- 
1.7.5.4

---
 include/openobex/obex_const.h |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index ff147df..18d698a 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -151,19 +151,33 @@ enum obex_mode {
 	OBEX_MODE_SERVER = 1, /**< server mode */
 };
 
-/* Possible events */
-#define OBEX_EV_PROGRESS	0	/* Progress has been made */
-#define OBEX_EV_REQHINT		1	/* An incoming request is about to come */
-#define OBEX_EV_REQ		2	/* An incoming request has arrived */
-#define OBEX_EV_REQDONE		3	/* Request has finished */
-#define OBEX_EV_LINKERR		4	/* Link has been disconnected */
-#define OBEX_EV_PARSEERR	5	/* Malformed data encountered */
-#define OBEX_EV_ACCEPTHINT	6	/* Connection accepted */
-#define OBEX_EV_ABORT		7	/* Request was aborted */
-#define OBEX_EV_STREAMEMPTY	8	/* Need to feed more data when sending a stream */
-#define OBEX_EV_STREAMAVAIL	9	/* Time to pick up data when receiving a stream */
-#define OBEX_EV_UNEXPECTED	10	/* Unexpected data, not fatal */
-#define OBEX_EV_REQCHECK	11	/* First packet of an incoming request has been parsed */
+/** Possible events */
+enum obex_event {
+	/** Progress has been made */
+	OBEX_EV_PROGRESS = 0,
+	/** An incoming request is about to come */
+	OBEX_EV_REQHINT = 1,
+	/** An incoming request has arrived */
+	OBEX_EV_REQ = 2,
+	/** Request has finished */
+	OBEX_EV_REQDONE = 3,
+	/** Link has been disconnected */
+	OBEX_EV_LINKERR = 4,
+	/** Malformed data encountered */
+	OBEX_EV_PARSEERR = 5,
+	/** Connection accepted */
+	OBEX_EV_ACCEPTHINT = 6,
+	/** Request was aborted */
+	OBEX_EV_ABORT = 7,
+	/** Need to feed more data when sending a stream */
+	OBEX_EV_STREAMEMPTY = 8,
+	/** Time to pick up data when receiving a stream */
+	OBEX_EV_STREAMAVAIL = 9,
+	/** Unexpected data, not fatal */
+	OBEX_EV_UNEXPECTED = 10,
+	/** First packet of an incoming request has been parsed */
+	OBEX_EV_REQCHECK = 11,
+};
 
 /* For OBEX_Init() */
 #define OBEX_FL_KEEPSERVER	(1 <<  1) /* Keep the server alive */
-- 
1.7.5.4

---
 lib/obex.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/obex.c b/lib/obex.c
index a2409a2..bf2b71b 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -81,7 +81,7 @@
 			- #OBEX_FL_KEEPSERVER : Keep the server alive after incomming request
 			- #OBEX_FL_FILTERHINT : Filter target devices based on Obex hint bit
 			- #OBEX_FL_FILTERIAS  : Filter target devices based on IAS entry
-			- #OBEX_FL_CLOSEXEC   : Open all sockets with SO_CLOEXEC set
+			- #OBEX_FL_CLOEXEC   : Open all sockets with SO_CLOEXEC set
 	\return an OBEX handle or NULL on error.
  */
 LIB_SYMBOL
-- 
1.7.5.4

Hi Hendrik,

On Wed, Jul 27, 2011, Hendrik Sattler wrote:
> @Johan:
> You can find all of these patches in my gitorious repository in the "testing"
> branch and I really recommend pull from there! (git am has its issues when
> files with DOS-style line-endings are involved). I will not be available almost
> all of August, so can be get this in before then?

You're asking me to review 52 patches by the end of this week?
Unfortunately I don't think that's doable even if I allocated all of my
time for this. I will at least try to get the ones in which you said are
strictly needed.

Johan

Am Mittwoch, 27. Juli 2011, 22:16:37 schrieb Johan Hedberg:
> Hi Hendrik,
> 
> On Wed, Jul 27, 2011, Hendrik Sattler wrote:
> > @Johan:
> > You can find all of these patches in my gitorious repository in the
> > "testing" branch and I really recommend pull from there! (git am has its
> > issues when files with DOS-style line-endings are involved). I will not
> > be available almost all of August, so can be get this in before then?
> 
> You're asking me to review 52 patches by the end of this week?
> Unfortunately I don't think that's doable even if I allocated all of my
> time for this. I will at least try to get the ones in which you said are
> strictly needed.

No, I don't ask that ;-)
You are right, it would be quite a lot :-/

Have fun...

HS

Hi Hendrik,

On Wed, Jul 27, 2011, Hendrik Sattler wrote:
> ---
>  apps/obex_test/obex_test.c        |   12 ++++---
>  apps/obex_test/obex_test_client.c |   61 ++++++++++++++++++++++--------------
>  2 files changed, 44 insertions(+), 29 deletions(-)

Patches 1-9 have been applied, but this one has issues (though in
general these two c-files are a total mess as far as coding style and
whitespace is concerned).

> diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
> index 4200f9b..350d808 100644
> --- a/apps/obex_test/obex_test.c
> +++ b/apps/obex_test/obex_test.c
> @@ -153,8 +153,8 @@ static int inet_connect(obex_t *handle)
>  //
>  int main (int argc, char *argv[])
>  {
> -	char cmd[10];
> -	int num, end = 0;
> +	char cmd[3];
> +	int end = 0;
>  	int cobex = FALSE, tcpobex = FALSE, btobex = FALSE, r320 = FALSE, usbobex = FALSE;
>  	obex_t *handle;
>  #ifdef HAVE_BLUETOOTH
> @@ -350,10 +350,12 @@ int main (int argc, char *argv[])
>  
>  	while (!end) {
>  		printf("> ");
> -		num = scanf("%s", cmd);
> -		if (num == EOF)
> +		fflush(stdout);
> +		(void)fgets(cmd, sizeof(cmd), stdin);

Could you just do

if (fgets(...) == NULL)
	break;

to avoid the typecast (and even if there was a typecast there's always a
space before the function/variable name.

> +		if (cmd[0] == 0) /* EOF */
>  			break;
> -		switch (cmd[0] | 0x20)	{
> +		cmd[strlen(cmd)-1] = 0; /* remove trailing newline */

That should be cmd[strlen(cmd) - 1] = '\0'; (0 is for integers, '\0' for
characters. Also not the whitespace change.

> +	fprintf(stdout, "PUSH file> ");
> +	fflush(stdout);
> +	(void)fgets(fname, sizeof(fname), stdin);

The same thing as above.

> +	if (fname[0] == 0) /* EOF */

== '\0'

> +	fname[strlen(fname)-1] = 0; /* remove trailing newline */

Same thing as earlier.

> +	if (strlen(fname) == 0) {
>  		perror("scanf");

You're not using scanf anymore so this error log isn't correct. Also,
since you're truncating the string this strlen check doesn't guarantee
that errno will be set.

> +	(void)fgets(lname, sizeof(lname), stdin);
> +	if (lname[0] == 0) /* EOF */
> +		return;
> +	lname[strlen(lname)-1] = 0; /* remove trailing newline */
> +	if (strlen(lname) == 0) {
>  		perror("scanf:");
>  		return;
>  	}

Same issues here as I've already pointed out.

> +	fprintf(stdout, "PUT remote filename (default: %s)> ", lname);
> +	fflush(stdout);
> +	(void)fgets(rname, sizeof(rname), stdin);
> +	if (rname[0] == 0) /* EOF */
> +		return;
> +	rname[strlen(rname)-1] = 0; /* remove trailing newline */
> +	if (strlen(rname) == 0)

And here.

> +	fprintf(stdout, "GET file> ");
> +	fflush(stdout);
> +	(void)fgets(req_name, sizeof(req_name), stdin);
> +	if (req_name[0] == 0) /* EOF */
> +		return;
> +	req_name[strlen(req_name)-1] = 0; /* remove trailing newline */
> +	if (strlen(req_name) == 0) {
>  		perror("scanf:");
>  		return;
>  	}

And here.

> +	fprintf(stdout, "SETPATH> ");
> +	fflush(stdout);
> +	(void)fgets(path, sizeof(path), stdin);
> +	if (path[0] == 0) /* EOF */
> +		return;
> +	path[strlen(path)-1] = 0; /* remove trailing newline */
> +	if (strlen(path) == 0) {
>  		perror("scanf:");
>  		return;
>  	}

And here.

Btw, since the code patterns in all of these places are almost the same
it'd probably make sense to make a helper function for this.

Johan

Hi,

On Wed, Jul 27, 2011, Hendrik Sattler wrote:
> This is needed for obex_test to actually work.
> ---
>  lib/obex_client.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)

This patch has been applied.

Johan

V2:
    - add function read_input() and uses it to print the prompt and read the
      user input

---
 apps/obex_test/obex_test.c        |   26 ++++++++++++++++-----
 apps/obex_test/obex_test.h        |    1 +
 apps/obex_test/obex_test_client.c |   44 +++++++++++++-----------------------
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 4200f9b..9336e2a 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -49,6 +49,7 @@ bdaddr_t bluez_compat_bdaddr_any = { BTH_ADDR_NULL };
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 
 #ifndef in_addr_t
 #define in_addr_t unsigned long
@@ -107,6 +108,21 @@ static void obex_event(obex_t *handle, obex_object_t *object, int mode,
 	}
 }
 
+int read_input(char *answer, size_t size, const char *question, ...)
+{
+	va_list ap;
+	va_start(ap, question);
+	vfprintf(stdout, question, ap);
+	va_end(ap);
+
+	fflush(stdout);
+	if (fgets(answer, size, stdin) == NULL)
+		return -1;
+
+	answer[strlen(answer)-1] = '\0'; /* remove trailing newline */
+	return strlen(answer);
+}	
+
 #if 0
 /*
  * Function get_peer_addr (name, peer)
@@ -153,8 +169,8 @@ static int inet_connect(obex_t *handle)
 //
 int main (int argc, char *argv[])
 {
-	char cmd[10];
-	int num, end = 0;
+	char cmd[3];
+	int end = 0;
 	int cobex = FALSE, tcpobex = FALSE, btobex = FALSE, r320 = FALSE, usbobex = FALSE;
 	obex_t *handle;
 #ifdef HAVE_BLUETOOTH
@@ -349,11 +365,9 @@ int main (int argc, char *argv[])
 	printf( "OBEX Interactive test client/server.\n");
 
 	while (!end) {
-		printf("> ");
-		num = scanf("%s", cmd);
-		if (num == EOF)
+		if (read_input(cmd, sizeof(cmd), "> ") < 0)
 			break;
-		switch (cmd[0] | 0x20)	{
+		switch(cmd[0]) {
 			case 'h':
 				printf("Commands:\n"
 				       " c - connect\n"
diff --git a/apps/obex_test/obex_test.h b/apps/obex_test/obex_test.h
index a340f75..14d347e 100644
--- a/apps/obex_test/obex_test.h
+++ b/apps/obex_test/obex_test.h
@@ -19,5 +19,6 @@ struct context
 	int clientdone;
 	char *get_name;	/* Name of last get-request */
 };
+int read_input(char *answer, size_t size, const char *question, ...);
 
 #endif
diff --git a/apps/obex_test/obex_test_client.c b/apps/obex_test/obex_test_client.c
index 8f0efc7..da92df7 100644
--- a/apps/obex_test/obex_test_client.c
+++ b/apps/obex_test/obex_test_client.c
@@ -227,18 +227,14 @@ void push_client(obex_t *handle)
 	unsigned int uname_size;
 	char *bfname;
 	uint8_t *uname;
-	int num;
 
 	obex_headerdata_t hd;
 	
 	uint8_t *buf;
 	int file_size;
 
-	printf("PUSH filename> ");
-	memset(fname, 0, sizeof(fname));
-	num = scanf("%199c", fname);
-	if (num != 1) {
-		perror("scanf");
+	if (read_input(fname, sizeof(fname), "PUSH file> ") <= 0) {
+		perror("Error reading file name");
 		return;
 	}
 
@@ -294,16 +290,12 @@ void put_client(obex_t *handle)
 	char rname[200];
 	unsigned int rname_size;
 	obex_headerdata_t hd;
-	int num;
 	
 	uint8_t *buf;
 	int file_size;
 
-	printf("PUT file (local)> ");
-	memset(lname, 0, sizeof(lname));
-	num = scanf("%199c", lname);
-	if (num != 1) {
-		perror("scanf:");
+	if (read_input(lname, sizeof(lname), "PUT file (local)> ") <= 0) {
+		perror("Error reading file name");
 		return;
 	}
 
@@ -314,10 +306,12 @@ void put_client(obex_t *handle)
 		return;
 	}
 
-	printf("PUT remote filename (default: %s)> ", lname);
-	memset(rname, 0, sizeof(rname));
-	num = scanf("%199c", rname);
-	if (num == 0)
+	if (read_input(rname, sizeof(rname),
+		       "PUT remote filename (default: %s)> ", lname) < 0) {
+		perror("Error reading file name");
+		return;
+	}
+	if (strlen(rname) == 0)
 		strcpy(rname, lname);
 	printf("Going to send %d bytes\n", file_size);
 
@@ -362,14 +356,11 @@ void get_client(obex_t *handle, struct context *gt)
 	obex_object_t *object;
 	uint8_t rname[200];
 	char req_name[200];
-	int num, rname_size;
+	int rname_size;
 	obex_headerdata_t hd;
 
-	printf("GET File> ");
-	memset(req_name, 0, sizeof(req_name));
-	num = scanf("%199c", req_name);
-	if (num != 1) {
-		perror("scanf:");
+	if (read_input(req_name, sizeof(req_name), "GET file> ") <= 0) {
+		perror("Error reading file name");
 		return;
 	}
 
@@ -438,14 +429,11 @@ void setpath_client(obex_t *handle)
 	uint8_t setpath_data[2] = { 0, 0 };
 	obex_object_t *object;
 	char path[200];
-	int num, path_size;
+	int path_size;
 	obex_headerdata_t hd;
 
-	printf("SETPATH> ");
-	memset(path, 0, sizeof(path));
-	num = scanf("%199c", path);
-	if (num != 1) {
-		perror("scanf:");
+	if (read_input(path, sizeof(path), "SETPATH> ") <= 0) {
+		perror("Error reading path");
 		return;
 	}
 
-- 
1.7.5.4