SF.net SVN: fclient: [156] trunk/sandbox/fcp/fcp2_0_consts.py

[<ju...@us...>]

Revision: 156
          http://fclient.svn.sourceforge.net/fclient/?rev=156&view=rev
Author:   jurner
Date:     2008-02-06 02:52:05 -0800 (Wed, 06 Feb 2008)

Log Message:
-----------
more fine grained status and type flags for requests

Modified Paths:
--------------
    trunk/sandbox/fcp/fcp2_0_consts.py

Modified: trunk/sandbox/fcp/fcp2_0_consts.py
===================================================================
--- trunk/sandbox/fcp/fcp2_0_consts.py	2008-02-05 16:00:48 UTC (rev 155)
+++ trunk/sandbox/fcp/fcp2_0_consts.py	2008-02-06 10:52:05 UTC (rev 156)
@@ -298,9 +298,11 @@
 	@cvar Started: the request has started
 	@cvar Compressing: the request is about to be compressed
 	@cvar Compressed: compressing is completed
-	@cvar Complete: the request has completed successfuly
+	@cvar Success: the request has completed successfuly
 	@cvar Error: the request has completed with an error
-	@cvar Removed: the request is no longer present in the client (and on the nodes queue)
+	@cvar Completed: processing of the request is completed
+	@cvar Removed: the request is no longer present in the nodes queue. The client will remove the request
+	from its own queue as soon as all event listeners have been notified.
 	
 	@cvar MaskProcessed: bitmask checking if a request is completely processed (either 
 	successfuly completed or completed with an error or removed) 
@@ -313,25 +315,31 @@
 	Started = 0x2
 	Compressing = 0x4
 	Compressed = 0x8
-	Complete = 0x10
+	Success = 0x10
 	Error = 0x20
-	Removed = 0x40
-		
-	MaskProcessed = Complete | Error | Removed
+	
+	Completed =0x10000000
+	Removed = 0x2000000
+	
 
-
-class RequestSubType:
-	"""Consts indicating the subtype of a message"""
+class RequestType:
+	"""Consts indicating the type of a request"""
 	
 	Null = 0
-	GetData = 1
-	GetFile = 2
-	GetKeyInfo = 3
-	Put = 4
-	PutDiskDir = 5
-	PutComplexDir = 6
+	GetData = 0x1
+	GetFile = 0x2
+	GetKeyInfo = 0x4
+	Put = 0x8
+	PutDiskDir = 0x10
+	PutComplexDir = 0x20
 	
+	GenerateSSKKeypair = GenerateKeypair = 0x1000
+	GenerateUSKKeypair = 0x2000
+	
+	PluginInfo = 0x2000000
+	PluginMessage = 0x4000000
 
+
 #TODO: no idea how fcp handles strings as in <Peer volatile.status=CONNECTED>
 #           all I could find in the sources where these constants as in PEER_NODE_STATUS_CONNECTED
 #           in --> freenet/node/PeerManager.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.