[maemo-commits] [maemo-commits] r14703 - in projects/connectivity/osso-gwobex/trunk: . debian src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Nov 2 10:19:52 EET 2007
- Previous message: [maemo-commits] r14702 - projects/connectivity/osso-gwobex/trunk/src
- Next message: [maemo-commits] r14704 - projects/connectivity/osso-gwobex/trunk/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jh
Date: 2007-11-02 10:19:50 +0200 (Fri, 02 Nov 2007)
New Revision: 14703
Modified:
projects/connectivity/osso-gwobex/trunk/configure.ac
projects/connectivity/osso-gwobex/trunk/debian/changelog
projects/connectivity/osso-gwobex/trunk/src/obex-priv.c
Log:
Increase wait time before returning timeout error.
Modified: projects/connectivity/osso-gwobex/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-gwobex/trunk/configure.ac 2007-11-02 07:11:40 UTC (rev 14702)
+++ projects/connectivity/osso-gwobex/trunk/configure.ac 2007-11-02 08:19:50 UTC (rev 14703)
@@ -1,4 +1,4 @@
-AC_INIT([osso-gwobex],[0.56])
+AC_INIT([osso-gwobex],[0.57])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -47,17 +47,16 @@
AC_SUBST(GW_OBEX_LIBS)
### Doxygen Documentation
-
AC_PATH_PROG(DOXYGEN, doxygen, no)
-
+
AC_MSG_CHECKING([whether to build Doxygen documentation])
-
+
if test x$DOXYGEN = xno ; then
have_doxygen=no
else
have_doxygen=yes
fi
-
+
if test x$enable_docs = xauto ; then
if test x$have_doxygen = xno ; then
enable_docs=no
@@ -65,17 +64,17 @@
enable_docs=yes
fi
fi
-
+
if test x$enable_docs = xyes; then
if test x$have_doxygen = xno; then
AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found])
- else
+ else
AC_MSG_RESULT(yes)
fi
else
AC_MSG_RESULT(no)
fi
-
+
AM_CONDITIONAL(DOXYGEN_DOCS_ENABLED, test x$enable_docs = xyes)
AC_MSG_CHECKING([whether to enable debug information])
Modified: projects/connectivity/osso-gwobex/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-gwobex/trunk/debian/changelog 2007-11-02 07:11:40 UTC (rev 14702)
+++ projects/connectivity/osso-gwobex/trunk/debian/changelog 2007-11-02 08:19:50 UTC (rev 14703)
@@ -1,12 +1,18 @@
+osso-gwobex (0.56ubuntu1) gutsy; urgency=low
+
+ * Increase wait time before returning timeout error. Fixes: NB#74851
+
+ -- Johan Hedberg <johan.hedberg at nokia.com> Fri, 02 Nov 2007 10:01:34 +0200
+
osso-gwobex (0.56) unstable; urgency=low
- * New version to force recompilation against new openobex package
+ * New version to force recompilation against new openobex package
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 30 Jul 2007 16:18:37 +0300
osso-gwobex (0.55) unstable; urgency=low
- * Check the return value of read(). Fixes: MB#1137
+ * Check the return value of read(). Fixes: MB#1137
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 18 Apr 2007 15:23:47 +0300
@@ -14,7 +20,7 @@
* Don't set abort error if xfer_close caused the abort itself.
Fixes: NB#48358
- * Add -dbg package. Fixes: NB#40776
+ * Add -dbg package. Fixes: NB#40776
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 1 Dec 2006 13:23:05 +0200
@@ -32,7 +38,7 @@
osso-gwobex (0.52.2) unstable; urgency=low
- * Second try at fix for idle source handling. Fixes: #NB36519
+ * Second try at fix for idle source handling. Fixes: #NB36519
-- Johan Hedberg <johan.hedberg at nokia.com> Tue, 15 Aug 2006 13:41:10 +0300
@@ -56,7 +62,7 @@
osso-gwobex (0.51) unstable; urgency=low
- * Fix calling of xfer callback after xfer_write. Fixes: #NB35777
+ * Fix calling of xfer callback after xfer_write. Fixes: #NB35777
-- Johan Hedberg <johan.hedberg at nokia.com> Tue, 25 Jul 2006 14:18:29 +0300
@@ -70,7 +76,7 @@
osso-gwobex (0.49.1) unstable; urgency=low
- * Fix small leak in GIOSource
+ * Fix small leak in GIOSource
* Fix GMutex leak on connection failure. Fixes: NB#33454
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 21 Jun 2006 13:54:09 +0300
@@ -90,19 +96,19 @@
osso-gwobex (0.47.4) unstable; urgency=low
- * Remove duplicate libopenobex1 depends
+ * Remove duplicate libopenobex1 depends
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 5 May 2006 13:27:07 +0300
osso-gwobex (0.47.3) unstable; urgency=low
- * Treat GIOCondition correctly in gw_obex_cb
+ * Treat GIOCondition correctly in gw_obex_cb
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 3 May 2006 18:55:05 +0300
osso-gwobex (0.47.2) unstable; urgency=low
- * Adjust RX MTU from 12kB to 4kB for better IOP
+ * Adjust RX MTU from 12kB to 4kB for better IOP
-- Johan Hedberg <johan.hedberg at nokia.com> Tue, 2 May 2006 16:14:59 +0300
@@ -114,7 +120,7 @@
osso-gwobex (0.47) unstable; urgency=low
- * Updated depends for openobex 1.2
+ * Updated depends for openobex 1.2
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 20 Mar 2006 14:23:44 +0200
@@ -143,7 +149,7 @@
* Call OBEX_HandleInput instead of g_main_context_iteration
* Add missing call to OBEX_SuspendRequest in obex_readstream
* Fix some locking issues
- * Split xfer_close to xfer_close and xfer_free
+ * Split xfer_close to xfer_close and xfer_free
* xfer_abort nolonger requires xfer_close to be called (just xfer_free)
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 13 Feb 2006 17:40:56 +0200
@@ -151,7 +157,7 @@
osso-gwobex (0.43) unstable; urgency=low
* Better error reporting for async functions
- * Added error argument and boolean return to xfer_flush (breaks API)
+ * Added error argument and boolean return to xfer_flush (breaks API)
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 3 Feb 2006 11:24:48 -0800
@@ -164,13 +170,13 @@
osso-gwobex (0.42) unstable; urgency=low
- * Add gw_obex_xfer_set_blocking
+ * Add gw_obex_xfer_set_blocking
-- Johan Hedberg <johan.hedberg at nokia.com> Thu, 2 Feb 2006 21:12:02 -0800
osso-gwobex (0.41) unstable; urgency=low
- * Add gw_obex_xfer_flush
+ * Add gw_obex_xfer_flush
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 14 Dec 2005 13:54:19 +0200
@@ -184,7 +190,7 @@
* Send OBEX Disconnect command before closing transport connection
* Added PBAP UUID to public header
- * Call obex_link_error in case of timeout
+ * Call obex_link_error in case of timeout
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 5 Oct 2005 21:35:07 +0300
@@ -198,7 +204,7 @@
* Use proper invalid connection id value (0xFFFFFFFF)
* Use connection id also in action command
- * Added new function gw_obex_get_type
+ * Added new function gw_obex_get_type
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 9 Sep 2005 11:10:16 +0300
@@ -225,7 +231,7 @@
* Moved gwobex_test to its own source package (osso-obc)
* Removed gwconnect dependency from libgwobex.pc
* Make use of time headers in put and get operations
- * Call progress callback at correct place
+ * Call progress callback at correct place
-- Johan Hedberg <johan.hedberg at nokia.com> Sun, 21 Aug 2005 01:14:34 +0300
@@ -242,7 +248,7 @@
* gwobex_test: use HCI_Read_Remote_Name if GConf fails
* gwobex_test: One or more OBEX commands (separated by ";") can be given
with the -c command line parameter")
- * gwobex_test license changed to GPL (from LGPL)
+ * gwobex_test license changed to GPL (from LGPL)
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 15 Aug 2005 10:11:04 +0300
@@ -264,14 +270,14 @@
osso-gwobex (0.27.3) unstable; urgency=low
- * Don't send ABORT twice by mistake.
+ * Don't send ABORT twice by mistake.
-- Johan Hedberg <johan.hedberg at nokia.com> Thu, 4 Aug 2005 12:43:38 +0300
osso-gwobex (0.27.2) unstable; urgency=low
* Support for showing current directory in gwobex_test
- * Couple of new commands to gwobex_test (lls, pwd, lpwd, lcd, |)
+ * Couple of new commands to gwobex_test (lls, pwd, lpwd, lcd, |)
* Show device name in gwobex_test prompt
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 3 Aug 2005 15:39:28 +0300
@@ -307,7 +313,7 @@
* Fail on trying to do PUT for a directory
* Misc. fixes to gwobex_test
* Two new possible errors:
- - GW_OBEX_ERROR_INVALID_PARAMS
+ - GW_OBEX_ERROR_INVALID_PARAMS
- GW_OBEX_ERROR_LOCAL_ACCESS
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 23 Mar 2005 23:13:51 +0200
@@ -316,7 +322,7 @@
* Update to new rfcomm_(dis)connect btcond API
* Remove UTF-8 validation since XML docs may have other encoding than UTF-8
- * Added Recomends: osso-gwconnect to osso-gwobex-test
+ * Added Recomends: osso-gwconnect to osso-gwobex-test
-- Johan Hedberg <johan.hedberg at nokia.com> Sat, 19 Mar 2005 21:47:32 +0200
@@ -329,7 +335,7 @@
osso-gwobex (0.23) unstable; urgency=low
- * Use O_SYNC when opening rfcomm device
+ * Use O_SYNC when opening rfcomm device
* Use \r instead of \n when reporting progress for gwobex_test
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 22 Nov 2004 11:22:41 +0200
@@ -353,13 +359,13 @@
* Added missing comma to build-depends list
* Added copyright file
- * Added manpage for gwobex_test
+ * Added manpage for gwobex_test
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 15 Oct 2004 11:09:12 +0300
osso-gwobex (0.19) unstable; urgency=low
- * Added pkgconfig support (patch from Imendio)
+ * Added pkgconfig support (patch from Imendio)
-- Johan Hedberg <johan.hedberg at nokia.com> Tue, 21 Sep 2004 15:21:39 +0300
@@ -377,57 +383,57 @@
osso-gwobex (0.16) unstable; urgency=low
- * Updated test app to new gwconnect API
+ * Updated test app to new gwconnect API
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 10 Sep 2004 09:58:57 +0300
osso-gwobex (0.15) unstable; urgency=low
* Updated license disclamers in files
- * Fixed source packaging
+ * Fixed source packaging
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 3 Sep 2004 13:54:50 +0300
osso-gwobex (0.14) unstable; urgency=low
- * Fixed incorrect symlink for install-sh (closes #1336)
+ * Fixed incorrect symlink for install-sh (closes #1336)
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 30 Aug 2004 10:02:43 +0300
osso-gwobex (0.13) unstable; urgency=low
* Remove usage of gw_is_connectable method call in test application
- * Added build-dependency to osso-gwconnect-dev
+ * Added build-dependency to osso-gwconnect-dev
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 20 Aug 2004 12:57:25 +0300
osso-gwobex (0.12-2) unstable; urgency=low
- * Created osso-gwobex-test with gwobex_test program
+ * Created osso-gwobex-test with gwobex_test program
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 9 Aug 2004 13:27:36 +0300
osso-gwobex (0.12-1) unstable; urgency=low
- * Remove error prints (library should output something only in debyg mode)
+ * Remove error prints (library should output something only in debyg mode)
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 9 Jul 2004 16:14:25 +0300
osso-gwobex (0.11-1) unstable; urgency=low
- * Support for Nokia FTP in gwobex_test
+ * Support for Nokia FTP in gwobex_test
-- Johan Hedberg <johan.hedberg at nokia.com> Thu, 13 May 2004 15:27:00 +0300
osso-gwobex (0.10-1) unstable; urgency=low
- * Abort related fixes and cleanup in gw_obex_request_sync()
+ * Abort related fixes and cleanup in gw_obex_request_sync()
-- Johan Hedberg <johan.hedberg at nokia.com> Thu, 13 May 2004 13:02:03 +0300
osso-gwobex (0.9-1) unstable; urgency=low
- * Fixed problems with the obex_link_error function.
+ * Fixed problems with the obex_link_error function.
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 12 May 2004 17:41:20 +0300
@@ -441,25 +447,25 @@
osso-gwobex (0.7-1) unstable; urgency=low
* Added GMainContext parameter go gw_obex_setup()
- * Removed race condition by unlocking GwObex before disconnect callback
+ * Removed race condition by unlocking GwObex before disconnect callback
-- Johan Hedberg <johan.hedberg at nokia.com> Mon, 10 May 2004 12:45:19 +0300
osso-gwobex (0.6-1) unstable; urgency=low
- * Added internal locking of the GwObex structure
+ * Added internal locking of the GwObex structure
-- Johan Hedberg <johan.hedberg at nokia.com> Fri, 7 May 2004 15:09:01 +0300
osso-gwobex (0.5-1) unstable; urgency=low
- * Added gw_obex_{put,get}_fd functions
+ * Added gw_obex_{put,get}_fd functions
-- Johan Hedberg <johan.hedberg at nokia.com> Thu, 6 May 2004 18:29:09 +0300
osso-gwobex (0.4-1) unstable; urgency=low
- * Changed GW_OBEX to GwObex (more GLib-like)
+ * Changed GW_OBEX to GwObex (more GLib-like)
-- Johan Hedberg <johan.hedberg at nokia.com> Wed, 5 May 2004 16:04:51 +0300
@@ -472,7 +478,7 @@
osso-gwobex (0.2-1) unstable; urgency=low
- * New autotools build system by Mikael Hallendal <micke at imendio.com>
+ * New autotools build system by Mikael Hallendal <micke at imendio.com>
* Cleanup & fixes
* Better debianization using compat == 4
Modified: projects/connectivity/osso-gwobex/trunk/src/obex-priv.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-priv.c 2007-11-02 07:11:40 UTC (rev 14702)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-priv.c 2007-11-02 08:19:50 UTC (rev 14703)
@@ -50,6 +50,9 @@
#include "obex-xfer.h"
#include "obex-priv.h"
+#define MAX_TIMEOUTS 20
+#define MAX_TIMEOUTS_FIRST 60
+
static gboolean file_is_dir(const char *filename) {
struct stat st;
@@ -88,6 +91,8 @@
}
static gboolean gw_obex_request_sync(GwObex *ctx, obex_object_t *object) {
+ int timeouts = 0, first = 1;
+
/* Set sensible start values */
ctx->done = FALSE;
@@ -98,9 +103,9 @@
}
while (TRUE) {
- int ret;
+ int ret, max_timeouts;
- ret = OBEX_HandleInput(ctx->handle, 10);
+ ret = OBEX_HandleInput(ctx->handle, 1);
if (ctx->done)
break;
@@ -120,7 +125,19 @@
ctx->error = GW_OBEX_ERROR_INTERNAL;
return FALSE;
}
- else if (ret == 0) { /* Timeout */
+
+ /* Timeout */
+ if (ret == 0)
+ timeouts++;
+ else {
+ timeouts = 0;
+ if (first)
+ first = 0;
+ }
+
+ max_timeouts = first ? MAX_TIMEOUTS_FIRST : MAX_TIMEOUTS;
+
+ if (timeouts > max_timeouts) {
debug("OBEX_HandleInput(): timeout\n");
ctx->error = GW_OBEX_ERROR_TIMEOUT;
obex_link_error(ctx);
- Previous message: [maemo-commits] r14702 - projects/connectivity/osso-gwobex/trunk/src
- Next message: [maemo-commits] r14704 - projects/connectivity/osso-gwobex/trunk/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]