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

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

Revision: 110
          http://fclient.svn.sourceforge.net/fclient/?rev=110&view=rev
Author:   jurner
Date:     2008-02-02 03:25:23 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
refactor

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-02 11:24:50 UTC (rev 109)
+++ trunk/sandbox/fcp/fcp2_0_consts.py	2008-02-02 11:25:23 UTC (rev 110)
@@ -208,76 +208,89 @@
 class Message:
 		"""Fcp messages"""
 		
-		# client s
+		# client --> node
+		AddPeer = 'AddPeer'
 		ClientHello = 'ClientHello'
+		ClientGet = 'ClientGet'
+		ClientPut = 'ClientPut'
+		ClientPutDiskDir = 'ClientPutDiskDir'
+		ClientPutComplexDir = 'ClientPutComplexDir'
+		FCPPlugin = 'FCPPlugin'
+		GenerateSSK = 'GenerateSSK'
+		GetConfig = 'GetConfig'														# (since 1027)
+		GetNode = 'GetNode'
+		GetPluginInfo = 'GetPluginInfo'
+		GetRequestStatus = 'GetRequestStatus'
 		ListPeer = 'ListPeer'															# (since 1045)
 		ListPeers = 'ListPeers'
 		ListPeerNotes = 'ListPeerNotes'
-		AddPeer = 'AddPeer'
+		ListPersistentRequests = 'ListPersistentRequests'
+		ModifyConfig = 'ModifyConfig'												# (since 1027)
 		ModifyPeer = 'ModifyPeer'
 		ModifyPeerNote = 'ModifyPeerNote'
+		ModifyPersistentRequest = 'ModifyPersistentRequest'
 		RemovePeer = 'RemovePeer'
-		GetNode = 'GetNode'
-		GetConfig = 'GetConfig'														# (since 1027)
-		ModifyConfig = 'ModifyConfig'											# (since 1027)
+		RemovePersistentRequest = 'RemovePersistentRequest'
+		Shutdown = 'Shutdown'
+		SubscribeUSK = 'SubscribeUSK'													
 		TestDDARequest = 'TestDDARequest'									# (since 1027)
 		TestDDAResponse = 'TestDDAResponse'								# (since 1027)
-		GenerateSSK = 'GenerateSSK'
-		ClientPut = 'ClientPut'
-		ClientPutDiskDir = 'ClientPutDiskDir'
-		ClientPutComplexDir = 'ClientPutComplexDir'
-		ClientGet = 'ClientGet'
-		GetPluginInfo = 'GetPluginInfo'
-		FCPPlugin = 'FCPPlugin'
-		SubscribeUSK = 'SubscribeUSK'
 		WatchGlobal = 'WatchGlobal'
-		GetRequestStatus = 'GetRequestStatus'
-		ListPersistentRequests = 'ListPersistentRequests'
-		RemovePersistentRequest = 'RemovePersistentRequest'
-		ModifyPersistentRequest = 'ModifyPersistentRequest'
-		Shutdown = 'Shutdown'
-		
-		# node s
+				
+		# node --> client
+		AllData = 'AllData'
+		CloseConnectionDuplicateClientName = 'CloseConnectionDuplicateClientName'
+		ConfigData = 'ConfigData'													# (since 1027)
+		DataFound = 'DataFound'
+		EndListPeers = 'EndListPeers'
+		EndListPeerNotes = 'EndListPeerNotes'
+		EndListPersistentRequests = 'EndListPersistentRequests'
+		FCPPluginReply = 'FCPPluginReply'
+		FinishedCompression = 'FinishedCompression'
+		GetFailed = 'GetFailed'
+		IdentifierCollision = 'IdentifierCollision'
+		NodeData = 'NodeData'
 		NodeHello = 'NodeHello'
-		CloseConnectionDuplicateClientName = 'CloseConnectionDuplicateClientName'
 		Peer = 'Peer'
 		PeerNote = 'PeerNote'
-		EndListPeers = 'EndListPeers'
-		EndListPeerNotes = 'EndListPeerNotes'
 		PeerRemoved = 'PeerRemoved'
-		NodeData = 'NodeData'
-		ConfigData = 'ConfigData'													# (since 1027)
-		TestDDAReply = 'TestDDAReply'											# (since 1027)
-		TestDDAComplete = 'TestDDAComplete'								# (since 1027)
-		SSKKeypair = 'SSKKeypair'
 		PersistentGet = 'PersistentGet'
 		PersistentPut = 'PersistentPut'
 		PersistentPutDir = 'PersistentPutDir'
-		URIGenerated = 'URIGenerated'
+		PersistentRequestModified = 'PersistentRequestModified'	# (since 1016)
+		PersistentRequestRemoved = 'PersistentRequestRemoved'		# (since 1016)
+		PluginInfo = 'PluginInfo'
+		ProtocolError = 'ProtocolError'
+		PutFailed = 'PutFailed'
+		PutFetchable = 'PutFetchable'
 		PutSuccessful = 'PutSuccessful'
-		PutFetchable = 'PutFetchable'
-		DataFound = 'DataFound'
-		AllData = 'AllData'
+		SimpleProgress = 'SimpleProgress'
+		SSKKeypair = 'SSKKeypair'
 		StartedCompression = 'StartedCompression'
-		FinishedCompression = 'FinishedCompression'
-		SimpleProgress = 'SimpleProgress'
-		EndListPersistentRequests = 'EndListPersistentRequests'
-		PersistentRequestRemoved = 'PersistentRequestRemoved'		# (since 1016)
-		PersistentRequestModified = 'PersistentRequestModified'	# (since 1016)
-		PutFailed = 'PutFailed'
-		GetFailed = 'GetFailed'
-		ProtocolError = 'ProtocolError'
-		IdentifierCollision = 'IdentifierCollision'
+		SubscribedUSKUpdate = 'SubscribedUSKUpdate'
+		TestDDAComplete = 'TestDDAComplete'								# (since 1027)
+		TestDDAReply = 'TestDDAReply'											# (since 1027)
 		UnknownNodeIdentifier = 'UnknownNodeIdentifier'
 		UnknownPeerNoteType = 'UnknownPeerNoteType'
-		SubscribedUSKUpdate = 'SubscribedUSKUpdate'
-		PluginInfo = 'PluginInfo'
-		FCPPluginReply = 'FCPPluginReply'
-
+		URIGenerated = 'URIGenerated'
+		
+	
 		# client s (internal use only)
 		ClientSocketTimeout = 1
 		ClientSocketDied = 2
 		ClientDisconnected = 3
+		
+		ClientRequestMessages = (
+				ClientGet,
+				ClientPut,
+				ClientPutDiskDir,
+				ClientPutComplexDir,
+				)
+		ClientPluginMessages = (
+				GetPluginInfo,
+				FCPPlugin,
+				)
+		
 
 
 class MessageStatus:


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