diff --git a/modules/csync_owncloud.c b/modules/csync_owncloud.c index c036ebf9b..f740463cd 100644 --- a/modules/csync_owncloud.c +++ b/modules/csync_owncloud.c @@ -426,10 +426,6 @@ static int dav_connect(const char *base_url) { return 0; } - dav_session.time_delta_sum = 0; - dav_session.time_delta_cnt = 0; - dav_session.prev_delta = 0; - rc = c_parse_uri( base_url, &scheme, &dav_session.user, &dav_session.pwd, &host, &port, &path ); if( rc < 0 ) { DEBUG_WEBDAV("Failed to parse uri %s", base_url ); @@ -605,13 +601,8 @@ static struct listdir_context *fetch_resource_list(const char *uri, int depth) int ret = 0; ne_propfind_handler *hdl = NULL; ne_request *request = NULL; - const char *date_header = NULL; const char *content_type = NULL; char *curi = NULL; - time_t server_time; - time_t now; - time_t time_diff; - time_t time_diff_delta; const ne_status *req_status = NULL; curi = _cleanPath( uri ); @@ -696,41 +687,6 @@ static struct listdir_context *fetch_resource_list(const char *uri, int depth) } } - if( ret == NE_OK ) { - date_header = ne_get_response_header( request, "Date" ); - DEBUG_WEBDAV("Server Date from HTTP header value: %s", date_header); - server_time = oc_httpdate_parse(date_header); - if( server_time ) { - now = time(NULL); - time_diff = server_time - now; - - dav_session.time_delta_sum += time_diff; - dav_session.time_delta_cnt++; - - /* Store the previous time delta */ - dav_session.prev_delta = dav_session.time_delta; - - /* check the changing of the time delta */ - time_diff_delta = llabs(dav_session.time_delta - time_diff); - if( dav_session.time_delta_cnt == 1 ) { - DEBUG_WEBDAV( "The first time_delta is %ld", time_diff ); - } else if( dav_session.time_delta_cnt > 1 ) { - if( time_diff_delta > 5 ) { - DEBUG_WEBDAV("WRN: The time delta changed more than 5 second"); - // errno = ERRNO_TIMEDELTA; - // ret = OC_TIMEDELTA_FAIL; - } else { - DEBUG_WEBDAV("Ok: Time delta remained (almost) the same: %ld.", time_diff); - } - } else { - DEBUG_WEBDAV("Difference to last server time delta: %ld", time_diff_delta ); - } - dav_session.time_delta = time_diff; - } else { - DEBUG_WEBDAV("ERROR: Unable to parse server time."); - } - } - if( ret != NE_OK ) { const char *err = NULL; @@ -750,10 +706,6 @@ static struct listdir_context *fetch_resource_list(const char *uri, int depth) DEBUG_WEBDAV("Permanently moved to %s", redir_uri); } } - if( ret == OC_TIMEDELTA_FAIL ) { - DEBUG_WEBDAV("WRN: Time delta changed too much!"); - /* FIXME: Reasonable user warning */ - } if( ret != NE_OK ) { free_fetchCtx(fetchCtx); @@ -1664,10 +1616,6 @@ static int owncloud_utimes(const char *uri, const struct timeval *times) { newmodtime = modtime->tv_sec; - DEBUG_WEBDAV("Add a time delta to modtime %lu: %ld", - modtime->tv_sec, (long) dav_session.time_delta); - newmodtime += dav_session.time_delta; - snprintf( val, sizeof(val), "%ld", newmodtime ); DEBUG_WEBDAV("Setting LastModified of %s to %s", curi, val ); diff --git a/modules/csync_owncloud.h b/modules/csync_owncloud.h index 71db84193..cf532f3e5 100644 --- a/modules/csync_owncloud.h +++ b/modules/csync_owncloud.h @@ -65,10 +65,6 @@ #define DEBUG_WEBDAV(...) csync_log( dav_session.csync_ctx, 9, "oc_module", __VA_ARGS__); -#define OC_TIMEDELTA_FAIL (NE_REDIRECT +1) -#define OC_PROPFIND_FAIL (NE_REDIRECT +2) - - enum resource_type { resr_normal = 0, resr_collection, @@ -150,11 +146,6 @@ struct dav_session_s { int read_timeout; - long int prev_delta; - long int time_delta; /* The time delta to use. */ - long int time_delta_sum; /* What is the time delta average? */ - long int time_delta_cnt; /* How often was the server time gathered? */ - CSYNC *csync_ctx; void *userdata; diff --git a/modules/csync_owncloud_util.c b/modules/csync_owncloud_util.c index 3391971a2..b264da410 100644 --- a/modules/csync_owncloud_util.c +++ b/modules/csync_owncloud_util.c @@ -303,10 +303,7 @@ csync_vio_file_stat_t *resourceToFileStat( struct resource *res ) DEBUG_WEBDAV("ERROR: Unknown resource type %d", res->type); } - /* Correct the mtime of the file with the server time delta */ - DEBUG_WEBDAV(" :> Subtracting %ld from modtime %llu", dav_session.time_delta, - (unsigned long long) res->modtime); - lfs->mtime = res->modtime - dav_session.time_delta ; + lfs->mtime = res->modtime; lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MTIME; lfs->size = res->size; lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_SIZE;