Commit graph

150 commits

Author SHA1 Message Date
Olivier Goffart
0eb1855345 Revert "Only refresh the folder id for remote replica"
This reverts commit ce94beb068.

This broke because the tree are not merged yet.
If a file was added on the remote, it is not yet in the remote tree, and
still we need to query the ETag
2012-12-06 16:36:13 +01:00
Olivier Goffart
ce94beb068 Only refresh the folder id for remote replica
Also don't remove trailing slash, there is no trailing slashes in the
path
2012-12-05 18:18:45 +01:00
Klaas Freitag
79d5e19a65 Remove left over WIP code. 2012-12-05 12:38:57 +01:00
Olivier Goffart
f18f58ace0 Add progress callback 2012-12-04 17:26:23 +01:00
Olivier Goffart
0f35b92d75 Add an API to be able to pass information to the vio module 2012-12-04 17:22:11 +01:00
Klaas Freitag
13354b6e8b Removed old log callback code. 2012-12-03 19:41:44 +01:00
Olivier Goffart
95edd6a9de Merge remote-tracking branch 'origin/master' into dav
Conflicts:
	config/ocsync_log.conf
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_log.h
	src/csync_private.h
	src/csync_statedb.c
	tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01:00
Olivier Goffart
62897e6d37 Win: Load the exclude lists in the config 2012-11-07 17:46:13 +01:00
Klaas Freitag
67373dcb0d commented work in progress treewalk stuff. 2012-11-07 12:33:39 +01:00
Klaas Freitag
898d51f92d WIP: Try to catch a cleared remote path 2012-10-31 21:38:57 +01:00
Klaas Freitag
e183854b58 Added experimental function to check if a file is known locally. 2012-10-31 21:33:17 +01:00
Andreas Schneider
8a0b4319d3 csync: Add a new logging system. 2012-10-30 11:27:21 +01:00
Andreas Schneider
95b367dd23 csync: Add option to set and get log verbosity. 2012-10-30 11:27:20 +01:00
Andreas Schneider
890df87d00 csync: Add support for a log callback. 2012-10-30 11:27:20 +01:00
Klaas Freitag
8afe182e0c Fix merge: Initialise data before accessing them. 2012-10-28 11:31:25 +01:00
Klaas Freitag
2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move.
Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Andreas Schneider
805621540a csync: Move auth callback to a common struct. 2012-10-27 15:29:00 +02:00
Klaas Freitag
0db9427377 Add name of rename target to treewalk data structure. 2012-10-26 20:01:25 +02:00
Klaas Freitag
d82850f145 Fix more csync->ocsync renaming issues. 2012-10-26 16:11:34 +02:00
Andreas Schneider
76e6fbb72f csync: Move the statedb (journal) to the local directory. 2012-10-22 14:53:59 +02:00
Andreas Schneider
6ae00fe3b2 csync: Don't leak memory on error in csync_create().
Found by Coverity.
2012-10-19 20:37:13 +02:00
Andreas Schneider
3f02bf7990 csync: Rework _csync_treewalk_visitor().
This fixes some possible null pointer defererences.

Found by Coverity.
2012-10-19 19:24:07 +02:00
Benjamin Legrand
cb8a501241 Fix a typeo and rename REPLCIA to REPLICA.
BUG #8

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-10-19 15:59:51 +02:00
Klaas Freitag
e89c6dc256 Free md5 memory when destroying. 2012-10-16 09:47:07 +02:00
Klaas Freitag
44a6cf9bfc Remove wrong free. 2012-09-20 17:54:23 +03:00
Klaas Freitag
fc6cd714c7 win32: Fix random file name generation, init random generator once.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-09-04 12:19:12 +02:00
Klaas Freitag
6fbc510aeb Free memory of id_list lists. 2012-08-30 13:05:24 +03:00
Klaas Freitag
3950b18dc7 Fix memory leaks in new id sync code. 2012-08-28 17:53:26 +03:00
Klaas Freitag
452babe593 Improved error report on proxy- and connection problems. 2012-08-09 15:12:22 +03:00
Klaas Freitag
5b38e2cb5a Improved logging in error case (minor fix). 2012-07-31 17:58:49 +03:00
Klaas Freitag
85993d2650 Don't override error code set by timedif in vio init 2012-07-19 21:21:33 +02:00
Klaas Freitag
59202fffe4 fixed spaces and logging if timesync is needed for the module. 2012-07-11 16:03:31 +02:00
Klaas Freitag
de209ecdb9 ownCloud: Don't require time sync between server and client. 2012-07-04 16:32:17 +02:00
Klaas Freitag
8ba2f483bf Add a vio capabilites function to let a module define its capabilities. 2012-07-04 13:56:24 +02:00
Klaas Freitag
98bc5098c9 Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into dav
Conflicts:
	src/csync_propagate.c
2012-07-01 15:27:41 +02:00
Klaas Freitag
8034da83cc Ability to push to remote without using a tempfile to copy to.
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
2012-06-26 18:30:50 +02:00
Klaas Freitag
92ec13d886 win32: Fix random file name generation, init random generator once. 2012-06-26 18:30:50 +02:00
Klaas Freitag
e129d02024 do not log on stderr on MacOSX because that spams system log 2012-06-26 18:28:38 +02:00
Klaas Freitag
cd7aec1636 Do not log "module not found" messages if there is a second try. 2012-06-26 18:28:18 +02:00
Klaas Freitag
5e040d47d6 Add ability to log to a callback for the csync library. 2012-06-26 18:28:07 +02:00
Klaas Freitag
b0f6602681 Added a csync_errno function to provide more info for clients. 2012-06-26 18:24:08 +02:00
Klaas Freitag
357b5cd5f3 Ability to push to remote without using a tempfile to copy to.
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
2012-06-22 15:32:04 +02:00
Klaas Freitag
9836ec864a win32: Fix random file name generation, init random generator once. 2012-06-20 10:40:40 +02:00
Klaas Freitag
370e2e451f do not log on stderr on MacOSX because that spams system log 2012-06-18 13:02:06 +02:00
Klaas Freitag
c1953d61c7 Do not log "module not found" messages if there is a second try. 2012-06-18 10:43:07 +02:00
Klaas Freitag
d1ae05166d Added a newline in case the logging callback is zero. 2012-06-08 12:52:48 +02:00
Klaas Freitag
39534fb5de Add ability to log to a callback for the csync library. 2012-06-05 17:11:33 +02:00
Klaas Freitag
33d1825551 Merge branch 'dav' of http://git.csync.org/users/freitag/csync into dav
Conflicts:
	src/csync.c
2012-05-15 16:17:51 +02:00
Klaas Freitag
a198f36bf5 ownCloud: set correct module load error code. 2012-05-15 16:15:27 +02:00
Klaas Freitag
522a6e27a2 Set module load error code after csync_vio_init failed. 2012-05-04 12:07:20 +02:00