[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19513 - gnunet/src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19513 - gnunet/src/include |
Date: |
Sun, 29 Jan 2012 22:20:23 +0100 |
Author: grothoff
Date: 2012-01-29 22:20:23 +0100 (Sun, 29 Jan 2012)
New Revision: 19513
Modified:
gnunet/src/include/gnunet_fs_service.h
gnunet/src/include/gnunet_protocols.h
Log:
-towards external meta scanner process
Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h 2012-01-29 21:20:17 UTC (rev
19512)
+++ gnunet/src/include/gnunet_fs_service.h 2012-01-29 21:20:23 UTC (rev
19513)
@@ -2608,9 +2608,10 @@
GNUNET_FS_DIRSCANNER_FILE_START = 0,
/**
- * We've finished processing a subtree in the pre-pass.
+ * We're having trouble accessing a file (soft-error); it will
+ * be ignored.
*/
- GNUNET_FS_DIRSCANNER_SUBTREE_COUNTED,
+ GNUNET_FS_DIRSCANNER_FILE_IGNORED,
/**
* We've found all files (in the pre-pass).
@@ -2629,12 +2630,6 @@
GNUNET_FS_DIRSCANNER_FINISHED,
/**
- * We're having trouble accessing a file (soft-error); it will
- * be ignored.
- */
- GNUNET_FS_DIRSCANNER_DOES_NOT_EXIST,
-
- /**
* There was an internal error. Application should abort the scan.
*/
GNUNET_FS_DIRSCANNER_INTERNAL_ERROR
@@ -2647,7 +2642,6 @@
* progress on the job at hand.
*
* @param cls closure
- * @param ds handle to the directory scanner (NEEDED!?)
* @param filename which file we are making progress on
* @param is_directory GNUNET_YES if this is a directory,
* GNUNET_NO if this is a file
@@ -2655,7 +2649,6 @@
* @param reason kind of progress we are making
*/
typedef void (*GNUNET_FS_DirScannerProgressCallback) (void *cls,
- struct
GNUNET_FS_DirScanner *ds,
const char *filename,
int is_directory,
enum
GNUNET_FS_DirScannerProgressUpdateReason reason);
@@ -2710,16 +2703,11 @@
char *filename;
/**
- * Base name of the file/directory
+ * Base name of the file/directory; FIXME: needed?
*/
char *short_filename;
/**
- * Size of the file (if it is a file), in bytes
- */
- uint64_t file_size;
-
- /**
* GNUNET_YES if this is a directory
*/
int is_directory;
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2012-01-29 21:20:17 UTC (rev
19512)
+++ gnunet/src/include/gnunet_protocols.h 2012-01-29 21:20:23 UTC (rev
19513)
@@ -608,8 +608,6 @@
*/
#define GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_VPN 192
-
-
/**
* Type of messages containing an DNS request for a DNS exit service.
*/
@@ -1214,12 +1212,50 @@
*/
#define GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK 410
+/*******************************************************************************
+ * FS-PUBLISH-HELPER IPC Messages
+
******************************************************************************/
/**
- * Next available: 420
+ * Progress information from the helper: found a file
*/
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_FILE 420
+/**
+ * Progress information from the helper: found a directory
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_DIRECTORY 421
+/**
+ * Error signal from the helper.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR 422
+
+/**
+ * Signal that helper skipped a file.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_SKIP_FILE 423
+
+/**
+ * Signal that helper is done scanning the directory tree.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_COUNTING_DONE 424
+
+/**
+ * Extracted meta data from the helper.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_META_DATA 425
+
+/**
+ * Signal that helper is done.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED 426
+
+
+/**
+ * Next available: 430
+ */
+
/*******************************************************************************
* TODO: we need a way to register message types centrally (via some webpage).
* For now: unofficial extensions should start at 48k, internal extensions
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19513 - gnunet/src/include,
gnunet <=